summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--debian/openvpn.install1
-rw-r--r--debian/postinst8
-rwxr-xr-xdebian/rules4
4 files changed, 19 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 43d0dfa..8b1643e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openvpn (2.4.3-2) unstable; urgency=medium
+
+ * The "Bye bye OpenVPN" revenge release
+ * Put upstream tmpfiles conf in the right place and merge with Debian's.
+ (Closes: #865589)
+
+ -- Alberto Gonzalez Iniesta <agi@inittab.org> Fri, 23 Jun 2017 11:43:50 +0200
+
openvpn (2.4.3-1) unstable; urgency=high
* The "Bye bye OpenVPN" release.
diff --git a/debian/openvpn.install b/debian/openvpn.install
index b03fbb7..5d85845 100644
--- a/debian/openvpn.install
+++ b/debian/openvpn.install
@@ -1,4 +1,3 @@
debian/openvpn@.service /lib/systemd/system
-debian/openvpn.conf /usr/lib/tmpfiles.d
debian/openvpn.service /lib/systemd/system
debian/openvpn-generator /lib/systemd/system-generators
diff --git a/debian/postinst b/debian/postinst
index 3776449..a3d7113 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -30,6 +30,14 @@ case "$1" in
echo "$b" | grep -q '\*' && continue
ln -sf "/run/openvpn/$b" "/run/sendsigs.omit.d/openvpn.$b"
done
+ # Fix for #865589, this should be removed before Buster is released
+ # Only affected sid users
+ if [ -n "$2" ] && [ "$2" = "2.4.3-1" ] && [ -f /etc/tmpfiles.d/openvpn.conf ] ; then
+ if [ "$( md5sum /etc/tmpfiles.d/openvpn.conf | cut -d' ' -f1)" = "af1d2934dd0025c441d93f6de4540443" ] ; then
+ # remove wrongly placed file by 2.4.3-1
+ rm -f /etc/tmpfiles.d/openvpn.conf
+ fi
+ fi
;;
esac
diff --git a/debian/rules b/debian/rules
index 0f8963f..9974293 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
ENV_VARS := IFCONFIG=/sbin/ifconfig ROUTE=/lib/freebsd/route
EXTRA_ARGS :=
else
-ENV_VARS := SYSTEMD_ASK_PASSWORD=/bin/systemd-ask-password IFCONFIG=/sbin/ifconfig ROUTE=/sbin/route IPROUTE=/sbin/ip SYSTEMD_UNIT_DIR=/lib/systemd/system TMPFILES_DIR=/etc/tmpfiles.d
+ENV_VARS := SYSTEMD_ASK_PASSWORD=/bin/systemd-ask-password IFCONFIG=/sbin/ifconfig ROUTE=/sbin/route IPROUTE=/sbin/ip SYSTEMD_UNIT_DIR=/lib/systemd/system TMPFILES_DIR=/usr/lib/tmpfiles.d
EXTRA_ARGS := --enable-systemd --enable-iproute2
endif
@@ -57,6 +57,8 @@ override_dh_auto_install:
install -m 755 debian/update-resolv-conf $(CURDIR)/debian/openvpn/etc/openvpn/update-resolv-conf
# bash completion
install -m 644 debian/openvpn.bash_completion $(CURDIR)/debian/openvpn/usr/share/bash-completion/completions/openvpn
+ # append Debian's tmpfiles conf to upstream's
+ cat debian/openvpn.conf >> $(CURDIR)/debian/openvpn/usr/lib/tmpfiles.d/openvpn.conf
override_dh_installexamples:
dh_installexamples