From a0eeabc56b61b1efdf1850686f9714695fa1269e Mon Sep 17 00:00:00 2001 From: Tuan Van Date: Wed, 28 Jul 2004 23:27:02 +0000 Subject: revision bump to fix bug #58644. Remove -r1. --- net-mail/mailman/ChangeLog | 7 +- net-mail/mailman/Manifest | 2 + net-mail/mailman/files/digest-mailman-2.1.5-r1 | 1 - net-mail/mailman/files/digest-mailman-2.1.5-r2 | 1 + net-mail/mailman/mailman-2.1.5-r1.ebuild | 136 ----------------------- net-mail/mailman/mailman-2.1.5-r2.ebuild | 142 +++++++++++++++++++++++++ 6 files changed, 151 insertions(+), 138 deletions(-) delete mode 100644 net-mail/mailman/files/digest-mailman-2.1.5-r1 create mode 100644 net-mail/mailman/files/digest-mailman-2.1.5-r2 delete mode 100644 net-mail/mailman/mailman-2.1.5-r1.ebuild create mode 100644 net-mail/mailman/mailman-2.1.5-r2.ebuild (limited to 'net-mail') diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog index fc95fd2f82cd..4c0b170601ee 100644 --- a/net-mail/mailman/ChangeLog +++ b/net-mail/mailman/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-mail/mailman # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.42 2004/07/27 21:19:13 langthang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.43 2004/07/28 23:27:02 langthang Exp $ + +*mailman-2.1.5-r2 (28 Jul 2004) + + 28 Jul 2004; Tuan Van +mailman-2.1.5-r2.ebuild: + fix bug #58644. Revision bump. 27 Jul 2004; Tuan Van mailman-2.1.5-r1.ebuild: switch to enew{group,user}. diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest index 4dc448abbc1e..044151d5b082 100644 --- a/net-mail/mailman/Manifest +++ b/net-mail/mailman/Manifest @@ -1,5 +1,6 @@ MD5 daee86d054df325d64fc98757d131e6b mailman-2.1.5-r1.ebuild 4028 MD5 2c755e431914dc9ef5acd2b2cdc47f5e mailman-2.1.5.ebuild 3764 +MD5 d1cf63a595857bb614e5d23f5369f827 mailman-2.1.5-r2.ebuild 4312 MD5 e7a93267bf90b556ae85af5d51e33c08 ChangeLog 5843 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161 MD5 ea0c850a55a563d90a520ab52809112f files/README.gentoo 4963 @@ -7,4 +8,5 @@ MD5 1c839f4abbbe57c6ffc915fc8dc3018c files/mailman-2.1.5-directory-check.patch 6 MD5 3089c1f0f8d91abdd612997b085959eb files/mailman.conf 385 MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5 63 MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r1 63 +MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r2 63 MD5 ce6d06f51e3da34e92048369e9fe14d2 files/mailman.rc 597 diff --git a/net-mail/mailman/files/digest-mailman-2.1.5-r1 b/net-mail/mailman/files/digest-mailman-2.1.5-r1 deleted file mode 100644 index 1e43ecb04e52..000000000000 --- a/net-mail/mailman/files/digest-mailman-2.1.5-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 f5f56f04747cd4aff67427e7a45631af mailman-2.1.5.tgz 5745912 diff --git a/net-mail/mailman/files/digest-mailman-2.1.5-r2 b/net-mail/mailman/files/digest-mailman-2.1.5-r2 new file mode 100644 index 000000000000..1e43ecb04e52 --- /dev/null +++ b/net-mail/mailman/files/digest-mailman-2.1.5-r2 @@ -0,0 +1 @@ +MD5 f5f56f04747cd4aff67427e7a45631af mailman-2.1.5.tgz 5745912 diff --git a/net-mail/mailman/mailman-2.1.5-r1.ebuild b/net-mail/mailman/mailman-2.1.5-r1.ebuild deleted file mode 100644 index 4712957ce947..000000000000 --- a/net-mail/mailman/mailman-2.1.5-r1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2004 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-r1.ebuild,v 1.4 2004/07/27 21:19:13 langthang Exp $ - -inherit eutils -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." -} - -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 - 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 - 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 - bin/check_perms -f - python bin/check_perms_grsecurity.py -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 "" - if ! use apache2; then - einfo "It appears that you aren't running apache2..." - einfo "ebuild /var/db/pkg/net-mail/${PN}/${PF}.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 -} diff --git a/net-mail/mailman/mailman-2.1.5-r2.ebuild b/net-mail/mailman/mailman-2.1.5-r2.ebuild new file mode 100644 index 000000000000..43c85d06117c --- /dev/null +++ b/net-mail/mailman/mailman-2.1.5-r2.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2004 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-r2.ebuild,v 1.1 2004/07/28 23:27:02 langthang Exp $ + +inherit eutils +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." +} + +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 + 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 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 "*********************************************** *" + einfo "Running \`${INSTALLDIR}/bin/check_perms -f\` *" + einfo "*********************************************** *" + bin/check_perms -f + einfo "************************************************************* *" + einfo "Running \`${INSTALLDIR}/bin/check_perms_grsecurity.py -f\` *" + einfo "************************************************************* *" + bin/check_perms_grsecurity.py -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 "" + if ! use apache2; then + einfo "It appears that you aren't running apache2..." + einfo "ebuild /var/db/pkg/net-mail/${PN}/${PF}.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 +} -- cgit v1.2.3-65-gdbad