More apache config changes. Revision bump as there have been numerous changes since the original 2.1.2 release.

4 files changed, 132 insertions, 6 deletions

diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 368b8582bc2b..721ed875ad5a 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,12 +1,12 @@
 MD5 b6ba1e9ebe12dfce53fb8d89e3952d1b mailman-2.1.1-r3.ebuild 2895
 MD5 dab1b4d55cf6b2e232eb0be19d16036f mailman-2.1.1-r2.ebuild 2745
 MD5 9e4300aa2a74c76627fd80bd932dc3b8 mailman-2.1.2.ebuild 3809
-MD5 cd8829e813816fcce8605d7a477ce1f7 mailman-2.1.2-r1.ebuild 3840
-MD5 190cbca8b910e7558038932c6e1b69fb ChangeLog 2617
+MD5 499bfeba5c0225d2a8b80853fc9b610e mailman-2.1.2-r1.ebuild 3833
+MD5 999c23da98a51b50fdf00b2ac42467c2 ChangeLog 2922
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 db7f50be9ad50e5f63f9cade7f183ce0 files/mailman.2.1.1-r2.conf 361
 MD5 7696a83219b38b7e7842de3f11305f56 files/mailman.2.1.1-r3.conf 365
-MD5 2fd035ad0e0b3f747ad1602bd7808f00 files/README.gentoo 4618
+MD5 2bb507c6bb27de07563452f64cdd952e files/README.gentoo 4643
 MD5 3089c1f0f8d91abdd612997b085959eb files/mailman.conf 385
 MD5 c633b40bfc65dcf74cc36594b311031a files/digest-mailman-2.1.2 63
 MD5 3163b3164584897610113805a484fd2d files/digest-mailman-2.1.1-r2 63
diff --git a/net-mail/mailman/files/README.gentoo b/net-mail/mailman/files/README.gentoo
index b0903b44bd7b..645118ef20ce 100644
--- a/net-mail/mailman/files/README.gentoo
+++ b/net-mail/mailman/files/README.gentoo
@@ -8,10 +8,10 @@ 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(.apache) file.
+locations in the mailman.conf file.
 
-1) If this is your first time installing mailman, after your "emerge mailman", you will need to
-run:
+1) If this is your first time installing mailman, after your "emerge mailman",
+**and you are using apache 1.x**, you will need to run:
 
 ebuild /var/db/pkg/net-mail/mailman-x.x.x/mailman-x.x.x.ebuild config
 
diff --git a/net-mail/mailman/files/digest-mailman-2.1.2-r1 b/net-mail/mailman/files/digest-mailman-2.1.2-r1
new file mode 100644
index 000000000000..b41b5a6549ef
--- /dev/null
+++ b/net-mail/mailman/files/digest-mailman-2.1.2-r1
@@ -0,0 +1 @@
+MD5 24d2917ba0229e7bcd6153661d749e60 mailman-2.1.2.tgz 4641165
diff --git a/net-mail/mailman/mailman-2.1.2-r1.ebuild b/net-mail/mailman/mailman-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..f06538b105dc
--- /dev/null
+++ b/net-mail/mailman/mailman-2.1.2-r1.ebuild
@@ -0,0 +1,125 @@
+# 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-r1.ebuild,v 1.1 2003/07/30 19:33:04 raker Exp $
+
+IUSE="apache2"
+
+DESCRIPTION="A python-based mailing list server with an extensive web interface"
+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="280"
+
+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() {
+        econf \
+                --prefix=${INSTALLDIR} \
+                --with-mail-gid=${MAILGID} \
+                --with-cgi-gid=${APACHEGID} \
+		|| die "configure failed"
+
+        make || die "make failed"
+}
+
+src_install () {
+	ID=${D}${INSTALLDIR}
+
+        mkdir -p ${ID}/logs
+	touch ${ID}/logs/.keep
+
+        chown -R mailman.mailman ${ID}
+        chmod 2775 ${ID}
+
+        make prefix=${ID} var_prefix=${ID} doinstall || die
+
+	if [ "`use apache2`" ]; then
+		dodir /etc/apache2/conf/modules.d
+		insinto /etc/apache2/conf/modules.d
+		newins ${FILESDIR}/mailman.conf 50_mailman.conf
+	else
+		dodir /etc/apache/conf/addon-modules
+		insinto /etc/apache/conf/addon-modules
+		doins ${FILESDIR}/mailman.conf
+	fi
+
+	dodoc ${FILESDIR}/README.gentoo
+	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL
+	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}/usr/local/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!"
+	einfo ""
+	ewarn ""
+	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.)"
+	ewarn ""
+	if [ ! "`use apache2`" ]; then
+		einfo "It appears that you aren't running apache2..."
+		einfo "ebuild /var/db/pkg/net-mail/mailman/mailman-2.1.2-r1.ebuild config"
+		einfo "to add the mailman hooks to your config"
+	fi	
+}
+
+pkg_config() {
+	if [ ! "`use apache2`" ]; then
+		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
+	fi
+}