Should fix up a number of mailman issues.

10 files changed, 174 insertions, 30 deletions

diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog
index 4fed78f09b08..14ce93008e8f 100644
--- a/net-mail/mailman/ChangeLog
+++ b/net-mail/mailman/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/mailman
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.12 2003/05/14 02:18:22 tberman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.13 2003/05/20 01:58:24 tberman Exp $
+
+*mailman-2.1.2 (19 May 2003)
+
+  19 May 2003; Todd Berman <tberman@gentoo.org> mailman-2.1.1-r2.ebuild,
+  mailman-2.1.1-r3.ebuild, mailman-2.1.2.ebuild, files/README.gentoo,
+  files/mailman.2.1.1-r2.conf, files/mailman.2.1.1-r3.conf,
+  files/mailman.conf:
+  Version bump. Hopefully fixed install location issues. Hopefully fixed misc
+  issues with mailman install. (new install location is /usr/local/)
 
 *mailman-2.1.1-r3 (13 May 2003)
 
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 2ee2740996ac..f3eb24f2e6b3 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,7 +1,7 @@
-MD5 d1b2914678b8242fab7142f9a5487222 mailman-2.1.2.ebuild 3281
-MD5 f891280b2a4f17b0fc92364701785b75 mailman-2.1.1-r2.ebuild 2736
-MD5 c8d1a2749f2b4ef67a96e9c6792bf96e ChangeLog 1889
-MD5 8d46048408dad61579391706d97b0000 mailman-2.1.1-r3.ebuild 2886
+MD5 18326a8258a25b7ffb14bd62b2d02e74 mailman-2.1.2.ebuild 3278
+MD5 880b2c044357e8c70a3caa8e7ccc1ef5 mailman-2.1.1-r2.ebuild 2736
+MD5 d4eccb8c8481a0d9fba22259ff0f49a9 ChangeLog 1889
+MD5 87a159f7e009ba6cd1a2d4d48e843f57 mailman-2.1.1-r3.ebuild 2886
 MD5 8f68e283d9aeb1d9c86289864351d3f4 files/README.gentoo 1380
 MD5 db7f50be9ad50e5f63f9cade7f183ce0 files/mailman.2.1.1-r2.conf 361
 MD5 7696a83219b38b7e7842de3f11305f56 files/mailman.2.1.1-r3.conf 365
diff --git a/net-mail/mailman/files/README.gentoo b/net-mail/mailman/files/README.gentoo
index 017badcda820..e34af2f21e18 100644
--- a/net-mail/mailman/files/README.gentoo
+++ b/net-mail/mailman/files/README.gentoo
@@ -4,7 +4,7 @@ submitted by Joby Walker (YOU RULE!)
 
 Please view the documentation on Mailman at: http://www.list.org/
 
-I have configured Mailman to install in /home/mailman by default, to change
+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(.apache) file.
 
@@ -42,6 +42,6 @@ Remember:
 
 Do everything as user "mailman".  If root you will cause mailman to fail,
 but it is correctable by running "bin/check_perms -f" from the root
-mailman directory (/home/mailman).
+mailman directory (/usr/local/mailman).
 
 NOTE TO ORIGINAL AUTHOR: Once again thanks for the submission, you rule!
diff --git a/net-mail/mailman/files/digest-mailman-2.1.2 b/net-mail/mailman/files/digest-mailman-2.1.2
new file mode 100644
index 000000000000..b41b5a6549ef
--- /dev/null
+++ b/net-mail/mailman/files/digest-mailman-2.1.2
@@ -0,0 +1 @@
+MD5 24d2917ba0229e7bcd6153661d749e60 mailman-2.1.2.tgz 4641165
diff --git a/net-mail/mailman/files/mailman.2.1.1-r2.conf b/net-mail/mailman/files/mailman.2.1.1-r2.conf
new file mode 100644
index 000000000000..5e2524e2bace
--- /dev/null
+++ b/net-mail/mailman/files/mailman.2.1.1-r2.conf
@@ -0,0 +1,17 @@
+ScriptAlias /mailman/ "/var/mailman/cgi-bin/"
+
+<Directory "/var/mailman/cgi-bin/">
+	AllowOverride None
+	Options None
+	Order allow,deny
+	Allow from all
+</Directory>
+
+Alias /pipermail/ "/var/mailman/archives/public/"
+
+<Directory "/var/mailman/archives/public/">
+	AllowOverride None
+	Options ExecCGI FollowSymLinks
+	Order allow,deny  
+	Allow from all
+</Directory>
diff --git a/net-mail/mailman/files/mailman.2.1.1-r3.conf b/net-mail/mailman/files/mailman.2.1.1-r3.conf
new file mode 100644
index 000000000000..c8abe11ebc47
--- /dev/null
+++ b/net-mail/mailman/files/mailman.2.1.1-r3.conf
@@ -0,0 +1,17 @@
+ScriptAlias /mailman/ "/home/mailman/cgi-bin/"
+
+<Directory "/home/mailman/cgi-bin/">
+	AllowOverride None
+	Options None
+	Order allow,deny
+	Allow from all
+</Directory>
+
+Alias /pipermail/ "/home/mailman/archives/public/"
+
+<Directory "/home/mailman/archives/public/">
+	AllowOverride None
+	Options ExecCGI FollowSymLinks
+	Order allow,deny  
+	Allow from all
+</Directory>
diff --git a/net-mail/mailman/files/mailman.conf b/net-mail/mailman/files/mailman.conf
index bf491295e139..4d8facd12832 100644
--- a/net-mail/mailman/files/mailman.conf
+++ b/net-mail/mailman/files/mailman.conf
@@ -1,19 +1,17 @@
-<IfDefine MAILMAN>
-	ScriptAlias /mailman/ "/home/mailman/cgi-bin/"
+ScriptAlias /mailman/ "/usr/local/mailman/cgi-bin/"
 
-	<Directory "/home/mailman/cgi-bin/">
-		AllowOverride None
-		Options None
-		Order allow,deny
-		Allow from all
-	</Directory>
+<Directory "/usr/local/mailman/cgi-bin/">
+	AllowOverride None
+	Options None
+	Order allow,deny
+	Allow from all
+</Directory>
 
-	Alias /pipermail/ "/home/mailman/archives/public/"
+Alias /pipermail/ "/usr/local/mailman/archives/public/"
 
-	<Directory "/home/mailman/archives/public/">
-		AllowOverride None
-		Options ExecCGI FollowSymLinks
-		Order allow,deny  
-		Allow from all
-	</Directory>
-</IfDefine>
+<Directory "/usr/local/mailman/archives/public/">
+	AllowOverride None
+	Options ExecCGI FollowSymLinks
+	Order allow,deny  
+	Allow from all
+</Directory>
diff --git a/net-mail/mailman/mailman-2.1.1-r2.ebuild b/net-mail/mailman/mailman-2.1.1-r2.ebuild
index 9047e26055e4..b4fffe9de60c 100644
--- a/net-mail/mailman/mailman-2.1.1-r2.ebuild
+++ b/net-mail/mailman/mailman-2.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.1-r2.ebuild,v 1.1 2003/04/30 01:02:38 tberman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.1-r2.ebuild,v 1.2 2003/05/20 01:58:24 tberman Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU Mailman, the mailing list server with webinterface"
@@ -49,7 +49,7 @@ src_install () {
         chmod 2775 ${ID}
         make prefix=${ID} var_prefix=${ID} doinstall || die
 	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/mailman.conf
+	newins ${FILESDIR}/mailman.2.1.1-r2.conf mailman.conf
 	
 	dodoc ${FILESDIR}/README.gentoo
 	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING
diff --git a/net-mail/mailman/mailman-2.1.1-r3.ebuild b/net-mail/mailman/mailman-2.1.1-r3.ebuild
index b20599ab5051..6cd01b68098f 100644
--- a/net-mail/mailman/mailman-2.1.1-r3.ebuild
+++ b/net-mail/mailman/mailman-2.1.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.1-r3.ebuild,v 1.2 2003/05/14 02:34:29 tberman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.1-r3.ebuild,v 1.3 2003/05/20 01:58:24 tberman Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU Mailman, the mailing list server with webinterface"
@@ -49,7 +49,7 @@ src_install () {
         chmod 2775 ${ID}
         make prefix=${ID} var_prefix=${ID} doinstall || die
 	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/mailman.conf
+	newins ${FILESDIR}/mailman.2.1.1-r3.conf mailman.conf
 	
 	dodoc ${FILESDIR}/README.gentoo
 	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING
@@ -63,9 +63,9 @@ src_install () {
 	# doesn't work for this package.
 	if [ -f ${ROOT}/var/mailman/Mailman/mm_cfg.py ]; then
 		cp ${ROOT}/home/mailman/Mailman/mm_cfg.py \
-			${D}/home/mailman/Mailman/mm_cfg.py.old
-		einfo "Your old config has been saved as mm_cfg.py.old."
-		einfo "A new config has been installed as mm_cfg.py"
+			${D}/home/mailman/Mailman/mm_cfg.py
+		einfo "Your old config has been saved as mm_cfg.py"
+		einfo "A new config has been installed as mm_cfg.py.dist"
 	fi
 
 	exeinto /etc/init.d
diff --git a/net-mail/mailman/mailman-2.1.2.ebuild b/net-mail/mailman/mailman-2.1.2.ebuild
new file mode 100644
index 000000000000..d1274006b4f6
--- /dev/null
+++ b/net-mail/mailman/mailman-2.1.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.2.ebuild,v 1.1 2003/05/20 01:58:24 tberman Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="GNU Mailman, the mailing list server with webinterface"
+SRC_URI="mirror://gnu/${PN}/${P}.tgz"
+HOMEPAGE="http://www.list.org/"
+
+SLOT="O"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc "
+
+DEPEND=">=dev-lang/python-1.5.2
+	virtual/mta
+	net-www/apache"
+
+INSTALLDIR="/usr/local/mailman"
+APACHEGID="81"
+MAILGID="daemon"
+
+pkg_setup() {
+        if ! grep -q ^mailman: /etc/group ; then
+                groupadd -g 280 mailman || die "problem adding group mailman"
+        fi
+        if ! grep -q ^mailman: /etc/passwd ; then
+                useradd -u 280 -g mailman -G cron -s /bin/bash \
+					-d ${INSTALLDIR} -c "mailman" mailman
+        fi
+	mkdir -p ${INSTALLDIR}
+	chown mailman.mailman ${INSTALLDIR}
+	chmod 2775 ${INSTALLDIR}
+}
+
+src_compile() {
+        cd ${S}
+        ./configure \
+                --prefix=${INSTALLDIR} \
+                --with-mail-gid=${MAILGID} \
+                --with-cgi-gid=${APACHEGID}
+        make || die
+}
+
+src_install () {
+	ID=${D}${INSTALLDIR}
+        cd ${S}
+        mkdir -p ${ID}
+        chown -R mailman.mailman ${ID}
+        chmod 2775 ${ID}
+        make prefix=${ID} var_prefix=${ID} doinstall || die
+	insinto /etc/apache/conf/addon-modules
+	doins ${FILESDIR}/mailman.conf
+	
+	dodoc ${FILESDIR}/README.gentoo
+	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING
+	dodoc contrib/README.check_perms_grsecurity contrib/mm-handler.readme
+	dodoc contrib/virtusertable contrib/mailman.mc
+
+	cp contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
+		contrib/mm-handler* ${D}/home/mailman/bin
+
+	# Save the old config into the new package as CONFIG_PROTECT
+	# doesn't work for this package.
+	if [ -f ${ROOT}/var/mailman/Mailman/mm_cfg.py ]; then
+		cp ${ROOT}/var/mailman/Mailman/mm_cfg.py \
+			${D}/usr/local/mailman/Mailman/mm_cfg.py
+		einfo "Your old config has been saved as mm_cfg.py"
+		einfo "A new config has been installed as mm_cfg.dist"
+	fi
+	if [ -f ${ROOT}/home/mailman/Mailman/mm_cfg.py ]; then
+		cp ${ROOT}/home/mailman/Mailman/mm_cfg.py \
+			${D}/usr/local/mailman/Mailman/mm_cfg.py
+		einfo "Your old config has been saved as mm_cfg.py"
+		einfo "A new config has been installed as mm_cfg.py.dist"
+	fi
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/mailman.rc mailman
+	}
+
+pkg_postinst() {
+	cd ${INSTALLDIR}
+	bin/update
+	bin/check_perms -f
+	einfo
+	einfo "Please read /usr/share/doc/${PF}/README.gentoo.gz for additional"
+	einfo "Setup information, mailman will NOT run unless you follow"
+	einfo "those instructions!"
+	ewarn "The home directory for mailman has been moved from /var/mailman"
+	ewarn "(pre 2.1.1-r2) or /home/mailman (2.1.1-r3) to /usr/local/mailman"
+	ewarn "This should hopefully solve any problems, and this is what the mailman"
+	ewarn "default is. (Any existing config has been saved in the"
+	ewarn "new home directory.)"
+}	
+
+pkg_config() {
+	einfo "Updating apache config"
+	einfo "added: \"Include  conf/addon-modules/mailman.conf\""
+	einfo "to ${ROOT}/etc/apache/conf/apache.conf"
+        echo "Include  conf/addon-modules/mailman.conf" \
+		>> ${ROOT}/etc/apache/conf/apache.conf
+}