[Pkg-mailman-hackers] Pkg-mailman commit - rev 659 - trunk/debian/patches

Thijs Kinkhorst thijs at alioth.debian.org
Mon May 24 15:50:00 UTC 2010 

Author: thijs
Date: 2010-05-24 15:49:59 +0000 (Mon, 24 May 2010)
New Revision: 659

Modified:
   trunk/debian/patches/01_defaults.debian.patch
   trunk/debian/patches/02_force_autoconf_2.50.patch
   trunk/debian/patches/07_snooze.patch
   trunk/debian/patches/10_wrapper_uid.patch
   trunk/debian/patches/15_mailmanctl_daemonize.patch
   trunk/debian/patches/16_update_debian.patch
   trunk/debian/patches/20_qmail_to_mailman.debian.patch
   trunk/debian/patches/21_newlist_help.patch
   trunk/debian/patches/25_site_logo.patch
   trunk/debian/patches/51_nocompile.pyc.patch
   trunk/debian/patches/52_check_perms_lstat.patch
   trunk/debian/patches/53_disable_addons.patch
Log:
refresh patches


Modified: trunk/debian/patches/01_defaults.debian.patch
===================================================================
--- trunk/debian/patches/01_defaults.debian.patch	2010-05-24 15:16:47 UTC (rev 658)
+++ trunk/debian/patches/01_defaults.debian.patch	2010-05-24 15:49:59 UTC (rev 659)
@@ -1,10 +1,10 @@
 Patch: 01_defaults.debian.dpatch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Set sane defaults in Defaults.py.in
-Index: mailman-2.1.12/Mailman/Defaults.py.in
+Index: b/Mailman/Defaults.py.in
 ===================================================================
---- mailman-2.1.12.orig/Mailman/Defaults.py.in	2009-03-02 20:41:57.000000000 +0100
-+++ mailman-2.1.12/Mailman/Defaults.py.in	2009-03-02 20:49:55.000000000 +0100
+--- a/Mailman/Defaults.py.in	2010-05-24 17:28:44.000000000 +0200
++++ b/Mailman/Defaults.py.in	2010-05-24 17:28:46.000000000 +0200
 @@ -54,7 +54,7 @@
  # disable Mailman's logo footer altogther, hack
  # Mailman/htmlformat.py:MailmanLogo(), which also contains the hardcoded links
@@ -23,7 +23,7 @@
  
  # DEFAULT_HOST_NAME has been replaced with DEFAULT_EMAIL_HOST, however some
  # sites may have the former in their mm_cfg.py files.  If so, we'll believe
-@@ -1352,7 +1352,7 @@
+@@ -1355,7 +1355,7 @@
  MAILDIR_DIR     = os.path.join(QUEUE_DIR, 'maildir')
  
  # Other useful files

Modified: trunk/debian/patches/02_force_autoconf_2.50.patch
===================================================================
--- trunk/debian/patches/02_force_autoconf_2.50.patch	2010-05-24 15:16:47 UTC (rev 658)
+++ trunk/debian/patches/02_force_autoconf_2.50.patch	2010-05-24 15:49:59 UTC (rev 659)
@@ -2,10 +2,10 @@
 Author: Lionel Elie Mamane <lionel at mamane.lu>
 Get Debian's autoconf wrapper to use autoconf >= 2.50 (like upstream
 uses) and not autoconf 2.13.
-Index: mailman-2.1.12/configure.in
+Index: b/configure.in
 ===================================================================
---- mailman-2.1.12.orig/configure.in	2009-05-22 08:57:20.541033289 +0200
-+++ mailman-2.1.12/configure.in	2009-05-22 08:57:27.805439774 +0200
+--- a/configure.in	2010-05-24 17:28:44.000000000 +0200
++++ b/configure.in	2010-05-24 17:28:47.000000000 +0200
 @@ -16,7 +16,7 @@
  
  dnl Process this file with autoconf to produce a configure script.

Modified: trunk/debian/patches/07_snooze.patch
===================================================================
--- trunk/debian/patches/07_snooze.patch	2010-05-24 15:16:47 UTC (rev 658)
+++ trunk/debian/patches/07_snooze.patch	2010-05-24 15:49:59 UTC (rev 659)
@@ -1,10 +1,10 @@
 Patch: 07_snooze.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Snooze a bit to avoid eating too much CPU if you get an SMTP error (Closes: #175173)
-Index: mailman-2.1.12/Mailman/Queue/OutgoingRunner.py
+Index: b/Mailman/Queue/OutgoingRunner.py
 ===================================================================
---- mailman-2.1.12.orig/Mailman/Queue/OutgoingRunner.py	2009-03-02 20:41:56.000000000 +0100
-+++ mailman-2.1.12/Mailman/Queue/OutgoingRunner.py	2009-03-02 20:49:57.000000000 +0100
+--- a/Mailman/Queue/OutgoingRunner.py	2010-05-24 17:28:44.000000000 +0200
++++ b/Mailman/Queue/OutgoingRunner.py	2010-05-24 17:28:48.000000000 +0200
 @@ -89,6 +89,7 @@
                  syslog('error', 'Cannot connect to SMTP server %s on port %s',
                         mm_cfg.SMTPHOST, port)

Modified: trunk/debian/patches/10_wrapper_uid.patch
===================================================================
--- trunk/debian/patches/10_wrapper_uid.patch	2010-05-24 15:16:47 UTC (rev 658)
+++ trunk/debian/patches/10_wrapper_uid.patch	2010-05-24 15:49:59 UTC (rev 659)
@@ -1,10 +1,10 @@
 Patch: 10_wrapper_uid.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Makes sure we're called with the right UID and GID (Closes: #36010, #89564, #89848, 89818)
-Index: mailman-2.1.12/src/cgi-wrapper.c
+Index: b/src/cgi-wrapper.c
 ===================================================================
---- mailman-2.1.12.orig/src/cgi-wrapper.c	2009-03-02 20:41:55.000000000 +0100
-+++ mailman-2.1.12/src/cgi-wrapper.c	2009-03-02 20:49:59.000000000 +0100
+--- a/src/cgi-wrapper.c	2010-05-24 17:28:43.000000000 +0200
++++ b/src/cgi-wrapper.c	2010-05-24 17:28:49.000000000 +0200
 @@ -42,7 +42,8 @@
          char* fake_argv[3];
  
@@ -15,10 +15,10 @@
  
          /* For these CGI programs, we can ignore argc and argv since they
           * don't contain anything useful.  `script' will always be the driver
-Index: mailman-2.1.12/src/mail-wrapper.c
+Index: b/src/mail-wrapper.c
 ===================================================================
---- mailman-2.1.12.orig/src/mail-wrapper.c	2009-03-02 20:41:56.000000000 +0100
-+++ mailman-2.1.12/src/mail-wrapper.c	2009-03-02 20:49:59.000000000 +0100
+--- a/src/mail-wrapper.c	2010-05-24 17:28:43.000000000 +0200
++++ b/src/mail-wrapper.c	2010-05-24 17:28:49.000000000 +0200
 @@ -74,7 +74,8 @@
                  fatal(logident, MAIL_ILLEGAL_COMMAND,
                        "Illegal command: %s", argv[1]);

Modified: trunk/debian/patches/15_mailmanctl_daemonize.patch
===================================================================
--- trunk/debian/patches/15_mailmanctl_daemonize.patch	2010-05-24 15:16:47 UTC (rev 658)
+++ trunk/debian/patches/15_mailmanctl_daemonize.patch	2010-05-24 15:49:59 UTC (rev 659)
@@ -1,10 +1,10 @@
 Patch: 15_mailmanctl_daemonize.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Daemonize mailmanctl properly (Closes: #175175)
-Index: mailman-2.1.12/bin/mailmanctl
+Index: b/bin/mailmanctl
 ===================================================================
---- mailman-2.1.12.orig/bin/mailmanctl	2009-03-02 20:41:55.000000000 +0100
-+++ mailman-2.1.12/bin/mailmanctl	2009-03-02 20:50:01.000000000 +0100
+--- a/bin/mailmanctl	2010-05-24 17:28:43.000000000 +0200
++++ b/bin/mailmanctl	2010-05-24 17:28:50.000000000 +0200
 @@ -417,6 +417,13 @@
          # won't be opening any terminal devices, don't do the ultra-paranoid
          # suggestion of doing a second fork after the setsid() call.

Modified: trunk/debian/patches/16_update_debian.patch
===================================================================
--- trunk/debian/patches/16_update_debian.patch	2010-05-24 15:16:47 UTC (rev 658)
+++ trunk/debian/patches/16_update_debian.patch	2010-05-24 15:49:59 UTC (rev 659)
@@ -2,10 +2,10 @@
 Author: Tollef Fog Heen <tfheen at debian.org>
 update is called from the Debian maintainer scripts and
 prints non-appropriate output.  Change that.
-Index: mailman-2.1.13/bin/update
+Index: b/bin/update
 ===================================================================
---- mailman-2.1.13.orig/bin/update	2009-12-22 19:00:43.000000000 +0100
-+++ mailman-2.1.13/bin/update	2009-12-29 19:57:40.000000000 +0100
+--- a/bin/update	2010-05-24 17:28:43.000000000 +0200
++++ b/bin/update	2010-05-24 17:28:51.000000000 +0200
 @@ -334,37 +334,6 @@
      # BAW: Is this still necessary?!
      mlist.Save()

Modified: trunk/debian/patches/20_qmail_to_mailman.debian.patch
===================================================================
--- trunk/debian/patches/20_qmail_to_mailman.debian.patch	2010-05-24 15:16:47 UTC (rev 658)
+++ trunk/debian/patches/20_qmail_to_mailman.debian.patch	2010-05-24 15:49:59 UTC (rev 659)
@@ -1,10 +1,10 @@
 Patch: 20_qmail_to_mailman.debian.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Fix some paths in the qmail_to_mailman wrapper (Closes: #217573)
-Index: mailman-2.1.12/contrib/qmail-to-mailman.py
+Index: b/contrib/qmail-to-mailman.py
 ===================================================================
---- mailman-2.1.12.orig/contrib/qmail-to-mailman.py	2009-03-02 20:41:54.000000000 +0100
-+++ mailman-2.1.12/contrib/qmail-to-mailman.py	2009-03-02 20:50:03.000000000 +0100
+--- a/contrib/qmail-to-mailman.py	2010-05-24 17:28:43.000000000 +0200
++++ b/contrib/qmail-to-mailman.py	2010-05-24 17:28:51.000000000 +0200
 @@ -28,12 +28,12 @@
  #
  # INSTALLATION:

Modified: trunk/debian/patches/21_newlist_help.patch
===================================================================
--- trunk/debian/patches/21_newlist_help.patch	2010-05-24 15:16:47 UTC (rev 658)
+++ trunk/debian/patches/21_newlist_help.patch	2010-05-24 15:49:59 UTC (rev 659)
@@ -1,10 +1,10 @@
 Patch: 21_newlist_help.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 make newlist be a bit friendlier (Closes: #309339, #170362)
-Index: mailman-2.1.12/bin/newlist
+Index: b/bin/newlist
 ===================================================================
---- mailman-2.1.12.orig/bin/newlist	2009-03-02 20:41:54.000000000 +0100
-+++ mailman-2.1.12/bin/newlist	2009-03-02 20:50:04.000000000 +0100
+--- a/bin/newlist	2010-05-24 17:28:43.000000000 +0200
++++ b/bin/newlist	2010-05-24 17:28:52.000000000 +0200
 @@ -88,12 +88,16 @@
  defined in your Defaults.py file or overridden by settings in mm_cfg.py).
  
@@ -32,7 +32,7 @@
      try:
          opts, args = getopt.getopt(sys.argv[1:], 'hql:u:e:',
                                     ['help', 'quiet', 'language=',
-@@ -203,7 +210,7 @@
+@@ -204,7 +211,7 @@
          except Errors.BadListNameError, s:
              usage(1, _('Illegal list name: %(s)s'))
          except Errors.EmailAddressError, s:

Modified: trunk/debian/patches/25_site_logo.patch
===================================================================
--- trunk/debian/patches/25_site_logo.patch	2010-05-24 15:16:47 UTC (rev 658)
+++ trunk/debian/patches/25_site_logo.patch	2010-05-24 15:49:59 UTC (rev 659)
@@ -3,10 +3,11 @@
 Allow each mailman site to have a custom text, link and logo. Also fix existing logo linkage.
 http://bugs.debian.org/267243
 http://sf.net/support/tracker.php?aid=1615748
-diff -urNad mailman-2.1.5/Mailman/Defaults.py.in /tmp/dpep.h3m72C/mailman-2.1.5/Mailman/Defaults.py.in
---- mailman-2.1.5/Mailman/Defaults.py.in	2005-01-05 15:11:16.000000000 +0800
-+++ /tmp/dpep.h3m72C/mailman-2.1.5/Mailman/Defaults.py.in	2005-01-05 15:13:10.000000000 +0800
-@@ -65,6 +65,12 @@
+Index: b/Mailman/Defaults.py.in
+===================================================================
+--- a/Mailman/Defaults.py.in	2010-05-24 17:28:46.000000000 +0200
++++ b/Mailman/Defaults.py.in	2010-05-24 17:28:53.000000000 +0200
+@@ -64,6 +64,12 @@
  #MAILMAN_URL = 'http://www.list.org/'
  #MAILMAN_URL = 'http://mailman.sf.net/'
  
@@ -19,10 +20,11 @@
  # Mailman needs to know about (at least) two fully-qualified domain names
  # (fqdn); 1) the hostname used in your urls, and 2) the hostname used in email
  # addresses for your domain.  For example, if people visit your Mailman system
-diff -urNad mailman-2.1.5/Mailman/htmlformat.py /tmp/dpep.h3m72C/mailman-2.1.5/Mailman/htmlformat.py
---- mailman-2.1.5/Mailman/htmlformat.py	2005-01-05 15:11:16.000000000 +0800
-+++ /tmp/dpep.h3m72C/mailman-2.1.5/Mailman/htmlformat.py	2005-01-05 15:18:57.000000000 +0800
-@@ -618,24 +618,33 @@
+Index: b/Mailman/htmlformat.py
+===================================================================
+--- a/Mailman/htmlformat.py	2010-05-24 17:28:43.000000000 +0200
++++ b/Mailman/htmlformat.py	2010-05-24 17:28:53.000000000 +0200
+@@ -622,24 +622,33 @@
  
  def MailmanLogo():
      t = Table(border=0, width='100%')

Modified: trunk/debian/patches/51_nocompile.pyc.patch
===================================================================
--- trunk/debian/patches/51_nocompile.pyc.patch	2010-05-24 15:16:47 UTC (rev 658)
+++ trunk/debian/patches/51_nocompile.pyc.patch	2010-05-24 15:49:59 UTC (rev 659)
@@ -1,10 +1,10 @@
 Patch: 51_nocompile.pyc.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Don't do the compileall dance.  It'll just waste CPU cycles.
-Index: mailman-2.1.12/Makefile.in
+Index: b/Makefile.in
 ===================================================================
---- mailman-2.1.12.orig/Makefile.in	2009-03-02 20:41:52.000000000 +0100
-+++ mailman-2.1.12/Makefile.in	2009-03-02 20:50:07.000000000 +0100
+--- a/Makefile.in	2010-05-24 17:28:43.000000000 +0200
++++ b/Makefile.in	2010-05-24 17:28:54.000000000 +0200
 @@ -124,7 +124,7 @@
  	do \
  	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \

Modified: trunk/debian/patches/52_check_perms_lstat.patch
===================================================================
--- trunk/debian/patches/52_check_perms_lstat.patch	2010-05-24 15:16:47 UTC (rev 658)
+++ trunk/debian/patches/52_check_perms_lstat.patch	2010-05-24 15:49:59 UTC (rev 659)
@@ -1,10 +1,10 @@
 Patch: 52_check_perms_lstat.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Use lstat instead of stat in check_perms
-Index: mailman-2.1.12/bin/check_perms
+Index: b/bin/check_perms
 ===================================================================
---- mailman-2.1.12.orig/bin/check_perms	2009-03-02 20:41:52.000000000 +0100
-+++ mailman-2.1.12/bin/check_perms	2009-03-02 20:50:08.000000000 +0100
+--- a/bin/check_perms	2010-05-24 17:28:43.000000000 +0200
++++ b/bin/check_perms	2010-05-24 17:28:55.000000000 +0200
 @@ -82,7 +82,7 @@
      return os.stat(path)[ST_MODE]
  

Modified: trunk/debian/patches/53_disable_addons.patch
===================================================================
--- trunk/debian/patches/53_disable_addons.patch	2010-05-24 15:16:47 UTC (rev 658)
+++ trunk/debian/patches/53_disable_addons.patch	2010-05-24 15:49:59 UTC (rev 659)
@@ -1,13 +1,12 @@
 Patch: 53_disable_addons.patch
 Author: Tollef Fog Heen <tfheen at debian.org>
 Disable some modules which are pulled in from other Debian packages.
-Index: mailman-2.1.12/misc/Makefile.in
-===================================================================
---- mailman-2.1.12.orig/misc/Makefile.in	2009-03-02 20:41:52.000000000 +0100
-+++ mailman-2.1.12/misc/Makefile.in	2009-03-02 20:50:09.000000000 +0100
+diff -Nur mailman-2.1.13/misc/Makefile.in mailman-2.1.13/misc/Makefile.in
+--- mailman-2.1.13/misc/Makefile.in	2009-12-22 19:00:43.000000000 +0100
++++ mailman-2.1.13/misc/Makefile.in	2010-05-24 17:37:28.000000000 +0200
 @@ -57,7 +57,10 @@
- JACODECSPKG=	JapaneseCodecs-1.4.11
- KOCODECSPKG=	KoreanCodecs-2.0.5
+ JACODECSPKG=	@JACODECSPKG@
+ KOCODECSPKG=	@KOCODECSPKG@
  
 -PACKAGES= $(EMAILPKG) $(JACODECSPKG) $(KOCODECSPKG)
 +#Debian note (LEM): we take the Japanese and Korean codecs from other
@@ -17,10 +16,9 @@
  
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
-Index: mailman-2.1.12/misc/paths.py.in
-===================================================================
---- mailman-2.1.12.orig/misc/paths.py.in	2009-03-02 20:41:52.000000000 +0100
-+++ mailman-2.1.12/misc/paths.py.in	2009-03-02 20:50:09.000000000 +0100
+diff -Nur mailman-2.1.13/misc/paths.py.in mailman-2.1.13/misc/paths.py.in
+--- mailman-2.1.13/misc/paths.py.in	2009-12-22 19:00:43.000000000 +0100
++++ mailman-2.1.13/misc/paths.py.in	2010-05-24 17:37:28.000000000 +0200
 @@ -67,13 +67,19 @@
  # files would be imported automatically.  But because we inhibit the importing
  # of the site module, we need to be explicit about importing these codecs.

More information about the Pkg-mailman-hackers mailing list