mailman: make user and group configurable

Package-Manager: portage-2.1.4_rc3

3 files changed, 30 insertions, 18 deletions

diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog
index 41b0ae6c5ae2..f9cdb787b5f9 100644
--- a/net-mail/mailman/ChangeLog
+++ b/net-mail/mailman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/mailman
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.102 2007/11/26 02:17:22 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.103 2007/11/26 02:24:29 hanno Exp $
+
+  26 Nov 2007; Hanno Boeck <hanno@gentoo.org> mailman-2.1.9-r2.ebuild:
+  Make user and group configurable, resolves #194862, thanks to Sebastian
+  Wieseler.
 
   26 Nov 2007; Hanno Boeck <hanno@gentoo.org> files/README.gentoo:
   Precisions of doc, resolves #156434, thanks to Sylvain Demers.
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 3b6f69317783..f4322421a8bf 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -26,18 +26,18 @@ EBUILD mailman-2.1.9-r1.ebuild 3733 RMD160 b3c7d1314b4c09f190e44688b92278d34fa65
 MD5 ca38a4d81421e81a11ad178564561eb6 mailman-2.1.9-r1.ebuild 3733
 RMD160 b3c7d1314b4c09f190e44688b92278d34fa65be0 mailman-2.1.9-r1.ebuild 3733
 SHA256 9d1f1de75c3da99e26d289b561cb8bdef01fda6f75ca8f7a77acdd6cd7595c53 mailman-2.1.9-r1.ebuild 3733
-EBUILD mailman-2.1.9-r2.ebuild 4418 RMD160 45d5e9641f37cb3f9d3feb4ee4af1faebfa0f269 SHA1 42ac272ef0f0032a1254b0ec362fd6d2e51ab756 SHA256 2157b488c3becb191cd4cdd6607e81e8333bf7259baaa4b492492498f01e61fa
-MD5 79746ffb37ec17ed6c882cedb18f1b0c mailman-2.1.9-r2.ebuild 4418
-RMD160 45d5e9641f37cb3f9d3feb4ee4af1faebfa0f269 mailman-2.1.9-r2.ebuild 4418
-SHA256 2157b488c3becb191cd4cdd6607e81e8333bf7259baaa4b492492498f01e61fa mailman-2.1.9-r2.ebuild 4418
+EBUILD mailman-2.1.9-r2.ebuild 4766 RMD160 9263c24eae707a4837768e3d7e66412228c34ac1 SHA1 fec41bd8e4beff60fd100a97d939743ae02aece0 SHA256 3d186d310c0b265debabcf9a6c7aaf4c803368a39a4edf7680b30efb2d2b0465
+MD5 0c9d28116ae609e5749c8958f97bdf4a mailman-2.1.9-r2.ebuild 4766
+RMD160 9263c24eae707a4837768e3d7e66412228c34ac1 mailman-2.1.9-r2.ebuild 4766
+SHA256 3d186d310c0b265debabcf9a6c7aaf4c803368a39a4edf7680b30efb2d2b0465 mailman-2.1.9-r2.ebuild 4766
 EBUILD mailman-2.1.9.ebuild 3394 RMD160 073eb36288063f065b68851676b5d21729b6999c SHA1 19f3df9938c8830e724c9ae8e8390519d80fb499 SHA256 aa2f6ef7aaf113f13e8ff71ca181997f062b3f8f2a40f629023f7d0611de12c6
 MD5 9f208d87a83c8bf2fb7652d9e86769c5 mailman-2.1.9.ebuild 3394
 RMD160 073eb36288063f065b68851676b5d21729b6999c mailman-2.1.9.ebuild 3394
 SHA256 aa2f6ef7aaf113f13e8ff71ca181997f062b3f8f2a40f629023f7d0611de12c6 mailman-2.1.9.ebuild 3394
-MISC ChangeLog 13545 RMD160 7c55012ada5ec43aa757427d575ba8f9f64756ce SHA1 8be30a7268f543ef7555999a17573cce4b97c510 SHA256 5787519fd9c906ef1b67355e294a17395aa359e83a903ff1f485db432ce05339
-MD5 289f35e5bd15880ab794ce55df213743 ChangeLog 13545
-RMD160 7c55012ada5ec43aa757427d575ba8f9f64756ce ChangeLog 13545
-SHA256 5787519fd9c906ef1b67355e294a17395aa359e83a903ff1f485db432ce05339 ChangeLog 13545
+MISC ChangeLog 13703 RMD160 35cb0f881640a5a1974385cc0384e645ddbfefea SHA1 5aefc44c82586a8eb8727b6c00987600e1446976 SHA256 7eaba44b5ce4b1bb33a918312b5fa2007eeba162468fb31f6bac5c1eef7f7302
+MD5 9f0bcd4880ce18a9457aa8fc188c6fd1 ChangeLog 13703
+RMD160 35cb0f881640a5a1974385cc0384e645ddbfefea ChangeLog 13703
+SHA256 7eaba44b5ce4b1bb33a918312b5fa2007eeba162468fb31f6bac5c1eef7f7302 ChangeLog 13703
 MISC metadata.xml 218 RMD160 30759d93f0209fdd74f29393ae54999fe6b2bdff SHA1 486b307ff1dae10aef7d18472460a21bc2decdfb SHA256 09421ca1b9299683d07f68ddbbd3ed97251dac613121b420841a3251da7fcb89
 MD5 45b42e062b70460f0304d1ebe48d82ab metadata.xml 218
 RMD160 30759d93f0209fdd74f29393ae54999fe6b2bdff metadata.xml 218
@@ -54,7 +54,7 @@ SHA256 7fdbc00422a55956c8b091193599ffd51a1042885148a22a246fcab0d1aa74f7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHSiy8r2QksT29OyARApXJAKCS6faJCnck3TBnlpCMqLGHJBiVtQCfT/n0
-WhLgEDAKqz/D58jI+GSbUN0=
-=i0O5
+iD8DBQFHSi5or2QksT29OyARApO1AJ9yiR+nI6QcKms1WaBc1rujLFYk5QCeKPw3
+MkAER4Ae9t9OGNzjNdcblXI=
+=Wvqr
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mailman/mailman-2.1.9-r2.ebuild b/net-mail/mailman/mailman-2.1.9-r2.ebuild
index 31d0f08e4369..2f311e684bb9 100644
--- a/net-mail/mailman/mailman-2.1.9-r2.ebuild
+++ b/net-mail/mailman/mailman-2.1.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.9-r2.ebuild,v 1.4 2007/11/26 02:12:38 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.9-r2.ebuild,v 1.5 2007/11/26 02:24:29 hanno Exp $
 
 inherit eutils python multilib
 
@@ -22,13 +22,16 @@ pkg_setup() {
 	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
 	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
 	CGIGID=${MAILMAN_CGIGID:-81}
+	MAILUSR=${MAILMAN_MAILUSR:-mailman}
+	MAILUID=${MAILMAN_MAILUID:-280}
+	MAILGRP=${MAILMAN_MAILGRP:-mailman}
 	MAILGID=${MAILMAN_MAILGID:-280}
 
 	# 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
+	enewgroup ${MAILGRP} ${MAILGID}
+	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman -G cron -c "mailman"
 }
 
 src_unpack() {
@@ -44,6 +47,8 @@ src_compile() {
 		--with-cgi-gid=${CGIGID} \
 		--with-cgi-ext="${MAILMAN_CGIEXT}" \
 		--with-var-prefix="${VAR_PREFIX}" \
+		--with-username=${MAILUSR} \
+		--with-groupname=${MAILGRP} \
 	|| die "configure failed"
 
 	emake || die "make failed"
@@ -87,7 +92,7 @@ src_install () {
 	keepdir ${VAR_PREFIX}/lists
 	keepdir ${VAR_PREFIX}/qfiles
 
-	chown -R mailman:mailman "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/*
+	chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/*
 	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
 		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public}
 	chmod 2750 "${D}/${VAR_PREFIX}/archives/private"
@@ -99,8 +104,8 @@ src_install () {
 pkg_postinst() {
 	python_mod_optimize ${INSTALLDIR}/bin/ ${INSTALLDIR}/Mailman
 
-	enewgroup mailman 280
-	enewuser mailman 280 -1 ${INSTALLDIR} mailman -G cron -c "mailman"
+	enewgroup ${MAILGRP} ${MAILGID}
+	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman -G cron -c "mailman"
 	elog
 	elog "Please read /usr/share/doc/${PF}/README.gentoo.gz for additional"
 	elog "Setup information, mailman will NOT run unless you follow"
@@ -120,6 +125,9 @@ pkg_postinst() {
 	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
 	ewarn "MAILMAN_CGIGID (default: 81)"
 	ewarn "MAILMAN_CGIEXT (default: empty)" \
+	ewarn "MAILMAN_MAILUSR (default: mailman)"
+	ewarn "MAILMAN_MAILUID (default: 280)"
+	ewarn "MAILMAN_MAILGRP (default: mailman)"
 	ewarn "MAILMAN_MAILGID (default: 280)"
 	ewarn
 	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."