Bug#694373: unblock: dma/0.0.2010.06.17-14

To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: Bug#694373: unblock: dma/0.0.2010.06.17-14
From: Laszlo Kajan <lkajan@rostlab.org>
Date: Sun, 25 Nov 2012 22:41:06 +0100
Message-id: <[🔎] 20121125214106.12085.34179.reportbug@debian-unstable.rostclust>
Reply-to: Laszlo Kajan <lkajan@rostlab.org>, 694373@bugs.debian.org

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Please unblock package dma

Bug #688682 is resolved following Arno's suggestion. Passes piuparts tests now. debdiff is attached.

Thank you, Laszlo (from BSP Munich)

unblock dma/0.0.2010.06.17-14

- -- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF8, LC_CTYPE=en_US.UTF8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBAgAGBQJQspBrAAoJEJvS1kCaDFL65L0P/0bZud7Hp0nt22wGkmA6nogP
XmZK/Sc+e49K87bGnBUN6xIvRR2BUi21jjjO4aR1v6VMw1j+ZtxKt3h7ikbADwL1
aqFfdPol8qlKrw+g+2fnDe9xfznW7JxN0mU1M1blvPlSgJ0YAjtd2V6wNo5qZphF
nnBIJBYq3KUVvihJPx2dGju5Tyy95CBV5wPzMlAp2evv759HXSQ3SV0Yj9ta/A8x
aVFS3HrTuygdgDtKo+UV2Kj8rhN9zBl+hr/chwet39X8i3ot1Ba4T2kIY1ovby7E
5zCBx/5TaANXHHZT+v7Z39basMzvX3wiPiY2clEWsnsBVcJhgzGiMx9ySuL7D/zZ
PQwGdEaLccJiup8tDoYvRidV52GNxAVKFWseAvzN8RY4qh2QWNrN64BiGJZEF6v8
A3Q/IuWs3BFYhEQHyIkHfnCqgEQVEvB6Eim5R6q83FgPqxn9Xz3cysd5TYOPR/22
aQqNaDxjF9hXOXDo4aO/v63um95Y1tqEypTk57YI8REqC6ur+kIk5oL3qZJgMuHE
g0oYX9JjSWdF93c8EYvdAVmYd61pnSzP+lks0HFDiI1Wd9g4U7wVDKvEDT6MWgPX
hT3rOCK0C5G4H6mmKA8Bv6ZzNB+aDZcULtVcKvvvxfjBYTKKwMd1ZwEpb4isVXLg
wKeeDdaWf7BlEdiVp9kx
=bLNF
-----END PGP SIGNATURE-----

diff -Nru dma-0.0.2010.06.17/debian/changelog dma-0.0.2010.06.17/debian/changelog
--- dma-0.0.2010.06.17/debian/changelog	2012-08-31 23:05:18.000000000 +0000
+++ dma-0.0.2010.06.17/debian/changelog	2012-11-25 20:20:59.000000000 +0000
@@ -1,3 +1,11 @@
+dma (0.0.2010.06.17-14.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fixed 'modifies conffiles (policy 10.7.3): /etc/dma/dma.conf'
+    Closes: #688682
+
+ -- Laszlo Kajan <lkajan@rostlab.org>  Sun, 25 Nov 2012 20:19:16 +0000
+
 dma (0.0.2010.06.17-14) unstable; urgency=low
 
   * Fix the parsing of multiple comma-separated and bracketed addresses
diff -Nru dma-0.0.2010.06.17/debian/control dma-0.0.2010.06.17/debian/control
--- dma-0.0.2010.06.17/debian/control	2012-03-02 23:57:05.000000000 +0000
+++ dma-0.0.2010.06.17/debian/control	2012-11-25 20:53:36.000000000 +0000
@@ -12,7 +12,8 @@
 
 Package: dma
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: dpkg (>= 1.15.7.2)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ucf (>= 0.28)
 Provides: mail-transport-agent
 Conflicts: mail-transport-agent
 Replaces: mail-transport-agent
diff -Nru dma-0.0.2010.06.17/debian/dma.install dma-0.0.2010.06.17/debian/dma.install
--- dma-0.0.2010.06.17/debian/dma.install	2009-03-10 12:04:54.000000000 +0000
+++ dma-0.0.2010.06.17/debian/dma.install	2012-11-25 18:45:51.000000000 +0000
@@ -1,2 +1,3 @@
 debian/dbounce-simple-safecat usr/bin
 debian/dbounce-simple-safecat.1 usr/share/man/man1
+dma.conf usr/share/dma
diff -Nru dma-0.0.2010.06.17/debian/postinst dma-0.0.2010.06.17/debian/postinst
--- dma-0.0.2010.06.17/debian/postinst	2010-11-17 08:53:09.000000000 +0000
+++ dma-0.0.2010.06.17/debian/postinst	2012-11-25 21:03:09.000000000 +0000
@@ -3,6 +3,9 @@
 
 set -e
 
+# lkajan: resolution of #688682
+dpkg-maintscript-helper rm_conffile /etc/dma/dma.conf "0.0.2010.06.17-14.1~" dma -- "$@"
+
 . /usr/share/debconf/confmodule
 db_version 2.0
 
@@ -13,20 +16,34 @@
     	db_get dma/mailname
 	echo "$RET" > /etc/mailname
 
+	# lkajan: example is apticron
+	tmpfile="$( mktemp -t dma.conf.XXXXXXXXXX )"
+	chown root:mail "$tmpfile"; chmod 0640 "$tmpfile"
+	# lkajan: preserve changes to old conffile dma.conf (dma.conf.dpkg-backup at this point), if any:
+	if [ -e /etc/dma/dma.conf.dpkg-backup ]; then
+		cp -f /etc/dma/dma.conf.dpkg-backup "$tmpfile";
+	else
+		cp -f /usr/share/dma/dma.conf "$tmpfile";
+	fi
+
 	db_get dma/relayhost
 	if [ -n "$RET" ]; then
-		sed -i -re 's@^[[:space:]]*(#+[[:space:]]*)?SMARTHOST([[:space:]]+.*)?$@SMARTHOST '"$RET@" /etc/dma/dma.conf
+		sed -i -re 's@^[[:space:]]*(#+[[:space:]]*)?SMARTHOST([[:space:]]+.*)?$@SMARTHOST '"$RET@" "$tmpfile"
 	else
-		sed -i -re 's@^[[:space:]]*(#+[[:space:]]*)?SMARTHOST([[:space:]]+.*)?$@#SMARTHOST@' /etc/dma/dma.conf
+		sed -i -re 's@^[[:space:]]*(#+[[:space:]]*)?SMARTHOST([[:space:]]+.*)?$@#SMARTHOST@' "$tmpfile"
 	fi
 
 	db_get dma/dbounceprog
 	if [ -n "$RET" ]; then
-		sed -i -re 's/^[[:space:]]*(#+[[:space:]]*)?DBOUNCEPROG([[:space:]]+.*)?$/DBOUNCEPROG '"$RET/" /etc/dma/dma.conf
+		sed -i -re 's/^[[:space:]]*(#+[[:space:]]*)?DBOUNCEPROG([[:space:]]+.*)?$/DBOUNCEPROG '"$RET/" "$tmpfile"
 	else
-		sed -i -re 's/^[[:space:]]*(#+[[:space:]]*)?DBOUNCEPROG([[:space:]]+.*)?$/#DBOUNCEPROG/' /etc/dma/dma.conf
+		sed -i -re 's/^[[:space:]]*(#+[[:space:]]*)?DBOUNCEPROG([[:space:]]+.*)?$/#DBOUNCEPROG/' "$tmpfile"
 	fi
 
+	ucf --debconf-ok --three-way "$tmpfile" /etc/dma/dma.conf
+	rm -f "$tmpfile"
+	ucfr dma /etc/dma/dma.conf
+
 	if dpkg --compare-versions "$2" lt '0.0.2009.07.17-3'; then
 		chown root:mail /etc/dma/*
 		chmod 640 /etc/dma/*
diff -Nru dma-0.0.2010.06.17/debian/postrm dma-0.0.2010.06.17/debian/postrm
--- dma-0.0.2010.06.17/debian/postrm	1970-01-01 00:00:00.000000000 +0000
+++ dma-0.0.2010.06.17/debian/postrm	2012-11-25 21:00:30.000000000 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+# lkajan: resolution of #688682
+dpkg-maintscript-helper rm_conffile /etc/dma/dma.conf "0.0.2010.06.17-14.1~" dma -- "$@"
+
+case "$1" in
+    purge)
+	if which ucfr >/dev/null; then
+		ucfr --purge dma /etc/dma/dma.conf
+	fi
+	if which ucf >/dev/null; then
+		ucf --purge /etc/dma/dma.conf
+	fi
+	if [ -d /etc/dma ] ; then
+		rm -rf /etc/dma || true
+	fi
+    ;;
+esac
+
+#DEBHELPER#
diff -Nru dma-0.0.2010.06.17/debian/preinst dma-0.0.2010.06.17/debian/preinst
--- dma-0.0.2010.06.17/debian/preinst	1970-01-01 00:00:00.000000000 +0000
+++ dma-0.0.2010.06.17/debian/preinst	2012-11-25 20:49:47.000000000 +0000
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+# lkajan: resolution of #688682
+dpkg-maintscript-helper rm_conffile /etc/dma/dma.conf "0.0.2010.06.17-14.1~" dma -- "$@"
+
+#DEBHELPER#
diff -Nru dma-0.0.2010.06.17/debian/rules dma-0.0.2010.06.17/debian/rules
--- dma-0.0.2010.06.17/debian/rules	2012-08-31 00:17:06.000000000 +0000
+++ dma-0.0.2010.06.17/debian/rules	2012-11-25 18:47:16.000000000 +0000
@@ -11,7 +11,10 @@
 
 CFLAGS+=	-DNEED_GETPROGNAME -DNEED_REALLOCF -DNEED_STRLCPY
 
-CONFFILES=	auth.conf dma.conf virtusertable
+CONFFILES=	auth.conf virtusertable
+
+# lkajan: installed to /usr/share/dma/ by dh_install, used by d/postinst
+CONFTEMPLATE=	dma.conf
 
 ifneq (,$(filter werror,$(DEB_BUILD_OPTIONS)))
 	CFLAGS+=	-Werror

Reply to:

Prev by Date: Bug#693500: marked as done (unblock: getmail4/4.32.0-2)
Next by Date: Re: Comments regarding gnome-themes-standard_3.4.2-2.1_amd64.changes
Previous by thread: Bug#689289: marked as done (unblock: keystone/2012.1.1-9 (CVE-2012-445{6,7}, +policy RC fixes))
Next by thread: Bug#687292: marked as done (unblock: nvidia-graphics-drivers-legacy-96xx/96.43.23-2)
Index(es):
- Date
- Thread