Bug#692145: retitle unblock
retitle 692145 unblock: maradns/1.4.12-5
thanks
There is a new release and the debdiff is attached.
diff -Nru maradns-1.4.12/debian/changelog maradns-1.4.12/debian/changelog
--- maradns-1.4.12/debian/changelog 2012-06-08 21:38:28.000000000 +0100
+++ maradns-1.4.12/debian/changelog 2012-11-04 17:24:15.000000000 +0000
@@ -1,3 +1,21 @@
+maradns (1.4.12-5) unstable; urgency=low
+
+ * Resolved use of undefined environment variable in maintenance
+ scripts. Thanks to Andreas Beckmann and Adam Barratt for pointing
+ this out
+
+ -- Nicholas Bamber <nicholas@periapt.co.uk> Sun, 04 Nov 2012 17:24:10 +0000
+
+maradns (1.4.12-4) unstable; urgency=low
+
+ * Using ucf to manage config file to comply with
+ policy 10.7.3. (Closes: 636158)
+ - Added ucf as a dependency to the maradns package
+ - Maradns config file installed below /usr/share/maradns
+ - ucf used to install and purge the config file
+
+ -- Nicholas Bamber <nicholas@periapt.co.uk> Thu, 01 Nov 2012 22:16:08 +0000
+
maradns (1.4.12-3) unstable; urgency=low
* Improved changelog parsing to work with binNMUs (Closes: #675392)
diff -Nru maradns-1.4.12/debian/control maradns-1.4.12/debian/control
--- maradns-1.4.12/debian/control 2012-06-06 22:15:49.000000000 +0100
+++ maradns-1.4.12/debian/control 2012-10-29 08:40:29.000000000 +0000
@@ -11,7 +11,7 @@
Package: maradns
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base,
- duende (>= 1.4.06-3)
+ duende (>= 1.4.06-3), ucf
Recommends: ${python:Depends}, maradns-zoneserver
Description: simple security-focused Domain Name Service server
MaraDNS is easy to configure DNS server that functions as a
diff -Nru maradns-1.4.12/debian/maradns.install maradns-1.4.12/debian/maradns.install
--- maradns-1.4.12/debian/maradns.install 2012-02-02 09:50:22.000000000 +0000
+++ maradns-1.4.12/debian/maradns.install 2012-10-29 09:27:59.000000000 +0000
@@ -3,5 +3,5 @@
tcp/fetchzone usr/sbin
tcp/getzone usr/sbin
server/maradns usr/sbin
-debian/mararc etc/maradns
+debian/mararc usr/share/maradns
debian/maradns-insserv etc/insserv.conf.d
diff -Nru maradns-1.4.12/debian/postinst maradns-1.4.12/debian/postinst
--- maradns-1.4.12/debian/postinst 2012-02-02 09:50:22.000000000 +0000
+++ maradns-1.4.12/debian/postinst 2012-11-03 21:45:54.000000000 +0000
@@ -11,18 +11,16 @@
mkdir -p /etc/maradns/logger
-if [ "$1" = "configure" ] && [ -f /etc/maradns/mararc ]
+if [ "$1" = "configure" ]
then
IDNUM=`id -u maradns`
GIDNUM=`id -g maradns`
- if [ "$2" = "" ] # we are doing fresh install
- then
- sed -e "s/^maradns_uid = .*$/maradns_uid = $IDNUM/" \
- -e "s/^# maradns_gid = .*$/maradns_gid = $GIDNUM/" < /etc/maradns/mararc > /etc/maradns/mararc.tmp
- mv -f /etc/maradns/mararc.tmp /etc/maradns/mararc
- else
- grep -q "maradns_uid = $IDNUM" /etc/maradns/mararc || echo WARNING: "maradns_uid = $IDNUM" is missing from /etc/maradns/mararc
- fi
+ CFG_TEMPLATE=/usr/share/maradns/mararc
+ CFG_TMP=/etc/maradns/mararc.dpkg-new
+ CFG_FILE=/etc/maradns/mararc
+ sed -e "s/^maradns_uid = .*$/maradns_uid = $IDNUM/" \
+ -e "s/^# maradns_gid = .*$/maradns_gid = $GIDNUM/" < $CFG_TEMPLATE > $CFG_TMP
+ ucf --debconf-ok $CFG_TMP $CFG_FILE && rm -f $CFG_TMP
fi
#DEBHELPER#
diff -Nru maradns-1.4.12/debian/postrm maradns-1.4.12/debian/postrm
--- maradns-1.4.12/debian/postrm 2012-02-02 09:50:22.000000000 +0000
+++ maradns-1.4.12/debian/postrm 2012-10-31 20:02:55.000000000 +0000
@@ -2,6 +2,8 @@
set -e
+CFG_FILE=/etc/maradns/mararc
+
case "$1" in
purge)
@@ -9,6 +11,18 @@
# However there is no consensus on the correct implementation.
# Also this might get missed because it does not use 'deluser'.
userdel maradns ||true
+
+ if which ucf >/dev/null 2>&1; then
+ ucf --purge $CFG_FILE
+ else
+ rm -f $CFG_FILE
+ fi
+
+ for ext in .bak .tmp .dpkg-tmp .dkpg-new .dpkg-old .ucf-new .ucf-old .ucf-dist
+ do
+ rm -f $CFG_FILE$ext
+ done
+
rm -rf /etc/maradns ||true
;;
Reply to: