mailman bump to 2.1.11

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)

3 files changed, 100 insertions, 31 deletions

diff --git a/net-mail/mailman/files/50_mailman.conf-r1 b/net-mail/mailman/files/50_mailman.conf-r1
new file mode 100644
index 000000000000..82a23214fce9
--- /dev/null
+++ b/net-mail/mailman/files/50_mailman.conf-r1
@@ -0,0 +1,24 @@
+<IfDefine MAILMAN>
+	ScriptAlias /mailman/ "/usr/local/mailman/cgi-bin/"
+	<Directory "/usr/local/mailman/cgi-bin/">
+		AllowOverride None
+		Options None
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+	Alias /pipermail/ "/usr/local/mailman/archives/public/"
+	<Directory "/usr/local/mailman/archives/public/">
+		AllowOverride None
+		Options ExecCGI FollowSymLinks
+		Order allow,deny  
+		Allow from all
+	</Directory>
+
+	Alias /mailman-icons/ "/usr/local/mailman/icons/"
+	<Directory "/usr/local/mailman/icons/">
+		AllowOverride None
+		Order allow,deny
+		Allow from all
+	</Directory>
+</IfDefine>
diff --git a/net-mail/mailman/files/README.gentoo b/net-mail/mailman/files/README.gentoo-r3
index 627662561b94..58c2f33db49a 100644
--- a/net-mail/mailman/files/README.gentoo
+++ b/net-mail/mailman/files/README.gentoo-r3
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/files/README.gentoo,v 1.11 2007/11/26 02:17:23 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/files/README.gentoo-r3,v 1.1 2008/07/04 13:33:42 hanno Exp $
 
 Follow these instructions to finish setting up mailman. This file and the
 original ebuild were tweaked by me <lamer@gentoo.org> but were graciously
@@ -10,9 +10,9 @@ for 2.1.x.
 
 Please view the documentation on Mailman at: http://www.list.org/
 
-I have configured Mailman to install in /usr/local/mailman by default, to change
-this you will need to modify the INSTALLDIR variable in the ebuild and the
-locations in the mailman.conf file.
+This documentation assumes you're using the default gentoo path
+(/usr/lib/mailman/), if you've changed it with MAILMAN_PREFIX, adjust them
+accordingly.
 
 1) If this is your first time installing mailman, after your "emerge mailman",
 you need to add -D MAILMAN to /etc/conf.d/apache or /etc/conf.d/apache2 and restart
@@ -52,16 +52,16 @@ and main list:
 
 (Postfix users: read the notes at the end of this file before you continue)
 Add this to /etc/mail/aliases (and see point 9 for notes):
-     mailman:              "|/usr/local/mailman/mail/mailman post mailman"
-     mailman-admin:        "|/usr/local/mailman/mail/mailman admin mailman"
-     mailman-bounces:      "|/usr/local/mailman/mail/mailman bounces mailman"
-     mailman-confirm:      "|/usr/local/mailman/mail/mailman confirm mailman"
-     mailman-join:         "|/usr/local/mailman/mail/mailman join mailman"
-     mailman-leave:        "|/usr/local/mailman/mail/mailman leave mailman"
-     mailman-owner:        "|/usr/local/mailman/mail/mailman owner mailman"
-     mailman-request:      "|/usr/local/mailman/mail/mailman request mailman"
-     mailman-subscribe:    "|/usr/local/mailman/mail/mailman subscribe mailman"
-     mailman-unsubscribe:  "|/usr/local/mailman/mail/mailman unsubscribe mailman"
+     mailman:              "|/usr/lib/mailman/mail/mailman post mailman"
+     mailman-admin:        "|/usr/lib/mailman/mail/mailman admin mailman"
+     mailman-bounces:      "|/usr/lib/mailman/mail/mailman bounces mailman"
+     mailman-confirm:      "|/usr/lib/mailman/mail/mailman confirm mailman"
+     mailman-join:         "|/usr/lib/mailman/mail/mailman join mailman"
+     mailman-leave:        "|/usr/lib/mailman/mail/mailman leave mailman"
+     mailman-owner:        "|/usr/lib/mailman/mail/mailman owner mailman"
+     mailman-request:      "|/usr/lib/mailman/mail/mailman request mailman"
+     mailman-subscribe:    "|/usr/lib/mailman/mail/mailman subscribe mailman"
+     mailman-unsubscribe:  "|/usr/lib/mailman/mail/mailman unsubscribe mailman"
 
 For courier, the aliases have to go to /etc/courier/aliases and you have to skip
 the quotes.
@@ -70,9 +70,6 @@ Run newaliases (only if you use sendmail).
 
 	newaliases
     
-Copy the web icons:
-     cp /usr/local/mailman/icons/* /var/www/localhost/icons
-
 6) Start the mailman daemon:
 
 	/etc/init.d/mailman start
@@ -85,16 +82,16 @@ and add it to default runlevel (optional but recommended):
 this must be added to /etc/mail/aliases (see smrsh notes below)
 replace <list-name> with the name of the list:
 
-	<list-name>: "|/usr/local/mailman/mail/mailman post <list-name>"
-	<list-name>-admin: "|/usr/local/mailman/mail/mailman admin <list-name>"
-	<list-name>-bounces: "|/usr/local/mailman/mail/mailman bounces <list-name>"
-     	<list-name>-confirm: "|/usr/local/mailman/mail/mailman confirm <list-name>"
-     	<list-name>-join: "|/usr/local/mailman/mail/mailman join <list-name>"
-	<list-name>-leave: "|/usr/local/mailman/mail/mailman leave <list-name>"
-	<list-name>-owner: "|/usr/local/mailman/mail/mailman owner <list-name>"
-	<list-name>-request: "|/usr/local/mailman/mail/mailman request <list-name>"
-     	<list-name>-subscribe: "|/usr/local/mailman/mail/mailman subscribe <list-name>"
-	<list-name>-unsubscribe: "|/usr/local/mailman/mail/mailman unsubscribe <list-name>"
+	<list-name>: "|/usr/lib/mailman/mail/mailman post <list-name>"
+	<list-name>-admin: "|/usr/lib/mailman/mail/mailman admin <list-name>"
+	<list-name>-bounces: "|/usr/lib/mailman/mail/mailman bounces <list-name>"
+     	<list-name>-confirm: "|/usr/lib/mailman/mail/mailman confirm <list-name>"
+     	<list-name>-join: "|/usr/lib/mailman/mail/mailman join <list-name>"
+	<list-name>-leave: "|/usr/lib/mailman/mail/mailman leave <list-name>"
+	<list-name>-owner: "|/usr/lib/mailman/mail/mailman owner <list-name>"
+	<list-name>-request: "|/usr/lib/mailman/mail/mailman request <list-name>"
+     	<list-name>-subscribe: "|/usr/lib/mailman/mail/mailman subscribe <list-name>"
+	<list-name>-unsubscribe: "|/usr/lib/mailman/mail/mailman unsubscribe <list-name>"
 
 For courier, the aliases have to go to /etc/courier/aliases and you have to skip
 the quotes.
@@ -107,14 +104,14 @@ smrsh notes
 -----------
 (if you use sendmail, you are surely using srmsh) you must note that 
 sendmail won't run any program outside of EBINDIR. I tried to change 
-EBINDIR using,define(`confEBINDIR', `/usr/local/mailman/mail')dnl in 
+EBINDIR using,define(`confEBINDIR', `/usr/lib/mailman/mail')dnl in 
 sendmail.mc but it didn't work, so mailman must be placed in EBINDIR, 
 which in Gentoo is /usr/adm/sm.bin, so you must run as root:
 
-     ln -s /usr/local/mailman/mail/mailman /usr/adm/sm.bin/mailman
+     ln -s /usr/lib/mailman/mail/mailman /usr/adm/sm.bin/mailman
 
 And the lines in /etc/mail/aliases which refer to 
-/usr/local/mailman/mail/mailman must be changed to mailman:
+/usr/lib/mailman/mail/mailman must be changed to mailman:
 
      <list-name>:              "|mailman post <list-name>"
      <list-name>-admin:        "|mailman admin <list-name>"
@@ -127,11 +124,47 @@ And the lines in /etc/mail/aliases which refer to
      <list-name>-subscribe:    "|mailman subscribe <list-name>"
      <list-name>-unsubscribe:  "|mailman unsubscribe <list-name>"
 
+exim notes
+----------
+You can write an exim stanza for the router and transport that looks something
+like (Derived from, and in part taken from cpanel):
+
+mailman_virtual_router:
+	driver = accept
+	require_files = /var/lib/mailman/lists/${lc::local_part}/config.pck
+	local_part_suffix_optional
+	local_part_suffix = -admin     : \
+						-bounces   : -bounces+* : \
+						-confirm   : -confirm+* : \
+						-join      : -leave     : \
+						-owner     : -request   : \
+						-subscribe : -unsubscribe
+	transport = mailman_virtual_transport
+
+mailman_virtual_transport:
+    driver = pipe
+    command = /usr/lib/mailman/mail/mailman \
+              '${if def:local_part_suffix \
+                    {${sg{$local_part_suffix}{-(\\w+)(\\+.*)?}{\$1}}} \
+                    {post}}' \
+              ${lc:$local_part}
+    current_directory = /usr/lib/mailman
+    home_directory = /usr/lib/mailman
+    user = mailman
+    group = mailman
+
+Note the double colon in the require files.  See
+http://wiki.exim.org/FAQ/General_Debugging/Q0060 for more information.
+
+This should be modified if you're using the vhosts USE flag, specifically you
+need to modify the location of the config.pck file, to be
+${lc::local_part}-${lc::domain} instead of simply ${lc::local_part}, and for the
+transport you need to change the last part of the command in the same fashion.
 
 Other Helpful things to know...
 -------------------------------
 run "bin/check_perms -f" from the root mailman directory
-(/usr/local/mailman) to check and fix permission problems.
+(/usr/lib/mailman) to check and fix permission problems.
 
 The INSTALL file is located in /usr/share/doc/mailman-$VERSION/ 
 
diff --git a/net-mail/mailman/files/mailman-2.1.9-icons.patch b/net-mail/mailman/files/mailman-2.1.9-icons.patch
new file mode 100644
index 000000000000..07cd63e58812
--- /dev/null
+++ b/net-mail/mailman/files/mailman-2.1.9-icons.patch
@@ -0,0 +1,12 @@
+diff -rau mailman-2.1.9-orig/Mailman/Defaults.py.in mailman-2.1.9-mailman-icons/Mailman/Defaults.py.in
+--- mailman-2.1.9-orig/Mailman/Defaults.py.in	2006-08-04 14:20:33.000000000 +0200
++++ mailman-2.1.9/Mailman/Defaults.py.in	2008-02-03 14:27:02.000000000 +0200
+@@ -54,7 +54,7 @@
+ # disable Mailman's logo footer altogther, hack
+ # Mailman/htmlformat.py:MailmanLogo(), which also contains the hardcoded links
+ # and image names.
+-IMAGE_LOGOS = '/icons/'
++IMAGE_LOGOS = '/mailman-icons/'
+ 
+ # The name of the Mailman favicon
+ SHORTCUT_ICON = 'mm-icon.png'