---- mailman-2.1.5.orig/bin/check_perms 2003-03-31 15:07:55.000000000 -0500
-+++ mailman-2.1.5.FHS/bin/check_perms 2004-10-08 16:05:09.000000000 -0400
-@@ -164,7 +164,8 @@
- print _('checking mode for %(prefix)s')
+diff -urNp -x '*.orig' mailman-2.1.34.org/Mailman/Defaults.py.in mailman-2.1.34/Mailman/Defaults.py.in
+--- mailman-2.1.34.org/Mailman/Defaults.py.in 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/Mailman/Defaults.py.in 2021-10-23 13:33:04.601341234 +0200
+@@ -1751,9 +1751,11 @@ AuthListPoster = 6 # List poster (App
+
+ # Useful directories
+ LIST_DATA_DIR = os.path.join(VAR_PREFIX, 'lists')
+-LOG_DIR = os.path.join(VAR_PREFIX, 'logs')
+-LOCK_DIR = os.path.join(VAR_PREFIX, 'locks')
++LOG_DIR = '@LOG_DIR@'
++LOCK_DIR = '@LOCK_DIR@'
++CONFIG_DIR = '@CONFIG_DIR@'
+ DATA_DIR = os.path.join(VAR_PREFIX, 'data')
++PID_DIR = '@PID_DIR@'
+ SPAM_DIR = os.path.join(VAR_PREFIX, 'spam')
+ WRAPPER_DIR = os.path.join(EXEC_PREFIX, 'mail')
+ BIN_DIR = os.path.join(PREFIX, 'bin')
+@@ -1764,7 +1766,7 @@ PUBLIC_ARCHIVE_FILE_DIR = os.path.join(
+ PRIVATE_ARCHIVE_FILE_DIR = os.path.join(VAR_PREFIX, 'archives', 'private')
+
+ # Directories used by the qrunner subsystem
+-QUEUE_DIR = os.path.join(VAR_PREFIX, 'qfiles')
++QUEUE_DIR = '@QUEUE_DIR@'
+ INQUEUE_DIR = os.path.join(QUEUE_DIR, 'in')
+ OUTQUEUE_DIR = os.path.join(QUEUE_DIR, 'out')
+ CMDQUEUE_DIR = os.path.join(QUEUE_DIR, 'commands')
+@@ -1778,9 +1780,9 @@ RETRYQUEUE_DIR = os.path.join(QUEUE_DIR
+ MAILDIR_DIR = os.path.join(QUEUE_DIR, 'maildir')
+
+ # Other useful files
+-PIDFILE = os.path.join(DATA_DIR, 'master-qrunner.pid')
+-SITE_PW_FILE = os.path.join(DATA_DIR, 'adm.pw')
+-LISTCREATOR_PW_FILE = os.path.join(DATA_DIR, 'creator.pw')
++PIDFILE = os.path.join(PID_DIR, 'master-qrunner.pid')
++SITE_PW_FILE = os.path.join(CONFIG_DIR, 'adm.pw')
++LISTCREATOR_PW_FILE = os.path.join(CONFIG_DIR, 'creator.pw')
+
+ # Import a bunch of version numbers
+ from Version import *
+diff -urNp -x '*.orig' mailman-2.1.34.org/Mailman/MTA/Postfix.py mailman-2.1.34/Mailman/MTA/Postfix.py
+--- mailman-2.1.34.org/Mailman/MTA/Postfix.py 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/Mailman/MTA/Postfix.py 2021-10-23 13:33:04.601341234 +0200
+@@ -33,8 +33,8 @@ from Mailman.MTA.Utils import makealiase
+ from Mailman.Logging.Syslog import syslog
+
+ LOCKFILE = os.path.join(mm_cfg.LOCK_DIR, 'creator')
+-ALIASFILE = os.path.join(mm_cfg.DATA_DIR, 'aliases')
+-VIRTFILE = os.path.join(mm_cfg.DATA_DIR, 'virtual-mailman')
++ALIASFILE = os.path.join(mm_cfg.CONFIG_DIR, 'aliases')
++VIRTFILE = os.path.join(mm_cfg.CONFIG_DIR, 'virtual-mailman')
+ # Desired mode for aliases(.db) and virtual-mailman(.db) for both creation
+ # and check_perms.
+ targetmode = S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH
+diff -urNp -x '*.orig' mailman-2.1.34.org/Makefile.in mailman-2.1.34/Makefile.in
+--- mailman-2.1.34.org/Makefile.in 2021-10-23 13:33:04.297992099 +0200
++++ mailman-2.1.34/Makefile.in 2021-10-23 13:33:04.601341234 +0200
+@@ -28,6 +28,11 @@ bindir= @bindir@
+ prefix= @prefix@
+ exec_prefix= @exec_prefix@
+ var_prefix= @VAR_PREFIX@
++configdir= @CONFIG_DIR@
++lockdir= @LOCK_DIR@
++logdir= @LOG_DIR@
++piddir= @PID_DIR@
++queuedir= @QUEUE_DIR@
+ DESTDIR=
+
+ CC= @CC@
+@@ -41,8 +46,12 @@ DEFS= @DEFS@
+ OPT= @OPT@
+ CFLAGS= @CFLAGS@ $(OPT) $(DEFS)
+
++FHS_DIRS= \
++ ${configdir} ${lockdir} ${logdir} ${piddir} ${queuedir}
++
++
+ VAR_DIRS= \
+- logs archives lists locks data spam qfiles \
++ archives lists data spam \
+ archives/private archives/public
+
+ ARCH_INDEP_DIRS= \
+@@ -104,6 +113,15 @@ doinstall: $(SUBDIRS)
+ $(INSTALL) -d -m $(DIRMODE) $$dir; \
+ else true; \
+ fi; \
++ done
++ @for d in $(FHS_DIRS); \
++ do \
++ dir=$(DESTDIR)/$$d; \
++ if test ! -d $$dir; then \
++ echo "Creating directory $$dir"; \
++ $(INSTALL) -d -m $(DIRMODE) $$dir; \
++ else true; \
++ fi; \
+ done
+ chmod o-r $(DESTDIR)$(var_prefix)/archives/private
+ @for d in $(ARCH_INDEP_DIRS); \
+diff -urNp -x '*.orig' mailman-2.1.34.org/bin/check_perms mailman-2.1.34/bin/check_perms
+--- mailman-2.1.34.org/bin/check_perms 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/bin/check_perms 2021-10-23 13:33:04.598007726 +0200
+@@ -183,7 +183,8 @@ def checkall():
+ print C_('checking mode for %(prefix)s')
dirs = {}
for d in (mm_cfg.PREFIX, mm_cfg.EXEC_PREFIX, mm_cfg.VAR_PREFIX,
- mm_cfg.LOG_DIR):
dirs[d] = True
for d in dirs.keys():
try:
---- mailman-2.1.5.orig/configure.in 2003-12-24 12:11:48.000000000 -0500
-+++ mailman-2.1.5.FHS/configure.in 2004-09-30 16:13:56.000000000 -0400
-@@ -180,7 +180,7 @@
+diff -urNp -x '*.orig' mailman-2.1.34.org/configure.in mailman-2.1.34/configure.in
+--- mailman-2.1.34.org/configure.in 2021-10-23 13:33:04.291325085 +0200
++++ mailman-2.1.34/configure.in 2021-10-23 13:33:04.598007726 +0200
+@@ -321,7 +321,7 @@ default_var_prefix="/var/mailman"
AC_SUBST(VAR_PREFIX)
AC_MSG_CHECKING(for --with-var-prefix)
AC_ARG_WITH(var-prefix, dnl
case "$with_var_prefix" in
yes) VAR_PREFIX="$default_var_prefix"; ans=$VAR_PREFIX;;
""|no) VAR_PREFIX="$prefix"; ans="no";;
-@@ -207,6 +207,61 @@
+@@ -348,6 +348,61 @@ else
prefixcheck=$VAR_PREFIX
fi
+AC_MSG_RESULT($QUEUE_DIR)
+
# new macro for finding group names
- AC_DEFUN(MM_FIND_GROUP_NAME, [
+ AC_DEFUN([MM_FIND_GROUP_NAME], [
# $1 == variable name
-@@ -619,7 +674,7 @@
+@@ -744,7 +799,7 @@ AC_OUTPUT([misc/paths.py Mailman/Default
templates/Makefile cron/Makefile scripts/Makefile messages/Makefile
cron/crontab.in misc/mailman Makefile
tests/Makefile tests/bounces/Makefile tests/msgs/Makefile
echo "configuration completed at" `date`)
# Make sure all the build scripts are executable.
---- mailman-2.1.5.orig/Mailman/Defaults.py.in 2004-04-24 22:30:03.000000000 -0400
-+++ mailman-2.1.5.FHS/Mailman/Defaults.py.in 2004-10-08 14:38:57.000000000 -0400
-@@ -1198,9 +1198,11 @@
-
- # Useful directories
- LIST_DATA_DIR = os.path.join(VAR_PREFIX, 'lists')
--LOG_DIR = os.path.join(VAR_PREFIX, 'logs')
--LOCK_DIR = os.path.join(VAR_PREFIX, 'locks')
-+LOG_DIR = '@LOG_DIR@'
-+LOCK_DIR = '@LOCK_DIR@'
-+CONFIG_DIR = '@CONFIG_DIR@'
- DATA_DIR = os.path.join(VAR_PREFIX, 'data')
-+PID_DIR = '@PID_DIR@'
- SPAM_DIR = os.path.join(VAR_PREFIX, 'spam')
- WRAPPER_DIR = os.path.join(EXEC_PREFIX, 'mail')
- BIN_DIR = os.path.join(PREFIX, 'bin')
-@@ -1211,7 +1213,7 @@
- PRIVATE_ARCHIVE_FILE_DIR = os.path.join(VAR_PREFIX, 'archives', 'private')
-
- # Directories used by the qrunner subsystem
--QUEUE_DIR = os.path.join(VAR_PREFIX, 'qfiles')
-+QUEUE_DIR = '@QUEUE_DIR@'
- INQUEUE_DIR = os.path.join(QUEUE_DIR, 'in')
- OUTQUEUE_DIR = os.path.join(QUEUE_DIR, 'out')
- CMDQUEUE_DIR = os.path.join(QUEUE_DIR, 'commands')
-@@ -1225,9 +1227,9 @@
- MAILDIR_DIR = os.path.join(QUEUE_DIR, 'maildir')
-
- # Other useful files
--PIDFILE = os.path.join(DATA_DIR, 'master-qrunner.pid')
--SITE_PW_FILE = os.path.join(DATA_DIR, 'adm.pw')
--LISTCREATOR_PW_FILE = os.path.join(DATA_DIR, 'creator.pw')
-+PIDFILE = os.path.join(PID_DIR, 'master-qrunner.pid')
-+SITE_PW_FILE = os.path.join(CONFIG_DIR, 'adm.pw')
-+LISTCREATOR_PW_FILE = os.path.join(CONFIG_DIR, 'creator.pw')
-
- # Import a bunch of version numbers
- from Version import *
---- mailman-2.1.5.orig/Mailman/MTA/Postfix.py 2003-03-31 16:49:43.000000000 -0500
-+++ mailman-2.1.5.FHS/Mailman/MTA/Postfix.py 2004-10-08 16:02:20.000000000 -0400
-@@ -33,8 +33,8 @@ from Mailman.MTA.Utils import makealiase
- from Mailman.Logging.Syslog import syslog
-
- LOCKFILE = os.path.join(mm_cfg.LOCK_DIR, 'creator')
--ALIASFILE = os.path.join(mm_cfg.DATA_DIR, 'aliases')
--VIRTFILE = os.path.join(mm_cfg.DATA_DIR, 'virtual-mailman')
-+ALIASFILE = os.path.join(mm_cfg.CONFIG_DIR, 'aliases')
-+VIRTFILE = os.path.join(mm_cfg.CONFIG_DIR, 'virtual-mailman')
- # Desired mode for aliases(.db) and virtual-mailman(.db) for both creation
- # and check_perms.
- targetmode = S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH
---- mailman-2.1.5.orig/Makefile.in 2003-03-31 14:26:57.000000000 -0500
-+++ mailman-2.1.5.FHS/Makefile.in 2004-10-15 16:48:17.000000000 -0400
-@@ -28,6 +28,11 @@
- prefix= @prefix@
- exec_prefix= @exec_prefix@
- var_prefix= @VAR_PREFIX@
-+configdir= @CONFIG_DIR@
-+lockdir= @LOCK_DIR@
-+logdir= @LOG_DIR@
-+piddir= @PID_DIR@
-+queuedir= @QUEUE_DIR@
- DESTDIR=
-
- CC= @CC@
-@@ -41,8 +46,12 @@
- OPT= @OPT@
- CFLAGS= @CFLAGS@ $(OPT) $(DEFS)
-
-+FHS_DIRS= \
-+ ${configdir} ${lockdir} ${logdir} ${piddir} ${queuedir}
-+
-+
- VAR_DIRS= \
-- logs archives lists locks data spam qfiles \
-+ archives lists data spam \
- archives/private archives/public
-
- ARCH_INDEP_DIRS= \
-@@ -96,6 +105,15 @@
- else true; \
- fi; \
- done
-+ @for d in $(FHS_DIRS); \
-+ do \
-+ dir=$(DESTDIR)/$$d; \
-+ if test ! -d $$dir; then \
-+ echo "Creating directory $$dir"; \
-+ $(INSTALL) -d -m $(DIRMODE) $$dir; \
-+ else true; \
-+ fi; \
-+ done
- chmod o-r $(DESTDIR)$(var_prefix)/archives/private
- @for d in $(ARCH_INDEP_DIRS); \
- do \
---- mailman-2.1.5.orig/misc/Makefile.in 2004-05-13 23:34:34.000000000 -0400
-+++ mailman-2.1.5.FHS/misc/Makefile.in 2004-10-13 14:00:19.000000000 -0400
-@@ -26,6 +26,12 @@
+diff -urNp -x '*.orig' mailman-2.1.34.org/misc/Makefile.in mailman-2.1.34/misc/Makefile.in
+--- mailman-2.1.34.org/misc/Makefile.in 2021-10-23 13:33:04.297992099 +0200
++++ mailman-2.1.34/misc/Makefile.in 2021-10-23 13:33:04.601341234 +0200
+@@ -27,6 +27,12 @@ bindir= @bindir@
prefix= @prefix@
exec_prefix= @exec_prefix@
var_prefix= @VAR_PREFIX@
DESTDIR=
CC= @CC@
-@@ -84,7 +90,7 @@
+@@ -87,7 +93,7 @@ install-other:
$(INSTALL) -m $(FILEMODE) paths.py $$dir; \
done
$(INSTALL) -m $(EXEMODE) mailman $(DESTDIR)$(SCRIPTSDIR)
+ $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(configdir)
install-packages:
- for p in $(PACKAGES); \
+ if [ -z "$(EMAILPKG)" -a -d $(DESTDIR)$(PYTHONLIBDIR)/email ] ; \
-diff -r -u mailman-2.1.5.orig/cron/bumpdigests mailman-2.1.5/cron/bumpdigests
---- mailman-2.1.5.orig/cron/bumpdigests 2002-10-21 18:36:56.000000000 -0400
-+++ mailman-2.1.5/cron/bumpdigests 2004-09-03 10:41:12.000000000 -0400
+diff -urNp -x '*.orig' mailman-2.1.34.org/cron/bumpdigests mailman-2.1.34/cron/bumpdigests
+--- mailman-2.1.34.org/cron/bumpdigests 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/cron/bumpdigests 2021-10-23 13:32:45.963703728 +0200
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
- # Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
#
-diff -r -u mailman-2.1.5.orig/cron/checkdbs mailman-2.1.5/cron/checkdbs
---- mailman-2.1.5.orig/cron/checkdbs 2003-12-26 17:51:10.000000000 -0500
-+++ mailman-2.1.5/cron/checkdbs 2004-08-31 12:21:24.000000000 -0400
+diff -urNp -x '*.orig' mailman-2.1.34.org/cron/checkdbs mailman-2.1.34/cron/checkdbs
+--- mailman-2.1.34.org/cron/checkdbs 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/cron/checkdbs 2021-10-23 13:32:45.963703728 +0200
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
- # Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
#
-diff -r -u mailman-2.1.5.orig/cron/crontab.in.in mailman-2.1.5/cron/crontab.in.in
---- mailman-2.1.5.orig/cron/crontab.in.in 2002-01-06 01:28:12.000000000 -0500
-+++ mailman-2.1.5/cron/crontab.in.in 2004-09-02 17:43:27.000000000 -0400
+diff -urNp -x '*.orig' mailman-2.1.34.org/cron/crontab.in.in mailman-2.1.34/cron/crontab.in.in
+--- mailman-2.1.34.org/cron/crontab.in.in 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/cron/crontab.in.in 2021-10-23 13:32:45.963703728 +0200
@@ -1,27 +1,27 @@
# At 8AM every day, mail reminders to admins as to pending requests.
# They are less likely to ignore these reminders if they're mailed
# At 4:30AM daily, cull old entries from the 'bad' and 'shunt' queues.
-30 4 * * * @PYTHON@ -S @prefix@/cron/cull_bad_shunt
+30 4 * * * @MAILMAN_USER@ @prefix@/cron/cull_bad_shunt
-diff -r -u mailman-2.1.5.orig/cron/disabled mailman-2.1.5/cron/disabled
---- mailman-2.1.5.orig/cron/disabled 2004-02-10 17:59:45.000000000 -0500
-+++ mailman-2.1.5/cron/disabled 2004-08-31 12:22:54.000000000 -0400
+diff -urNp -x '*.orig' mailman-2.1.34.org/cron/disabled mailman-2.1.34/cron/disabled
+--- mailman-2.1.34.org/cron/disabled 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/cron/disabled 2021-10-23 13:32:45.963703728 +0200
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
- # Copyright (C) 2001-2004 by the Free Software Foundation, Inc.
+ # Copyright (C) 2001-2018 by the Free Software Foundation, Inc.
#
-diff -r -u mailman-2.1.5.orig/cron/gate_news mailman-2.1.5/cron/gate_news
---- mailman-2.1.5.orig/cron/gate_news 2003-09-21 22:29:51.000000000 -0400
-+++ mailman-2.1.5/cron/gate_news 2004-08-31 12:21:48.000000000 -0400
+diff -urNp -x '*.orig' mailman-2.1.34.org/cron/gate_news mailman-2.1.34/cron/gate_news
+--- mailman-2.1.34.org/cron/gate_news 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/cron/gate_news 2021-10-23 13:32:45.963703728 +0200
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
- # Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
#
-diff -r -u mailman-2.1.5.orig/cron/mailpasswds mailman-2.1.5/cron/mailpasswds
---- mailman-2.1.5.orig/cron/mailpasswds 2003-09-21 22:29:51.000000000 -0400
-+++ mailman-2.1.5/cron/mailpasswds 2004-08-31 12:21:56.000000000 -0400
+diff -urNp -x '*.orig' mailman-2.1.34.org/cron/mailpasswds mailman-2.1.34/cron/mailpasswds
+--- mailman-2.1.34.org/cron/mailpasswds 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/cron/mailpasswds 2021-10-23 13:32:45.963703728 +0200
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
- # Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
#
-diff -r -u mailman-2.1.5.orig/cron/nightly_gzip mailman-2.1.5/cron/nightly_gzip
---- mailman-2.1.5.orig/cron/nightly_gzip 2002-10-21 18:36:58.000000000 -0400
-+++ mailman-2.1.5/cron/nightly_gzip 2004-08-31 12:22:32.000000000 -0400
+diff -urNp -x '*.orig' mailman-2.1.34.org/cron/nightly_gzip mailman-2.1.34/cron/nightly_gzip
+--- mailman-2.1.34.org/cron/nightly_gzip 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/cron/nightly_gzip 2021-10-23 13:32:45.963703728 +0200
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
- # Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
#
-diff -r -u mailman-2.1.5.orig/cron/senddigests mailman-2.1.5/cron/senddigests
---- mailman-2.1.5.orig/cron/senddigests 2002-10-21 18:36:58.000000000 -0400
-+++ mailman-2.1.5/cron/senddigests 2004-08-31 12:22:44.000000000 -0400
+diff -urNp -x '*.orig' mailman-2.1.34.org/cron/senddigests mailman-2.1.34/cron/senddigests
+--- mailman-2.1.34.org/cron/senddigests 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/cron/senddigests 2021-10-23 13:32:45.963703728 +0200
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
- # Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
#
NOTE: you won't be able to authorize with list password anymore.
---- mailman-2.1.11/Mailman/Defaults.py.in~ 2009-06-08 16:45:29.000000000 +0300
-+++ mailman-2.1.11/Mailman/Defaults.py.in 2009-06-08 16:45:31.967055253 +0300
-@@ -1319,6 +1319,10 @@
- AuthListModerator = 4 # List Moderator (can only handle held requests)
+diff -urNp -x '*.orig' mailman-2.1.34.org/Mailman/Defaults.py.in mailman-2.1.34/Mailman/Defaults.py.in
+--- mailman-2.1.34.org/Mailman/Defaults.py.in 2021-10-23 13:34:18.675199759 +0200
++++ mailman-2.1.34/Mailman/Defaults.py.in 2021-10-23 13:34:18.988549415 +0200
+@@ -1749,6 +1749,10 @@ AuthListModerator = 4 # List Moderator (
AuthSiteAdmin = 5 # Site Administrator (total control over everything)
+ AuthListPoster = 6 # List poster (Approved: <pw> header in posts only)
+# If value is True, site administrator is trusted from REMOTE_USER CGI variable
+# Use this to if you want to use password authentication for site admin.
# Useful directories
LIST_DATA_DIR = os.path.join(VAR_PREFIX, 'lists')
LOG_DIR = '@LOG_DIR@'
---- mailman-2.1.11/Mailman/Utils.py~ 2009-06-08 16:45:22.000000000 +0300
-+++ mailman-2.1.11/Mailman/Utils.py 2009-06-08 16:45:25.094129761 +0300
-@@ -411,6 +411,11 @@
+diff -urNp -x '*.orig' mailman-2.1.34.org/Mailman/Utils.py mailman-2.1.34/Mailman/Utils.py
+--- mailman-2.1.34.org/Mailman/Utils.py 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/Mailman/Utils.py 2021-10-23 13:34:18.988549415 +0200
+@@ -481,6 +481,11 @@ def get_global_password(siteadmin=True):
def check_global_password(response, siteadmin=True):
---- mailman-2.1.23/bin/mailmanctl~ 2016-08-28 14:46:13.000000000 +0300
-+++ mailman-2.1.23/bin/mailmanctl 2016-08-28 14:47:55.871820256 +0300
-@@ -35,7 +35,7 @@
+diff -urNp -x '*.orig' mailman-2.1.34.org/bin/mailmanctl mailman-2.1.34/bin/mailmanctl
+--- mailman-2.1.34.org/bin/mailmanctl 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/bin/mailmanctl 2021-10-23 13:32:24.269240325 +0200
+@@ -36,7 +36,7 @@ in the file data/master-qrunner.pid but
pid directly. The `start', `stop', `restart', and `reopen' commands handle
everything for you.
Options:
-@@ -89,6 +89,9 @@
+@@ -90,6 +90,9 @@ Commands:
reopen - This will close all log files, causing them to be re-opened the
next time a message is written to them
"""
import sys
-@@ -189,6 +192,52 @@
+@@ -190,6 +193,52 @@ def qrunner_state():
return 0
return 1
def acquire_lock_1(force):
# Be sure we can acquire the master qrunner lock. If not, it means some
-@@ -387,13 +387,15 @@
+@@ -338,13 +387,15 @@ def main():
command = COMMASPACE.join(args)
usage(1, C_('Bad command: %(command)s'))
if command == 'stop':
# Sent the master qrunner process a SIGINT, which is equivalent to
# giving cron/qrunner a ctrl-c or KeyboardInterrupt. This will
-@@ -361,6 +412,14 @@
+@@ -363,6 +414,14 @@ def main():
if not quiet:
- print _('Re-opening all log files')
+ print C_('Re-opening all log files')
kill_watcher(signal.SIGHUP)
+ elif command == 'status':
+ status, pid = mailman_status()
elif command == 'start':
# First, complain loudly if there's no site list.
check_for_site_list()
---- mailman-2.1.20/misc/mailman.in~ 2015-03-31 20:21:49.000000000 +0300
-+++ mailman-2.1.20/misc/mailman.in 2015-05-25 11:22:11.283298992 +0300
-@@ -37,23 +37,61 @@
+diff -urNp -x '*.orig' mailman-2.1.34.org/misc/mailman.in mailman-2.1.34/misc/mailman.in
+--- mailman-2.1.34.org/misc/mailman.in 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/misc/mailman.in 2021-10-23 13:32:24.269240325 +0200
+@@ -49,23 +49,61 @@ PYTHON=@PYTHON@
MAILMANHOME=@prefix@
MAILMANCTL=$MAILMANHOME/bin/mailmanctl
-diff -ur mailman-2.1.20.org/Mailman/Gui/General.py mailman-2.1.20/Mailman/Gui/General.py
---- mailman-2.1.20.org/Mailman/Gui/General.py 2015-03-31 19:21:49.000000000 +0200
-+++ mailman-2.1.20/Mailman/Gui/General.py 2016-02-21 10:25:57.685943034 +0100
-@@ -505,6 +505,13 @@
- here."""))
- )
+diff -urNp -x '*.orig' mailman-2.1.34.org/Mailman/Gui/General.py mailman-2.1.34/Mailman/Gui/General.py
+--- mailman-2.1.34.org/Mailman/Gui/General.py 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/Mailman/Gui/General.py 2021-10-23 13:33:28.222571670 +0200
+@@ -518,6 +518,13 @@ class General(GUIBase):
+ Cc: headers, set this to No."""))
+ )
+ # add X-IMAP-Folder header
+ rtn.append(
# Discard held messages after this number of days
rtn.append(
('max_days_to_hold', mm_cfg.Number, 7, 0,
-diff -ur mailman-2.1.20.org/Mailman/Handlers/CookHeaders.py mailman-2.1.20/Mailman/Handlers/CookHeaders.py
---- mailman-2.1.20.org/Mailman/Handlers/CookHeaders.py 2015-03-31 19:21:49.000000000 +0200
-+++ mailman-2.1.20/Mailman/Handlers/CookHeaders.py 2016-02-21 10:25:57.685943034 +0100
-@@ -107,6 +107,11 @@
+diff -urNp -x '*.orig' mailman-2.1.34.org/Mailman/Handlers/CookHeaders.py mailman-2.1.34/Mailman/Handlers/CookHeaders.py
+--- mailman-2.1.34.org/Mailman/Handlers/CookHeaders.py 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/Mailman/Handlers/CookHeaders.py 2021-10-23 13:33:28.222571670 +0200
+@@ -115,6 +115,11 @@ def process(mlist, msg, msgdata):
# X-BeenThere's intact.
change_header('X-BeenThere', mlist.GetListEmail(),
mlist, msg, msgdata, delete=False)
# Add Precedence: and other useful headers. None of these are standard
# and finding information on some of them are fairly difficult. Some are
# just common practice, and we'll add more here as they become necessary.
-diff -ur mailman-2.1.20.org/Mailman/MailList.py mailman-2.1.20/Mailman/MailList.py
---- mailman-2.1.20.org/Mailman/MailList.py 2015-03-31 19:21:49.000000000 +0200
-+++ mailman-2.1.20/Mailman/MailList.py 2016-02-21 10:25:57.685943034 +0100
-@@ -367,6 +367,7 @@
+diff -urNp -x '*.orig' mailman-2.1.34.org/Mailman/MailList.py mailman-2.1.34/Mailman/MailList.py
+--- mailman-2.1.34.org/Mailman/MailList.py 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/Mailman/MailList.py 2021-10-23 13:33:28.222571670 +0200
+@@ -391,6 +391,7 @@ class MailList(HTMLFormatter, Deliverer,
self.available_languages = []
self.include_rfc2369_headers = 1
self.include_list_post_header = 1
self.include_sender_header = 1
self.filter_mime_types = mm_cfg.DEFAULT_FILTER_MIME_TYPES
self.pass_mime_types = mm_cfg.DEFAULT_PASS_MIME_TYPES
-diff -ur mailman-2.1.20.org/Mailman/versions.py mailman-2.1.20/Mailman/versions.py
---- mailman-2.1.20.org/Mailman/versions.py 2015-03-31 19:21:49.000000000 +0200
-+++ mailman-2.1.20/Mailman/versions.py 2016-02-21 10:26:55.443940355 +0100
-@@ -168,6 +168,10 @@
+diff -urNp -x '*.orig' mailman-2.1.34.org/Mailman/versions.py mailman-2.1.34/Mailman/versions.py
+--- mailman-2.1.34.org/Mailman/versions.py 2020-06-27 02:21:21.000000000 +0200
++++ mailman-2.1.34/Mailman/versions.py 2021-10-23 13:33:28.222571670 +0200
+@@ -168,6 +168,10 @@ def UpdateOldVars(l, stored_state):
else:
return None
# Migrate to 2.1b3, baw 17-Aug-2001
if hasattr(l, 'dont_respond_to_post_requests'):
oldval = getattr(l, 'dont_respond_to_post_requests')
-@@ -414,6 +418,8 @@
+@@ -414,6 +418,8 @@ def UpdateOldVars(l, stored_state):
PreferStored('author_is_list', 'from_is_list',
mm_cfg.DEFAULT_FROM_IS_LIST)
projects / packages / mailman.git / commitdiff