diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/patches/configure_systemd-daemon.patch | 104 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 4 insertions, 108 deletions
diff --git a/debian/changelog b/debian/changelog index 105b97b..ad07d42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,13 @@ openvpn (2.3.8-1) unstable; urgency=medium * debian/control: Move libsystemd-daemon-dev Build-Dep to libsystemd-dev. - (Closes: #791904) + (Closes: #791904). Add systemd as Build-Dep on [linux-any] * New upstream release. (Closes: #791829) * debian/rules: remove obsolete options (*-path) to configure * openvpn@.service: Use KillMode=mixed to fix signaling of some plugins. (Closes: #792907). Also add PrivateTmp & LimitNPROC options. Thanks Daniel Hahler for the patch. + * Bumped Standards-Version to 3.9.6 -- Alberto Gonzalez Iniesta <agi@inittab.org> Mon, 10 Aug 2015 16:46:20 +0200 diff --git a/debian/control b/debian/control index 367f0ac..8a9a063 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: openvpn Section: net Priority: optional Maintainer: Alberto Gonzalez Iniesta <agi@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-dev -Standards-Version: 3.9.5 +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 [linux-any], systemd [linux-any] +Standards-Version: 3.9.6 Homepage: http://www.openvpn.net/ Vcs-Git: git://anonscm.debian.org/collab-maint/openvpn.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/openvpn.git diff --git a/debian/patches/configure_systemd-daemon.patch b/debian/patches/configure_systemd-daemon.patch deleted file mode 100644 index 45bc312..0000000 --- a/debian/patches/configure_systemd-daemon.patch +++ /dev/null @@ -1,104 +0,0 @@ -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/series b/debian/patches/series index eeb6112..f37465a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,4 +6,3 @@ route_default_nil.patch kfreebsd_support.patch accommodate_typo.patch manpage_fixes.patch -configure_systemd-daemon.patch |