On Thu, Aug 27, 2015 at 02:53:32AM +0200, Michael Biebl wrote: > Hi > > On Mon, 13 Jul 2015 16:30:11 +0200 Michael Biebl <bi...@debian.org> wrote: > > Control: severity -1 important > > > > Hi, > > > > this is a heads-up that we plan to drop the libsystemd-* compat > > libraries in about two months. At that point, your package will FTBFS > > and this bug will be raised to serious. > > This is another friendly reminder that the compat libraries will be > dropped in 2 weeks. > Would be great if you can prepare an upload. > > Michael >
Hi Michael, I've been fighting with this for some time, but building with recent libsystemd-dev (without libsystemd-daemon-dev), makes systemd-ask-password support fail (disappear?). Please find attached the debdiff for my work in progress. I had to patch the configure script in order to skip the check for libsystemd-daemon-dev. Any hints/help would be appreciated. I also tried with a more recent upstream version, with the same result. Regards, Alberto -- Alberto Gonzalez Iniesta | Formación, consultoría y soporte técnico mailto/sip: a...@inittab.org | en GNU/Linux y software libre Encrypted mail preferred | http://inittab.com Key fingerprint = 5347 CBD8 3E30 A9EB 4D7D 4BF2 009B 3375 6B9A AA55
diff -Nru openvpn-2.3.7/debian/changelog openvpn-2.3.7/debian/changelog --- openvpn-2.3.7/debian/changelog 2015-07-01 14:19:20.000000000 +0200 +++ openvpn-2.3.7/debian/changelog 2015-09-04 13:20:01.000000000 +0200 @@ -1,3 +1,10 @@ +openvpn (2.3.7-2) unstable; urgency=medium + + * Patch configure to build without libsystemd-daemon-dev. + (Closes: #791904). Rename debian/control Build-Dep + + -- Alberto Gonzalez Iniesta <a...@inittab.org> Fri, 04 Sep 2015 11:18:40 +0000 + openvpn (2.3.7-1) unstable; urgency=medium * New upstream version diff -Nru openvpn-2.3.7/debian/control openvpn-2.3.7/debian/control --- openvpn-2.3.7/debian/control 2015-07-01 13:14:01.000000000 +0200 +++ openvpn-2.3.7/debian/control 2015-09-04 13:21:16.000000000 +0200 @@ -2,7 +2,7 @@ Section: net Priority: optional Maintainer: Alberto Gonzalez Iniesta <a...@inittab.org> -Build-Depends: debhelper (>= 7.0.50~), libssl-dev (>> 0.9.8g-9), liblzo2-dev, libpam0g-dev, libpkcs11-helper1-dev, pkg-config, dpkg-dev (>= 1.16.1), iproute2 [linux-any], net-tools [!linux-any], dh-systemd (>= 1.5), libsystemd-daemon-dev +Build-Depends: debhelper (>= 7.0.50~), libssl-dev (>> 0.9.8g-9), liblzo2-dev, libpam0g-dev, libpkcs11-helper1-dev, pkg-config, dpkg-dev (>= 1.16.1), iproute2 [linux-any], net-tools [!linux-any], dh-systemd (>= 1.5), libsystemd-dev Standards-Version: 3.9.5 Homepage: http://www.openvpn.net/ Vcs-Git: git://anonscm.debian.org/collab-maint/openvpn.git diff -Nru openvpn-2.3.7/debian/patches/configure_systemd-daemon.patch openvpn-2.3.7/debian/patches/configure_systemd-daemon.patch --- openvpn-2.3.7/debian/patches/configure_systemd-daemon.patch 1970-01-01 01:00:00.000000000 +0100 +++ openvpn-2.3.7/debian/patches/configure_systemd-daemon.patch 2015-09-04 13:17:58.000000000 +0200 @@ -0,0 +1,104 @@ +Index: pp/configure +=================================================================== +--- pp.orig/configure ++++ pp/configure +@@ -16473,12 +16473,12 @@ if test -n "$libsystemd_CFLAGS"; then + pkg_cv_libsystemd_CFLAGS="$libsystemd_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_libsystemd_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` ++ pkg_cv_libsystemd_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -16490,12 +16490,12 @@ if test -n "$libsystemd_LIBS"; then + pkg_cv_libsystemd_LIBS="$libsystemd_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_libsystemd_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` ++ pkg_cv_libsystemd_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -16516,14 +16516,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- libsystemd_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1` ++ libsystemd_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1` + else +- libsystemd_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1` ++ libsystemd_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$libsystemd_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (libsystemd-daemon) were not met: ++ as_fn_error $? "Package requirements (libsystemd) were not met: + + $libsystemd_PKG_ERRORS + +@@ -16568,12 +16568,12 @@ if test -n "$libsystemd_CFLAGS"; then + pkg_cv_libsystemd_CFLAGS="$libsystemd_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_libsystemd_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` ++ pkg_cv_libsystemd_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -16585,12 +16585,12 @@ if test -n "$libsystemd_LIBS"; then + pkg_cv_libsystemd_LIBS="$libsystemd_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_libsystemd_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` ++ pkg_cv_libsystemd_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -16611,14 +16611,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- libsystemd_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1` ++ libsystemd_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1` + else +- libsystemd_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1` ++ libsystemd_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$libsystemd_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (libsystemd-daemon) were not met: ++ as_fn_error $? "Package requirements (libsystemd) were not met: + + $libsystemd_PKG_ERRORS + diff -Nru openvpn-2.3.7/debian/patches/series openvpn-2.3.7/debian/patches/series --- openvpn-2.3.7/debian/patches/series 2015-07-01 14:19:38.000000000 +0200 +++ openvpn-2.3.7/debian/patches/series 2015-09-04 13:18:15.000000000 +0200 @@ -6,3 +6,4 @@ kfreebsd_support.patch accommodate_typo.patch manpage_fixes.patch +configure_systemd-daemon.patch
