From: "cron2 (Code Review)" Date: Fri, 9 Jan 2026 17:20:38 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <2202bef0bac53b74bef98e065d4308b6466892ad-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="EOOw+CLguU0="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: configure.ac: Clean up systemd support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --EOOw+CLguU0= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/14= 63?usp=3Demail ) Change subject: configure.ac: Clean up systemd support ...................................................................... configure.ac: Clean up systemd support - 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 Message-Id: <20260109163514.23051-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg35= 203.html Signed-off-by: Gert Doering --- M config.h.cmake.in M configure.ac M src/openvpn/Makefile.am M src/openvpn/console_systemd.c M src/openvpn/init.c 5 files changed, 7 insertions(+), 28 deletions(-) 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}" =3D "yes"]) if test "$enable_systemd" =3D "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 mis= sing])] ) - 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=3D"${LIBS}" - LIBS=3D"${LIBS} ${libsystemd_LIBS}" - AC_CHECK_FUNCS([sd_booted], [], [AC_MSG_ERROR([systemd library is miss= ing sd_booted()])]) + OPTIONAL_SYSTEMD_CFLAGS=3D"${libsystemd_CFLAGS}" OPTIONAL_SYSTEMD_LIBS=3D"${libsystemd_LIBS}" AC_DEFINE(ENABLE_SYSTEMD, 1, [Enable systemd integration]) - LIBS=3D"${saved_LIBS}" if test -n "${SYSTEMD_UNIT_DIR}"; then systemdunitdir=3D"${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=3D\"${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 =3D 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=3D0"); 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=3DFailed to start up: %s With Errors\nERRNO= =3D1", 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 +} -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1463?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ie59e03ce01575acaeaf690f582eb5cfa80eb37fc Gerrit-Change-Number: 1463 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel --EOOw+CLguU0= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

configure.ac: Clean up systemd support

- = 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&= #39;t find any indication
that we use any of the variables defined by = it. (It
does not define any libraries, just variables)
- Remove che= ck 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: Ie59e03ce01575acaeaf690f582eb5cfa80eb37f= c
Signed-off-by: Frank Lichtenheld <frank@...2641...>
Acked-by:= Arne Schwabe <arne-openvpn@...1227...>
Gerrit URL: https://gerrit= .openvpn.net/c/openvpn/+/1463
Message-Id: <20260109163514.23051-1-ger= t@...1296...>
URL: https://www.mail-archive.com/openvpn-devel@...1096...= ourceforge.net/msg35203.html
Signed-off-by: Gert Doering <gert@...1826...= 6...>
---
M config.h.cmake.in
M configure.ac
M src/openvpn/M= akefile.am
M src/openvpn/console_systemd.c
M src/openvpn/init.c
5 = files changed, 7 insertions(+), 28 deletions(-)

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 <syslog.h> header file. */

#cmakedefine HAVE_SYSLOG_H

-/* Define to 1 if you have the <sys= temd/sd-daemon.h> header file. */
-#undef HAVE_SYSTEMD_SD_DAEMON_H
-
/* Define to 1 if you have the &= lt;sys/epoll.h> header file. */
#cmakedefine HAVE_SYS_E= POLL_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"<= br>
diff --git a/configure.ac b/configure.ac<= br>index 8ba5673..63d4d6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1139,28 +1139,14 @@
dnl
AM_CONDITIONAL([ENABLE_SYSTEMD], [test= "${enable_systemd}" =3D "yes"])
if te= st "$enable_systemd" =3D "yes" ; then
- PKG_CHECK_MODULES([libsystemd], [sy= stemd libsystemd],
+ = PKG_CHECK_MODULES([libsystemd], [libsystemd > 216],
= [],
- [PKG_CHECK_MODULES([libsystemd], [libsystemd-daem= on])]
+ = [AC_MSG_ERROR([systemd enabled but libsystemd is missing])]<= br> )

- PKG_CHECK_EXISTS([libsystemd > 216],=
- = [AC_DEFINE([SYSTEMD_NEWER_THAN_216], [1],
- [systemd is newer than v216]= )]
- = )
-
- AC_CHECK_HEADERS(systemd/sd-daemon.h= ,
- ,
<= span style=3D"color: hsl(0, 100%, 40%);">- [

- AC_MSG_ERROR([systemd development headers = not found.])
- ])=
-
- saved_LIBS=3D"${LIBS}"
- LIBS=3D"${LIBS} ${= libsystemd_LIBS}"
= - AC_CHECK_FUNCS([sd_booted], [], [AC_MSG_ERROR([systemd library is miss= ing sd_booted()])])
+= OPTIONAL_SYSTEMD_CFLAGS=3D"${libsystemd_CFLAGS}"
OPTIONAL_SYSTEMD_LIBS=3D"${libsystemd_LIBS}"

<= span> AC_DEFINE(ENABLE_SYSTEMD, 1, [Enable systemd integration])
=
- LIBS=3D"${saved_LIB= S}"

if test -n "${SYSTEMD_= UNIT_DIR}"; then
systemdunitdir=3D"${SYS= TEMD_UNIT_DIR}"
@@ -1377,6 +1363,7 @@
= AC_SUBST([OPTIONAL_LZO_LIBS])
AC_SUBST([OPTIONAL_LZ4_CFLA= GS])
AC_SUBST([OPTIONAL_LZ4_LIBS])
+AC_SUBST([OPTIONAL_SYSTEMD_CFLAGS])
AC_SUBST([OPTIONAL_SYSTEMD_LIBS])
AC_SUBST([OP= TIONAL_PKCS11_HELPER_CFLAGS])
AC_SUBST([OPTIONAL_PKCS11_HE= LPER_LIBS])
diff --git a/src/openvpn/Makefile.am b/src/open= vpn/Makefile.am
index 19c21c0f..c879585 100644
--- a/src/openvpn/Makefile.am

+++ b/src/openvpn/Makefil= e.am
@@ -28,6 +28,7 @@
$(OPTIONAL_LIBNL_G= ENL_CFLAGS) \
$(OPTIONAL_LZO_CFLAGS) \
= $(OPTIONAL_LZ4_CFLAGS) \
+ $(OPTIONAL_SYSTEMD_CFLAGS) \
$(OPTIONAL_PKCS11_HELP= ER_CFLAGS) \
$(OPTIONAL_INOTIFY_CFLAGS) \
-DPLUGIN_LIBDIR=3D\"${plugindir}\" \
diff --gi= t a/src/openvpn/console_systemd.c b/src/openvpn/console_systemd.cindex d277bd4..9588b95 100644
--- a/src/openvpn/cons= ole_systemd.c
+++ b/src/openvpn/console_systemd.c@@ -61,13 +61,10 @@
struct argv argv =3D argv_n= ew();

argv_printf(&argv, SYSTEMD= _ASK_PASSWORD_PATH);
-#= ifdef SYSTEMD_NEWER_THAN_216
- /* the --echo support arrived in upstream systemd 217 */<= br> if (echo)
{
arg= v_printf_cat(&argv, "--echo");
}<= br>-#endif
a= rgv_printf_cat(&argv, "--icon network-vpn");
= argv_printf_cat(&argv, "--timeout=3D0");
argv_printf_cat(&argv, "%s", prompt);
d= iff --git a/src/openvpn/init.c b/src/openvpn/init.c
index c= 014a91..b690dff 100644
--- a/src/openvpn/init.c
<= span>+++ b/src/openvpn/init.c
@@ -1545,7 +1545,7 @@<= br> #else
#ifdef ENABLE_SYSTEMD
= sd_notifyf(0, "STATUS=3DFailed to start up: %s With Errors\nERRNO= =3D1", 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
+}

To view, vis= it chang= e 1463. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie59e03ce01575acaeaf690f582e= b5cfa80eb37fc
Gerrit-Change-Number: 1463
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
= --EOOw+CLguU0=--