[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#705651: marked as done (unblock: inn2/2.5.3-3)

Your message dated Thu, 18 Apr 2013 08:07:55 +0100
with message-id <6eb0f863c5613c5f2d41c63ba524a04e@mail.adsl.funky-badger.org>
and subject line Re: Bug#705651: unblock: inn2/2.5.3-3
has caused the Debian Bug report #705651,
regarding unblock: inn2/2.5.3-3
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
705651: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705651
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package inn2

The first bug can be worked around but it makes the package seriously 
broken in the real world since it totally breaks control messages 
processing.
The second bug is RC.


diff -Nru inn2-2.5.3/debian/changelog inn2-2.5.3/debian/changelog
--- inn2-2.5.3/debian/changelog	2012-06-29 02:03:17.000000000 +0200
+++ inn2-2.5.3/debian/changelog	2013-04-08 09:22:26.000000000 +0200
@@ -1,3 +1,20 @@
+inn2 (2.5.3-3) unstable; urgency=low
+
+  * Fixed the fix for #690128.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 08 Apr 2013 09:21:53 +0200
+
+inn2 (2.5.3-2) unstable; urgency=low
+
+  * Fixed the fix for #652733, which totally broke pgpverify.
+    (Closes: #685007)
+  * Handle upstream renaming of our conffile /etc/news/motd.news to
+    non-conffile /etc/news/motd.nnrpd. If it has not been modified by
+    the admin then just remove it. Patch courtesy of Nick Leverton.
+    (Closes: #690128)
+
+ -- Marco d'Itri <md@linux.it>  Sun, 07 Apr 2013 21:43:24 +0200
+
 inn2 (2.5.3-1) unstable; urgency=low
 
   * New upstream release. Fixes:
diff -Nru inn2-2.5.3/debian/control inn2-2.5.3/debian/control
--- inn2-2.5.3/debian/control	2012-06-29 02:24:13.000000000 +0200
+++ inn2-2.5.3/debian/control	2013-04-08 04:55:37.000000000 +0200
@@ -7,7 +7,7 @@
 
 Package: inn2
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, cron, exim4 | mail-transport-agent, time, procps, perl, ${PERLAPI}, libmime-tools-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, cron, default-mta | mail-transport-agent, time, procps, perl, ${PERLAPI}, libmime-tools-perl
 Pre-Depends: inn2-inews (>= 2.3.999+20030227-1)
 Suggests: gnupg, wget, libgd-gd2-noxpm-perl | libgd-gd2-perl, ${shlibs:Suggests}
 Replaces: inn, inewsinn, innfeed, ninpaths, inn2-dev
@@ -37,7 +37,7 @@
 
 Package: inn2-lfs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, cron, exim4 | mail-transport-agent, time, procps, perl, ${PERLAPI}, libmime-tools-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, cron, default-mta | mail-transport-agent, time, procps, perl, ${PERLAPI}, libmime-tools-perl
 Pre-Depends: inn2-inews (>= 2.3.999+20030227-1)
 Suggests: gnupg, wget, libgd-gd2-noxpm-perl | libgd-gd2-perl, ${shlibs:Suggests}
 Replaces: inn, inewsinn, innfeed, ninpaths, inn2-dev
diff -Nru inn2-2.5.3/debian/copyright inn2-2.5.3/debian/copyright
--- inn2-2.5.3/debian/copyright	2011-04-14 00:26:37.000000000 +0200
+++ inn2-2.5.3/debian/copyright	2013-04-07 19:49:10.000000000 +0200
@@ -9,7 +9,7 @@
 different licenses and/or copyrights is covered by the following copyright
 and license:
 
-   Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009
+   Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
        by Internet Systems Consortium, Inc. ("ISC")
    Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
        2002, 2003 by The Internet Software Consortium and Rich Salz
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 17:49:56.000000000 +0200
+++ inn2-2.5.3/debian/inn2.postinst	2013-04-08 09:23:51.000000000 +0200
@@ -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" -a "$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 "Renaming modified conffile /etc/news/motd.news 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~ -- "$@"
+
 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-14 00:26:37.000000000 +0200
+++ inn2-2.5.3/debian/inn2.postrm	2013-04-08 09:23:30.000000000 +0200
@@ -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~ -- "$@"
+
 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-14 00:26:37.000000000 +0200
+++ inn2-2.5.3/debian/inn2.preinst	2013-04-07 22:26:24.000000000 +0200
@@ -20,6 +20,11 @@
   fi # 2.3.1-2
 }
 
+# #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~ -- "$@"
+
 case "$1" in
     install|upgrade)
     upgrade_quirks "$@"
diff -Nru inn2-2.5.3/debian/patches/motd-conffile-upgrade inn2-2.5.3/debian/patches/motd-conffile-upgrade
--- inn2-2.5.3/debian/patches/motd-conffile-upgrade	1970-01-01 01:00:00.000000000 +0100
+++ inn2-2.5.3/debian/patches/motd-conffile-upgrade	2013-04-08 01:33:12.000000000 +0200
@@ -0,0 +1,12 @@
+--- 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 dpkg conffile mechanism
++           # '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 01:06:03.000000000 +0200
+++ inn2-2.5.3/debian/patches/series	2013-04-08 01:33:23.000000000 +0200
@@ -10,4 +10,5 @@
 
 # packaging-related
 no-makedbz-on-install
+motd-conffile-upgrade
 
diff -Nru inn2-2.5.3/debian/rules inn2-2.5.3/debian/rules
--- inn2-2.5.3/debian/rules	2012-06-29 02:21:34.000000000 +0200
+++ inn2-2.5.3/debian/rules	2013-04-07 20:28:52.000000000 +0200
@@ -82,7 +82,7 @@
 	ac_cv_path__PATH_SED=sed \
 	ac_cv_path__PATH_SORT=sort \
 	ac_cv_path__PATH_UUX=uux \
-	ac_cv_path_GPGV=gpgv \
+	ac_cv_path_GPGV=/usr/bin/gpgv \
 	ac_cv_path_GETFTP=wget \
 	ac_cv_search_dbm_open=-ldb \
 	LDFLAGS="-Wl,--as-needed $(LDFLAGS)" \

unblock inn2/2.5.3-3

-- 
ciao,
Marco

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message --- 
On 18.04.2013 02:23, Marco d'Itri wrote:

The first bug can be worked around but it makes the package seriously
broken in the real world since it totally breaks control messages
processing.
The second bug is RC.


Done. However, I should note that I'm not particularly happy with this:


--- inn2-2.5.3/debian/control	2012-06-29 02:24:13.000000000 +0200
+++ inn2-2.5.3/debian/control	2013-04-08 04:55:37.000000000 +0200
@@ -7,7 +7,7 @@

 Package: inn2
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, cron, exim4 |
mail-transport-agent, time, procps, perl, ${PERLAPI},
libmime-tools-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, cron, default-mta |
mail-transport-agent, time, procps, perl, ${PERLAPI},
libmime-tools-perl
appearing in a late-freeze unblock, particularly when it's not even mentioned in the changelog... 

Regards,

Adam

--- End Message ---
Reply to: