commit: 27f737c61dcf8a9273edbffd8c91625347069ef2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Sep 21 06:04:40 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Sep 21 06:07:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27f737c6
net-mail/mailman: Remove last-rited <3 Bug: https://bugs.gentoo.org/710134 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-mail/mailman/Manifest | 1 - net-mail/mailman/files/50_mailman.conf-r2 | 18 -- net-mail/mailman/files/README.gentoo-r3 | 181 --------------------- .../files/mailman-2.1.14_rc1-directory-check.patch | 19 --- net-mail/mailman/files/mailman-2.1.9-icons.patch | 12 -- net-mail/mailman/files/mailman.rc | 26 --- net-mail/mailman/files/mailman.service | 13 -- net-mail/mailman/mailman-2.1.33.ebuild | 169 ------------------- profiles/package.mask | 1 - 9 files changed, 440 deletions(-) diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest index 6078fefac27..4d517d20222 100644 --- a/net-mail/mailman/Manifest +++ b/net-mail/mailman/Manifest @@ -1,4 +1,3 @@ -DIST mailman-2.1.33.tgz 9412979 BLAKE2B 1018ee5b2993658117ac5a1d76e1742c5e27cef69ba2892e8f56897f6c00394b1b479b3fa00855f78211844bd531a5ac1e5ac8c9d16763dd49303ab3690edc0c SHA512 1e7bb58a9d38e5171f682563abb0b23fcb0a7423e0e7fa883326815ada37ffa8074845ea70fad4ea29fa098a6e7203e259caf57532e09a0f7c05120f89dd83a9 DIST mailman-3.3.0-importlib_resources-fix.diff.xz 2120 BLAKE2B d455a88a922fe715cb3e3faf6d7f94115ab0e762b85a3195988c9bcb0d01b37d4495e4c30c566f10f65f47c55f18c8af46e21037fca042503167238c88e1ff77 SHA512 31e6f71ff700a3e648b78b75808ac40b333ed58f3d51819b959f48ef4598f0e5d07d3b4fc178745702c02fb3137941c9887a6bd1cdd9ea7d18cd50d32da6c57f DIST mailman-3.3.0.tar.gz 839241 BLAKE2B a9f972a5cd09be6e971b568066cf67980c050fc619bc0bba7956d65b9601613f2dd87bbf243072be2478367e2fecfd48b184dada6fc525dae8cf1414dc64cec0 SHA512 63cf30c102751c1cae086f4c046767c2d817ad57097bd60bc838ead19c4e29ed1bc5d4cc2c1eef40f41787daf60d8b98033f64064d6ad4567a9552b5fb2cabd8 DIST mailman-3.3.1.tar.gz 1184548 BLAKE2B e9bf5cec5fec75ae01093003fa9b128f9415c55cc505eda841a807d72177d17dc7609e1e0c20305f5f38c40e01745b4cbc58d1c5ddc43d0799ec601bde92cb54 SHA512 31dc5d0fca7f28579a1e174010ea8ac83d17b5e7ace37f3a86fb73110de412af145a9c3d16cf7b446f80e44a3419b51cce7b56b8de93264751cf771b2c084ddc diff --git a/net-mail/mailman/files/50_mailman.conf-r2 b/net-mail/mailman/files/50_mailman.conf-r2 deleted file mode 100644 index c0cf69562fe..00000000000 --- a/net-mail/mailman/files/50_mailman.conf-r2 +++ /dev/null @@ -1,18 +0,0 @@ -<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/files/README.gentoo-r3 b/net-mail/mailman/files/README.gentoo-r3 deleted file mode 100644 index 8584a2d6a07..00000000000 --- a/net-mail/mailman/files/README.gentoo-r3 +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -Follow these instructions to finish setting up mailman. This file and the -original ebuild were tweaked by me <[email protected]> but were graciously -submitted by Joby Walker (YOU RULE!) -2003 Jul 09: updated by Jesus Perez and re-tweaked by me <[email protected]> -for 2.1.x. - -Please view the documentation on Mailman at: http://www.list.org/ - -This documentation assumes you're using the default gentoo path -(/usr/lib/mailman/), if you've changed it with MAILMAN_PREFIX, adjust them -accordingly. - -1) If this is your first time installing mailman, after your "emerge mailman", -you need to add -D MAILMAN to /etc/conf.d/apache or /etc/conf.d/apache2 and restart -apache. - -2) In your /etc/conf.d/apache (for apache 1.x) - or /etc/conf.d/apache2 (for apache 2.x) - file add the additional option to the - APACHE_OPTS or APACHE2_OPTS variable: - - -D MAILMAN - -3) Make sure mailman is a part of the cron group - -4) This must be done as user mailman: - - su - mailman - -Add the cron jobs: - - cd cron - crontab crontab.in - cd .. - -Create the site password: - - bin/mmsitepass - -and main list: - - bin/newlist mailman - - -5) Change back to root: - - exit - -(Postfix users: read the notes at the end of this file before you continue) -Add this to /etc/mail/aliases (and see point 9 for notes): - mailman: "|/usr/lib/mailman/mail/mailman post mailman" - mailman-admin: "|/usr/lib/mailman/mail/mailman admin mailman" - mailman-bounces: "|/usr/lib/mailman/mail/mailman bounces mailman" - mailman-confirm: "|/usr/lib/mailman/mail/mailman confirm mailman" - mailman-join: "|/usr/lib/mailman/mail/mailman join mailman" - mailman-leave: "|/usr/lib/mailman/mail/mailman leave mailman" - mailman-owner: "|/usr/lib/mailman/mail/mailman owner mailman" - mailman-request: "|/usr/lib/mailman/mail/mailman request mailman" - mailman-subscribe: "|/usr/lib/mailman/mail/mailman subscribe mailman" - mailman-unsubscribe: "|/usr/lib/mailman/mail/mailman unsubscribe mailman" - -For courier, the aliases have to go to /etc/courier/aliases and you have to skip -the quotes. - -Run newaliases (only if you use sendmail). - - newaliases - -6) Start the mailman daemon: - - /etc/init.d/mailman start - -and add it to default runlevel (optional but recommended): - - rc-update add mailman default - -7) For each list created (either with web interface or with bin/newlist) -this must be added to /etc/mail/aliases (see smrsh notes below) -replace <list-name> with the name of the list: - - <list-name>: "|/usr/lib/mailman/mail/mailman post <list-name>" - <list-name>-admin: "|/usr/lib/mailman/mail/mailman admin <list-name>" - <list-name>-bounces: "|/usr/lib/mailman/mail/mailman bounces <list-name>" - <list-name>-confirm: "|/usr/lib/mailman/mail/mailman confirm <list-name>" - <list-name>-join: "|/usr/lib/mailman/mail/mailman join <list-name>" - <list-name>-leave: "|/usr/lib/mailman/mail/mailman leave <list-name>" - <list-name>-owner: "|/usr/lib/mailman/mail/mailman owner <list-name>" - <list-name>-request: "|/usr/lib/mailman/mail/mailman request <list-name>" - <list-name>-subscribe: "|/usr/lib/mailman/mail/mailman subscribe <list-name>" - <list-name>-unsubscribe: "|/usr/lib/mailman/mail/mailman unsubscribe <list-name>" - -For courier, the aliases have to go to /etc/courier/aliases and you have to skip -the quotes. - -Run newaliases: - - newaliases - -smrsh notes ------------ -(if you use sendmail, you are surely using srmsh) you must note that -sendmail won't run any program outside of EBINDIR. I tried to change -EBINDIR using,define(`confEBINDIR', `/usr/lib/mailman/mail')dnl in -sendmail.mc but it didn't work, so mailman must be placed in EBINDIR, -which in Gentoo is /usr/adm/sm.bin, so you must run as root: - - ln -s /usr/lib/mailman/mail/mailman /usr/adm/sm.bin/mailman - -And the lines in /etc/mail/aliases which refer to -/usr/lib/mailman/mail/mailman must be changed to mailman: - - <list-name>: "|mailman post <list-name>" - <list-name>-admin: "|mailman admin <list-name>" - <list-name>-bounces: "|mailman bounces <list-name>" - <list-name>-confirm: "|mailman confirm <list-name>" - <list-name>-join: "|mailman join <list-name>" - <list-name>-leave: "|mailman leave <list-name>" - <list-name>-owner: "|mailman owner <list-name>" - <list-name>-request: "|mailman request <list-name>" - <list-name>-subscribe: "|mailman subscribe <list-name>" - <list-name>-unsubscribe: "|mailman unsubscribe <list-name>" - -exim notes ----------- -You can write an exim stanza for the router and transport that looks something -like (Derived from, and in part taken from cpanel): - -mailman_virtual_router: - driver = accept - require_files = /var/lib/mailman/lists/${lc::$local_part}/config.pck - local_part_suffix_optional - local_part_suffix = -admin : \ - -bounces : -bounces+* : \ - -confirm : -confirm+* : \ - -join : -leave : \ - -owner : -request : \ - -subscribe : -unsubscribe - transport = mailman_virtual_transport - -mailman_virtual_transport: - driver = pipe - command = /usr/lib/mailman/mail/mailman \ - '${if def:local_part_suffix \ - {${sg{$local_part_suffix}{-(\\w+)(\\+.*)?}{\$1}}} \ - {post}}' \ - ${lc:$local_part} - current_directory = /usr/lib/mailman - home_directory = /usr/lib/mailman - user = mailman - group = mailman - -Note the double colon in the require files. See -http://wiki.exim.org/FAQ/General_Debugging/Q0060 for more information. - -This should be modified if you're using the vhosts USE flag, specifically you -need to modify the location of the config.pck file, to be -${lc::$local_part}-${lc::$domain} instead of simply ${lc::$local_part}, and for the -transport you need to change the last part of the command in the same fashion. - -Other Helpful things to know... -------------------------------- -run "bin/check_perms -f" from the root mailman directory -(/usr/lib/mailman) to check and fix permission problems. - -The INSTALL file is located in /usr/share/doc/mailman-$VERSION/ - -Postfix notes -------------- -If you're using Postfix, don't manually change your /etc/mail/aliases -file, as described above. Instead, follow these instructions: - -http://list.org/mailman-install/node13.html - -This will set up Mailman and Postfix to automatically generate the new -aliases when you create new lists. It will also make sure that Postfix -uses the correct group ID when it's talking to Mailman, otherwise you -will get security errors from Mailman. - diff --git a/net-mail/mailman/files/mailman-2.1.14_rc1-directory-check.patch b/net-mail/mailman/files/mailman-2.1.14_rc1-directory-check.patch deleted file mode 100644 index a3c26ede877..00000000000 --- a/net-mail/mailman/files/mailman-2.1.14_rc1-directory-check.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- mailman-2.1.14rc1/bin/update 2010-09-09 18:51:09.000000000 +0200 -+++ mailman-2.1.14rc1-1/bin/update 2010-09-14 01:02:09.000000000 +0200 -@@ -35,6 +35,7 @@ - """ - - import os -+import stat - import sys - import time - import errno -@@ -428,7 +429,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/files/mailman-2.1.9-icons.patch b/net-mail/mailman/files/mailman-2.1.9-icons.patch deleted file mode 100644 index 07cd63e5881..00000000000 --- a/net-mail/mailman/files/mailman-2.1.9-icons.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rau mailman-2.1.9-orig/Mailman/Defaults.py.in mailman-2.1.9-mailman-icons/Mailman/Defaults.py.in ---- mailman-2.1.9-orig/Mailman/Defaults.py.in 2006-08-04 14:20:33.000000000 +0200 -+++ mailman-2.1.9/Mailman/Defaults.py.in 2008-02-03 14:27:02.000000000 +0200 -@@ -54,7 +54,7 @@ - # disable Mailman's logo footer altogther, hack - # Mailman/htmlformat.py:MailmanLogo(), which also contains the hardcoded links - # and image names. --IMAGE_LOGOS = '/icons/' -+IMAGE_LOGOS = '/mailman-icons/' - - # The name of the Mailman favicon - SHORTCUT_ICON = 'mm-icon.png' diff --git a/net-mail/mailman/files/mailman.rc b/net-mail/mailman/files/mailman.rc deleted file mode 100644 index d748a2c9673..00000000000 --- a/net-mail/mailman/files/mailman.rc +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net - use logger -} - -start() { - ebegin "Starting mailman" - su - mailman -c 'bin/mailmanctl -s start' >/dev/null 2>&1 - eend $? -} - -stop() { - ebegin "Stopping mailman" - su - mailman -c 'bin/mailmanctl stop' >/dev/null 2>&1 - eend $? -} - -svc_restart() { - ebegin "Restarting mailman" - su - mailman -c 'bin/mailmanctl restart' >/dev/null 2>&1 - eend $? -} diff --git a/net-mail/mailman/files/mailman.service b/net-mail/mailman/files/mailman.service deleted file mode 100644 index 21b81956554..00000000000 --- a/net-mail/mailman/files/mailman.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=GNU Mailing List Manager -After=network.target - -[Service] -User=mailman -ExecStart=/usr/lib/mailman/bin/mailmanctl -s start -ExecReload=/usr/lib/mailman/bin/mailmanctl restart -ExecStop=/usr/lib/mailman/bin/mailmanctl stop -Type=forking - -[Install] -WantedBy=multi-user.target diff --git a/net-mail/mailman/mailman-2.1.33.ebuild b/net-mail/mailman/mailman-2.1.33.ebuild deleted file mode 100644 index f4b289046d8..00000000000 --- a/net-mail/mailman/mailman-2.1.33.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-single-r1 multilib systemd user - -DESCRIPTION="A python-based mailing list server with an extensive web interface" -SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz" -HOMEPAGE="http://www.list.org/"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="selinux" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/dnspython[${PYTHON_MULTI_USEDEP}] - ') - virtual/mta - virtual/cron - virtual/httpd-cgi" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-mailman ) -" - -S="${WORKDIR}/${P/_p/-}" - -pkg_setup() { - python-single-r1_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_prepare() { - epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch" - epatch "${FILESDIR}/${PN}-2.1.9-icons.patch" -} - -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}" -} - -src_install() { - emake "DESTDIR=${D}" doinstall - - insinto /etc/apache2/modules.d - newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf - sed \ - -e "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" \ - -e "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" \ - -e "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" \ - -i "${D}/etc/apache2/modules.d/50_mailman.conf" || die - - newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo - - dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \ - contrib/README.check_perms_grsecurity contrib/virtusertable - - exeinto ${INSTALLDIR}/bin - doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \ - contrib/mm-handler* - - 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" || die - 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/* || die - chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" || die - chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \ - "${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} || die - chmod 2770 "${D}/${VAR_PREFIX}/archives/private" || die - chmod 2770 "${D}/${VAR_PREFIX}/qfiles" || die - chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" || die - - python_optimize "${D}/${INSTALLDIR}/bin/" \ - "${D}/${INSTALLDIR}/Mailman/" \ - "${D}/${INSTALLDIR}/Mailman/*" -} - -pkg_postinst() { - enewgroup ${MAILGRP} ${MAILGID} - enewuser ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron - echo - 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!" - echo - - elog "An example Mailman configuration file for Apache has been installed into:" - elog " ${APACHE2_MODULES_CONFDIR}/50_mailman.conf" - echo - elog "To enable, you will need to add \"-D MAILMAN\" to" - elog "/etc/conf.d/apache2." - echo - - 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." -} diff --git a/profiles/package.mask b/profiles/package.mask index 4703b613045..3a918f7d158 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -673,7 +673,6 @@ media-plugins/gimp-resynthesizer <net-analyzer/linkchecker-10.0.0_pre net-analyzer/pbgpp net-libs/openpgm -<net-mail/mailman-3 # Alfredo Tupone <[email protected]> (2020-08-16) # Ported to py3.8 but not yet released
