Rev bumps. Update to use the new apache paths. Closes #77916.

Package-Manager: portage-2.0.51.18

7 files changed, 311 insertions, 14 deletions

diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog
index 8ebecde752be..4f8d53e62052 100644
--- a/net-mail/mailman/ChangeLog
+++ b/net-mail/mailman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/mailman
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.59 2005/02/16 19:53:21 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.60 2005/03/01 13:11:02 beu Exp $
+
+*mailman-2.1.6_beta1-r1 (01 Mar 2005)
+
+  01 Mar 2005; Elfyn McBratney <beu@gentoo.org> +files/50_mailman.conf,
+  +mailman-2.1.5-r5.ebuild, +mailman-2.1.6_beta1-r1.ebuild:
+  Rev bumps.  Update to use the new apache paths.  Closes #77916.
 
   16 Feb 2005; Elfyn McBratney <beu@gentoo.org> mailman-2.1.5-r2.ebuild,
   mailman-2.1.5-r3.ebuild, mailman-2.1.5-r4.ebuild,
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 048fa52e8c07..2fd0c2d21312 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,27 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7731447ba688e61e1eb0b99323282008 ChangeLog 7968
-MD5 6c4951c896d251e7331dcddcedad232e mailman-2.1.5-r2.ebuild 4043
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 76d45d0a8d7f4a6e086937769e0b6822 ChangeLog 8206
+MD5 09431e2d5b91f1cbf33f69bb32105859 mailman-2.1.6_beta1-r1.ebuild 4142
 MD5 f70c5c2eeb20980b4da7595aae738cb7 mailman-2.1.5-r3.ebuild 4453
-MD5 65c5a95ff622bc1b385a56872a0e8e58 mailman-2.1.5-r4.ebuild 4517
+MD5 6c4951c896d251e7331dcddcedad232e mailman-2.1.5-r2.ebuild 4043
+MD5 c537d02f0cb01e7a96a13b41e22aa311 mailman-2.1.5-r5.ebuild 4024
 MD5 e74cbe18ea30eef6439a1bb5209912c1 mailman-2.1.6_beta1.ebuild 4636
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 65c5a95ff622bc1b385a56872a0e8e58 mailman-2.1.5-r4.ebuild 4517
+MD5 ce6d06f51e3da34e92048369e9fe14d2 files/mailman.rc 597
+MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r5 63
+MD5 740c1eb479ebc2df0109668027f60762 files/mailman-2.1.5-driver.cvs.patch 2539
 MD5 ea0c850a55a563d90a520ab52809112f files/README.gentoo 4963
-MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r2 63
+MD5 1c839f4abbbe57c6ffc915fc8dc3018c files/mailman-2.1.5-directory-check.patch 641
 MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r3 63
 MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r4 63
+MD5 3089c1f0f8d91abdd612997b085959eb files/mailman.conf 385
+MD5 165ec3889c73f334f7b524c654977066 files/50_mailman.conf 429
+MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r2 63
+MD5 208aa179cb4feeb3597841fe30529d15 files/mailman-2.1.6_beta1-directory-check.patch 1494
 MD5 0e6fd904fc72c7ecf923a717d48cffeb files/digest-mailman-2.1.6_beta1 65
-MD5 1c839f4abbbe57c6ffc915fc8dc3018c files/mailman-2.1.5-directory-check.patch 641
-MD5 740c1eb479ebc2df0109668027f60762 files/mailman-2.1.5-driver.cvs.patch 2539
+MD5 0e6fd904fc72c7ecf923a717d48cffeb files/digest-mailman-2.1.6_beta1-r1 65
 MD5 ede21221890a680ccadd3a6f142f3802 files/mailman-2.1.5-true_path.patch 447
-MD5 208aa179cb4feeb3597841fe30529d15 files/mailman-2.1.6_beta1-directory-check.patch 1494
-MD5 3089c1f0f8d91abdd612997b085959eb files/mailman.conf 385
-MD5 ce6d06f51e3da34e92048369e9fe14d2 files/mailman.rc 597
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCE6TCjUHll2nfF60RAn+LAJ9XfejoenSyZk6vDFeKywYwhiWYcACfZ27S
-1QqY54ZGJeXxmxZ32rOL2Ck=
-=up+N
+iD8DBQFCJGnzjUHll2nfF60RAp9HAJ0QhD3mJEgBXC31+b0wSykDSsYuXACgpVgG
+eOSohrBao2/ROC4UehnWpgY=
+=FBXk
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mailman/files/50_mailman.conf b/net-mail/mailman/files/50_mailman.conf
new file mode 100644
index 000000000000..dc076dab77aa
--- /dev/null
+++ b/net-mail/mailman/files/50_mailman.conf
@@ -0,0 +1,18 @@
+<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>
+</IfDefine>
diff --git a/net-mail/mailman/files/digest-mailman-2.1.5-r5 b/net-mail/mailman/files/digest-mailman-2.1.5-r5
new file mode 100644
index 000000000000..1e43ecb04e52
--- /dev/null
+++ b/net-mail/mailman/files/digest-mailman-2.1.5-r5
@@ -0,0 +1 @@
+MD5 f5f56f04747cd4aff67427e7a45631af mailman-2.1.5.tgz 5745912
diff --git a/net-mail/mailman/files/digest-mailman-2.1.6_beta1-r1 b/net-mail/mailman/files/digest-mailman-2.1.6_beta1-r1
new file mode 100644
index 000000000000..f5065e95d3d6
--- /dev/null
+++ b/net-mail/mailman/files/digest-mailman-2.1.6_beta1-r1
@@ -0,0 +1 @@
+MD5 bde3b5e68bc4dca0ba49baa07935b31e mailman-2.1.6b1.tgz 6299030
diff --git a/net-mail/mailman/mailman-2.1.5-r5.ebuild b/net-mail/mailman/mailman-2.1.5-r5.ebuild
new file mode 100644
index 000000000000..96c3a6540432
--- /dev/null
+++ b/net-mail/mailman/mailman-2.1.5-r5.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.5-r5.ebuild,v 1.1 2005/03/01 13:11:02 beu Exp $
+
+inherit eutils depend.apache
+IUSE="apache2"
+
+DESCRIPTION="A python-based mailing list server with an extensive web interface"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+HOMEPAGE="http://www.list.org/"
+
+SLOT="O"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+
+DEPEND=">=dev-lang/python-2.3
+	virtual/mta
+	net-www/apache"
+
+INSTALLDIR="/usr/local/mailman"
+APACHEGID="81"
+MAILGID="280"
+
+pkg_setup() {
+	# Bug #58526: switch to enew{group,user}.
+	# need to add mailman here for compile process.
+	# Duplicated at pkg_postinst() for binary install.
+	enewgroup mailman 280
+	enewuser mailman 280 /bin/bash ${INSTALLDIR} mailman -G cron -c mailman
+	mkdir -p ${INSTALLDIR}
+	chown mailman:mailman ${INSTALLDIR}
+	chmod 2775 ${INSTALLDIR}
+}
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	epatch ${FILESDIR}/${P}-directory-check.patch || die "patch failed."
+	# Bug #77524. remove with version bump.
+	epatch ${FILESDIR}/${P}-driver.cvs.patch || die "patch failed."
+	epatch ${FILESDIR}/${P}-true_path.patch || die "patch failed."
+}
+
+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}
+
+	make prefix=${ID} var_prefix=${ID} doinstall || die
+
+	keepdir ${INSTALLDIR}/logs
+	keepdir ${INSTALLDIR}/locks
+	keepdir ${INSTALLDIR}/spam
+	keepdir ${INSTALLDIR}/archives/public
+	keepdir ${INSTALLDIR}/archives/private
+	keepdir ${INSTALLDIR}/lists
+	keepdir ${INSTALLDIR}/qfiles
+
+	if use apache2; then
+		insinto ${APACHE2_MODULES_CONFDIR}
+	else
+		insinto ${APACHE1_MODULES_CONFDIR}
+	fi
+	newins ${FILESDIR}/mailman.conf 50_mailman.conf
+
+	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 build/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
+	if [ -f ${ROOT}/usr/local/mailman/Mailman/mm_cfg.py ]; then
+		cp ${ROOT}/usr/local/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
+
+	chown -R mailman:mailman ${ID}
+	chmod 2775 ${ID}
+	}
+
+pkg_postinst() {
+	enewgroup mailman 280
+	enewuser mailman 280 /bin/false ${INSTALLDIR} mailman -G cron -c "mailman"
+	cd ${INSTALLDIR}
+	bin/update
+	einfo "Running \`${INSTALLDIR}/bin/check_perms -f\` *"
+	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 ""
+
+	einfo "An example Mailman configuration file for Apache has been installed into:"
+	use apache2 && einfo "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
+	use apache2 || einfo "  ${APACHE1_MODULES_CONFDIR}/50_mailman.conf"
+	einfo ""
+	einfo "To enable, you will need to add \"-D MAILMAN\" to"
+	use apache2 && einfo "/etc/conf.d/apache2."
+	use apache2 || einfo "/etc/conf.d/apache."
+	einfo ""
+}
diff --git a/net-mail/mailman/mailman-2.1.6_beta1-r1.ebuild b/net-mail/mailman/mailman-2.1.6_beta1-r1.ebuild
new file mode 100644
index 000000000000..dc237c7b423d
--- /dev/null
+++ b/net-mail/mailman/mailman-2.1.6_beta1-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.6_beta1-r1.ebuild,v 1.1 2005/03/01 13:11:02 beu Exp $
+
+inherit eutils depend.apache
+IUSE="apache2"
+
+MY_PV=${PV/_beta/b}
+
+DESCRIPTION="A python-based mailing list server with an extensive web interface"
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tgz"
+SRC_URI="http://www.list.org/${PN}-${MY_PV}.tgz"
+HOMEPAGE="http://www.list.org/"
+
+SLOT="O"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+
+DEPEND=">=dev-lang/python-2.3
+	virtual/mta
+	net-www/apache"
+
+INSTALLDIR="/usr/local/mailman"
+APACHEGID="81"
+MAILGID="280"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+pkg_setup() {
+	# Bug #58526: switch to enew{group,user}.
+	# need to add mailman here for compile process.
+	# Duplicated at pkg_postinst() for binary install.
+	enewgroup mailman 280
+	enewuser mailman 280 /bin/bash ${INSTALLDIR} mailman -G cron -c mailman
+	mkdir -p ${INSTALLDIR}
+	chown mailman:mailman ${INSTALLDIR}
+	chmod 2775 ${INSTALLDIR}
+}
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	epatch ${FILESDIR}/${P}-directory-check.patch || die "patch failed."
+	# Bug #77524. remove with version bump.
+	#epatch ${FILESDIR}/${P}-driver.cvs.patch || die "patch failed."
+	#epatch ${FILESDIR}/${P}-true_path.patch || die "patch failed."
+}
+
+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}
+
+	make prefix=${ID} var_prefix=${ID} doinstall || die
+
+	keepdir ${INSTALLDIR}/logs
+	keepdir ${INSTALLDIR}/locks
+	keepdir ${INSTALLDIR}/spam
+	keepdir ${INSTALLDIR}/archives/public
+	keepdir ${INSTALLDIR}/archives/private
+	keepdir ${INSTALLDIR}/lists
+	keepdir ${INSTALLDIR}/qfiles
+
+	if use apache2; then
+		insinto ${APACHE2_MODULES_CONFDIR}
+	else
+		insinto ${APACHE1_MODULES_CONFDIR}
+	fi
+	newins ${FILESDIR}/mailman.conf 50_mailman.conf
+
+	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 build/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
+	if [ -f ${ROOT}/usr/local/mailman/Mailman/mm_cfg.py ]; then
+		cp ${ROOT}/usr/local/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
+
+	chown -R mailman:mailman ${ID}
+	chmod 2775 ${ID}
+}
+
+pkg_postinst() {
+	enewgroup mailman 280
+	enewuser mailman 280 /bin/false ${INSTALLDIR} mailman -G cron -c "mailman"
+	cd ${INSTALLDIR}
+	bin/update
+	einfo "Running \`${INSTALLDIR}/bin/check_perms -f\` *"
+	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 ""
+
+	einfo "An example Mailman configuration file for Apache has been installed into:"
+	use apache2 && einfo "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
+	use apache2 || einfo "  ${APACHE1_MODULES_CONFDIR}/50_mailman.conf"
+	einfo ""
+	einfo "To enable, you will need to add \"-D MAILMAN\" to"
+	use apache2 && einfo "/etc/conf.d/apache2."
+	use apache2 || einfo "/etc/conf.d/apache."
+	einfo ""
+}