Version bumped. MTA now configured with USE-Flag

(Portage version: 2.0.51.19)

5 files changed, 208 insertions, 28 deletions

diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog
index 4f8d53e62052..c1d1c3901efa 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.60 2005/03/01 13:11:02 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.61 2005/05/24 22:25:40 mholzer Exp $
+
+*mailman-2.1.6_rc4 (24 May 2005)
+
+  24 May 2005; Martin Holzer <mholzer@gentoo.org>
+  +files/mailman-2.1.6_rc4-directory-check.patch, +mailman-2.1.6_rc4.ebuild:
+  Version bumped. MTA now configured with USE flag
 
 *mailman-2.1.6_beta1-r1 (01 Mar 2005)
 
@@ -15,7 +21,7 @@
 
 *mailman-2.1.6_beta1 (12 Feb 2005)
 
-  12 Feb 2005; Tuấn Văn <langthang@gentoo.org>
+  12 Feb 2005; Tuấn Văn <langthang@gentoo.org>
   +files/mailman-2.1.6_beta1-directory-check.patch,
   +mailman-2.1.6_beta1.ebuild:
   New version. New directory-check.patch, thanks to Brian Harring <ferringb@gentoo.org>
@@ -26,10 +32,10 @@
   09 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> mailman-2.1.5-r4.ebuild:
   Stable on sparc wrt #81109
 
-  09 Feb 2005; Olivier Crête <tester@gentoo.org> mailman-2.1.5-r4.ebuild:
+  09 Feb 2005; Olivier Crête <tester@gentoo.org> mailman-2.1.5-r4.ebuild:
   Stable on x86, bug #81109
 
-  09 Feb 2005; Tuấn Văn <langthang@gentoo.org>
+  09 Feb 2005; Tuấn Văn <langthang@gentoo.org>
   +files/mailman-2.1.5-true_path.patch:
   revision bump with true_path patch.
 
@@ -37,7 +43,7 @@
   mailman-2.1.5-r3.ebuild:
   Stable on amd64, bug #77524
 
-  16 Jan 2005; Tuấn Văn <langthang@gentoo.org> mailman-2.1.5-r3.ebuild:
+  16 Jan 2005; Tuấn Văn <langthang@gentoo.org> mailman-2.1.5-r3.ebuild:
   stable on x86.
 
   16 Jan 2005; Jason Wever <weeve@gentoo.org> mailman-2.1.5-r3.ebuild:
@@ -45,7 +51,7 @@
 
 *mailman-2.1.5-r3 (15 Jan 2005)
 
-  15 Jan 2005; Tuấn Văn <langthang@gentoo.org>
+  15 Jan 2005; Tuấn Văn <langthang@gentoo.org>
   +files/mailman-2.1.5-driver.cvs.patch, +mailman-2.1.5-r3.ebuild:
   revision bump to resolve bug #77524.
 
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 2fd0c2d21312..1d824cc494b1 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,32 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 f70c5c2eeb20980b4da7595aae738cb7 mailman-2.1.5-r3.ebuild 4453
 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 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 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 e74cbe18ea30eef6439a1bb5209912c1 mailman-2.1.6_beta1.ebuild 4636
+MD5 c537d02f0cb01e7a96a13b41e22aa311 mailman-2.1.5-r5.ebuild 4024
+MD5 09431e2d5b91f1cbf33f69bb32105859 mailman-2.1.6_beta1-r1.ebuild 4142
+MD5 bdc4c215434a5b006d61ef666530a839 mailman-2.1.6_rc4.ebuild 4364
 MD5 ea0c850a55a563d90a520ab52809112f files/README.gentoo 4963
+MD5 165ec3889c73f334f7b524c654977066 files/50_mailman.conf 429
+MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r2 63
 MD5 1c839f4abbbe57c6ffc915fc8dc3018c files/mailman-2.1.5-directory-check.patch 641
+MD5 3089c1f0f8d91abdd612997b085959eb files/mailman.conf 385
+MD5 ce6d06f51e3da34e92048369e9fe14d2 files/mailman.rc 597
 MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r3 63
+MD5 740c1eb479ebc2df0109668027f60762 files/mailman-2.1.5-driver.cvs.patch 2539
 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 ede21221890a680ccadd3a6f142f3802 files/mailman-2.1.5-true_path.patch 447
 MD5 0e6fd904fc72c7ecf923a717d48cffeb files/digest-mailman-2.1.6_beta1 65
+MD5 208aa179cb4feeb3597841fe30529d15 files/mailman-2.1.6_beta1-directory-check.patch 1494
+MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r5 63
 MD5 0e6fd904fc72c7ecf923a717d48cffeb files/digest-mailman-2.1.6_beta1-r1 65
-MD5 ede21221890a680ccadd3a6f142f3802 files/mailman-2.1.5-true_path.patch 447
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCJGnzjUHll2nfF60RAp9HAJ0QhD3mJEgBXC31+b0wSykDSsYuXACgpVgG
-eOSohrBao2/ROC4UehnWpgY=
-=FBXk
------END PGP SIGNATURE-----
+MD5 b6cf776a5d518cd817fcac8a007c265b files/digest-mailman-2.1.6_rc4 66
+MD5 130b235f32a50d11f76a88b979fb4245 files/mailman-2.1.6_rc4-directory-check.patch 1287
diff --git a/net-mail/mailman/files/digest-mailman-2.1.6_rc4 b/net-mail/mailman/files/digest-mailman-2.1.6_rc4
new file mode 100644
index 000000000000..b56d83e773a7
--- /dev/null
+++ b/net-mail/mailman/files/digest-mailman-2.1.6_rc4
@@ -0,0 +1 @@
+MD5 81a5fb00b72cfb95667cad48ec9c76e5 mailman-2.1.6rc4.tgz 6473242
diff --git a/net-mail/mailman/files/mailman-2.1.6_rc4-directory-check.patch b/net-mail/mailman/files/mailman-2.1.6_rc4-directory-check.patch
new file mode 100644
index 000000000000..d8542fcf6a88
--- /dev/null
+++ b/net-mail/mailman/files/mailman-2.1.6_rc4-directory-check.patch
@@ -0,0 +1,30 @@
+--- bin/check_perms.org	2005-05-25 00:04:15.000000000 +0200
++++ bin/check_perms	2005-05-25 00:04:35.000000000 +0200
+@@ -331,6 +331,8 @@
+         print _('checking permissions on list data')
+     # BAW: This needs to be converted to the Site module abstraction
+     for dir in os.listdir(mm_cfg.LIST_DATA_DIR):
++        if not S_ISDIR(statmode(os.path.join(mm_cfg.LIST_DATA_DIR,dir))):
++            continue
+         for file in checkfiles:
+             path = os.path.join(mm_cfg.LIST_DATA_DIR, dir, file)
+             if STATE.VERBOSE:
+--- bin/update.org	2005-05-25 00:04:30.000000000 +0200
++++ bin/update	2005-05-25 00:04:35.000000000 +0200
+@@ -34,6 +34,7 @@
+ """
+ 
+ import os
++import stat
+ import md5
+ import sys
+ import time
+@@ -425,7 +426,7 @@
+     # Now update for the Mailman 2.1.5 qfile format.  For every filebase in
+     # the qfiles/* directories that has both a .pck and a .db file, pull the
+     # data out and re-queue them.
+-    for dirname in os.listdir(mm_cfg.QUEUE_DIR):
++    for dirname in [x for x in os.listdir(mm_cfg.QUEUE_DIR) if stat.S_ISDIR(os.stat(os.path.join(mm_cfg.QUEUE_DIR,x)).st_mode)]:
+         dirpath = os.path.join(mm_cfg.QUEUE_DIR, dirname)
+         if dirpath == mm_cfg.BADQUEUE_DIR:
+             # The files in qfiles/bad can't possibly be pickles
diff --git a/net-mail/mailman/mailman-2.1.6_rc4.ebuild b/net-mail/mailman/mailman-2.1.6_rc4.ebuild
new file mode 100644
index 000000000000..2ab6a8e476c7
--- /dev/null
+++ b/net-mail/mailman/mailman-2.1.6_rc4.ebuild
@@ -0,0 +1,150 @@
+# 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_rc4.ebuild,v 1.1 2005/05/24 22:25:40 mholzer Exp $
+
+inherit eutils depend.apache
+IUSE="apache2 postfix sendmail qmail courier exim xmail"
+
+MY_PV=${PV/_rc/rc}
+
+DESCRIPTION="A python-based mailing list server with an extensive web interface"
+SRC_URI="mirror://sourceforge/${PN}/${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"
+
+if use postfix; then
+	MAILGID=nobody
+elif use sendmail; then
+	MAILGID=daemon
+elif use qmail; then
+	MAILGID=qmail
+elif use courier; then
+	MAILGID=mail
+elif use exim; then
+	MAILGID=mail
+elif use xmail; then
+	MAILGID=xmail
+else
+	MAILGID="280"
+fi
+
+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 ""
+}