From 78e2604ab82b470fece2d17ccfcbd38c41c1027c Mon Sep 17 00:00:00 2001 From: Alberto Gonzalez Iniesta Date: Fri, 4 Sep 2015 13:16:03 +0200 Subject: Patch configure to build without libsystemd-daemon-dev --- debian/patches/configure_systemd-daemon.patch | 104 ++++++++++++++++++++++++++ debian/patches/manpage_fixes.patch | 8 +- debian/patches/openvpn-pkcs11warn.patch | 6 +- debian/patches/series | 1 + 4 files changed, 112 insertions(+), 7 deletions(-) create mode 100644 debian/patches/configure_systemd-daemon.patch diff --git a/debian/patches/configure_systemd-daemon.patch b/debian/patches/configure_systemd-daemon.patch new file mode 100644 index 0000000..45bc312 --- /dev/null +++ b/debian/patches/configure_systemd-daemon.patch @@ -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 --git a/debian/patches/manpage_fixes.patch b/debian/patches/manpage_fixes.patch index eb10655..8bd5a8b 100644 --- a/debian/patches/manpage_fixes.patch +++ b/debian/patches/manpage_fixes.patch @@ -2,8 +2,8 @@ Description: Man page fixes Author: Alberto Gonzalez Iniesta Index: openvpn/doc/openvpn.8 =================================================================== ---- openvpn.orig/doc/openvpn.8 2015-07-01 14:11:08.987461064 +0200 -+++ openvpn/doc/openvpn.8 2015-07-01 14:11:08.983461107 +0200 +--- openvpn.orig/doc/openvpn.8 2015-09-04 13:13:36.785038213 +0200 ++++ openvpn/doc/openvpn.8 2015-09-04 13:13:36.781038257 +0200 @@ -21,13 +21,13 @@ .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .\" @@ -20,7 +20,7 @@ Index: openvpn/doc/openvpn.8 .\" .nf -- no formatting .\" .fi -- resume formatting .\" .ft 3 -- boldface -@@ -3991,7 +3991,7 @@ +@@ -4007,7 +4007,7 @@ This option is only relevant in UDP mode, i.e. when either .B \-\-proto udp @@ -29,7 +29,7 @@ Index: openvpn/doc/openvpn.8 .B \-\-proto option is specified. -@@ -5266,7 +5266,7 @@ +@@ -5282,7 +5282,7 @@ .B \-\-dev tun mode, OpenVPN will cause the DHCP server to masquerade as if it were coming from the remote endpoint. The optional offset parameter is diff --git a/debian/patches/openvpn-pkcs11warn.patch b/debian/patches/openvpn-pkcs11warn.patch index 5b61f99..f3fadc7 100644 --- a/debian/patches/openvpn-pkcs11warn.patch +++ b/debian/patches/openvpn-pkcs11warn.patch @@ -3,9 +3,9 @@ Author: Florian Kulzer Bug-Debian: http://bugs.debian.org/475353 Index: openvpn/src/openvpn/options.c =================================================================== ---- openvpn.orig/src/openvpn/options.c 2015-07-01 14:10:25.083929500 +0200 -+++ openvpn/src/openvpn/options.c 2015-07-01 14:10:25.083929500 +0200 -@@ -6293,6 +6293,20 @@ +--- openvpn.orig/src/openvpn/options.c 2015-09-04 13:13:30.157111451 +0200 ++++ openvpn/src/openvpn/options.c 2015-09-04 13:13:30.153111496 +0200 +@@ -6300,6 +6300,20 @@ { VERIFY_PERMISSION (OPT_P_ROUTE_EXTRAS); } diff --git a/debian/patches/series b/debian/patches/series index f37465a..eeb6112 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ route_default_nil.patch kfreebsd_support.patch accommodate_typo.patch manpage_fixes.patch +configure_systemd-daemon.patch -- cgit v1.2.3