diff options
author | Hanno Böck <hanno@gentoo.org> | 2015-03-29 13:08:58 +0000 |
---|---|---|
committer | Hanno Böck <hanno@gentoo.org> | 2015-03-29 13:08:58 +0000 |
commit | f4d2ab95bccb5ef22d8561d3857c572a5bf17fae (patch) | |
tree | 123eb1038599bd46283d69a3114c1aa1f09fb6cd /net-mail | |
parent | linguist-tools are build-time dep only (diff) | |
download | gentoo-2-f4d2ab95bccb5ef22d8561d3857c572a5bf17fae.tar.gz gentoo-2-f4d2ab95bccb5ef22d8561d3857c572a5bf17fae.tar.bz2 gentoo-2-f4d2ab95bccb5ef22d8561d3857c572a5bf17fae.zip |
Bump, remove old apache 2.2 directives, remove old versions.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A5880072BBB51E42)
Diffstat (limited to 'net-mail')
-rw-r--r-- | net-mail/mailman/ChangeLog | 11 | ||||
-rw-r--r-- | net-mail/mailman/files/50_mailman.conf-r2 | 18 | ||||
-rw-r--r-- | net-mail/mailman/mailman-2.1.14.ebuild | 164 | ||||
-rw-r--r-- | net-mail/mailman/mailman-2.1.17.ebuild | 171 | ||||
-rw-r--r-- | net-mail/mailman/mailman-2.1.19.ebuild (renamed from net-mail/mailman/mailman-2.1.15.ebuild) | 17 |
5 files changed, 37 insertions, 344 deletions
diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog index c14ee246236c..58aa56248487 100644 --- a/net-mail/mailman/ChangeLog +++ b/net-mail/mailman/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-mail/mailman -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.147 2014/12/31 16:07:02 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.148 2015/03/29 13:08:58 hanno Exp $ + +*mailman-2.1.19 (29 Mar 2015) + + 29 Mar 2015; <hanno@gentoo.org> -mailman-2.1.14.ebuild, + -mailman-2.1.15.ebuild, -mailman-2.1.17.ebuild, +mailman-2.1.19.ebuild, + +files/50_mailman.conf-r2: + Bump, remove old apache 2.2 directives, remove old versions. 31 Dec 2014; Agostino Sarubbo <ago@gentoo.org> mailman-2.1.18_p1.ebuild: Stable for ppc, wrt bug #530772 diff --git a/net-mail/mailman/files/50_mailman.conf-r2 b/net-mail/mailman/files/50_mailman.conf-r2 new file mode 100644 index 000000000000..c0cf69562fed --- /dev/null +++ b/net-mail/mailman/files/50_mailman.conf-r2 @@ -0,0 +1,18 @@ +<IfDefine MAILMAN> + ScriptAlias /mailman/ "/usr/local/mailman/cgi-bin/" + <Directory "/usr/local/mailman/cgi-bin/"> + AllowOverride None + Options None + </Directory> + + Alias /pipermail/ "/usr/local/mailman/archives/public/" + <Directory "/usr/local/mailman/archives/public/"> + AllowOverride None + Options ExecCGI FollowSymLinks + </Directory> + + Alias /mailman-icons/ "/usr/local/mailman/icons/" + <Directory "/usr/local/mailman/icons/"> + AllowOverride None + </Directory> +</IfDefine> diff --git a/net-mail/mailman/mailman-2.1.14.ebuild b/net-mail/mailman/mailman-2.1.14.ebuild deleted file mode 100644 index 5ae257ebe141..000000000000 --- a/net-mail/mailman/mailman-2.1.14.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.14.ebuild,v 1.10 2014/01/08 06:42:15 vapier Exp $ - -inherit eutils python multilib user - -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="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -IUSE="selinux" - -DEPEND=">=dev-lang/python-2.3 - virtual/mta - virtual/cron - virtual/httpd-cgi - selinux? ( sec-policy/selinux-mailman )" -RDEPEND="${DEPEND}" - -pkg_setup() { - INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"} - VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"} - CGIUID=${MAILMAN_CGIUID:-apache} - CGIGID=${MAILMAN_CGIGID:-apache} - 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 ${MAILGRP} ${MAILGID} - enewuser ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch" || die "patch failed." - epatch "${FILESDIR}/${PN}-2.1.9-icons.patch" || die "patch failed." - epatch "${FILESDIR}/${PN}-2.1.13-ldflags.patch" -} - -src_compile() { - econf --without-permcheck \ - --prefix="${INSTALLDIR}" \ - --with-mail-gid=${MAILGID} \ - --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" -} - -src_install () { - emake "DESTDIR=${D}" doinstall || die - - insinto /etc/apache2/modules.d - newins "${FILESDIR}/50_mailman.conf-r1" 50_mailman.conf - dosed "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" /etc/apache2/modules.d/50_mailman.conf - dosed "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" /etc/apache2/modules.d/50_mailman.conf - dosed "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" /etc/apache2/modules.d/50_mailman.conf - - newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo || die "newdoc failed" - - dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \ - contrib/README.check_perms_grsecurity contrib/virtusertable || die "dodoc failed" - - exeinto ${INSTALLDIR}/bin - doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \ - contrib/mm-handler* || die - - dodir /etc/mailman - mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman" - dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py - - # Save the old config for updates from pre-2.1.9-r2 - # To be removed some distant day - for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR} - do - if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then - cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py" - fi - done - - newinitd "${FILESDIR}/mailman.rc" mailman - - keepdir ${VAR_PREFIX}/logs - keepdir ${VAR_PREFIX}/locks - keepdir ${VAR_PREFIX}/spam - keepdir ${VAR_PREFIX}/archives/public - keepdir ${VAR_PREFIX}/archives/private - keepdir ${VAR_PREFIX}/lists - keepdir ${VAR_PREFIX}/qfiles - - chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/* - chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" - chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \ - "${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} - chmod 2770 "${D}/${VAR_PREFIX}/archives/private" - chmod 2770 "${D}/${VAR_PREFIX}/qfiles" - chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" - -} - -pkg_postinst() { - python_mod_optimize ${INSTALLDIR}/bin/ ${INSTALLDIR}/Mailman \ - ${INSTALLDIR}/Mailman/*/ - - enewgroup ${MAILGRP} ${MAILGID} - enewuser ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron - elog - elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional" - elog "Setup information, mailman will NOT run unless you follow" - elog "those instructions!" - elog - - elog "An example Mailman configuration file for Apache has been installed into:" - elog " ${APACHE2_MODULES_CONFDIR}/50_mailman.conf" - elog - elog "To enable, you will need to add \"-D MAILMAN\" to" - elog "/etc/conf.d/apache2." - elog - - ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure" - ewarn "mailman with the following variables:" - ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)" - ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)" - ewarn "MAILMAN_CGIUID (default: apache)" - ewarn "MAILMAN_CGIGID (default: apache)" - 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." - ewarn - ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you" - ewarn "NEED to make a few manual updates to your system:" - ewarn - ewarn "1. Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman" - ewarn "2. Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'" - ewarn "3. Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py" - ewarn - ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from" - ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and" - ewarn "archives/ directory to the new location, ensuring that the" - ewarn "permissions is correct. See bug #208789 for a discussion." - ebeep -} - -pkg_postrm() { - INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"} - python_mod_cleanup ${INSTALLDIR}/bin ${INSTALLDIR}/Mailman \ - ${INSTALLDIR}/Mailman/*/ -} diff --git a/net-mail/mailman/mailman-2.1.17.ebuild b/net-mail/mailman/mailman-2.1.17.ebuild deleted file mode 100644 index 538b28489385..000000000000 --- a/net-mail/mailman/mailman-2.1.17.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.17.ebuild,v 1.5 2014/11/02 09:00:17 swift Exp $ - -EAPI="4" -PYTHON_DEPEND="2" - -inherit eutils python multilib systemd user - -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="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -IUSE="selinux" - -DEPEND="virtual/mta - virtual/cron - virtual/httpd-cgi" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-mailman )" - -pkg_setup() { - python_set_active_version 2 - INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"} - VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"} - CGIUID=${MAILMAN_CGIUID:-apache} - CGIGID=${MAILMAN_CGIGID:-apache} - 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 ${MAILGRP} ${MAILGID} - enewuser ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron - - python_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch" || die "patch failed." - epatch "${FILESDIR}/${PN}-2.1.9-icons.patch" || die "patch failed." -} - -src_configure() { - econf --without-permcheck \ - --prefix="${INSTALLDIR}" \ - --with-mail-gid=${MAILGID} \ - --with-cgi-gid=${CGIGID} \ - --with-cgi-ext="${MAILMAN_CGIEXT}" \ - --with-var-prefix="${VAR_PREFIX}" \ - --with-username=${MAILUSR} \ - --with-groupname=${MAILGRP} \ - --with-python=$(PYTHON -2 -a) \ - || die "configure failed" -} - -src_compile() { - emake || die "make failed" -} - -src_install () { - emake "DESTDIR=${D}" doinstall || die - - insinto /etc/apache2/modules.d - newins "${FILESDIR}/50_mailman.conf-r1" 50_mailman.conf - sed -i "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" "${D}/etc/apache2/modules.d/50_mailman.conf" - sed -i "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" "${D}/etc/apache2/modules.d/50_mailman.conf" - sed -i "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" "${D}/etc/apache2/modules.d/50_mailman.conf" - - newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo || die "newdoc failed" - - dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \ - contrib/README.check_perms_grsecurity contrib/virtusertable || die "dodoc failed" - - exeinto ${INSTALLDIR}/bin - doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \ - contrib/mm-handler* || die - - dodir /etc/mailman - mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman" - dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py - - # Save the old config for updates from pre-2.1.9-r2 - # To be removed some distant day - for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR} - do - if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then - cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py" - fi - done - - newinitd "${FILESDIR}/mailman.rc" mailman - cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die - sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die - systemd_dounit "${T}/mailman.service" - - keepdir ${VAR_PREFIX}/logs - keepdir ${VAR_PREFIX}/locks - keepdir ${VAR_PREFIX}/spam - keepdir ${VAR_PREFIX}/archives/public - keepdir ${VAR_PREFIX}/archives/private - keepdir ${VAR_PREFIX}/lists - keepdir ${VAR_PREFIX}/qfiles - - chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/* - chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" - chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \ - "${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} - chmod 2770 "${D}/${VAR_PREFIX}/archives/private" - chmod 2770 "${D}/${VAR_PREFIX}/qfiles" - chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" - -} - -pkg_postinst() { - python_mod_optimize ${INSTALLDIR}/bin/ ${INSTALLDIR}/Mailman \ - ${INSTALLDIR}/Mailman/*/ - - enewgroup ${MAILGRP} ${MAILGID} - enewuser ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron - elog - elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional" - elog "Setup information, mailman will NOT run unless you follow" - elog "those instructions!" - elog - - elog "An example Mailman configuration file for Apache has been installed into:" - elog " ${APACHE2_MODULES_CONFDIR}/50_mailman.conf" - elog - elog "To enable, you will need to add \"-D MAILMAN\" to" - elog "/etc/conf.d/apache2." - elog - - ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure" - ewarn "mailman with the following variables:" - ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)" - ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)" - ewarn "MAILMAN_CGIUID (default: apache)" - ewarn "MAILMAN_CGIGID (default: apache)" - 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." - ewarn - ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you" - ewarn "NEED to make a few manual updates to your system:" - ewarn - ewarn "1. Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman" - ewarn "2. Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'" - ewarn "3. Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py" - ewarn - ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from" - ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and" - ewarn "archives/ directory to the new location, ensuring that the" - ewarn "permissions is correct. See bug #208789 for a discussion." -} - -pkg_postrm() { - INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"} - python_mod_cleanup ${INSTALLDIR}/bin ${INSTALLDIR}/Mailman \ - ${INSTALLDIR}/Mailman/*/ -} diff --git a/net-mail/mailman/mailman-2.1.15.ebuild b/net-mail/mailman/mailman-2.1.19.ebuild index 26870bbc5372..0583bd6b317b 100644 --- a/net-mail/mailman/mailman-2.1.15.ebuild +++ b/net-mail/mailman/mailman-2.1.19.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.15.ebuild,v 1.9 2014/01/08 06:42:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.19.ebuild,v 1.1 2015/03/29 13:08:58 hanno Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -8,19 +8,22 @@ PYTHON_DEPEND="2" inherit eutils python multilib systemd user DESCRIPTION="A python-based mailing list server with an extensive web interface" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz" HOMEPAGE="http://www.list.org/" +S="${WORKDIR}/${P/_p/-}" SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="selinux" DEPEND="virtual/mta virtual/cron virtual/httpd-cgi - selinux? ( sec-policy/selinux-mailman )" -RDEPEND="${DEPEND}" + dev-python/dnspython" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-mailman ) +" pkg_setup() { python_set_active_version 2 @@ -68,7 +71,7 @@ src_install () { emake "DESTDIR=${D}" doinstall || die insinto /etc/apache2/modules.d - newins "${FILESDIR}/50_mailman.conf-r1" 50_mailman.conf + newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf sed -i "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" "${D}/etc/apache2/modules.d/50_mailman.conf" sed -i "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" "${D}/etc/apache2/modules.d/50_mailman.conf" sed -i "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" "${D}/etc/apache2/modules.d/50_mailman.conf" |