tag 690128 +patch
thanks
On Tue, Nov 27, 2012 at 10:42:37PM -0800, Russ Allbery wrote:
> Marco, do you want to handle this update? I'm happy to help here, but
> don't want to tromp on you if you'd rather take care of it.
Herewith the debdiff in the hope it makes reviewing easier - meant to
append it previously, sorry.
Nick
diff -Nru inn2-2.5.3/debian/changelog inn2-2.5.3/debian/changelog
--- inn2-2.5.3/debian/changelog 2012-06-29 01:03:17.000000000 +0100
+++ inn2-2.5.3/debian/changelog 2012-11-27 11:49:54.000000000 +0000
@@ -1,3 +1,12 @@
+inn2 (2.5.3-1.1) squeeze-backports; urgency=low
+
+ * Non-maintainer upload.
+ * Handle upstream renaming of our conffile /etc/news/motd.news to
+ non-conffile /etc/news/motd.nnrpd. If it's never been amended by
+ the admin, then just remove it. (Closes: #690128)
+
+ -- Nick Leverton <n...@leverton.org> Tue, 27 Nov 2012 11:43:37 +0000
+
inn2 (2.5.3-1) unstable; urgency=low
* New upstream release. Fixes:
diff -Nru inn2-2.5.3/debian/inn2.postinst inn2-2.5.3/debian/inn2.postinst
--- inn2-2.5.3/debian/inn2.postinst 2012-06-28 16:49:56.000000000 +0100
+++ inn2-2.5.3/debian/inn2.postinst 2012-11-27 15:35:25.000000000 +0000
@@ -155,6 +155,18 @@
fi
}
+# #690128: if the old MOTD file has been amended by the admin from default,
+# then copy it to the new non-conffile nnrpd MOTD file.
+# If not then remove the old MOTD conffile, being sure to cater for rollback.
+if [ "$1" = "configure" ] && [ -n "$2" ] &&
+ dpkg --compare-versions "$2" le-nl "2.5.3-1~"; then
+ if [ -e /etc/news/motd.news.dpkg-backup -a ! -e /etc/news/motd.nnrpd ];
then
+ echo "Moving obsolete conffile /etc/news/motd.news modified by you
to /etc/news/motd.nnrpd"
+ mv /etc/news/motd.news.dpkg-backup /etc/news/motd.nnrpd
+ fi
+fi
+dpkg-maintscript-helper rm_conffile /etc/news/motd.news 2.5.3-1~ package --
"$@"
+
case "$1" in
configure)
init_inn_files
diff -Nru inn2-2.5.3/debian/inn2.postrm inn2-2.5.3/debian/inn2.postrm
--- inn2-2.5.3/debian/inn2.postrm 2011-04-13 23:26:37.000000000 +0100
+++ inn2-2.5.3/debian/inn2.postrm 2012-11-27 15:35:30.000000000 +0000
@@ -1,5 +1,10 @@
#!/bin/sh -e
+# #690128: if the old MOTD file has been amended by the admin from default,
+# then rename it to the new non-conffile nnrpd MOTD file.
+# If not then remove the old MOTD conffile, being sure to cater for rollback.
+dpkg-maintscript-helper rm_conffile /etc/news/motd.news 2.5.3-1~ package --
"$@"
+
if [ "$1" = "purge" ]; then
update-rc.d inn2 remove >/dev/null
if [ -e /var/lib/news/ ]; then
diff -Nru inn2-2.5.3/debian/inn2.preinst inn2-2.5.3/debian/inn2.preinst
--- inn2-2.5.3/debian/inn2.preinst 2011-04-13 23:26:37.000000000 +0100
+++ inn2-2.5.3/debian/inn2.preinst 2012-11-27 15:35:30.000000000 +0000
@@ -1,5 +1,10 @@
#!/bin/sh -e
+# #690128: if the old MOTD file has been amended by the admin from default,
+# then copy it to the new non-conffile nnrpd MOTD file.
+# If not then remove the old MOTD conffile, being sure to cater for rollback.
+dpkg-maintscript-helper rm_conffile /etc/news/motd.news 2.5.3-1~ -- "$@"
+
upgrade_quirks() {
# $2 is non-empty when installing from the "config-files" state
[ "$2" ] || return 0
diff -Nru inn2-2.5.3/debian/patches/debian-handle-motd-on-upgrade.patch
inn2-2.5.3/debian/patches/debian-handle-motd-on-upgrade.patch
--- inn2-2.5.3/debian/patches/debian-handle-motd-on-upgrade.patch
1970-01-01 01:00:00.000000000 +0100
+++ inn2-2.5.3/debian/patches/debian-handle-motd-on-upgrade.patch
2012-11-24 19:50:55.000000000 +0000
@@ -0,0 +1,14 @@
+Index: inn2-2.5.3/scripts/innupgrade.in
+===================================================================
+--- inn2-2.5.3.orig/scripts/innupgrade.in 2012-06-15 19:25:36.000000000
+0100
++++ inn2-2.5.3/scripts/innupgrade.in 2012-11-24 19:50:43.000000000 +0000
+@@ -66,7 +66,8 @@
+ 'filter.tcl' => 'filter.tcl.OLD',
+ 'startup.tcl' => 'startup.tcl.OLD',
+
+- 'motd.news' => 'motd.nnrpd' # Rename in INN 2.5.3.
++ # In Debian we handle this via the Debian conffile mechanism with
dpkg-maintscript-helper
++ # 'motd.news' => 'motd.nnrpd' # Rename in INN 2.5.3.
+ );
+
+ # Clean up inn.conf for the new parser in INN 2.4. Null keys (keys without
diff -Nru inn2-2.5.3/debian/patches/series inn2-2.5.3/debian/patches/series
--- inn2-2.5.3/debian/patches/series 2011-04-14 00:06:03.000000000 +0100
+++ inn2-2.5.3/debian/patches/series 2012-11-27 12:01:43.000000000 +0000
@@ -11,3 +11,4 @@
# packaging-related
no-makedbz-on-install
+debian-handle-motd-on-upgrade.patch
