From patchwork Fri Jan 9 16:35:08 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4698 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:b01a:b0:80a:3855:ce6a with SMTP id nz26csp1833328mab; Fri, 9 Jan 2026 08:35:39 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUsiKCHeR7idh/DDMF46BeQ9XeCcn5GmJpzRctb2gr/Fk2an03BWh95gpVP9Denl7livsmLM/wwenQ=@openvpn.net X-Google-Smtp-Source: AGHT+IEoUtz5l6j/RnLSQjkKVPMTXLGQXhWPCv9fUR8odms7+A6AB7z0vVmoCAVLxQranMmngWUu X-Received: by 2002:a05:6808:4fe4:b0:44d:a570:bc24 with SMTP id 5614622812f47-45a6bcc9b08mr5466428b6e.9.1767976539293; Fri, 09 Jan 2026 08:35:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1767976539; cv=none; d=google.com; s=arc-20240605; b=lzwXK3gtGHAfRHsVCwU2CJVr1rnjfiUGUSg/J+lRnLoeHOsLNozXWsK4TEtpO7kTEY OkZAoeorUN8Q7qRAZswGRSIrf+tguYfcs0RGm71FwEG2cVRiTkWU3rFIRzRFBdJkYBvh 6+tTSzwIYH3jYcnwvJPoTM6+E2HcW4xTcUBEbyPVZ8D1n4WXnFWXeuReR/5EcT+JoPEj lrdXwuur2QYnEHWyVrtFuqGbWM5B+GXZOZm16YAhV5kxmWmnQXqwsG5x4wbbpFKtpwBM 38HuKLJEscigL8VZb/ghj6kaOCQaAqklf6eAsY1Z2c7ZNITAErXU27omBFqSeE7C9bWD WfrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=Gvoh6OW2RBmXridzXnhmMdfOVVizDT0s4fMCVV5A/wg=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=k+2bUj2OlH+zDzppMPMzKZy7i+wMcZE6osDNHYZtPwyXScQ9/CyGPDWxLadZEPKXCZ WfgoqIwMSnSMRJMgB4NFHhEEaUcIRmHipGMKT2RquBH5tePlvZ+G0LhSl6uSsv1urDz4 z6T/uSW+GP5WRfL9uxVqlXXdfEuPEpfs79v9Zp6L0BE/0ip50NoiXvUlOLv09up1butc BdCEsaTrmTJnwX8dcIV3IzZPtAGiWx/mEZs2xnm2tUVHpxz3yLEgYvpZ5qYpvau7zS5h vbbMqz8gSq6HoRKYiKPAa+yfNsymFfSrPYCMp3Wrw/9naB71fCxuO/dkL1ZNfG2bzXbD 9sSA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=mB0Ji0mC; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=fKh4RRrP; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=BfrD1649; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 586e51a60fabf-3ffa5089689si7358264fac.262.2026.01.09.08.35.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Jan 2026 08:35:38 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=mB0Ji0mC; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=fKh4RRrP; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=BfrD1649; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Gvoh6OW2RBmXridzXnhmMdfOVVizDT0s4fMCVV5A/wg=; b=mB0Ji0mCPYg4dyT2EIlRr44D9G 6jZVisBVJWIQbFXnQuiu8pZjPloGlYVA49JnB5L7Dn8zoEeH9GQJXgPQHi+ANnG1jN7I6SuqKvZFu 7SKrwgLtnOzqgAprm7hnTGPs9/m0dvUAJ9OXgceN9VZKRjDldWQ5+VB78OxlcyCx+T+4=; Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1veFST-0004d4-VN; Fri, 09 Jan 2026 16:35:30 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1veFSR-0004cp-Sh for openvpn-devel@lists.sourceforge.net; Fri, 09 Jan 2026 16:35:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ox2P1MWsmNRmZEK9G5028yQY1sCEMO3bCR8Jx0KHTOc=; b=fKh4RRrPcYhU4TxZSZb02SJzSI A21ITTsaMwJ00HxCqGhEd4NT9VPi9/wZFUoMD/fJcjxE6Lck5aAj8Q++LjdSIcL7CPZKQknyZ4dMt yOKpEhTeyHB6DDVsdtUyJ47vIwHzJVII6joBBXMkXvLCA/wm7Pwo7rLtDEDdp388zei4=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ox2P1MWsmNRmZEK9G5028yQY1sCEMO3bCR8Jx0KHTOc=; b=BfrD1649UYg/yKZE8nhsEw2TwB 9fckxM7cpG8ROQSbf7M8foCpDMgiIvm6y8r0hY57cZe7oHIrFXS62s+Aob4FBOb9oBN3qAmNIxoRu 8FDY/ER5cqEq2xllfBoEYjMvXi9jWjT1rtVGTndMEJLiXyEgOrPwunni6W2qplpKgAPQ=; Received: from [193.149.48.134] (helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1veFSQ-0001fQ-TV for openvpn-devel@lists.sourceforge.net; Fri, 09 Jan 2026 16:35:28 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 609GZEA2023064 for ; Fri, 9 Jan 2026 17:35:14 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 609GZEYl023063 for openvpn-devel@lists.sourceforge.net; Fri, 9 Jan 2026 17:35:14 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Fri, 9 Jan 2026 17:35:08 +0100 Message-ID: <20260109163514.23051-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.51.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-1.hosts.colo.sdot.me", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Frank Lichtenheld - Do not try to handle very old systemd that was released over ten years ago (remove SYSTEMD_NEWER_THAN_216) - Do not require systemd.pc. I can't find any indication that we use any of the variables d [...] Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_DNSWL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to DNSWL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#DnsBlocklists-dnsbl-block for more information. [193.149.48.134 listed in list.dnswl.org] 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1veFSQ-0001fQ-TV Subject: [Openvpn-devel] [PATCH v1] configure.ac: Clean up systemd support X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1853857767984567030?= X-GMAIL-MSGID: =?utf-8?q?1853857767984567030?= From: Frank Lichtenheld - Do not try to handle very old systemd that was released over ten years ago (remove SYSTEMD_NEWER_THAN_216) - Do not require systemd.pc. I can't find any indication that we use any of the variables defined by it. (It does not define any libraries, just variables) - Remove check for sd-daemon.h. We did not use the conditional and assumed it was there already. - Allow libsystemd.pc to define cflags. Previously we ignored those. Change-Id: Ie59e03ce01575acaeaf690f582eb5cfa80eb37fc Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1463 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1463 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Arne Schwabe diff --git a/config.h.cmake.in b/config.h.cmake.in index 01bbadc..53976a7 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -284,9 +284,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYSLOG_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYSTEMD_SD_DAEMON_H - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_EPOLL_H @@ -374,9 +371,6 @@ /* Path to systemd-ask-password tool */ #undef SYSTEMD_ASK_PASSWORD_PATH -/* systemd is newer than v216 */ -#define SYSTEMD_NEWER_THAN_216 - /* The tap-windows id */ #define TAP_WIN_COMPONENT_ID "tap0901" diff --git a/configure.ac b/configure.ac index 8ba5673..63d4d6e 100644 --- a/configure.ac +++ b/configure.ac @@ -1139,28 +1139,14 @@ dnl AM_CONDITIONAL([ENABLE_SYSTEMD], [test "${enable_systemd}" = "yes"]) if test "$enable_systemd" = "yes" ; then - PKG_CHECK_MODULES([libsystemd], [systemd libsystemd], + PKG_CHECK_MODULES([libsystemd], [libsystemd > 216], [], - [PKG_CHECK_MODULES([libsystemd], [libsystemd-daemon])] + [AC_MSG_ERROR([systemd enabled but libsystemd is missing])] ) - PKG_CHECK_EXISTS([libsystemd > 216], - [AC_DEFINE([SYSTEMD_NEWER_THAN_216], [1], - [systemd is newer than v216])] - ) - - AC_CHECK_HEADERS(systemd/sd-daemon.h, - , - [ - AC_MSG_ERROR([systemd development headers not found.]) - ]) - - saved_LIBS="${LIBS}" - LIBS="${LIBS} ${libsystemd_LIBS}" - AC_CHECK_FUNCS([sd_booted], [], [AC_MSG_ERROR([systemd library is missing sd_booted()])]) + OPTIONAL_SYSTEMD_CFLAGS="${libsystemd_CFLAGS}" OPTIONAL_SYSTEMD_LIBS="${libsystemd_LIBS}" AC_DEFINE(ENABLE_SYSTEMD, 1, [Enable systemd integration]) - LIBS="${saved_LIBS}" if test -n "${SYSTEMD_UNIT_DIR}"; then systemdunitdir="${SYSTEMD_UNIT_DIR}" @@ -1377,6 +1363,7 @@ AC_SUBST([OPTIONAL_LZO_LIBS]) AC_SUBST([OPTIONAL_LZ4_CFLAGS]) AC_SUBST([OPTIONAL_LZ4_LIBS]) +AC_SUBST([OPTIONAL_SYSTEMD_CFLAGS]) AC_SUBST([OPTIONAL_SYSTEMD_LIBS]) AC_SUBST([OPTIONAL_PKCS11_HELPER_CFLAGS]) AC_SUBST([OPTIONAL_PKCS11_HELPER_LIBS]) diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am index 19c21c0f..c879585 100644 --- a/src/openvpn/Makefile.am +++ b/src/openvpn/Makefile.am @@ -28,6 +28,7 @@ $(OPTIONAL_LIBNL_GENL_CFLAGS) \ $(OPTIONAL_LZO_CFLAGS) \ $(OPTIONAL_LZ4_CFLAGS) \ + $(OPTIONAL_SYSTEMD_CFLAGS) \ $(OPTIONAL_PKCS11_HELPER_CFLAGS) \ $(OPTIONAL_INOTIFY_CFLAGS) \ -DPLUGIN_LIBDIR=\"${plugindir}\" \ diff --git a/src/openvpn/console_systemd.c b/src/openvpn/console_systemd.c index d277bd4..9588b95 100644 --- a/src/openvpn/console_systemd.c +++ b/src/openvpn/console_systemd.c @@ -61,13 +61,10 @@ struct argv argv = argv_new(); argv_printf(&argv, SYSTEMD_ASK_PASSWORD_PATH); -#ifdef SYSTEMD_NEWER_THAN_216 - /* the --echo support arrived in upstream systemd 217 */ if (echo) { argv_printf_cat(&argv, "--echo"); } -#endif argv_printf_cat(&argv, "--icon network-vpn"); argv_printf_cat(&argv, "--timeout=0"); argv_printf_cat(&argv, "%s", prompt); diff --git a/src/openvpn/init.c b/src/openvpn/init.c index c014a91..b690dff 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -1545,7 +1545,7 @@ #else #ifdef ENABLE_SYSTEMD sd_notifyf(0, "STATUS=Failed to start up: %s With Errors\nERRNO=1", message); -#endif /* HAVE_SYSTEMD_SD_DAEMON_H */ +#endif msg(M_INFO, "%s With Errors", message); #endif } @@ -5052,4 +5052,4 @@ packet_id_free(&c->c2.crypto_options.packet_id); context_gc_free(c); -} \ No newline at end of file +}