Version bumped.

(Portage version: 2.0.53)

7 files changed, 197 insertions, 7 deletions

diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog
index 7b513c37dbfe..6de8f21573ad 100644
--- a/net-mail/mailman/ChangeLog
+++ b/net-mail/mailman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/mailman
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.64 2006/01/03 19:55:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.65 2006/01/03 23:02:01 mholzer Exp $
+
+*mailman-2.1.7 (03 Jan 2006)
+
+  03 Jan 2006; Martin Holzer <mholzer@gentoo.org>
+  +files/mailman-2.1.7-directory-check.patch, +mailman-2.1.7.ebuild:
+  Version bumped.
 
   03 Jan 2006; Martin Holzer <mholzer@gentoo.org> mailman-2.1.6_rc4.ebuild,
   mailman-2.1.6.ebuild:
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 4b6c3957201d..3543053ef49a 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -5,16 +5,19 @@ MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r4 63
 MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r5 63
 MD5 67bd3d52df6390733875bb04e142d471 files/digest-mailman-2.1.6 63
 MD5 b6cf776a5d518cd817fcac8a007c265b files/digest-mailman-2.1.6_rc4 66
+MD5 b8cbeb10e0b59889315d0e112785ebbf files/digest-mailman-2.1.7 63
 MD5 1c839f4abbbe57c6ffc915fc8dc3018c files/mailman-2.1.5-directory-check.patch 641
 MD5 740c1eb479ebc2df0109668027f60762 files/mailman-2.1.5-driver.cvs.patch 2539
 MD5 ede21221890a680ccadd3a6f142f3802 files/mailman-2.1.5-true_path.patch 447
 MD5 130b235f32a50d11f76a88b979fb4245 files/mailman-2.1.6-directory-check.patch 1287
 MD5 208aa179cb4feeb3597841fe30529d15 files/mailman-2.1.6_beta1-directory-check.patch 1494
 MD5 130b235f32a50d11f76a88b979fb4245 files/mailman-2.1.6_rc4-directory-check.patch 1287
+MD5 130b235f32a50d11f76a88b979fb4245 files/mailman-2.1.7-directory-check.patch 1287
 MD5 3089c1f0f8d91abdd612997b085959eb files/mailman.conf 385
 MD5 ce6d06f51e3da34e92048369e9fe14d2 files/mailman.rc 597
 MD5 4b900bf200ef5581266a4b9c66cef87b mailman-2.1.5-r4.ebuild 4511
 MD5 8c528315bd7d3fd689d76c7b88027f8d mailman-2.1.5-r5.ebuild 4018
-MD5 bcc2e52ef62a2fd9b94633a9e68cf311 mailman-2.1.6.ebuild 4351
-MD5 6315a3bad8fadc1261a324b6b768f261 mailman-2.1.6_rc4.ebuild 4355
+MD5 729527a8e34797ecf08edf358cecde26 mailman-2.1.6.ebuild 4349
+MD5 a19eee07497872371f6c59e2f2f49414 mailman-2.1.6_rc4.ebuild 4353
+MD5 729527a8e34797ecf08edf358cecde26 mailman-2.1.7.ebuild 4349
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
diff --git a/net-mail/mailman/files/digest-mailman-2.1.7 b/net-mail/mailman/files/digest-mailman-2.1.7
new file mode 100644
index 000000000000..9bbb0ad5bb7b
--- /dev/null
+++ b/net-mail/mailman/files/digest-mailman-2.1.7
@@ -0,0 +1 @@
+MD5 81ea139ecd24fbd2a85a9185a37df402 mailman-2.1.7.tgz 6736536
diff --git a/net-mail/mailman/files/mailman-2.1.7-directory-check.patch b/net-mail/mailman/files/mailman-2.1.7-directory-check.patch
new file mode 100644
index 000000000000..d8542fcf6a88
--- /dev/null
+++ b/net-mail/mailman/files/mailman-2.1.7-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.ebuild b/net-mail/mailman/mailman-2.1.6.ebuild
index 6ce2fe07afef..b9df72e54cde 100644
--- a/net-mail/mailman/mailman-2.1.6.ebuild
+++ b/net-mail/mailman/mailman-2.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.ebuild,v 1.3 2006/01/03 19:55:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.6.ebuild,v 1.4 2006/01/03 23:02:01 mholzer Exp $
 
 inherit eutils depend.apache
 IUSE="apache2 postfix sendmail qmail courier exim xmail"
@@ -23,7 +23,7 @@ INSTALLDIR="/usr/local/mailman"
 APACHEGID="81"
 
 if use postfix; then
-	MAILGID=mailman
+	MAILGID="280"
 elif use sendmail; then
 	MAILGID=daemon
 elif use qmail; then
diff --git a/net-mail/mailman/mailman-2.1.6_rc4.ebuild b/net-mail/mailman/mailman-2.1.6_rc4.ebuild
index 6cd2e2eb05ac..2f8ba573a892 100644
--- a/net-mail/mailman/mailman-2.1.6_rc4.ebuild
+++ b/net-mail/mailman/mailman-2.1.6_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.3 2006/01/03 19:55:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.6_rc4.ebuild,v 1.4 2006/01/03 23:02:01 mholzer Exp $
 
 inherit eutils depend.apache
 IUSE="apache2 postfix sendmail qmail courier exim xmail"
@@ -23,7 +23,7 @@ INSTALLDIR="/usr/local/mailman"
 APACHEGID="81"
 
 if use postfix; then
-	MAILGID=mailman
+	MAILGID="280"
 elif use sendmail; then
 	MAILGID=daemon
 elif use qmail; then
diff --git a/net-mail/mailman/mailman-2.1.7.ebuild b/net-mail/mailman/mailman-2.1.7.ebuild
new file mode 100644
index 000000000000..9fa46055161c
--- /dev/null
+++ b/net-mail/mailman/mailman-2.1.7.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.7.ebuild,v 1.1 2006/01/03 23:02:01 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="280"
+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 -1 ${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 ""
+}