Bug#698701: tpu: dspam/3.10.1+dfsg-8
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package dspam
Sorry to come again with an issue on dspam again. This time it's about
bug #698580 - useless prompting at upgrade when no configuration file
have been modified. A mistake was made which made
/etc/dspam/dspam.d/{pgsql,mysql}.conf be conffiles and yet managed by
ucf. This patch move ucf template from /etc to /usr/share subdirectories
to avoid them being conffiles. See attached debdiff for the details
(avoid_useless_prompt.debdiff).
As before, the package being different in testing and sid, the fix would
have to go through tpu. The fix has just been uploaded to sid for more
testing.
I would also like to include the fix for #698136. I know it's only of
severity important but it's a simple oneliner fix so maybe you'll agree
for it anyway. See [1] for the patch.
[1] http://patch-tracker.debian.org/patch/series/view/dspam/3.10.2+dfsg-4/009_fix_recipient_corruption_when_releasing_message_from_quarantine.diff
Best regards,
Thomas Preud'homme
unblock dspam/3.10.1+dfsg-8
-- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (990, 'unstable'), (500, 'stable-updates'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru dspam-3.10.1+dfsg/debian/changelog dspam-3.10.1+dfsg/debian/changelog
--- dspam-3.10.1+dfsg/debian/changelog 2013-01-19 21:11:32.000000000 +0100
+++ dspam-3.10.1+dfsg/debian/changelog 2013-01-22 13:38:35.000000000 +0100
@@ -1,3 +1,11 @@
+dspam (3.10.1+dfsg-8) testing-proposed-updates; urgency=low
+
+ * Stop shipping ucf template as a conffile: this avoid unnecessary prompt
+ when upgrading if configuration files have not been modified by the user
+ (Closes: #698580).
+
+ -- Thomas Preud'homme <robotux@debian.org> Mon, 21 Jan 2013 22:25:00 +0100
+
dspam (3.10.1+dfsg-7) testing-proposed-updates; urgency=low
* Disable multi-arch since it create many problems with regards to the
diff -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.dirs dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.dirs
--- dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.dirs 2013-01-19 21:11:32.000000000 +0100
+++ dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.dirs 2013-01-22 13:38:35.000000000 +0100
@@ -1,3 +1,4 @@
etc/dspam/dspam.d
+usr/share/libdspam7-drv-mysql
usr/share/dbconfig-common/data/libdspam7-drv-mysql/install
usr/share/dbconfig-common/data/libdspam7-drv-mysql/upgrade
diff -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.install.in dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.install.in
--- dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.install.in 2013-01-19 21:11:32.000000000 +0100
+++ dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.install.in 2013-01-22 13:38:35.000000000 +0100
@@ -1,7 +1,7 @@
debian/sqlfiles/install/mysql usr/share/dbconfig-common/data/libdspam7-drv-mysql/install
debian/sqlfiles/upgrade/mysql usr/share/dbconfig-common/data/libdspam7-drv-mysql/upgrade
usr/lib/@DEB_HOST_MULTIARCH@/dspam/libmysql_drv.so*
-src/mysql.conf etc/dspam/dspam.d/
+src/mysql.conf usr/share/libdspam7-drv-mysql
src/tools.mysql_drv/mysql_objects-4.1.sql usr/share/doc/libdspam7-drv-mysql/sql/
src/tools.mysql_drv/purge-4.1.sql usr/share/doc/libdspam7-drv-mysql/sql/
src/tools.mysql_drv/virtual_user_aliases.sql usr/share/doc/libdspam7-drv-mysql/sql/
diff -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postinst dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postinst
--- dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postinst 2013-01-19 21:11:32.000000000 +0100
+++ dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postinst 2013-01-22 13:38:35.000000000 +0100
@@ -9,7 +9,7 @@
# Set some variables
dbc_generate_include=template:/etc/dspam/dspam.d/mysql.conf
-dbc_generate_include_args="-U -o template_infile='/etc/dspam/dspam.d/mysql.conf'"
+dbc_generate_include_args="-U -o template_infile='/usr/share/libdspam7-drv-mysql/mysql.conf'"
# Run dbconfig
dbc_go libdspam7-drv-mysql $@
diff -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.dirs dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.dirs
--- dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.dirs 2013-01-19 21:11:32.000000000 +0100
+++ dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.dirs 2013-01-22 13:38:35.000000000 +0100
@@ -1,4 +1,5 @@
etc/dspam/dspam.d
+usr/share/libdspam7-drv-pgsql
usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install
usr/share/dbconfig-common/data/libdspam7-drv-pgsql/upgrade
usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install-dbadmin
diff -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.install.in dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.install.in
--- dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.install.in 2013-01-19 21:11:32.000000000 +0100
+++ dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.install.in 2013-01-22 13:38:35.000000000 +0100
@@ -2,7 +2,7 @@
debian/sqlfiles/install/pgsql usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install
debian/sqlfiles/upgrade/pgsql usr/share/dbconfig-common/data/libdspam7-drv-pgsql/upgrade
usr/lib/@DEB_HOST_MULTIARCH@/dspam/libpgsql_drv.so*
-src/pgsql.conf etc/dspam/dspam.d/
+src/pgsql.conf usr/share/libdspam7-drv-pgsql
src/tools.pgsql_drv/pgsql_objects.sql usr/share/doc/libdspam7-drv-pgsql/sql/
src/tools.pgsql_drv/purge-pe.sql usr/share/doc/libdspam7-drv-pgsql/sql/
src/tools.pgsql_drv/virtual_users.sql usr/share/doc/libdspam7-drv-pgsql/sql/
diff -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.postinst dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.postinst
--- dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.postinst 2013-01-19 21:11:32.000000000 +0100
+++ dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.postinst 2013-01-22 13:38:35.000000000 +0100
@@ -6,7 +6,7 @@
# Set some variables
dbc_generate_include=template:/etc/dspam/dspam.d/pgsql.conf
-dbc_generate_include_args="-U -o template_infile='/etc/dspam/dspam.d/pgsql.conf'"
+dbc_generate_include_args="-U -o template_infile='/usr/share/libdspam7-drv-pgsql/pgsql.conf'"
# Load dbconfig (pgsql part)
. /usr/share/dbconfig-common/dpkg/postinst.pgsql
Reply to: