summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Schmidt <Bernhard.Schmidt@lrz.de>2017-06-28 15:03:04 +0200
committerBernhard Schmidt <Bernhard.Schmidt@lrz.de>2017-06-28 15:03:04 +0200
commit9907b48c891ac3e3f8853f637f92768ad9529b21 (patch)
tree012ad9269c954b07e6bf5446546e42b14bea4169
parentdb4f04c584f7d4e828b5d317cf40962b9d854ac5 (diff)
Properly remove obsolete /etc/tmpfiles.d/openvpn.conf
Closes: #865717
-rw-r--r--debian/changelog4
-rw-r--r--debian/openvpn.maintscript1
-rw-r--r--debian/postinst8
3 files changed, 5 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 85be0d4..86bd9e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ openvpn (2.4.3-3) UNRELEASED; urgency=medium
- Bump minimum debhelper version in debian/control to >= 10.
* Declare compliance with Debian Policy 4.0.0. (No changes needed).
+ [ Bernhard Schmidt ]
+ * properly remove obsolete /etc/tmpfiles.d/openvpn.conf using
+ dpkg-maintscript-helper (Closes: #865717)
+
-- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 27 Jun 2017 11:18:13 +0200
openvpn (2.4.3-2) unstable; urgency=medium
diff --git a/debian/openvpn.maintscript b/debian/openvpn.maintscript
new file mode 100644
index 0000000..91c908a
--- /dev/null
+++ b/debian/openvpn.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/tmpfiles.d/openvpn.conf 2.4.3-3~ openvpn
diff --git a/debian/postinst b/debian/postinst
index a3d7113..3776449 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -30,14 +30,6 @@ 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