rpms/mailman/devel mailman-2.1.9-unicode.patch, NONE, 1.1 mailman.spec, 1.67, 1.68

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/mailman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19261

Modified Files:
	mailman.spec 
Added Files:
	mailman-2.1.9-unicode.patch 
Log Message:
* Thu Jan 10 2008 Tomas Smetana <tsmetana at redhat.com> - 3:2.1.9-9
- fix #393911 - mail is not added to the archive


mailman-2.1.9-unicode.patch:

--- NEW FILE mailman-2.1.9-unicode.patch ---
diff -up mailman-2.1.9/Mailman/Archiver/pipermail.py.unicode mailman-2.1.9/Mailman/Archiver/pipermail.py
--- mailman-2.1.9/Mailman/Archiver/pipermail.py.unicode	2008-01-14 11:50:24.000000000 +0100
+++ mailman-2.1.9/Mailman/Archiver/pipermail.py	2008-01-14 11:51:48.000000000 +0100
@@ -45,24 +45,27 @@ smallNameParts = ['van', 'von', 'der', '
 
 def fixAuthor(author):
     "Canonicalize a name into Last, First format"
-    # If there's a comma, guess that it's already in "Last, First" format
-    if ',' in author:
+    try:
+        # If there's a comma, guess that it's already in "Last, First" format
+        if ',' in author:
+            return author
+        L = author.split()
+        i = len(L) - 1
+        if i == 0:
+            return author # The string's one word--forget it
+        if author.upper() == author or author.lower() == author:
+            # Damn, the name is all upper- or lower-case.
+            while i > 0 and L[i-1].lower() in smallNameParts:
+                i = i - 1
+        else:
+            # Mixed case; assume that small parts of the last name will be
+            # in lowercase, and check them against the list.
+            while i>0 and (L[i-1][0] in lowercase or
+                           L[i-1].lower() in smallNameParts):
+                i = i - 1
+        author = SPACE.join(L[-1:] + L[i:-1]) + ', ' + SPACE.join(L[:i])
+    except UnicodeDecodeError:
         return author
-    L = author.split()
-    i = len(L) - 1
-    if i == 0:
-        return author # The string's one word--forget it
-    if author.upper() == author or author.lower() == author:
-        # Damn, the name is all upper- or lower-case.
-        while i > 0 and L[i-1].lower() in smallNameParts:
-            i = i - 1
-    else:
-        # Mixed case; assume that small parts of the last name will be
-        # in lowercase, and check them against the list.
-        while i>0 and (L[i-1][0] in lowercase or
-                       L[i-1].lower() in smallNameParts):
-            i = i - 1
-    author = SPACE.join(L[-1:] + L[i:-1]) + ', ' + SPACE.join(L[:i])
     return author
 
 # Abstract class for databases


Index: mailman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mailman/devel/mailman.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- mailman.spec	24 Oct 2007 14:10:31 -0000	1.67
+++ mailman.spec	15 Jan 2008 07:30:08 -0000	1.68
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access
 Name: mailman
 Version: 2.1.9
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 3
 Group: Applications/Internet
 #Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -28,6 +28,7 @@
 Patch13: mailman-2.1.9-ctypefix.patch
 Patch14: mailman-2.1.9-header-folding.patch
 Patch15: mailman-2.1.9-selinux.patch
+Patch16: mailman-2.1.9-unicode.patch
 
 License: GPLv2+
 URL: http://www.list.org/
@@ -109,6 +110,7 @@
 %patch13 -p1 -b .ctypefix
 %patch14 -p0 -b .header
 %patch15 -p1 -b .selinux
+%patch16 -p1 -b .unicode
 
 #cp $RPM_SOURCE_DIR/mailman.INSTALL.REDHAT.in INSTALL.REDHAT.in
 cp %{SOURCE5} INSTALL.REDHAT.in
@@ -185,8 +187,9 @@
 cp $RPM_BUILD_ROOT/%{mmdir}/icons/* $RPM_BUILD_ROOT%{contentdir}/icons
 
 # Create a link to the wrapper in /etc/smrsh to allow sendmail to run it.
+# The link should be relative in order to make it work in chroot
 mkdir -p $RPM_BUILD_ROOT/etc/smrsh
-ln -s %{mmdir}/mail/%{mail_wrapper} $RPM_BUILD_ROOT/etc/smrsh
+ln -s ../..%{mmdir}/mail/%{mail_wrapper} $RPM_BUILD_ROOT/etc/smrsh
 
 # Create a link so that the config file mm_cfg.py appears in config
 # directory /etc/mailman. We don't put mm_cfg.py in the config directory
@@ -347,6 +350,9 @@
 %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in
 
 %changelog
+* Thu Jan 10 2008 Tomas Smetana <tsmetana at redhat.com> - 3:2.1.9-9
+- fix #393911 - mail is not added to the archive
+
 * Tue Oct 16 2007 Tomas Smetana <tsmetana at redhat.com> - 3:2.1.9-8
 - fix #333011 - withlist crashes with NameError
 - fix #350461 - init script prevents proper SELinux domain transitions