[mailman: 1/2] fix #822096 - update to version 2.1.15
Jan Kaluža
jkaluza at fedoraproject.org
Tue Jun 19 05:36:57 UTC 2012
commit 394c1c0ed9eb1d7f2909f5507930660d096c1d70
Author: Jan Kaluza <hanzz.k at gmail.com>
Date: Tue Jun 19 07:31:11 2012 +0200
fix #822096 - update to version 2.1.15
- fixed httpd config file to work with httpd-2.4
.gitignore | 1 +
httpd-mailman.conf | 6 +--
mailman-2.1.9-LC_CTYPE.patch | 75 +++++++++++++++++++++++------------------
mailman.spec | 19 +++++-----
sources | 2 +-
5 files changed, 55 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 649948a..ccb93c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
mailman-2.1.13.tgz
/mailman-2.1.14.tgz
+/mailman-2.1.15.tgz
diff --git a/httpd-mailman.conf b/httpd-mailman.conf
index 06acd9d..58dbc90 100644
--- a/httpd-mailman.conf
+++ b/httpd-mailman.conf
@@ -6,8 +6,7 @@ ScriptAlias /mailman/ @MMDIR@/cgi-bin/
<Directory @MMDIR@/cgi-bin/>
AllowOverride None
Options ExecCGI
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
@@ -15,8 +14,7 @@ Alias /pipermail/ @VARMMDIR@/archives/public/
<Directory @VARMMDIR@/archives/public>
Options MultiViews FollowSymLinks
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
AddDefaultCharset Off
</Directory>
diff --git a/mailman-2.1.9-LC_CTYPE.patch b/mailman-2.1.9-LC_CTYPE.patch
index 074f7e0..9317206 100644
--- a/mailman-2.1.9-LC_CTYPE.patch
+++ b/mailman-2.1.9-LC_CTYPE.patch
@@ -36,7 +36,7 @@ index 92e1c03..0abde2e 100644
equivalent) file by removing the following lines, and possibly running the
`newaliases' program:
diff --git a/Mailman/MTA/Postfix.py b/Mailman/MTA/Postfix.py
-index 376f8b6..0a8395b 100644
+index 8506b9b..d7a2d06 100644
--- a/Mailman/MTA/Postfix.py
+++ b/Mailman/MTA/Postfix.py
@@ -27,7 +27,7 @@ from stat import *
@@ -48,7 +48,7 @@ index 376f8b6..0a8395b 100644
from Mailman.MTA.Utils import makealiases
from Mailman.Logging.Syslog import syslog
-@@ -314,7 +314,7 @@ def checkperms(state):
+@@ -317,7 +317,7 @@ def checkperms(state):
targetmode = S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP
for file in ALIASFILE, VIRTFILE:
if state.VERBOSE:
@@ -57,7 +57,7 @@ index 376f8b6..0a8395b 100644
stat = None
try:
stat = os.stat(file)
-@@ -324,9 +324,9 @@ def checkperms(state):
+@@ -327,9 +327,9 @@ def checkperms(state):
if stat and (stat[ST_MODE] & targetmode) <> targetmode:
state.ERRORS += 1
octmode = oct(stat[ST_MODE])
@@ -69,7 +69,7 @@ index 376f8b6..0a8395b 100644
os.chmod(file, stat[ST_MODE] | targetmode)
else:
print
-@@ -342,7 +342,7 @@ def checkperms(state):
+@@ -345,7 +345,7 @@ def checkperms(state):
raise
continue
if state.VERBOSE:
@@ -78,7 +78,7 @@ index 376f8b6..0a8395b 100644
user = mm_cfg.MAILMAN_USER
ownerok = stat[ST_UID] == pwd.getpwnam(user)[2]
if not ownerok:
-@@ -350,10 +350,10 @@ def checkperms(state):
+@@ -353,10 +353,10 @@ def checkperms(state):
owner = pwd.getpwuid(stat[ST_UID])[0]
except KeyError:
owner = 'uid %d' % stat[ST_UID]
@@ -158,7 +158,7 @@ index 5f926b7..0cfdb99 100644
# Don't make these module globals since we have to do runtime translation
# of the strings anyway.
diff --git a/bin/add_members b/bin/add_members
-index 03f0af3..562e15a 100755
+index 77f11af..763ee16 100755
--- a/bin/add_members
+++ b/bin/add_members
@@ -81,6 +81,7 @@ from Mailman import mm_cfg
@@ -300,7 +300,7 @@ index 1bdaeda..22d8839 100644
print >> fd, msg
sys.exit(code)
diff --git a/bin/change_pw b/bin/change_pw
-index 6adabcd..b9a36de 100644
+index 67d5639..35be13d 100644
--- a/bin/change_pw
+++ b/bin/change_pw
@@ -77,6 +77,7 @@ from Mailman import Message
@@ -403,7 +403,7 @@ index b1157bc..40fa0a2 100755
diff --git a/bin/check_perms b/bin/check_perms
-index eb80b2d..5ef3306 100755
+index 1f45f84..f0c6795 100755
--- a/bin/check_perms
+++ b/bin/check_perms
@@ -45,7 +45,7 @@ directory. You must run this from the installation directory instead.
@@ -1159,7 +1159,7 @@ index d2731c1..6523ce2 100644
mlist.Unlock()
diff --git a/bin/genaliases b/bin/genaliases
-index 0a1a3da..29e5b5a 100644
+index 77bc290..c49cba6 100644
--- a/bin/genaliases
+++ b/bin/genaliases
@@ -40,7 +40,7 @@ import paths # path hacking
@@ -1597,7 +1597,7 @@ index 0bb6e77..bb4cc71 100755
diff --git a/bin/newlist b/bin/newlist
-index f9ca866..e52f340 100755
+index c14b77f..7000396 100755
--- a/bin/newlist
+++ b/bin/newlist
@@ -104,6 +104,7 @@ from Mailman import Message
@@ -1802,10 +1802,10 @@ index a7b4ebb..33aa6a2 100755
finally:
mlist.Unlock()
diff --git a/bin/rmlist b/bin/rmlist
-index fbaf306..8b58a3c 100755
+index f61b41d..4d1ce50 100755
--- a/bin/rmlist
+++ b/bin/rmlist
-@@ -45,7 +45,7 @@ import paths
+@@ -46,7 +46,7 @@ import paths
from Mailman import mm_cfg
from Mailman import Utils
from Mailman import MailList
@@ -1814,7 +1814,7 @@ index fbaf306..8b58a3c 100755
try:
True, False
-@@ -60,7 +60,7 @@ def usage(code, msg=''):
+@@ -61,7 +61,7 @@ def usage(code, msg=''):
fd = sys.stderr
else:
fd = sys.stdout
@@ -1823,7 +1823,7 @@ index fbaf306..8b58a3c 100755
if msg:
print >> fd, msg
sys.exit(code)
-@@ -69,15 +69,15 @@ def usage(code, msg=''):
+@@ -70,15 +70,15 @@ def usage(code, msg=''):
def remove_it(listname, filename, msg):
if os.path.islink(filename):
@@ -1842,7 +1842,7 @@ index fbaf306..8b58a3c 100755
-@@ -101,13 +101,13 @@ def main():
+@@ -102,13 +102,13 @@ def main():
if not Utils.list_exists(listname):
if not removeArchives:
@@ -1859,39 +1859,48 @@ index fbaf306..8b58a3c 100755
REMOVABLES = []
-@@ -121,7 +121,7 @@ def main():
+@@ -122,7 +122,7 @@ def main():
sys.modules[modname].remove(mlist)
REMOVABLES = [
-- (os.path.join('lists', listname), _('list info')),
-+ (os.path.join('lists', listname), C_('list info')),
+- (os.path.join(mm_cfg.LIST_DATA_DIR, listname), _('list info')),
++ (os.path.join(mm_cfg.LIST_DATA_DIR, listname), C_('list info')),
]
# Remove any stale locks associated with the list
-@@ -129,18 +129,18 @@ def main():
+@@ -130,7 +130,7 @@ def main():
fn_listname = filename.split('.')[0]
if fn_listname == listname:
REMOVABLES.append((os.path.join(mm_cfg.LOCK_DIR, filename),
- _('stale lock file')))
+ C_('stale lock file')))
+ # Remove any held messages for this list
+ for filename in os.listdir(mm_cfg.DATA_DIR):
+@@ -138,18 +138,18 @@ def main():
+ re.IGNORECASE)
+ if cre.match(filename):
+ REMOVABLES.append((os.path.join(mm_cfg.DATA_DIR, filename),
+- _('held message file')))
++ C_('held message file')))
+
if removeArchives:
REMOVABLES.extend([
- (os.path.join('archives', 'private', listname),
+ (os.path.join(mm_cfg.PRIVATE_ARCHIVE_FILE_DIR, listname),
- _('private archives')),
+ C_('private archives')),
- (os.path.join('archives', 'private', listname + '.mbox'),
+ (os.path.join(mm_cfg.PRIVATE_ARCHIVE_FILE_DIR, listname + '.mbox'),
- _('private archives')),
+ C_('private archives')),
- (os.path.join('archives', 'public', listname),
+ (os.path.join(mm_cfg.PUBLIC_ARCHIVE_FILE_DIR, listname),
- _('public archives')),
+ C_('public archives')),
- (os.path.join('archives', 'public', listname + '.mbox'),
+ (os.path.join(mm_cfg.PUBLIC_ARCHIVE_FILE_DIR, listname + '.mbox'),
- _('public archives')),
+ C_('public archives')),
])
- for dirtmpl, msg in REMOVABLES:
+ for dir, msg in REMOVABLES:
diff --git a/bin/show_qfiles b/bin/show_qfiles
index 0dbe9fe..686a652 100644
--- a/bin/show_qfiles
@@ -2109,7 +2118,7 @@ index 842cc0f..e17ecae 100644
else:
# Unlink the .bak file left by dequeue()
diff --git a/bin/update b/bin/update
-index 343ae7a..b584342 100755
+index d74cae9..0ac5ffe 100755
--- a/bin/update
+++ b/bin/update
@@ -52,7 +52,7 @@ from Mailman import MailList
@@ -2460,10 +2469,10 @@ index 72c50b8..4efba6f 100644
-print _('Using Mailman version:'), Mailman.mm_cfg.VERSION
+print C_('Using Mailman version:'), Mailman.mm_cfg.VERSION
diff --git a/bin/withlist b/bin/withlist
-index 6cda8db..0e0340b 100644
+index 38ab9ab..b23588a 100644
--- a/bin/withlist
+++ b/bin/withlist
-@@ -157,7 +157,7 @@ def usage(code, msg=''):
+@@ -154,7 +154,7 @@ def usage(code, msg=''):
fd = sys.stderr
else:
fd = sys.stdout
@@ -2472,7 +2481,7 @@ index 6cda8db..0e0340b 100644
if msg:
print >> fd, msg
sys.exit(code)
-@@ -175,11 +175,11 @@ def atexit():
+@@ -172,11 +172,11 @@ def atexit():
if m.Locked():
if VERBOSE:
listname = m.internal_name()
@@ -2486,7 +2495,7 @@ index 6cda8db..0e0340b 100644
del m
-@@ -188,16 +188,16 @@ def do_list(listname, args, func):
+@@ -185,16 +185,16 @@ def do_list(listname, args, func):
global m
# first try to open mailing list
if VERBOSE:
@@ -2507,7 +2516,7 @@ index 6cda8db..0e0340b 100644
m = None
# try to import the module and run the callable
-@@ -237,7 +237,7 @@ def main():
+@@ -234,7 +234,7 @@ def main():
all = True
if len(args) < 1 and not all:
@@ -2516,7 +2525,7 @@ index 6cda8db..0e0340b 100644
if interact:
# Let them keep going
print warning
-@@ -246,7 +246,7 @@ def main():
+@@ -243,7 +243,7 @@ def main():
usage(1, warning)
if all and not run:
@@ -2525,7 +2534,7 @@ index 6cda8db..0e0340b 100644
# The default for interact is 1 unless -r was given
if interact is None:
-@@ -266,11 +266,11 @@ def main():
+@@ -263,11 +263,11 @@ def main():
module = run[:i]
callable = run[i+1:]
if VERBOSE:
@@ -2539,7 +2548,7 @@ index 6cda8db..0e0340b 100644
func = getattr(mod, callable)
if all:
-@@ -291,7 +291,7 @@ def main():
+@@ -288,7 +288,7 @@ def main():
namespace = globals().copy()
namespace.update(locals())
if dolist:
diff --git a/mailman.spec b/mailman.spec
index 41fb7b0..e166827 100644
--- a/mailman.spec
+++ b/mailman.spec
@@ -1,7 +1,7 @@
Summary: Mailing list manager with built in Web access
Name: mailman
-Version: 2.1.14
-Release: 13%{?dist}
+Version: 2.1.15
+Release: 1%{?dist}
Epoch: 3
Group: Applications/Internet
Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -32,15 +32,11 @@ Patch13: mailman-2.1.9-unicode.patch
Patch14: mailman-2.1.11-fhsinit.patch
Patch15: mailman-2.1.13-lctype.patch
#Patch15: mailman-2.1.11-footer.patch
-Patch16: mailman-2.1.12-privurl.patch
Patch17: mailman-2.1.12-mmcfg.patch
Patch18: mailman-2.1.12-initcleanup.patch
-Patch19: mailman-2.1.12-codage.patch
# the service is now off by default
Patch20: mailman-2.1.12-init-not-on.patch
Patch21: mailman-2.1.13-env-python.patch
-Patch22: mailman-2.1.9-CVE-2011-0707.patch
-Patch23: mailman-2.1.13-subject-decode.patch
License: GPLv2+
URL: http://www.list.org/
@@ -133,14 +129,10 @@ additional installation steps, these are described in:
%patch12 -p1 -b .selinux
%patch13 -p1 -b .unicode
%patch14 -p1 -b .fhsinit
-%patch16 -p1 -b .privurl
%patch17 -p1 -b .mmcfg
%patch18 -p1 -b .initcleanup
-#u%%patch19 -p1
%patch20 -p1
%patch21 -p1
-%patch22
-%patch23 -p1
#cp $RPM_SOURCE_DIR/mailman.INSTALL.REDHAT.in INSTALL.REDHAT.in
cp %{SOURCE5} INSTALL.REDHAT.in
@@ -430,6 +422,9 @@ exit 0
%attr(2755,root,%{mmgroup}) %{mmdir}/Mailman/Bouncers
%attr(2755,root,%{mmgroup}) %{mmdir}/Mailman/Cgi
%attr(2755,root,%{mmgroup}) %{mmdir}/Mailman/Commands
+%{mmdir}/Mailman/CSRFcheck.py
+%{mmdir}/Mailman/CSRFcheck.pyc
+%{mmdir}/Mailman/CSRFcheck.pyo
%{mmdir}/Mailman/Defaults.py
%{mmdir}/Mailman/Defaults.pyc
%{mmdir}/Mailman/Defaults.pyo
@@ -542,6 +537,10 @@ exit 0
%attr(2770,%{cgiuser},%{mmgroup}) %{archivesdir}/private
%changelog
+* Mon Jun 18 2012 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.15-1
+- fix #822096 - update to version 2.1.15
+- fixed httpd config file to work with httpd-2.4
+
* Wed Jan 11 2012 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.14-13
- fix #751581 - changed systemd service file to create error log with proper
permissions, changed logrotate conf to swifth to proper username/group
diff --git a/sources b/sources
index b7320de..5c24621 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ea163871ceccbd33fee4c9e335fcf7b mailman-2.1.14.tgz
+7d207489e8e9de0727cb334d46029833 mailman-2.1.15.tgz
More information about the scm-commits
mailing list