[Pkg-mailman-hackers] Pkg-mailman commit - rev 263 - in trunk/debian: . patches

[Lionel Elie Mamane]

Author: lmamane
Date: 2005-12-25 15:16:21 +0000 (Sun, 25 Dec 2005)
New Revision: 263

Modified:
   trunk/debian/changelog
   trunk/debian/patches/21_newlist_help.dpatch
Log:
Tweak 21_newlist_help.dpatch:
The "automagically setgid to right group" part was slightly
suboptimal.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-12-25 14:19:15 UTC (rev 262)
+++ trunk/debian/changelog	2005-12-25 15:16:21 UTC (rev 263)
@@ -1,3 +1,11 @@
+mailman (2.1.6-2) UNRELEASED; urgency=low
+
+  * Tweak 21_newlist_help.dpatch:
+    The "automagically setgid to right group" part was slightly
+    suboptimal.
+
+ -- Lionel Elie Mamane <lmamane at debian.org>  Sun, 25 Dec 2005 16:15:56 +0100
+
 mailman (2.1.6-1) unstable; urgency=low
 
   * The "Quick, quick, upload before upstream releases a new version" release

Modified: trunk/debian/patches/21_newlist_help.dpatch
===================================================================
--- trunk/debian/patches/21_newlist_help.dpatch	2005-12-25 14:19:15 UTC (rev 262)
+++ trunk/debian/patches/21_newlist_help.dpatch	2005-12-25 15:16:21 UTC (rev 263)
@@ -21,10 +21,10 @@
 
 exit 0
 @DPATCH@
-diff -urNad /home/tfheen/external/pkg-mailman/trunk/bin/newlist trunk/bin/newlist
---- /home/tfheen/external/pkg-mailman/trunk/bin/newlist	2004-08-18 14:49:28.000000000 +0200
-+++ trunk/bin/newlist	2004-08-18 14:50:26.000000000 +0200
-@@ -62,6 +62,9 @@
+diff -urNad mailman-2.1.6~/bin/newlist mailman-2.1.6/bin/newlist
+--- mailman-2.1.6~/bin/newlist	2005-12-10 13:37:50.000000000 +0100
++++ mailman-2.1.6/bin/newlist	2005-12-25 15:55:10.056996722 +0100
+@@ -87,6 +87,9 @@
  defined in your Defaults.py file or overridden by settings in mm_cfg.py).
  
  Note that listnames are forced to lowercase.
@@ -34,7 +34,7 @@
  """
  
  import sys
-@@ -69,6 +72,7 @@
+@@ -94,6 +97,7 @@
  import getpass
  import getopt
  import sha
@@ -42,17 +42,17 @@
  
  import paths
  from Mailman import mm_cfg
-@@ -97,6 +101,9 @@
+@@ -122,6 +126,9 @@
  
  
  def main():
 +    gid = grp.getgrnam(mm_cfg.MAILMAN_GROUP)[2]
-+    if os.getgid() != mm_cfg.MAILMAN_GROUP:
++    if os.getgid() != gid:
 +        os.setgid(gid)
      try:
-         opts, args = getopt.getopt(sys.argv[1:], 'hql:',
-                                    ['help', 'quiet', 'language='])
-@@ -163,7 +170,7 @@
+         opts, args = getopt.getopt(sys.argv[1:], 'hql:u:e:',
+                                    ['help', 'quiet', 'language=',
+@@ -199,7 +206,7 @@
          except Errors.BadListNameError, s:
              usage(1, _('Illegal list name: %(s)s'))
          except Errors.EmailAddressError, s: