[packages/mailman] up to 2.1.20
glen
glen at pld-linux.org
Mon May 25 20:39:28 CEST 2015
commit 16950ab2060d2c6cbf9fcf090923bb1d323e1e4f
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon May 25 21:16:42 2015 +0300
up to 2.1.20
mailman-browser-save-passwd.patch | 29 +++++++++++++-----------
mailman-mailmanctl-status.patch | 46 +++++++++++++++------------------------
mailman-python-compile.patch | 9 ++++----
mailman-x-imap-folder.patch | 29 +++++-------------------
mailman.spec | 6 ++---
5 files changed, 46 insertions(+), 73 deletions(-)
---
diff --git a/mailman.spec b/mailman.spec
index 306ca79..71d7fd3 100644
--- a/mailman.spec
+++ b/mailman.spec
@@ -2,19 +2,19 @@
# Conditional build:
%bcond_with umbrella_hack # break anonimization (for use with moderated umbrella list of moderated lists)
-%define rel 7
+%define rel 1
Summary: The GNU Mailing List Management System
Summary(es.UTF-8): El Sistema de Mantenimiento de listas de GNU
Summary(pl.UTF-8): System Zarządzania Listami Pocztowymi GNU
Summary(pt_BR.UTF-8): O Sistema de Manutenção de listas da GNU
Name: mailman
-Version: 2.1.14
+Version: 2.1.20
Release: %{rel}%{?with_umbrella_hack:.umh}
Epoch: 5
License: GPL v2+
Group: Applications/System
Source0: http://downloads.sourceforge.net/mailman/%{name}-%{version}.tgz
-# Source0-md5: 9ea163871ceccbd33fee4c9e335fcf7b
+# Source0-md5: 96819640406f90a12bc28edd3dc09d4a
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
# Source1-md5: 6b55f9f8051c76961b84a12ed17fc14f
Source2: %{name}.conf
diff --git a/mailman-browser-save-passwd.patch b/mailman-browser-save-passwd.patch
index 25a1988..b159420 100644
--- a/mailman-browser-save-passwd.patch
+++ b/mailman-browser-save-passwd.patch
@@ -1,3 +1,8 @@
+
+NOTE: be sure to use vim -b when editing this file!
+
+http://stackoverflow.com/questions/5461153/how-to-completely-turn-off-vims-abilty-to-recode-files
+
diff -ur mailman-2.1.14/templates/ar/admlogin.html mailman-2.1.14-form/templates/ar/admlogin.html
--- mailman-2.1.14/templates/ar/admlogin.html 2010-09-20 20:18:27.000000000 +0200
+++ mailman-2.1.14-form/templates/ar/admlogin.html 2011-09-04 10:55:52.865551595 +0200
@@ -206,13 +211,12 @@ diff -ur mailman-2.1.14/templates/hu/admlogin.html mailman-2.1.14-form/templates
</tr>
<tr>
<td colspan=2 align=middle> <INPUT TYPE="SUBMIT" name="admlogin"
-diff -ur mailman-2.1.14/templates/ia/admlogin.html mailman-2.1.14-form/templates/ia/admlogin.html
---- mailman-2.1.14/templates/ia/admlogin.html 2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/ia/admlogin.html 2011-09-04 10:55:52.892218261 +0200
-@@ -14,7 +14,8 @@
+--- mailman-2.1.20/templates/ia/admlogin.html~ 2015-05-25 11:30:53.000000000 +0300
++++ mailman-2.1.20/templates/ia/admlogin.html 2015-05-25 11:30:54.870489260 +0300
+@@ -15,7 +15,8 @@
</TR>
<tr>
- <TD><div ALIGN="Right">Contrasigno de %(who)s al lista:</div></TD>
+ <TD><div ALIGN="Right">Contrasigno de %(who)s pro le lista:</div></TD>
- <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
+ <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
+ <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
@@ -349,19 +353,18 @@ diff -ur mailman-2.1.14/templates/ro/admlogin.html mailman-2.1.14-form/templates
</tr>
<tr>
<td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/ru/admlogin.html mailman-2.1.14-form/templates/ru/admlogin.html
---- mailman-2.1.14/templates/ru/admlogin.html 2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/ru/admlogin.html 2011-09-04 10:55:52.908884928 +0200
-@@ -15,7 +15,8 @@
- <!-- %(who)s -->
- <!-- ��. ����� ���������, �������������� ���� ��������... :( -->
- <TD><div ALIGN="Right">������� ������ %(who)s:</div></TD>
+--- mailman-2.1.20/templates/ru/admlogin.html~ 2015-03-31 20:21:49.000000000 +0300
++++ mailman-2.1.20/templates/ru/admlogin.html 2015-05-25 11:37:56.109031155 +0300
+@@ -14,7 +14,8 @@
+ </TR>
+ <tr>
+ <TD><div ALIGN="Right">Введите пароль %(who)s:</div></TD>
- <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
+ <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
+ <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
</tr>
<tr>
- <td colspan=2 align=middle><INPUT type="SUBMIT" name="admlogin" value="������ ������..."></td>
+ <td colspan=2 align=middle><INPUT type="SUBMIT" name="admlogin" value="Начать работу..."></td>
diff -ur mailman-2.1.14/templates/sk/admlogin.html mailman-2.1.14-form/templates/sk/admlogin.html
--- mailman-2.1.14/templates/sk/admlogin.html 2010-09-20 20:18:27.000000000 +0200
+++ mailman-2.1.14-form/templates/sk/admlogin.html 2011-09-04 10:55:52.908884928 +0200
diff --git a/mailman-mailmanctl-status.patch b/mailman-mailmanctl-status.patch
index 4e9535a..ba2473d 100644
--- a/mailman-mailmanctl-status.patch
+++ b/mailman-mailmanctl-status.patch
@@ -106,10 +106,9 @@ diff -r -u mailman-2.1.5.orig/bin/mailmanctl mailman-2.1.5/bin/mailmanctl
elif command == 'start':
# First, complain loudly if there's no site list.
check_for_site_list()
-diff -u -r mailman-2.1.5.orig/misc/mailman.in mailman-2.1.5/misc/mailman.in
---- mailman-2.1.5.orig/misc/mailman.in 2003-09-25 18:13:26.000000000 -0400
-+++ mailman-2.1.5/misc/mailman.in 2005-02-15 10:48:26.445983000 -0500
-@@ -36,19 +36,70 @@
+--- 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 @@
MAILMANHOME=@prefix@
MAILMANCTL=$MAILMANHOME/bin/mailmanctl
@@ -119,69 +118,60 @@ diff -u -r mailman-2.1.5.orig/misc/mailman.in mailman-2.1.5/misc/mailman.in
+RETVAL=0
+prog="mailman"
+
-+function start()
-+{
-+ echo -n $"Starting $prog: "
++start() {
++ msg_starting "$prog"
+ daemon $PYTHON $MAILMANCTL -s -q start
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-+ echo
-+ return $RETVAL
+}
+
-+function stop()
-+{
-+ echo -n $"Shutting down $prog: "
++stop() {
++ msg_stopping "$prog"
+ daemon $PYTHON $MAILMANCTL -q stop
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-+ echo
-+ return $RETVAL
+}
+
-+function restart()
-+{
++restart() {
+ stop
+ start
+ RETVAL=$?
-+ return $RETVAL
+}
+
++
case "$1" in
'start')
- #rm -f $MAILMANHOME/locks/*
- $PYTHON $MAILMANCTL -s -q start
+ start
-+ RETVAL=$?
;;
'stop')
- $PYTHON $MAILMANCTL -q stop
+ stop
-+ RETVAL=$?
;;
'restart')
- $PYTHON $MAILMANCTL -q restart
+ restart
-+ RETVAL=$?
-+ ;;
-+
+ ;;
+
+ 'reopen')
+ $PYTHON $MAILMANCTL -q reopen
+ ;;
+
+'condrestart')
+ $PYTHON $MAILMANCTL -q -u status
+ retval=$?
-+ if [ $retval -eq 0 ]
-+ then
-+ restart
-+ RETVAL=$?
++ if [ $retval -eq 0 ]; then
++ restart
+ fi
+ ;;
+
+'status')
+ $PYTHON $MAILMANCTL -u status
+ RETVAL=$?
- ;;
-
++
esac
-exit 0
+exit $RETVAL
diff --git a/mailman-python-compile.patch b/mailman-python-compile.patch
index 8b22bcc..cc13a51 100644
--- a/mailman-python-compile.patch
+++ b/mailman-python-compile.patch
@@ -40,15 +40,14 @@ compiling them. This resulting in leaving the wrong debug path in the
the compile_dir command and started the directory recursion one level
higher.
-diff -u -r mailman-2.1.5.orig/Makefile.in mailman-2.1.5.pyc/Makefile.in
---- mailman-2.1.5.orig/Makefile.in 2003-03-31 14:26:57.000000000 -0500
-+++ mailman-2.1.5.pyc/Makefile.in 2004-11-09 12:49:42.000000000 -0500
+--- mailman-2.1.20/Makefile.in~ 2015-03-31 20:21:49.000000000 +0300
++++ mailman-2.1.20/Makefile.in 2015-05-25 11:25:09.402548855 +0300
@@ -124,7 +124,7 @@
do \
(cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
done
-- $(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)/Mailman")'
-+ $(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)", 20, "$(prefix)", 1)'
+- $(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)/Mailman", ddir="$(prefix)/Mailman")'
++ $(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)", ddir="$(prefix)")'
# Only run bin/update if we aren't installing in DESTDIR, as this
# means there are probably no lists to deal with, and it wouldn't
diff --git a/mailman-x-imap-folder.patch b/mailman-x-imap-folder.patch
index c905849..de2f6ca 100644
--- a/mailman-x-imap-folder.patch
+++ b/mailman-x-imap-folder.patch
@@ -14,12 +14,12 @@
# Discard held messages after this number of days
rtn.append(
('max_days_to_hold', mm_cfg.Number, 7, 0,
---- mailman-2.1.9/Mailman/Handlers/CookHeaders.py 2006-02-17 04:42:35.000000000 +0200
-+++ mailman-2.1.9/Mailman/Handlers/CookHeaders.py 2007-09-20 17:50:50.507634678 +0300
-@@ -88,6 +88,11 @@
- # Mark message so we know we've been here, but leave any existing
+--- mailman-2.1.20/Mailman/Handlers/CookHeaders.py~ 2015-03-31 20:21:49.000000000 +0300
++++ mailman-2.1.20/Mailman/Handlers/CookHeaders.py 2015-05-25 11:28:53.400847919 +0300
+@@ -107,6 +107,11 @@
# X-BeenThere's intact.
- msg['X-BeenThere'] = mlist.GetListEmail()
+ change_header('X-BeenThere', mlist.GetListEmail(),
+ mlist, msg, msgdata, delete=False)
+
+ # X-IMAP-Folder header, used commonly for server side filtering to folders.
+ if mlist.x_imap_folder:
@@ -28,14 +28,6 @@
# 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.
-@@ -170,6 +175,7 @@
- add((str(i18ndesc), mlist.GetListEmail()))
- del msg['Cc']
- msg['Cc'] = COMMASPACE.join([formataddr(pair) for pair in new])
-+
- # Add list-specific headers as defined in RFC 2369 and RFC 2919, but only
- # if the message is being crafted for a specific list (e.g. not for the
- # password reminders).
--- mailman-2.1.14/Mailman/MailList.py~ 2010-09-20 21:18:27.000000000 +0300
+++ mailman-2.1.14/Mailman/MailList.py 2010-09-21 18:33:08.352249806 +0300
@@ -363,6 +363,7 @@
@@ -46,17 +38,6 @@
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
---- mailman-2.1.9/Mailman/Version.py 2006-09-13 06:21:03.000000000 +0300
-+++ mailman-2.1.9/Mailman/Version.py 2007-09-20 16:49:33.199894057 +0300
-@@ -37,7 +37,7 @@
- (REL_LEVEL << 4) | (REL_SERIAL << 0))
-
- # config.pck schema version number
--DATA_FILE_VERSION = 98
-+DATA_FILE_VERSION = 99
-
- # qfile/*.db schema version number
- QFILE_SCHEMA_VERSION = 3
--- mailman-2.1.9/Mailman/versions.py 2005-12-30 20:50:08.000000000 +0200
+++ mailman-2.1.9/Mailman/versions.py 2007-09-20 16:49:02.206553877 +0300
@@ -407,6 +407,8 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mailman.git/commitdiff/d8731d15ebd517892d681e4c6e149381b1378dac
More information about the pld-cvs-commit
mailing list