rpms/mailman/devel mailman-2.1-build.patch, 1.3, 1.4 mailman-2.1-mailmanctl-status.patch, 1.4, 1.5 mailman-2.1.10-FHS.patch, 1.1, 1.2 mailman-2.1.10-archive-reply.patch, 1.1, 1.2 mailman-2.1.10-ctypefix.patch, 1.1, 1.2 mailman-2.1.11-cron.patch, 1.2, 1.3 mailman-2.1.11-fhsinit.patch, 1.1, 1.2 mailman-2.1.12-lctype.patch, 1.1, 1.2 mailman-2.1.12-mmcfg.patch, 1.1, 1.2 mailman-2.1.12-multimail.patch, 1.1, 1.2 mailman-2.1.12-privurl.patch, 1.1, 1.2 mailman-2.1.9-ctypo-new.patch, 1.2, 1.3 mailman-2.1.9-header-folding.patch, 1.1, 1.2 mailman-2.1.9-selinux.patch, 1.1, 1.2 mailman-2.1.9-unicode.patch, 1.1, 1.2 mailman-python-compile.patch, 1.1, 1.2 mailman.spec, 1.85, 1.86
Daniel Novotny
dnovotny at fedoraproject.org
Tue Jul 28 10:46:49 UTC 2009
- Previous message (by thread): rpms/python-iwlib/F-11 import.log, NONE, 1.1 python-iwlib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/valgrind/devel valgrind-3.4.1-futex.patch, NONE, 1.1 valgrind.spec, 1.65, 1.66
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dnovotny
Update of /cvs/extras/rpms/mailman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32313
Modified Files:
mailman-2.1-build.patch mailman-2.1-mailmanctl-status.patch
mailman-2.1.10-FHS.patch mailman-2.1.10-archive-reply.patch
mailman-2.1.10-ctypefix.patch mailman-2.1.11-cron.patch
mailman-2.1.11-fhsinit.patch mailman-2.1.12-lctype.patch
mailman-2.1.12-mmcfg.patch mailman-2.1.12-multimail.patch
mailman-2.1.12-privurl.patch mailman-2.1.9-ctypo-new.patch
mailman-2.1.9-header-folding.patch mailman-2.1.9-selinux.patch
mailman-2.1.9-unicode.patch mailman-python-compile.patch
mailman.spec
Log Message:
un-fuzz patches; no check md5 on mm_cfg.pyc and .pyo
mailman-2.1-build.patch:
Mailman/Archiver/Makefile.in | 5 +----
Mailman/Bouncers/Makefile.in | 5 +----
Mailman/Cgi/Makefile.in | 5 +----
Mailman/Commands/Makefile.in | 5 +----
Mailman/Gui/Makefile.in | 5 +----
Mailman/Handlers/Makefile.in | 5 +----
Mailman/Logging/Makefile.in | 5 +----
Mailman/MTA/Makefile.in | 5 +----
Mailman/Makefile.in | 11 +----------
Mailman/Queue/Makefile.in | 5 +----
Makefile.in | 27 ++++++++++++++++-----------
bin/Makefile.in | 5 +----
cron/Makefile.in | 3 ---
messages/Makefile.in | 11 +++--------
misc/Makefile.in | 5 +----
scripts/Makefile.in | 5 +----
src/Makefile.in | 16 ++--------------
templates/Makefile.in | 7 ++-----
tests/Makefile.in | 5 +----
tests/bounces/Makefile.in | 5 +----
tests/msgs/Makefile.in | 5 +----
21 files changed, 39 insertions(+), 111 deletions(-)
Index: mailman-2.1-build.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1-build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mailman-2.1-build.patch 18 Oct 2004 17:51:32 -0000 1.3
+++ mailman-2.1-build.patch 28 Jul 2009 10:46:48 -0000 1.4
@@ -1,6 +1,6 @@
-diff -r -u mailman-2.1.5.orig/bin/Makefile.in mailman-2.1.5.build/bin/Makefile.in
---- mailman-2.1.5.orig/bin/Makefile.in 2003-12-24 12:03:15.000000000 -0500
-+++ mailman-2.1.5.build/bin/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/bin/Makefile.in mailman-2.1.12-b/bin/Makefile.in
+--- mailman-2.1.12-a/bin/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/bin/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -9,7 +9,7 @@ diff -r -u mailman-2.1.5.orig/bin/Makefi
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -55,7 +54,7 @@
+@@ -56,7 +55,7 @@
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -18,7 +18,7 @@ diff -r -u mailman-2.1.5.orig/bin/Makefi
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -71,8 +70,6 @@
+@@ -72,8 +71,6 @@
$(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \
done
@@ -27,11 +27,9 @@ diff -r -u mailman-2.1.5.orig/bin/Makefi
clean:
distclean:
-Only in mailman-2.1.5.build/bin: Makefile.in~
-Only in mailman-2.1.5.build: configure
-diff -r -u mailman-2.1.5.orig/cron/Makefile.in mailman-2.1.5.build/cron/Makefile.in
---- mailman-2.1.5.orig/cron/Makefile.in 2003-03-31 14:27:07.000000000 -0500
-+++ mailman-2.1.5.build/cron/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/cron/Makefile.in mailman-2.1.12-b/cron/Makefile.in
+--- mailman-2.1.12-a/cron/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/cron/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -49,10 +47,9 @@ diff -r -u mailman-2.1.5.orig/cron/Makef
clean:
distclean:
-Only in mailman-2.1.5.build/cron: Makefile.in~
-diff -r -u mailman-2.1.5.orig/Mailman/Archiver/Makefile.in mailman-2.1.5.build/Mailman/Archiver/Makefile.in
---- mailman-2.1.5.orig/Mailman/Archiver/Makefile.in 2003-03-31 14:26:58.000000000 -0500
-+++ mailman-2.1.5.build/Mailman/Archiver/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/Mailman/Archiver/Makefile.in mailman-2.1.12-b/Mailman/Archiver/Makefile.in
+--- mailman-2.1.12-a/Mailman/Archiver/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Archiver/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -79,10 +76,9 @@ diff -r -u mailman-2.1.5.orig/Mailman/Ar
clean:
distclean:
-Only in mailman-2.1.5.build/Mailman/Archiver: Makefile.in~
-diff -r -u mailman-2.1.5.orig/Mailman/Bouncers/Makefile.in mailman-2.1.5.build/Mailman/Bouncers/Makefile.in
---- mailman-2.1.5.orig/Mailman/Bouncers/Makefile.in 2003-03-31 14:26:58.000000000 -0500
-+++ mailman-2.1.5.build/Mailman/Bouncers/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/Mailman/Bouncers/Makefile.in mailman-2.1.12-b/Mailman/Bouncers/Makefile.in
+--- mailman-2.1.12-a/Mailman/Bouncers/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Bouncers/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -109,10 +105,9 @@ diff -r -u mailman-2.1.5.orig/Mailman/Bo
clean:
distclean:
-Only in mailman-2.1.5.build/Mailman/Bouncers: Makefile.in~
-diff -r -u mailman-2.1.5.orig/Mailman/Cgi/Makefile.in mailman-2.1.5.build/Mailman/Cgi/Makefile.in
---- mailman-2.1.5.orig/Mailman/Cgi/Makefile.in 2003-03-31 14:26:59.000000000 -0500
-+++ mailman-2.1.5.build/Mailman/Cgi/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/Mailman/Cgi/Makefile.in mailman-2.1.12-b/Mailman/Cgi/Makefile.in
+--- mailman-2.1.12-a/Mailman/Cgi/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Cgi/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -139,10 +134,9 @@ diff -r -u mailman-2.1.5.orig/Mailman/Cg
clean:
distclean:
-Only in mailman-2.1.5.build/Mailman/Cgi: Makefile.in~
-diff -r -u mailman-2.1.5.orig/Mailman/Commands/Makefile.in mailman-2.1.5.build/Mailman/Commands/Makefile.in
---- mailman-2.1.5.orig/Mailman/Commands/Makefile.in 2003-03-31 14:27:00.000000000 -0500
-+++ mailman-2.1.5.build/Mailman/Commands/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/Mailman/Commands/Makefile.in mailman-2.1.12-b/Mailman/Commands/Makefile.in
+--- mailman-2.1.12-a/Mailman/Commands/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Commands/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -169,10 +163,9 @@ diff -r -u mailman-2.1.5.orig/Mailman/Co
clean:
distclean:
-Only in mailman-2.1.5.build/Mailman/Commands: Makefile.in~
-diff -r -u mailman-2.1.5.orig/Mailman/Gui/Makefile.in mailman-2.1.5.build/Mailman/Gui/Makefile.in
---- mailman-2.1.5.orig/Mailman/Gui/Makefile.in 2003-03-31 14:27:01.000000000 -0500
-+++ mailman-2.1.5.build/Mailman/Gui/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/Mailman/Gui/Makefile.in mailman-2.1.12-b/Mailman/Gui/Makefile.in
+--- mailman-2.1.12-a/Mailman/Gui/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Gui/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -199,10 +192,9 @@ diff -r -u mailman-2.1.5.orig/Mailman/Gu
clean:
distclean:
-Only in mailman-2.1.5.build/Mailman/Gui: Makefile.in~
-diff -r -u mailman-2.1.5.orig/Mailman/Handlers/Makefile.in mailman-2.1.5.build/Mailman/Handlers/Makefile.in
---- mailman-2.1.5.orig/Mailman/Handlers/Makefile.in 2003-03-31 14:27:01.000000000 -0500
-+++ mailman-2.1.5.build/Mailman/Handlers/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/Mailman/Handlers/Makefile.in mailman-2.1.12-b/Mailman/Handlers/Makefile.in
+--- mailman-2.1.12-a/Mailman/Handlers/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Handlers/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -229,10 +221,9 @@ diff -r -u mailman-2.1.5.orig/Mailman/Ha
clean:
distclean:
-Only in mailman-2.1.5.build/Mailman/Handlers: Makefile.in~
-diff -r -u mailman-2.1.5.orig/Mailman/Logging/Makefile.in mailman-2.1.5.build/Mailman/Logging/Makefile.in
---- mailman-2.1.5.orig/Mailman/Logging/Makefile.in 2003-03-31 14:27:02.000000000 -0500
-+++ mailman-2.1.5.build/Mailman/Logging/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/Mailman/Logging/Makefile.in mailman-2.1.12-b/Mailman/Logging/Makefile.in
+--- mailman-2.1.12-a/Mailman/Logging/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Logging/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -259,10 +250,9 @@ diff -r -u mailman-2.1.5.orig/Mailman/Lo
clean:
distclean:
-Only in mailman-2.1.5.build/Mailman/Logging: Makefile.in~
-diff -r -u mailman-2.1.5.orig/Mailman/Makefile.in mailman-2.1.5.build/Mailman/Makefile.in
---- mailman-2.1.5.orig/Mailman/Makefile.in 2003-03-31 14:26:58.000000000 -0500
-+++ mailman-2.1.5.build/Mailman/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile.in
+--- mailman-2.1.12-a/Mailman/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -20,8 +20,6 @@
# Variables set by configure
@@ -302,10 +292,9 @@ diff -r -u mailman-2.1.5.orig/Mailman/Ma
clean:
for d in $(SUBDIRS); \
do \
-Only in mailman-2.1.5.build/Mailman: Makefile.in~
-diff -r -u mailman-2.1.5.orig/Mailman/MTA/Makefile.in mailman-2.1.5.build/Mailman/MTA/Makefile.in
---- mailman-2.1.5.orig/Mailman/MTA/Makefile.in 2003-03-31 14:27:02.000000000 -0500
-+++ mailman-2.1.5.build/Mailman/MTA/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/Mailman/MTA/Makefile.in mailman-2.1.12-b/Mailman/MTA/Makefile.in
+--- mailman-2.1.12-a/Mailman/MTA/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/MTA/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -332,10 +321,9 @@ diff -r -u mailman-2.1.5.orig/Mailman/MT
clean:
distclean:
-Only in mailman-2.1.5.build/Mailman/MTA: Makefile.in~
-diff -r -u mailman-2.1.5.orig/Mailman/Queue/Makefile.in mailman-2.1.5.build/Mailman/Queue/Makefile.in
---- mailman-2.1.5.orig/Mailman/Queue/Makefile.in 2003-03-31 14:27:03.000000000 -0500
-+++ mailman-2.1.5.build/Mailman/Queue/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/Mailman/Queue/Makefile.in mailman-2.1.12-b/Mailman/Queue/Makefile.in
+--- mailman-2.1.12-a/Mailman/Queue/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Queue/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -362,11 +350,9 @@ diff -r -u mailman-2.1.5.orig/Mailman/Qu
clean:
distclean:
-Only in mailman-2.1.5.build/Mailman/Queue: Makefile.in~
-Only in mailman-2.1.5.orig: mailman-FHS.patch
-diff -r -u mailman-2.1.5.orig/Makefile.in mailman-2.1.5.build/Makefile.in
---- mailman-2.1.5.orig/Makefile.in 2003-03-31 14:26:57.000000000 -0500
-+++ mailman-2.1.5.build/Makefile.in 2004-10-15 16:26:03.000000000 -0400
+diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
+--- mailman-2.1.12-a/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -61,11 +61,10 @@
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
@@ -430,10 +416,9 @@ diff -r -u mailman-2.1.5.orig/Makefile.i
else true; \
fi; \
done
-Only in mailman-2.1.5.build: Makefile.in~
-diff -r -u mailman-2.1.5.orig/messages/Makefile.in mailman-2.1.5.build/messages/Makefile.in
---- mailman-2.1.5.orig/messages/Makefile.in 2004-04-24 22:30:04.000000000 -0400
-+++ mailman-2.1.5.build/messages/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefile.in
+--- mailman-2.1.12-a/messages/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/messages/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -32,7 +32,6 @@
DESTDIR=
@@ -471,7 +456,7 @@ diff -r -u mailman-2.1.5.orig/messages/M
done
@for d in $(LANGUAGES); \
do \
-@@ -112,8 +109,6 @@
+@@ -113,8 +110,6 @@
mofiles: $(MOFILES)
@@ -480,11 +465,10 @@ diff -r -u mailman-2.1.5.orig/messages/M
clean:
-rm -f */LC_MESSAGES/mailman.mo
-Only in mailman-2.1.5.build/messages: Makefile.in~
-diff -r -u mailman-2.1.5.orig/misc/Makefile.in mailman-2.1.5.build/misc/Makefile.in
---- mailman-2.1.5.orig/misc/Makefile.in 2004-05-13 23:34:34.000000000 -0400
-+++ mailman-2.1.5.build/misc/Makefile.in 2004-10-15 15:36:46.000000000 -0400
-@@ -29,7 +29,6 @@
+diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in
+--- mailman-2.1.12-a/misc/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/misc/Makefile.in 2009-07-28 12:19:48.000000000 +0200
+@@ -30,7 +30,6 @@
DESTDIR=
CC= @CC@
@@ -492,7 +476,7 @@ diff -r -u mailman-2.1.5.orig/misc/Makef
INSTALL= @INSTALL@
PYTHON= @PYTHON@
-@@ -61,7 +60,7 @@
+@@ -62,7 +61,7 @@
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -501,7 +485,7 @@ diff -r -u mailman-2.1.5.orig/misc/Makef
EXEMODE= 755
FILEMODE= 644
DATAMODE= 664
-@@ -93,8 +92,6 @@
+@@ -101,8 +100,6 @@
(cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
done
@@ -510,10 +494,9 @@ diff -r -u mailman-2.1.5.orig/misc/Makef
clean:
distclean:
-Only in mailman-2.1.5.build/misc: Makefile.in~
-diff -r -u mailman-2.1.5.orig/scripts/Makefile.in mailman-2.1.5.build/scripts/Makefile.in
---- mailman-2.1.5.orig/scripts/Makefile.in 2003-03-31 14:27:12.000000000 -0500
-+++ mailman-2.1.5.build/scripts/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/scripts/Makefile.in mailman-2.1.12-b/scripts/Makefile.in
+--- mailman-2.1.12-a/scripts/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/scripts/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -540,10 +523,9 @@ diff -r -u mailman-2.1.5.orig/scripts/Ma
clean:
distclean:
-Only in mailman-2.1.5.build/scripts: Makefile.in~
-diff -r -u mailman-2.1.5.orig/src/Makefile.in mailman-2.1.5.build/src/Makefile.in
---- mailman-2.1.5.orig/src/Makefile.in 2003-03-31 14:27:14.000000000 -0500
-+++ mailman-2.1.5.build/src/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in
+--- mailman-2.1.12-a/src/Makefile.in 2009-07-28 12:19:47.000000000 +0200
++++ mailman-2.1.12-b/src/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -586,10 +568,9 @@ diff -r -u mailman-2.1.5.orig/src/Makefi
done
clean:
-Only in mailman-2.1.5.build/src: Makefile.in~
-diff -r -u mailman-2.1.5.orig/templates/Makefile.in mailman-2.1.5.build/templates/Makefile.in
---- mailman-2.1.5.orig/templates/Makefile.in 2004-04-24 22:30:04.000000000 -0400
-+++ mailman-2.1.5.build/templates/Makefile.in 2004-10-18 12:49:01.000000000 -0400
+diff -ruN mailman-2.1.12-a/templates/Makefile.in mailman-2.1.12-b/templates/Makefile.in
+--- mailman-2.1.12-a/templates/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/templates/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -624,10 +605,9 @@ diff -r -u mailman-2.1.5.orig/templates/
clean:
distclean:
-Only in mailman-2.1.5.build/templates: Makefile.in~
-diff -r -u mailman-2.1.5.orig/tests/bounces/Makefile.in mailman-2.1.5.build/tests/bounces/Makefile.in
---- mailman-2.1.5.orig/tests/bounces/Makefile.in 2003-03-31 14:27:16.000000000 -0500
-+++ mailman-2.1.5.build/tests/bounces/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/tests/bounces/Makefile.in mailman-2.1.12-b/tests/bounces/Makefile.in
+--- mailman-2.1.12-a/tests/bounces/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/tests/bounces/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -654,10 +634,9 @@ diff -r -u mailman-2.1.5.orig/tests/boun
clean:
distclean:
-Only in mailman-2.1.5.build/tests/bounces: Makefile.in~
-diff -r -u mailman-2.1.5.orig/tests/Makefile.in mailman-2.1.5.build/tests/Makefile.in
---- mailman-2.1.5.orig/tests/Makefile.in 2003-03-31 14:27:15.000000000 -0500
-+++ mailman-2.1.5.build/tests/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/tests/Makefile.in mailman-2.1.12-b/tests/Makefile.in
+--- mailman-2.1.12-a/tests/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/tests/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -684,10 +663,9 @@ diff -r -u mailman-2.1.5.orig/tests/Make
clean:
distclean:
-Only in mailman-2.1.5.build/tests: Makefile.in~
-diff -r -u mailman-2.1.5.orig/tests/msgs/Makefile.in mailman-2.1.5.build/tests/msgs/Makefile.in
---- mailman-2.1.5.orig/tests/msgs/Makefile.in 2003-03-31 14:27:17.000000000 -0500
-+++ mailman-2.1.5.build/tests/msgs/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+diff -ruN mailman-2.1.12-a/tests/msgs/Makefile.in mailman-2.1.12-b/tests/msgs/Makefile.in
+--- mailman-2.1.12-a/tests/msgs/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/tests/msgs/Makefile.in 2009-07-28 12:19:48.000000000 +0200
@@ -28,7 +28,6 @@
DESTDIR=
@@ -714,4 +692,3 @@ diff -r -u mailman-2.1.5.orig/tests/msgs
clean:
distclean:
-Only in mailman-2.1.5.build/tests/msgs: Makefile.in~
mailman-2.1-mailmanctl-status.patch:
bin/mailmanctl | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
misc/mailman.in | 61 ++++++++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 118 insertions(+), 8 deletions(-)
Index: mailman-2.1-mailmanctl-status.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1-mailmanctl-status.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mailman-2.1-mailmanctl-status.patch 18 Feb 2005 18:43:14 -0000 1.4
+++ mailman-2.1-mailmanctl-status.patch 28 Jul 2009 10:46:48 -0000 1.5
@@ -1,7 +1,7 @@
-diff -r -u mailman-2.1.5.orig/bin/mailmanctl mailman-2.1.5/bin/mailmanctl
---- mailman-2.1.5.orig/bin/mailmanctl 2004-02-03 17:26:08.000000000 -0500
-+++ mailman-2.1.5/bin/mailmanctl 2004-09-10 18:23:34.000000000 -0400
-@@ -35,7 +35,7 @@
+diff -ruN mailman-2.1.12-a/bin/mailmanctl mailman-2.1.12-b/bin/mailmanctl
+--- mailman-2.1.12-a/bin/mailmanctl 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/bin/mailmanctl 2009-07-28 12:19:48.000000000 +0200
+@@ -36,7 +36,7 @@
pid directly. The `start', `stop', `restart', and `reopen' commands handle
everything for you.
@@ -10,7 +10,7 @@ diff -r -u mailman-2.1.5.orig/bin/mailma
Options:
-@@ -89,6 +89,9 @@
+@@ -90,6 +90,9 @@
reopen - This will close all log files, causing them to be re-opened the
next time a message is written to them
@@ -20,7 +20,7 @@ diff -r -u mailman-2.1.5.orig/bin/mailma
"""
import sys
-@@ -189,6 +192,52 @@
+@@ -190,6 +193,52 @@
return 0
return 1
@@ -73,7 +73,7 @@ diff -r -u mailman-2.1.5.orig/bin/mailma
def acquire_lock_1(force):
# Be sure we can acquire the master qrunner lock. If not, it means some
-@@ -336,13 +385,15 @@
+@@ -337,13 +386,15 @@
command = COMMASPACE.join(args)
usage(1, _('Bad command: %(command)s'))
@@ -91,7 +91,7 @@ diff -r -u mailman-2.1.5.orig/bin/mailma
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 @@
+@@ -362,6 +413,14 @@
if not quiet:
print _('Re-opening all log files')
kill_watcher(signal.SIGHUP)
@@ -106,9 +106,9 @@ diff -r -u mailman-2.1.5.orig/bin/mailma
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
+diff -ruN mailman-2.1.12-a/misc/mailman.in mailman-2.1.12-b/misc/mailman.in
+--- mailman-2.1.12-a/misc/mailman.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/misc/mailman.in 2009-07-28 12:19:48.000000000 +0200
@@ -36,19 +36,70 @@
MAILMANHOME=@prefix@
MAILMANCTL=$MAILMANHOME/bin/mailmanctl
mailman-2.1.10-FHS.patch:
Mailman/Defaults.py.in | 14 +++++++-----
Mailman/MTA/Postfix.py | 4 +--
Makefile.in | 19 +++++++++++++++-
bin/check_perms | 3 +-
configure.in | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
misc/Makefile.in | 8 ++++++-
6 files changed, 93 insertions(+), 11 deletions(-)
Index: mailman-2.1.10-FHS.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1.10-FHS.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mailman-2.1.10-FHS.patch 13 May 2008 08:32:26 -0000 1.1
+++ mailman-2.1.10-FHS.patch 28 Jul 2009 10:46:48 -0000 1.2
@@ -1,33 +1,8 @@
-diff -up mailman-2.1.10/misc/Makefile.in.FHS mailman-2.1.10/misc/Makefile.in
---- mailman-2.1.10/misc/Makefile.in.FHS 2008-05-13 09:24:29.000000000 +0200
-+++ mailman-2.1.10/misc/Makefile.in 2008-05-13 09:25:28.000000000 +0200
-@@ -27,6 +27,12 @@ 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@
-+MAILMAN_GROUP= @MAILMAN_GROUP@
- DESTDIR=
-
- CC= @CC@
-@@ -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)$(DATADIR)
-+ $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(configdir)
-
- install-packages:
- for p in $(PACKAGES); \
-diff -up mailman-2.1.10/bin/check_perms.FHS mailman-2.1.10/bin/check_perms
---- mailman-2.1.10/bin/check_perms.FHS 2008-05-13 09:10:26.000000000 +0200
-+++ mailman-2.1.10/bin/check_perms 2008-05-13 09:11:38.000000000 +0200
-@@ -183,7 +183,8 @@ def checkall():
- print C_('checking mode for %(prefix)s')
+diff -ruN mailman-2.1.12-a/bin/check_perms mailman-2.1.12-b/bin/check_perms
+--- mailman-2.1.12-a/bin/check_perms 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/bin/check_perms 2009-07-28 12:19:49.000000000 +0200
+@@ -183,7 +183,8 @@
+ print _('checking mode for %(prefix)s')
dirs = {}
for d in (mm_cfg.PREFIX, mm_cfg.EXEC_PREFIX, mm_cfg.VAR_PREFIX,
- mm_cfg.LOG_DIR):
@@ -36,24 +11,76 @@ diff -up mailman-2.1.10/bin/check_perms.
dirs[d] = True
for d in dirs.keys():
try:
-diff -up mailman-2.1.10/Mailman/MTA/Postfix.py.FHS mailman-2.1.10/Mailman/MTA/Postfix.py
---- mailman-2.1.10/Mailman/MTA/Postfix.py.FHS 2008-05-13 09:15:34.000000000 +0200
-+++ mailman-2.1.10/Mailman/MTA/Postfix.py 2008-05-13 09:16:23.000000000 +0200
-@@ -32,8 +32,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')
+diff -ruN mailman-2.1.12-a/configure.in mailman-2.1.12-b/configure.in
+--- mailman-2.1.12-a/configure.in 2009-07-28 12:19:47.000000000 +0200
++++ mailman-2.1.12-b/configure.in 2009-07-28 12:19:49.000000000 +0200
+@@ -248,6 +248,62 @@
+ prefixcheck=$VAR_PREFIX
+ fi
- try:
- True, False
-diff -up mailman-2.1.10/Mailman/Defaults.py.in.FHS mailman-2.1.10/Mailman/Defaults.py.in
---- mailman-2.1.10/Mailman/Defaults.py.in.FHS 2008-05-13 09:13:51.000000000 +0200
-+++ mailman-2.1.10/Mailman/Defaults.py.in 2008-05-13 09:15:04.000000000 +0200
-@@ -1296,9 +1296,11 @@ AuthSiteAdmin = 5 # Site Administrat
++# Get the configuration file directory
++AC_SUBST(CONFIG_DIR)
++AC_MSG_CHECKING(for --with-config-dir)
++AC_ARG_WITH(config-dir, dnl
++[ --with-config-dir specify directory for configuration data other than [VAR_]PREFIX/data])
++case "$with_config_dir" in
++ yes|no|"") CONFIG_DIR="$VAR_PREFIX/data";;
++ *) CONFIG_DIR=$with_config_dir;;
++esac
++AC_MSG_RESULT($CONFIG_DIR)
++
++# Get the lock directory
++AC_SUBST(LOCK_DIR)
++AC_MSG_CHECKING(for --with-lock-dir)
++AC_ARG_WITH(lock-dir, dnl
++[ --with-lock-dir specify directory for lock files other than [VAR_]PREFIX/locks])
++case "$with_lock_dir" in
++ yes|no|"") LOCK_DIR="$VAR_PREFIX/locks";;
++ *) LOCK_DIR=$with_lock_dir;;
++esac
++AC_MSG_RESULT($LOCK_DIR)
++
++# Get the log directory
++AC_SUBST(LOG_DIR)
++AC_MSG_CHECKING(for --with-log-dir)
++AC_ARG_WITH(log-dir, dnl
++[ --with-log-dir specify directory for log files other than [VAR_]PREFIX/logs])
++case "$with_log_dir" in
++ yes|no|"") LOG_DIR="$VAR_PREFIX/logs";;
++ *) LOG_DIR=$with_log_dir;;
++esac
++AC_MSG_RESULT($LOG_DIR)
++
++# Get the pid directory
++AC_SUBST(PID_DIR)
++AC_MSG_CHECKING(for --with-pid-dir)
++AC_ARG_WITH(pid-dir, dnl
++[ --with-pid-dir specify directory for the pid file other than [VAR_]PREFIX/data])
++case "$with_pid_dir" in
++ yes|no|"") PID_DIR="$VAR_PREFIX/data";;
++ *) PID_DIR=$with_pid_dir;;
++esac
++AC_MSG_RESULT($PID_DIR)
++
++# Get the queue directory
++AC_SUBST(QUEUE_DIR)
++AC_MSG_CHECKING(for --with-queue-dir)
++AC_ARG_WITH(queue-dir, dnl
++[ --with-queue-dir specify directory for queue files other than [VAR_]PREFIX/qfiles])
++case "$with_queue_dir" in
++ yes|no|"") QUEUE_DIR="$VAR_PREFIX/qfiles";;
++ *) QUEUE_DIR=$with_queue_dir;;
++esac
++AC_MSG_RESULT($QUEUE_DIR)
++
++
+ # new macro for finding group names
+ # returns a comma separated list of quoted group names
+ # the list is returned in the same order as specified with any duplicates removed
+diff -ruN mailman-2.1.12-a/Mailman/Defaults.py.in mailman-2.1.12-b/Mailman/Defaults.py.in
+--- mailman-2.1.12-a/Mailman/Defaults.py.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Defaults.py.in 2009-07-28 12:19:49.000000000 +0200
+@@ -1325,9 +1325,11 @@
# Useful directories
LIST_DATA_DIR = os.path.join(VAR_PREFIX, 'lists')
@@ -67,7 +94,7 @@ diff -up mailman-2.1.10/Mailman/Defaults
SPAM_DIR = os.path.join(VAR_PREFIX, 'spam')
WRAPPER_DIR = os.path.join(EXEC_PREFIX, 'mail')
BIN_DIR = os.path.join(PREFIX, 'bin')
-@@ -1309,7 +1311,7 @@ PUBLIC_ARCHIVE_FILE_DIR = os.path.join(
+@@ -1338,7 +1340,7 @@
PRIVATE_ARCHIVE_FILE_DIR = os.path.join(VAR_PREFIX, 'archives', 'private')
# Directories used by the qrunner subsystem
@@ -76,7 +103,7 @@ diff -up mailman-2.1.10/Mailman/Defaults
INQUEUE_DIR = os.path.join(QUEUE_DIR, 'in')
OUTQUEUE_DIR = os.path.join(QUEUE_DIR, 'out')
CMDQUEUE_DIR = os.path.join(QUEUE_DIR, 'commands')
-@@ -1323,9 +1325,9 @@ RETRYQUEUE_DIR = os.path.join(QUEUE_DIR
+@@ -1352,9 +1354,9 @@
MAILDIR_DIR = os.path.join(QUEUE_DIR, 'maildir')
# Other useful files
@@ -89,10 +116,24 @@ diff -up mailman-2.1.10/Mailman/Defaults
# Import a bunch of version numbers
from Version import *
-diff -up mailman-2.1.10/Makefile.in.FHS mailman-2.1.10/Makefile.in
---- mailman-2.1.10/Makefile.in.FHS 2008-05-13 09:17:36.000000000 +0200
-+++ mailman-2.1.10/Makefile.in 2008-05-13 09:22:35.000000000 +0200
-@@ -28,6 +28,11 @@ bindir= @bindir@
+diff -ruN mailman-2.1.12-a/Mailman/MTA/Postfix.py mailman-2.1.12-b/Mailman/MTA/Postfix.py
+--- mailman-2.1.12-a/Mailman/MTA/Postfix.py 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/MTA/Postfix.py 2009-07-28 12:19:49.000000000 +0200
+@@ -32,8 +32,8 @@
+ 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')
+
+ try:
+ True, False
+diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
+--- mailman-2.1.12-a/Makefile.in 2009-07-28 12:19:48.000000000 +0200
++++ mailman-2.1.12-b/Makefile.in 2009-07-28 12:19:49.000000000 +0200
+@@ -28,6 +28,11 @@
prefix= @prefix@
exec_prefix= @exec_prefix@
var_prefix= @VAR_PREFIX@
@@ -104,7 +145,7 @@ diff -up mailman-2.1.10/Makefile.in.FHS
DESTDIR=
CC= @CC@
-@@ -41,8 +46,11 @@ DEFS= @DEFS@
+@@ -41,8 +46,11 @@
OPT= @OPT@
CFLAGS= @CFLAGS@ $(OPT) $(DEFS)
@@ -117,7 +158,7 @@ diff -up mailman-2.1.10/Makefile.in.FHS
archives/private archives/public
ARCH_INDEP_DIRS= \
-@@ -105,6 +113,15 @@ doinstall: $(SUBDIRS)
+@@ -105,6 +113,15 @@
else true; \
fi; \
done
@@ -133,69 +174,28 @@ diff -up mailman-2.1.10/Makefile.in.FHS
chmod o-r $(DESTDIR)$(var_prefix)/archives/private
@for d in $(ARCH_INDEP_DIRS); \
do \
-diff -up mailman-2.1.10/configure.in.FHS mailman-2.1.10/configure.in
---- mailman-2.1.10/configure.in.FHS 2008-05-13 09:02:50.000000000 +0200
-+++ mailman-2.1.10/configure.in 2008-05-13 09:03:58.000000000 +0200
-@@ -215,6 +215,62 @@ else
- prefixcheck=$VAR_PREFIX
- fi
+diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in
+--- mailman-2.1.12-a/misc/Makefile.in 2009-07-28 12:19:48.000000000 +0200
++++ mailman-2.1.12-b/misc/Makefile.in 2009-07-28 12:19:49.000000000 +0200
+@@ -27,6 +27,12 @@
+ 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@
++MAILMAN_GROUP= @MAILMAN_GROUP@
+ DESTDIR=
-+# Get the configuration file directory
-+AC_SUBST(CONFIG_DIR)
-+AC_MSG_CHECKING(for --with-config-dir)
-+AC_ARG_WITH(config-dir, dnl
-+[ --with-config-dir specify directory for configuration data other than [VAR_]PREFIX/data])
-+case "$with_config_dir" in
-+ yes|no|"") CONFIG_DIR="$VAR_PREFIX/data";;
-+ *) CONFIG_DIR=$with_config_dir;;
-+esac
-+AC_MSG_RESULT($CONFIG_DIR)
-+
-+# Get the lock directory
-+AC_SUBST(LOCK_DIR)
-+AC_MSG_CHECKING(for --with-lock-dir)
-+AC_ARG_WITH(lock-dir, dnl
-+[ --with-lock-dir specify directory for lock files other than [VAR_]PREFIX/locks])
-+case "$with_lock_dir" in
-+ yes|no|"") LOCK_DIR="$VAR_PREFIX/locks";;
-+ *) LOCK_DIR=$with_lock_dir;;
-+esac
-+AC_MSG_RESULT($LOCK_DIR)
-+
-+# Get the log directory
-+AC_SUBST(LOG_DIR)
-+AC_MSG_CHECKING(for --with-log-dir)
-+AC_ARG_WITH(log-dir, dnl
-+[ --with-log-dir specify directory for log files other than [VAR_]PREFIX/logs])
-+case "$with_log_dir" in
-+ yes|no|"") LOG_DIR="$VAR_PREFIX/logs";;
-+ *) LOG_DIR=$with_log_dir;;
-+esac
-+AC_MSG_RESULT($LOG_DIR)
-+
-+# Get the pid directory
-+AC_SUBST(PID_DIR)
-+AC_MSG_CHECKING(for --with-pid-dir)
-+AC_ARG_WITH(pid-dir, dnl
-+[ --with-pid-dir specify directory for the pid file other than [VAR_]PREFIX/data])
-+case "$with_pid_dir" in
-+ yes|no|"") PID_DIR="$VAR_PREFIX/data";;
-+ *) PID_DIR=$with_pid_dir;;
-+esac
-+AC_MSG_RESULT($PID_DIR)
-+
-+# Get the queue directory
-+AC_SUBST(QUEUE_DIR)
-+AC_MSG_CHECKING(for --with-queue-dir)
-+AC_ARG_WITH(queue-dir, dnl
-+[ --with-queue-dir specify directory for queue files other than [VAR_]PREFIX/qfiles])
-+case "$with_queue_dir" in
-+ yes|no|"") QUEUE_DIR="$VAR_PREFIX/qfiles";;
-+ *) QUEUE_DIR=$with_queue_dir;;
-+esac
-+AC_MSG_RESULT($QUEUE_DIR)
-+
-+
- # new macro for finding group names
- # returns a comma separated list of quoted group names
- # the list is returned in the same order as specified with any duplicates removed
+ CC= @CC@
+@@ -87,7 +93,7 @@
+ $(INSTALL) -m $(FILEMODE) paths.py $$dir; \
+ done
+ $(INSTALL) -m $(EXEMODE) mailman $(DESTDIR)$(SCRIPTSDIR)
+- $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(DATADIR)
++ $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(configdir)
+
+ install-packages:
+ if [ -z "$(EMAILPKG)" -a -d $(PYTHONLIBDIR)/email ] ; \
mailman-2.1.10-archive-reply.patch:
article.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: mailman-2.1.10-archive-reply.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1.10-archive-reply.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mailman-2.1.10-archive-reply.patch 13 May 2008 08:32:26 -0000 1.1
+++ mailman-2.1.10-archive-reply.patch 28 Jul 2009 10:46:48 -0000 1.2
@@ -1,5 +1,6 @@
---- mailman/templates/en/article.html.orig 2005-10-23 07:21:04.000000000 -0400
-+++ mailman/templates/en/article.html 2005-10-23 07:27:08.000000000 -0400
+diff -ruN mailman-2.1.12-a/templates/en/article.html mailman-2.1.12-b/templates/en/article.html
+--- mailman-2.1.12-a/templates/en/article.html 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/templates/en/article.html 2009-07-28 12:19:50.000000000 +0200
@@ -4,7 +4,7 @@
<TITLE> %(title)s
</TITLE>
mailman-2.1.10-ctypefix.patch:
withlist | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Index: mailman-2.1.10-ctypefix.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1.10-ctypefix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mailman-2.1.10-ctypefix.patch 13 May 2008 08:32:26 -0000 1.1
+++ mailman-2.1.10-ctypefix.patch 28 Jul 2009 10:46:48 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up mailman-2.1.10/bin/withlist.ctypefix mailman-2.1.10/bin/withlist
---- mailman-2.1.10/bin/withlist.ctypefix 2008-05-12 13:55:34.000000000 +0200
-+++ mailman-2.1.10/bin/withlist 2008-05-12 13:58:11.000000000 +0200
-@@ -128,7 +128,10 @@ import paths
+diff -ruN mailman-2.1.12-a/bin/withlist mailman-2.1.12-b/bin/withlist
+--- mailman-2.1.12-a/bin/withlist 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/bin/withlist 2009-07-28 12:19:51.000000000 +0200
+@@ -128,7 +128,10 @@
from Mailman import Errors
from Mailman import MailList
from Mailman import Utils
mailman-2.1.11-cron.patch:
cron/bumpdigests | 2 +-
cron/checkdbs | 2 +-
cron/crontab.in.in | 37 ++++++++++++++++++++++++++++++-------
cron/disabled | 2 +-
cron/gate_news | 2 +-
cron/mailpasswds | 2 +-
cron/nightly_gzip | 2 +-
cron/senddigests | 2 +-
misc/mailman.in | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
9 files changed, 83 insertions(+), 18 deletions(-)
Index: mailman-2.1.11-cron.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1.11-cron.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mailman-2.1.11-cron.patch 31 Jul 2008 12:18:04 -0000 1.2
+++ mailman-2.1.11-cron.patch 28 Jul 2009 10:46:48 -0000 1.3
@@ -1,132 +1,24 @@
-diff -up mailman-2.1.11/misc/mailman.in.cron mailman-2.1.11/misc/mailman.in
---- mailman-2.1.11/misc/mailman.in.cron 2008-07-31 13:53:55.000000000 +0200
-+++ mailman-2.1.11/misc/mailman.in 2008-07-31 13:53:55.000000000 +0200
-@@ -24,18 +24,48 @@
- # On Debian, type "update-rc.d mailman defaults"
- # On RedHat, and derivatives, install with "chkconfig --add mailman"
- #
--# chkconfig: 2345 98 12
-+# chkconfig: - 98 12
- # description: Mailman is the GNU Mailing List Manager, a program that \
- # manages electronic mail discussion groups. For more \
- # on GNU Mailman see http://www.list.org
- # processname: mailmanctl
- # config: @prefix@/Mailman/mm_cfg.py
--# pidfile: @prefix@/data/master-qrunner.pid
-+# pidfile: @PID_DIR@/master-qrunner.pid
-
- PYTHON=@PYTHON@
- MAILMANHOME=@prefix@
- MAILMANCTL=$MAILMANHOME/bin/mailmanctl
-
-+# We used to install the mailman cron jobs when the mailman rpm was
-+# installed, irrespective of whether mailman was actually being
-+# run. Although the cron jobs didn't create any problems if someone
-+# wasn't running mailman some users complained about the cron log file
-+# filling up, resource usage, and power consumption since systems
-+# wouldn't really idle. It really only makes sense to run the mailman
-+# cron jobs if the mailman service is turned on and not just merely
-+# having the rpm installed. This init.d script is an obvious place to
-+# install or remove the cron jobs based on the service being enabled
-+# or not.
-+
-+SRC_CRON_SCRIPT=$MAILMANHOME/cron/crontab.in
-+DST_CRON_SCRIPT=/etc/cron.d/mailman
-+
-+function InstallCron()
-+{
-+ install -m644 -o root -g root $SRC_CRON_SCRIPT $DST_CRON_SCRIPT
-+}
-+
-+function RemoveCron()
-+{
-+cat > $DST_CRON_SCRIPT <<EOF
-+# DO NOT EDIT THIS FILE!
-+#
-+# Contents of this file managed by /etc/init.d/mailman
-+# Master copy is @prefix@/cron/crontab.in
-+# Consult that file for documentation
-+EOF
-+}
-+
- # Source function library.
- . /etc/rc.d/init.d/functions
-
-@@ -47,7 +77,11 @@ function start()
- echo -n $"Starting $prog: "
- daemon $PYTHON $MAILMANCTL -s -q start
- RETVAL=$?
-- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-+ if [ $RETVAL -eq 0 ]
-+ then
-+ touch /var/lock/subsys/$prog
-+ InstallCron
-+ fi
- echo
- return $RETVAL
- }
-@@ -57,7 +91,11 @@ function stop()
- echo -n $"Shutting down $prog: "
- daemon $PYTHON $MAILMANCTL -q stop
- RETVAL=$?
-- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-+ if [ $RETVAL -eq 0 ]
-+ then
-+ rm -f /var/lock/subsys/$prog
-+ RemoveCron
-+ fi
- echo
- return $RETVAL
- }
-@@ -101,5 +139,9 @@ case "$1" in
- RETVAL=$?
- ;;
-
-+*)
-+ echo $"Usage: $prog {start|stop|restart|condrestart|status}"
-+ ;;
-+
- esac
- exit $RETVAL
-diff -up mailman-2.1.11/cron/senddigests.cron mailman-2.1.11/cron/senddigests
---- mailman-2.1.11/cron/senddigests.cron 2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/cron/senddigests 2008-07-31 13:53:55.000000000 +0200
+diff -ruN mailman-2.1.12-a/cron/bumpdigests mailman-2.1.12-b/cron/bumpdigests
+--- mailman-2.1.12-a/cron/bumpdigests 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/cron/bumpdigests 2009-07-28 12:19:49.000000000 +0200
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
- # Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
- #
-diff -up mailman-2.1.11/cron/nightly_gzip.cron mailman-2.1.11/cron/nightly_gzip
---- mailman-2.1.11/cron/nightly_gzip.cron 2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/cron/nightly_gzip 2008-07-31 13:53:55.000000000 +0200
-@@ -1,4 +1,4 @@
--#! @PYTHON@
-+#! @PYTHON@ -S
- #
# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
#
-diff -up mailman-2.1.11/cron/gate_news.cron mailman-2.1.11/cron/gate_news
---- mailman-2.1.11/cron/gate_news.cron 2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/cron/gate_news 2008-07-31 13:53:55.000000000 +0200
-@@ -1,4 +1,4 @@
--#! @PYTHON@
-+#! @PYTHON@ -S
- #
- # Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
- #
-diff -up mailman-2.1.11/cron/checkdbs.cron mailman-2.1.11/cron/checkdbs
---- mailman-2.1.11/cron/checkdbs.cron 2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/cron/checkdbs 2008-07-31 13:53:55.000000000 +0200
+diff -ruN mailman-2.1.12-a/cron/checkdbs mailman-2.1.12-b/cron/checkdbs
+--- mailman-2.1.12-a/cron/checkdbs 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/cron/checkdbs 2009-07-28 12:19:49.000000000 +0200
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
#
-diff -up mailman-2.1.11/cron/crontab.in.in.cron mailman-2.1.11/cron/crontab.in.in
---- mailman-2.1.11/cron/crontab.in.in.cron 2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/cron/crontab.in.in 2008-07-31 13:54:25.000000000 +0200
+diff -ruN mailman-2.1.12-a/cron/crontab.in.in mailman-2.1.12-b/cron/crontab.in.in
+--- mailman-2.1.12-a/cron/crontab.in.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/cron/crontab.in.in 2009-07-28 12:19:49.000000000 +0200
@@ -1,27 +1,50 @@
+#
+# -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING --
@@ -185,30 +77,138 @@ diff -up mailman-2.1.11/cron/crontab.in.
# 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 -up mailman-2.1.11/cron/mailpasswds.cron mailman-2.1.11/cron/mailpasswds
---- mailman-2.1.11/cron/mailpasswds.cron 2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/cron/mailpasswds 2008-07-31 13:53:55.000000000 +0200
+diff -ruN mailman-2.1.12-a/cron/disabled mailman-2.1.12-b/cron/disabled
+--- mailman-2.1.12-a/cron/disabled 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/cron/disabled 2009-07-28 12:19:49.000000000 +0200
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
- # Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+ # Copyright (C) 2001-2007 by the Free Software Foundation, Inc.
#
-diff -up mailman-2.1.11/cron/disabled.cron mailman-2.1.11/cron/disabled
---- mailman-2.1.11/cron/disabled.cron 2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/cron/disabled 2008-07-31 13:53:55.000000000 +0200
+diff -ruN mailman-2.1.12-a/cron/gate_news mailman-2.1.12-b/cron/gate_news
+--- mailman-2.1.12-a/cron/gate_news 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/cron/gate_news 2009-07-28 12:19:49.000000000 +0200
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
- # Copyright (C) 2001-2007 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2008 by the Free Software Foundation, Inc.
#
-diff -up mailman-2.1.11/cron/bumpdigests.cron mailman-2.1.11/cron/bumpdigests
---- mailman-2.1.11/cron/bumpdigests.cron 2008-06-30 18:29:46.000000000 +0200
-+++ mailman-2.1.11/cron/bumpdigests 2008-07-31 13:53:55.000000000 +0200
+diff -ruN mailman-2.1.12-a/cron/mailpasswds mailman-2.1.12-b/cron/mailpasswds
+--- mailman-2.1.12-a/cron/mailpasswds 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/cron/mailpasswds 2009-07-28 12:19:49.000000000 +0200
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
+ # Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+ #
+diff -ruN mailman-2.1.12-a/cron/nightly_gzip mailman-2.1.12-b/cron/nightly_gzip
+--- mailman-2.1.12-a/cron/nightly_gzip 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/cron/nightly_gzip 2009-07-28 12:19:49.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! @PYTHON@
++#! @PYTHON@ -S
+ #
# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
#
+diff -ruN mailman-2.1.12-a/cron/senddigests mailman-2.1.12-b/cron/senddigests
+--- mailman-2.1.12-a/cron/senddigests 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/cron/senddigests 2009-07-28 12:19:49.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! @PYTHON@
++#! @PYTHON@ -S
+ #
+ # Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
+ #
+diff -ruN mailman-2.1.12-a/misc/mailman.in mailman-2.1.12-b/misc/mailman.in
+--- mailman-2.1.12-a/misc/mailman.in 2009-07-28 12:19:48.000000000 +0200
++++ mailman-2.1.12-b/misc/mailman.in 2009-07-28 12:19:49.000000000 +0200
+@@ -24,18 +24,48 @@
+ # On Debian, type "update-rc.d mailman defaults"
+ # On RedHat, and derivatives, install with "chkconfig --add mailman"
+ #
+-# chkconfig: 2345 98 12
++# chkconfig: - 98 12
+ # description: Mailman is the GNU Mailing List Manager, a program that \
+ # manages electronic mail discussion groups. For more \
+ # on GNU Mailman see http://www.list.org
+ # processname: mailmanctl
+ # config: @prefix@/Mailman/mm_cfg.py
+-# pidfile: @prefix@/data/master-qrunner.pid
++# pidfile: @PID_DIR@/master-qrunner.pid
+
+ PYTHON=@PYTHON@
+ MAILMANHOME=@prefix@
+ MAILMANCTL=$MAILMANHOME/bin/mailmanctl
+
++# We used to install the mailman cron jobs when the mailman rpm was
++# installed, irrespective of whether mailman was actually being
++# run. Although the cron jobs didn't create any problems if someone
++# wasn't running mailman some users complained about the cron log file
++# filling up, resource usage, and power consumption since systems
++# wouldn't really idle. It really only makes sense to run the mailman
++# cron jobs if the mailman service is turned on and not just merely
++# having the rpm installed. This init.d script is an obvious place to
++# install or remove the cron jobs based on the service being enabled
++# or not.
++
++SRC_CRON_SCRIPT=$MAILMANHOME/cron/crontab.in
++DST_CRON_SCRIPT=/etc/cron.d/mailman
++
++function InstallCron()
++{
++ install -m644 -o root -g root $SRC_CRON_SCRIPT $DST_CRON_SCRIPT
++}
++
++function RemoveCron()
++{
++cat > $DST_CRON_SCRIPT <<EOF
++# DO NOT EDIT THIS FILE!
++#
++# Contents of this file managed by /etc/init.d/mailman
++# Master copy is @prefix@/cron/crontab.in
++# Consult that file for documentation
++EOF
++}
++
+ # Source function library.
+ . /etc/rc.d/init.d/functions
+
+@@ -47,7 +77,11 @@
+ echo -n $"Starting $prog: "
+ daemon $PYTHON $MAILMANCTL -s -q start
+ RETVAL=$?
+- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
++ if [ $RETVAL -eq 0 ]
++ then
++ touch /var/lock/subsys/$prog
++ InstallCron
++ fi
+ echo
+ return $RETVAL
+ }
+@@ -57,7 +91,11 @@
+ echo -n $"Shutting down $prog: "
+ daemon $PYTHON $MAILMANCTL -q stop
+ RETVAL=$?
+- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
++ if [ $RETVAL -eq 0 ]
++ then
++ rm -f /var/lock/subsys/$prog
++ RemoveCron
++ fi
+ echo
+ return $RETVAL
+ }
+@@ -101,5 +139,9 @@
+ RETVAL=$?
+ ;;
+
++*)
++ echo $"Usage: $prog {start|stop|restart|condrestart|status}"
++ ;;
++
+ esac
+ exit $RETVAL
mailman-2.1.11-fhsinit.patch:
mailman.in | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
Index: mailman-2.1.11-fhsinit.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1.11-fhsinit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mailman-2.1.11-fhsinit.patch 23 Jul 2008 08:40:04 -0000 1.1
+++ mailman-2.1.11-fhsinit.patch 28 Jul 2009 10:46:48 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up mailman-2.1.11/misc/mailman.in.fhsinit mailman-2.1.11/misc/mailman.in
---- mailman-2.1.11/misc/mailman.in.fhsinit 2008-07-23 09:41:12.000000000 +0200
-+++ mailman-2.1.11/misc/mailman.in 2008-07-23 09:42:45.000000000 +0200
+diff -ruN mailman-2.1.12-a/misc/mailman.in mailman-2.1.12-b/misc/mailman.in
+--- mailman-2.1.12-a/misc/mailman.in 2009-07-28 12:19:53.000000000 +0200
++++ mailman-2.1.12-b/misc/mailman.in 2009-07-28 12:19:53.000000000 +0200
@@ -31,6 +31,16 @@
# processname: mailmanctl
# config: @prefix@/Mailman/mm_cfg.py
@@ -18,7 +18,7 @@ diff -up mailman-2.1.11/misc/mailman.in.
MAILMANHOME=@prefix@
MAILMANCTL=$MAILMANHOME/bin/mailmanctl
-@@ -118,7 +128,7 @@ case "$1" in
+@@ -118,7 +128,7 @@
RETVAL=$?
;;
@@ -27,7 +27,7 @@ diff -up mailman-2.1.11/misc/mailman.in.
restart
RETVAL=$?
;;
-@@ -139,7 +149,8 @@ case "$1" in
+@@ -139,7 +149,8 @@
;;
*)
mailman-2.1.12-lctype.patch:
Mailman/MTA/Postfix.py | 14 +++----
Mailman/i18n.py | 30 +++++++++++++++-
bin/add_members | 28 +++++++--------
bin/arch | 10 ++---
bin/b4b5-archfix | 4 +-
bin/change_pw | 14 +++----
bin/check_db | 12 +++---
bin/check_perms | 78 +++++++++++++++++++++----------------------
bin/cleanarch | 10 ++---
bin/clone_member | 26 +++++++-------
bin/config_list | 30 ++++++++--------
bin/convert.py | 6 +--
bin/discard | 12 +++---
bin/dumpdb | 16 ++++----
bin/find_member | 12 +++---
bin/fix_url.py | 10 ++---
bin/genaliases | 2 -
bin/inject | 10 ++---
bin/list_admins | 8 ++--
bin/list_lists | 10 ++---
bin/list_members | 12 +++---
bin/list_owners | 4 +-
bin/mailmanctl | 40 +++++++++++-----------
bin/mmsitepass | 18 +++++-----
bin/newlist | 24 ++++++-------
bin/qrunner | 10 ++---
bin/rb-archfix | 4 +-
bin/remove_members | 12 +++---
bin/rmlist | 28 +++++++--------
bin/show_qfiles | 4 +-
bin/sync_members | 36 ++++++++++----------
bin/transcheck | 4 +-
bin/unshunt | 6 +--
bin/update | 88 ++++++++++++++++++++++++-------------------------
bin/version | 4 +-
bin/withlist | 24 ++++++-------
36 files changed, 343 insertions(+), 317 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 mailman-2.1.12-lctype.patchIndex: mailman-2.1.12-lctype.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1.12-lctype.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mailman-2.1.12-lctype.patch 11 Mar 2009 12:33:29 -0000 1.1
+++ mailman-2.1.12-lctype.patch 28 Jul 2009 10:46:48 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up mailman-2.1.12/bin/add_members.lctype mailman-2.1.12/bin/add_members
---- mailman-2.1.12/bin/add_members.lctype 2009-03-10 12:44:57.000000000 +0100
-+++ mailman-2.1.12/bin/add_members 2009-03-10 12:47:17.000000000 +0100
-@@ -80,7 +80,7 @@ from Mailman import Errors
+diff -ruN mailman-2.1.12-a/bin/add_members mailman-2.1.12-b/bin/add_members
+--- mailman-2.1.12-a/bin/add_members 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/bin/add_members 2009-07-28 12:19:54.000000000 +0200
+@@ -80,7 +80,7 @@
from Mailman import mm_cfg
from Mailman import i18n
@@ -10,7 +10,7 @@ diff -up mailman-2.1.12/bin/add_members.
-@@ -89,7 +89,7 @@ def usage(status, msg=''):
+@@ -89,7 +89,7 @@
fd = sys.stderr
else:
fd = sys.stdout
@@ -19,7 +19,7 @@ diff -up mailman-2.1.12/bin/add_members.
if msg:
print >> fd, msg
sys.exit(status)
-@@ -134,19 +134,19 @@ def addall(mlist, members, digest, ack,
+@@ -134,19 +134,19 @@
try:
mlist.ApprovedAddMember(userdesc, ack, 0)
except Errors.MMAlreadyAMember:
@@ -45,7 +45,7 @@ diff -up mailman-2.1.12/bin/add_members.
-@@ -191,26 +191,26 @@ def main():
+@@ -191,26 +191,26 @@
elif arg.lower()[0] == 'n':
send_welcome_msg = 0
else:
@@ -76,7 +76,7 @@ diff -up mailman-2.1.12/bin/add_members.
# Set up defaults
if send_welcome_msg is None:
-@@ -230,7 +230,7 @@ def main():
+@@ -230,7 +230,7 @@
nmembers = readfile(nfile)
if not dmembers and not nmembers:
@@ -85,7 +85,7 @@ diff -up mailman-2.1.12/bin/add_members.
s = StringIO()
i18n.set_language(mlist.preferred_language)
-@@ -242,7 +242,7 @@ def main():
+@@ -242,7 +242,7 @@
if admin_notif:
realname = mlist.real_name
@@ -94,10 +94,10 @@ diff -up mailman-2.1.12/bin/add_members.
msg = Message.UserNotification(
mlist.owner, Utils.get_site_email(), subject, s.getvalue(),
mlist.preferred_language)
-diff -up mailman-2.1.12/bin/arch.lctype mailman-2.1.12/bin/arch
---- mailman-2.1.12/bin/arch.lctype 2009-03-10 12:33:40.000000000 +0100
-+++ mailman-2.1.12/bin/arch 2009-03-10 12:35:10.000000000 +0100
-@@ -70,7 +70,7 @@ from Mailman.Archiver.HyperArch import H
+diff -ruN mailman-2.1.12-a/bin/arch mailman-2.1.12-b/bin/arch
+--- mailman-2.1.12-a/bin/arch 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/bin/arch 2009-07-28 12:19:54.000000000 +0200
+@@ -70,7 +70,7 @@
from Mailman.LockFile import LockFile
from Mailman import i18n
@@ -106,7 +106,7 @@ diff -up mailman-2.1.12/bin/arch.lctype
PROGRAM = sys.argv[0]
i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE)
-@@ -82,7 +82,7 @@ def usage(code, msg=''):
+@@ -82,7 +82,7 @@
fd = sys.stderr
else:
fd = sys.stdout
@@ -115,7 +115,7 @@ diff -up mailman-2.1.12/bin/arch.lctype
if msg:
print >> fd, msg
sys.exit(code)
-@@ -122,7 +122,7 @@ def main():
+@@ -122,7 +122,7 @@
# grok arguments
if len(args) < 1:
@@ -124,7 +124,7 @@ diff -up mailman-2.1.12/bin/arch.lctype
listname = args[0].lower().strip()
if len(args) < 2:
-@@ -140,7 +140,7 @@ def main():
+@@ -140,7 +140,7 @@
try:
mlist = MailList(listname)
except Errors.MMListError, e:
@@ -133,7 +133,7 @@ diff -up mailman-2.1.12/bin/arch.lctype
if mbox is None:
mbox = mlist.ArchiveFileName()
-@@ -165,7 +165,7 @@ def main():
+@@ -165,7 +165,7 @@
try:
fp = open(mbox)
except IOError, msg:
@@ -142,10 +142,10 @@ diff -up mailman-2.1.12/bin/arch.lctype
# Maybe wipe the old archives
if wipe:
if mlist.scrub_nondigest:
-diff -up mailman-2.1.12/bin/b4b5-archfix.lctype mailman-2.1.12/bin/b4b5-archfix
---- mailman-2.1.12/bin/b4b5-archfix.lctype 2009-03-10 12:53:58.000000000 +0100
-+++ mailman-2.1.12/bin/b4b5-archfix 2009-03-10 12:54:11.000000000 +0100
-@@ -44,7 +44,7 @@ import cPickle as pickle
+diff -ruN mailman-2.1.12-a/bin/b4b5-archfix mailman-2.1.12-b/bin/b4b5-archfix
+--- mailman-2.1.12-a/bin/b4b5-archfix 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/bin/b4b5-archfix 2009-07-28 12:19:54.000000000 +0200
+@@ -44,7 +44,7 @@
# Required to get the right classes for unpickling
import paths
@@ -154,7 +154,7 @@ diff -up mailman-2.1.12/bin/b4b5-archfix
PROGRAM = sys.argv[0]
-@@ -55,7 +55,7 @@ def usage(code, msg=''):
+@@ -55,7 +55,7 @@
fd = sys.stderr
else:
fd = sys.stdout
@@ -163,10 +163,10 @@ diff -up mailman-2.1.12/bin/b4b5-archfix
if msg:
print >> fd, msg
sys.exit(code)
-diff -up mailman-2.1.12/bin/change_pw.lctype mailman-2.1.12/bin/change_pw
---- mailman-2.1.12/bin/change_pw.lctype 2009-03-10 13:09:50.000000000 +0100
-+++ mailman-2.1.12/bin/change_pw 2009-03-10 13:10:18.000000000 +0100
-@@ -76,7 +76,7 @@ from Mailman import Errors
+diff -ruN mailman-2.1.12-a/bin/change_pw mailman-2.1.12-b/bin/change_pw
+--- mailman-2.1.12-a/bin/change_pw 2009-07-28 12:19:50.000000000 +0200
++++ mailman-2.1.12-b/bin/change_pw 2009-07-28 12:19:54.000000000 +0200
+@@ -76,7 +76,7 @@
from Mailman import Message
from Mailman import i18n
@@ -175,7 +175,7 @@ diff -up mailman-2.1.12/bin/change_pw.lc
SPACE = ' '
-@@ -87,7 +87,7 @@ def usage(code, msg=''):
+@@ -87,7 +87,7 @@
fd = sys.stderr
else:
fd = sys.stdout
@@ -184,7 +184,7 @@ diff -up mailman-2.1.12/bin/change_pw.lc
if msg:
print >> fd, msg
sys.exit(code)
-@@ -103,7 +103,7 @@ def openlist(listname):
+@@ -103,7 +103,7 @@
try:
mlist = MailList.MailList(listname, lock=0)
except Errors.MMListError, e:
@@ -193,7 +193,7 @@ diff -up mailman-2.1.12/bin/change_pw.lc
_listcache[listname] = mlist
return mlist
-@@ -141,11 +141,11 @@ def main():
+@@ -141,11 +141,11 @@
if args:
strargs = SPACE.join(args)
@@ -207,7 +207,7 @@ diff -up mailman-2.1.12/bin/change_pw.lc
shapassword = Utils.sha_new(password).hexdigest()
if domains:
-@@ -155,7 +155,7 @@ def main():
+@@ -155,7 +155,7 @@
listnames[name] = 1
if not listnames:
@@ -216,7 +216,7 @@ diff -up mailman-2.1.12/bin/change_pw.lc
sys.exit(0)
# Set the password on the lists
-@@ -177,7 +177,7 @@ def main():
+@@ -177,7 +177,7 @@
mlist.Unlock()
# Notification
[...1608 lines suppressed...]
@@ -2250,7 +2250,7 @@ diff -up mailman-2.1.12/bin/update.lctyp
if msg:
print >> sys.stderr, msg
sys.exit(code)
-@@ -787,15 +787,15 @@ if __name__ == '__main__':
+@@ -787,15 +787,15 @@
hextversion = hex(thisversion)
if lastversion == thisversion and not force:
# nothing to do
@@ -2269,7 +2269,7 @@ diff -up mailman-2.1.12/bin/update.lctyp
errors = main()
if not errors:
# Record the version we just upgraded to
-@@ -804,7 +804,7 @@ Exiting.""")
+@@ -804,7 +804,7 @@
fp.close()
else:
lockdir = mm_cfg.LOCK_DIR
@@ -2278,9 +2278,9 @@ diff -up mailman-2.1.12/bin/update.lctyp
ERROR:
-diff -up mailman-2.1.12/bin/version.lctype mailman-2.1.12/bin/version
---- mailman-2.1.12/bin/version.lctype 2009-03-10 12:48:20.000000000 +0100
-+++ mailman-2.1.12/bin/version 2009-03-10 12:48:39.000000000 +0100
+diff -ruN mailman-2.1.12-a/bin/version mailman-2.1.12-b/bin/version
+--- mailman-2.1.12-a/bin/version 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/bin/version 2009-07-28 12:19:54.000000000 +0200
@@ -21,6 +21,6 @@
import paths
@@ -2290,10 +2290,10 @@ diff -up mailman-2.1.12/bin/version.lcty
-print _('Using Mailman version:'), Mailman.mm_cfg.VERSION
+print C_('Using Mailman version:'), Mailman.mm_cfg.VERSION
-diff -up mailman-2.1.12/bin/withlist.lctype mailman-2.1.12/bin/withlist
---- mailman-2.1.12/bin/withlist.lctype 2009-03-10 13:06:37.000000000 +0100
-+++ mailman-2.1.12/bin/withlist 2009-03-10 13:07:27.000000000 +0100
-@@ -157,7 +157,7 @@ def usage(code, msg=''):
+diff -ruN mailman-2.1.12-a/bin/withlist mailman-2.1.12-b/bin/withlist
+--- mailman-2.1.12-a/bin/withlist 2009-07-28 12:19:51.000000000 +0200
++++ mailman-2.1.12-b/bin/withlist 2009-07-28 12:19:54.000000000 +0200
+@@ -157,7 +157,7 @@
fd = sys.stderr
else:
fd = sys.stdout
@@ -2302,7 +2302,7 @@ diff -up mailman-2.1.12/bin/withlist.lct
if msg:
print >> fd, msg
sys.exit(code)
-@@ -175,11 +175,11 @@ def atexit():
+@@ -175,11 +175,11 @@
if m.Locked():
if VERBOSE:
listname = m.internal_name()
@@ -2316,7 +2316,7 @@ diff -up mailman-2.1.12/bin/withlist.lct
del m
-@@ -188,16 +188,16 @@ def do_list(listname, args, func):
+@@ -188,16 +188,16 @@
global m
# first try to open mailing list
if VERBOSE:
@@ -2337,7 +2337,7 @@ diff -up mailman-2.1.12/bin/withlist.lct
m = None
# try to import the module and run the callable
-@@ -237,7 +237,7 @@ def main():
+@@ -237,7 +237,7 @@
all = True
if len(args) < 1 and not all:
@@ -2346,7 +2346,7 @@ diff -up mailman-2.1.12/bin/withlist.lct
if interact:
# Let them keep going
print warning
-@@ -246,7 +246,7 @@ def main():
+@@ -246,7 +246,7 @@
usage(1, warning)
if all and not run:
@@ -2355,7 +2355,7 @@ diff -up mailman-2.1.12/bin/withlist.lct
# The default for interact is 1 unless -r was given
if interact is None:
-@@ -266,11 +266,11 @@ def main():
+@@ -266,11 +266,11 @@
module = run[:i]
callable = run[i+1:]
if VERBOSE:
@@ -2369,7 +2369,7 @@ diff -up mailman-2.1.12/bin/withlist.lct
func = getattr(mod, callable)
if all:
-@@ -291,7 +291,7 @@ def main():
+@@ -291,7 +291,7 @@
namespace = globals().copy()
namespace.update(locals())
if dolist:
@@ -2378,9 +2378,9 @@ diff -up mailman-2.1.12/bin/withlist.lct
else:
ban = None
code.InteractiveConsole(namespace).interact(ban)
-diff -up mailman-2.1.12/Mailman/i18n.py.lctype mailman-2.1.12/Mailman/i18n.py
---- mailman-2.1.12/Mailman/i18n.py.lctype 2009-03-10 13:14:46.000000000 +0100
-+++ mailman-2.1.12/Mailman/i18n.py 2009-03-10 13:18:10.000000000 +0100
+diff -ruN mailman-2.1.12-a/Mailman/i18n.py mailman-2.1.12-b/Mailman/i18n.py
+--- mailman-2.1.12-a/Mailman/i18n.py 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/i18n.py 2009-07-28 12:19:54.000000000 +0200
@@ -15,6 +15,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
# USA.
@@ -2389,7 +2389,7 @@ diff -up mailman-2.1.12/Mailman/i18n.py.
import sys
import time
import gettext
-@@ -26,6 +27,16 @@ from Mailman.SafeDict import SafeDict
+@@ -26,6 +27,16 @@
_translation = None
@@ -2406,7 +2406,7 @@ diff -up mailman-2.1.12/Mailman/i18n.py.
def set_language(language=None):
global _translation
-@@ -54,7 +65,7 @@ if _translation is None:
+@@ -54,7 +65,7 @@
@@ -2415,7 +2415,7 @@ diff -up mailman-2.1.12/Mailman/i18n.py.
if s == '':
return s
assert s
-@@ -70,7 +81,7 @@ def _(s):
+@@ -70,7 +81,7 @@
# original string is 1) locals dictionary, 2) globals dictionary.
#
# First, get the frame of the caller
@@ -2424,7 +2424,7 @@ diff -up mailman-2.1.12/Mailman/i18n.py.
# A `safe' dictionary is used so we won't get an exception if there's a
# missing key in the dictionary.
dict = SafeDict(frame.f_globals.copy())
-@@ -88,6 +99,21 @@ def _(s):
+@@ -88,6 +99,21 @@
if isinstance(v, UnicodeType):
dict[k] = v.encode(charset, 'replace')
return tns % dict
@@ -2446,10 +2446,10 @@ diff -up mailman-2.1.12/Mailman/i18n.py.
-diff -up mailman-2.1.12/Mailman/MTA/Postfix.py.lctype mailman-2.1.12/Mailman/MTA/Postfix.py
---- mailman-2.1.12/Mailman/MTA/Postfix.py.lctype 2009-03-10 13:13:45.000000000 +0100
-+++ mailman-2.1.12/Mailman/MTA/Postfix.py 2009-03-10 13:14:16.000000000 +0100
-@@ -27,7 +27,7 @@ from stat import *
+diff -ruN mailman-2.1.12-a/Mailman/MTA/Postfix.py mailman-2.1.12-b/Mailman/MTA/Postfix.py
+--- mailman-2.1.12-a/Mailman/MTA/Postfix.py 2009-07-28 12:19:50.000000000 +0200
++++ mailman-2.1.12-b/Mailman/MTA/Postfix.py 2009-07-28 12:19:54.000000000 +0200
+@@ -27,7 +27,7 @@
from Mailman import mm_cfg
from Mailman import Utils
from Mailman import LockFile
@@ -2458,7 +2458,7 @@ diff -up mailman-2.1.12/Mailman/MTA/Post
from Mailman.MTA.Utils import makealiases
from Mailman.Logging.Syslog import syslog
-@@ -308,7 +308,7 @@ def checkperms(state):
+@@ -308,7 +308,7 @@
targetmode = S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP
for file in ALIASFILE, VIRTFILE:
if state.VERBOSE:
@@ -2467,7 +2467,7 @@ diff -up mailman-2.1.12/Mailman/MTA/Post
stat = None
try:
stat = os.stat(file)
-@@ -318,9 +318,9 @@ def checkperms(state):
+@@ -318,9 +318,9 @@
if stat and (stat[ST_MODE] & targetmode) <> targetmode:
state.ERRORS += 1
octmode = oct(stat[ST_MODE])
@@ -2479,7 +2479,7 @@ diff -up mailman-2.1.12/Mailman/MTA/Post
os.chmod(file, stat[ST_MODE] | targetmode)
else:
print
-@@ -336,7 +336,7 @@ def checkperms(state):
+@@ -336,7 +336,7 @@
raise
continue
if state.VERBOSE:
@@ -2488,7 +2488,7 @@ diff -up mailman-2.1.12/Mailman/MTA/Post
user = mm_cfg.MAILMAN_USER
ownerok = stat[ST_UID] == pwd.getpwnam(user)[2]
if not ownerok:
-@@ -344,10 +344,10 @@ def checkperms(state):
+@@ -344,10 +344,10 @@
owner = pwd.getpwuid(stat[ST_UID])[0]
except KeyError:
owner = 'uid %d' % stat[ST_UID]
mailman-2.1.12-mmcfg.patch:
mailman.in | 2 ++
1 file changed, 2 insertions(+)
Index: mailman-2.1.12-mmcfg.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1.12-mmcfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mailman-2.1.12-mmcfg.patch 2 Apr 2009 13:34:03 -0000 1.1
+++ mailman-2.1.12-mmcfg.patch 28 Jul 2009 10:46:48 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up mailman-2.1.12/misc/mailman.in.selinux mailman-2.1.12/misc/mailman.in
---- mailman-2.1.12/misc/mailman.in.selinux 2009-04-02 15:03:19.000000000 +0200
-+++ mailman-2.1.12/misc/mailman.in 2009-04-02 15:04:23.000000000 +0200
-@@ -84,6 +84,7 @@ prog="mailman"
+diff -ruN mailman-2.1.12-a/misc/mailman.in mailman-2.1.12-b/misc/mailman.in
+--- mailman-2.1.12-a/misc/mailman.in 2009-07-28 12:19:53.000000000 +0200
++++ mailman-2.1.12-b/misc/mailman.in 2009-07-28 12:19:55.000000000 +0200
+@@ -84,6 +84,7 @@
function start()
{
echo -n $"Starting $prog: "
@@ -9,7 +9,7 @@ diff -up mailman-2.1.12/misc/mailman.in.
daemon $MAILMANCTL -s -q start
RETVAL=$?
if [ $RETVAL -eq 0 ]
-@@ -98,6 +99,7 @@ function start()
+@@ -98,6 +99,7 @@
function stop()
{
echo -n $"Shutting down $prog: "
mailman-2.1.12-multimail.patch:
configure.in | 139 +++++++++++++++++++++++++++++++++++++++++++----------
src/Makefile.in | 4 -
src/cgi-wrapper.c | 6 +-
src/common.c | 61 +++++++++++++++--------
src/common.h | 4 -
src/mail-wrapper.c | 6 +-
6 files changed, 165 insertions(+), 55 deletions(-)
Index: mailman-2.1.12-multimail.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1.12-multimail.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mailman-2.1.12-multimail.patch 11 Mar 2009 12:33:29 -0000 1.1
+++ mailman-2.1.12-multimail.patch 28 Jul 2009 10:46:48 -0000 1.2
@@ -1,6 +1,7 @@
---- mailman-2.1.7/configure.in.multimail 2005-08-27 03:40:15.000000000 +0200
-+++ mailman-2.1.7/configure.in 2006-01-10 10:53:14.000000000 +0100
-@@ -208,26 +208,101 @@
+diff -ruN mailman-2.1.12-a/configure.in mailman-2.1.12-b/configure.in
+--- mailman-2.1.12-a/configure.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/configure.in 2009-07-28 12:19:47.000000000 +0200
+@@ -249,26 +249,101 @@
fi
# new macro for finding group names
@@ -110,10 +111,10 @@
fp = open("conftest.out", "w")
fp.write("%s\n" % gname)
fp.close()
-@@ -241,25 +316,41 @@
+@@ -282,25 +357,41 @@
# new macro for finding UIDs
- AC_DEFUN(MM_FIND_USER_NAME, [
+ AC_DEFUN([MM_FIND_USER_NAME], [
+# Given a list of tokens, either a name or a number (uid)
+# return the first one in the list that is found in the
+# password database. The return value is always a name, possibly
@@ -160,7 +161,7 @@
fp = open("conftest.out", "w")
fp.write("%s\n" % uname)
fp.close()
-@@ -285,7 +376,7 @@
+@@ -326,7 +417,7 @@
# User `mailman' must exist
AC_SUBST(MAILMAN_USER)
AC_MSG_CHECKING(for user name \"$USERNAME\")
@@ -169,7 +170,7 @@
if test -z "$MAILMAN_USER"
then
if test "$with_permcheck" = "yes"
-@@ -316,7 +407,7 @@
+@@ -357,7 +448,7 @@
# Target group must exist
AC_SUBST(MAILMAN_GROUP)
AC_MSG_CHECKING(for group name \"$GROUPNAME\")
@@ -178,7 +179,7 @@
if test -z "$MAILMAN_GROUP"
then
if test "$with_permcheck" = "yes"
-@@ -339,11 +430,11 @@
+@@ -380,11 +471,11 @@
prefix = "$prefixcheck"
groupname = "$GROUPNAME"
mailmangroup = "$MAILMAN_GROUP"
@@ -194,7 +195,7 @@
try: statdata = os.stat(prefix)
except OSError:
problems.append("Directory doesn't exist: " + prefix)
-@@ -393,7 +484,7 @@
+@@ -434,7 +525,7 @@
then
with_mail_gid="mailman other mail daemon"
fi
@@ -203,7 +204,7 @@
if test -z "$MAIL_GROUP"
then
if test "$with_permcheck" = "yes"
-@@ -420,7 +511,7 @@
+@@ -461,7 +552,7 @@
with_cgi_gid="www www-data nobody"
fi
@@ -212,42 +213,9 @@
if test -z "$CGI_GROUP"
then
if test "$with_permcheck" = "yes"
---- mailman-2.1.7/src/Makefile.in.multimail 2005-08-27 03:40:17.000000000 +0200
-+++ mailman-2.1.7/src/Makefile.in 2006-01-10 10:53:14.000000000 +0100
-@@ -49,9 +49,9 @@
-
- SHELL= /bin/sh
-
--MAIL_FLAGS= -DMAIL_GROUP="\"$(MAIL_GROUP)\""
-+MAIL_FLAGS= -DMAIL_GROUP='$(MAIL_GROUP)'
-
--CGI_FLAGS= -DCGI_GROUP="\"$(CGI_GROUP)\""
-+CGI_FLAGS= -DCGI_GROUP='$(CGI_GROUP)'
-
- HELPFUL= -DHELPFUL
-
---- mailman-2.1.7/src/common.h.multimail 2005-08-27 03:40:17.000000000 +0200
-+++ mailman-2.1.7/src/common.h 2006-01-10 10:53:14.000000000 +0100
-@@ -33,7 +33,7 @@
- #define GID_T GETGROUPS_T
-
- extern void fatal(const char*, int, char*, ...);
--extern void check_caller(const char*, const char*);
-+extern void check_caller(const char* ident, const char**, size_t);
- extern int run_script(const char*, int, char**, char**);
-
- /* Global variable used as a flag. */
-@@ -51,7 +51,7 @@
- #define MAIL_USAGE_ERROR 5
- #define MAIL_ILLEGAL_COMMAND 6
- #define ADDALIAS_USAGE_ERROR 7
--#define GROUP_NAME_NOT_FOUND 8
-+#define GROUP_ID_NOT_FOUND 8
-
-
- /*
---- mailman-2.1.7/src/cgi-wrapper.c.multimail 2005-08-27 03:40:17.000000000 +0200
-+++ mailman-2.1.7/src/cgi-wrapper.c 2006-01-10 10:53:14.000000000 +0100
+diff -ruN mailman-2.1.12-a/src/cgi-wrapper.c mailman-2.1.12-b/src/cgi-wrapper.c
+--- mailman-2.1.12-a/src/cgi-wrapper.c 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/src/cgi-wrapper.c 2009-07-28 12:19:47.000000000 +0200
@@ -28,11 +28,11 @@
/* Group name that CGI scripts run as. See your web server's documentation
* for details.
@@ -271,8 +239,9 @@
/* For these CGI programs, we can ignore argc and argv since they
* don't contain anything useful. `script' will always be the driver
---- mailman-2.1.7/src/common.c.multimail 2005-12-30 19:50:08.000000000 +0100
-+++ mailman-2.1.7/src/common.c 2006-01-10 11:01:43.000000000 +0100
+diff -ruN mailman-2.1.12-a/src/common.c mailman-2.1.12-b/src/common.c
+--- mailman-2.1.12-a/src/common.c 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/src/common.c 2009-07-28 12:19:47.000000000 +0200
@@ -117,13 +117,14 @@
/* Is the parent process allowed to call us?
*/
@@ -356,8 +325,30 @@
}
---- mailman-2.1.7/src/mail-wrapper.c.multimail 2005-08-27 03:40:17.000000000 +0200
-+++ mailman-2.1.7/src/mail-wrapper.c 2006-01-10 10:53:14.000000000 +0100
+diff -ruN mailman-2.1.12-a/src/common.h mailman-2.1.12-b/src/common.h
+--- mailman-2.1.12-a/src/common.h 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/src/common.h 2009-07-28 12:19:47.000000000 +0200
+@@ -33,7 +33,7 @@
+ #define GID_T GETGROUPS_T
+
+ extern void fatal(const char*, int, char*, ...);
+-extern void check_caller(const char*, const char*);
++extern void check_caller(const char* ident, const char**, size_t);
+ extern int run_script(const char*, int, char**, char**);
+
+ /* Global variable used as a flag. */
+@@ -51,7 +51,7 @@
+ #define MAIL_USAGE_ERROR 5
+ #define MAIL_ILLEGAL_COMMAND 6
+ #define ADDALIAS_USAGE_ERROR 7
+-#define GROUP_NAME_NOT_FOUND 8
++#define GROUP_ID_NOT_FOUND 8
+
+
+ /*
+diff -ruN mailman-2.1.12-a/src/mail-wrapper.c mailman-2.1.12-b/src/mail-wrapper.c
+--- mailman-2.1.12-a/src/mail-wrapper.c 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/src/mail-wrapper.c 2009-07-28 12:19:47.000000000 +0200
@@ -23,9 +23,9 @@
/* Group name that your mail programs run as. See your mail server's
* documentation for details.
@@ -379,3 +370,18 @@
/* If we got here, everything must be OK */
status = run_script(argv[1], argc, argv, env);
+diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in
+--- mailman-2.1.12-a/src/Makefile.in 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/src/Makefile.in 2009-07-28 12:19:47.000000000 +0200
+@@ -49,9 +49,9 @@
+
+ SHELL= /bin/sh
+
+-MAIL_FLAGS= -DMAIL_GROUP="\"$(MAIL_GROUP)\""
++MAIL_FLAGS= -DMAIL_GROUP='$(MAIL_GROUP)'
+
+-CGI_FLAGS= -DCGI_GROUP="\"$(CGI_GROUP)\""
++CGI_FLAGS= -DCGI_GROUP='$(CGI_GROUP)'
+
+ HELPFUL= -DHELPFUL
+
mailman-2.1.12-privurl.patch:
CookHeaders.py | 2 --
1 file changed, 2 deletions(-)
Index: mailman-2.1.12-privurl.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1.12-privurl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mailman-2.1.12-privurl.patch 31 Mar 2009 09:19:58 -0000 1.1
+++ mailman-2.1.12-privurl.patch 28 Jul 2009 10:46:48 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up mailman-2.1.12/Mailman/Handlers/CookHeaders.py.privurl mailman-2.1.12/Mailman/Handlers/CookHeaders.py
---- mailman-2.1.12/Mailman/Handlers/CookHeaders.py.privurl 2009-03-30 15:03:58.000000000 +0200
-+++ mailman-2.1.12/Mailman/Handlers/CookHeaders.py 2009-03-31 10:48:30.000000000 +0200
-@@ -215,8 +215,6 @@ def process(mlist, msg, msgdata):
+diff -ruN mailman-2.1.12-a/Mailman/Handlers/CookHeaders.py mailman-2.1.12-b/Mailman/Handlers/CookHeaders.py
+--- mailman-2.1.12-a/Mailman/Handlers/CookHeaders.py 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Handlers/CookHeaders.py 2009-07-28 12:19:54.000000000 +0200
+@@ -215,8 +215,6 @@
# Add this header if we're archiving
if mlist.archive:
archiveurl = mlist.GetBaseArchiveURL()
mailman-2.1.9-ctypo-new.patch:
Mailman/MTA/Postfix.py | 4 ++--
bin/change_pw | 4 ++--
bin/check_perms | 2 +-
bin/newlist | 2 +-
bin/reset_pw.py | 6 +++---
bin/update | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
Index: mailman-2.1.9-ctypo-new.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1.9-ctypo-new.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mailman-2.1.9-ctypo-new.patch 13 May 2008 08:32:26 -0000 1.2
+++ mailman-2.1.9-ctypo-new.patch 28 Jul 2009 10:46:48 -0000 1.3
@@ -1,6 +1,7 @@
---- mailman-2.1.9/bin/change_pw.ctypo 2007-08-27 13:27:11.000000000 +0200
-+++ mailman-2.1.9/bin/change_pw 2007-08-27 13:27:11.000000000 +0200
-@@ -187,8 +187,8 @@
+diff -ruN mailman-2.1.12-a/bin/change_pw mailman-2.1.12-b/bin/change_pw
+--- mailman-2.1.12-a/bin/change_pw 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/bin/change_pw 2009-07-28 12:19:50.000000000 +0200
+@@ -186,8 +186,8 @@
adminurl = mlist.GetScriptURL('admin', absolute=1)
msg = Message.UserNotification(
mlist.owner[:], Utils.get_site_email(),
@@ -11,8 +12,33 @@
The site administrator at %(hostname)s has changed the password for your
mailing list %(listname)s. It is now
---- mailman-2.1.9/bin/reset_pw.py.ctypo 2007-08-27 13:27:38.000000000 +0200
-+++ mailman-2.1.9/bin/reset_pw.py 2007-08-27 13:28:02.000000000 +0200
+diff -ruN mailman-2.1.12-a/bin/check_perms mailman-2.1.12-b/bin/check_perms
+--- mailman-2.1.12-a/bin/check_perms 2009-07-28 12:19:49.000000000 +0200
++++ mailman-2.1.12-b/bin/check_perms 2009-07-28 12:19:50.000000000 +0200
+@@ -221,7 +221,7 @@
+ # In addition, on a multiuser system you may want to hide the private
+ # archives so other users can't read them.
+ if mode & S_IXOTH:
+- print _("""\
++ print C_("""\
+ Warning: Private archive directory is other-executable (o+x).
+ This could allow other users on your system to read private archives.
+ If you're on a shared multiuser system, you should consult the
+diff -ruN mailman-2.1.12-a/bin/newlist mailman-2.1.12-b/bin/newlist
+--- mailman-2.1.12-a/bin/newlist 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/bin/newlist 2009-07-28 12:19:50.000000000 +0200
+@@ -246,7 +246,7 @@
+ try:
+ msg = Message.UserNotification(
+ owner_mail, siteowner,
+- _('Your new mailing list: %(listname)s'),
++ C_('Your new mailing list: %(listname)s'),
+ text, mlist.preferred_language)
+ msg.send(mlist)
+ finally:
+diff -ruN mailman-2.1.12-a/bin/reset_pw.py mailman-2.1.12-b/bin/reset_pw.py
+--- mailman-2.1.12-a/bin/reset_pw.py 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/bin/reset_pw.py 2009-07-28 12:19:50.000000000 +0200
@@ -38,7 +38,7 @@
import paths
@@ -38,9 +64,10 @@
mlist.Save()
---- mailman-2.1.9/bin/update.ctypo 2007-08-27 13:27:11.000000000 +0200
-+++ mailman-2.1.9/bin/update 2007-08-27 13:27:11.000000000 +0200
-@@ -445,7 +445,7 @@
+diff -ruN mailman-2.1.12-a/bin/update mailman-2.1.12-b/bin/update
+--- mailman-2.1.12-a/bin/update 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/bin/update 2009-07-28 12:19:50.000000000 +0200
+@@ -455,7 +455,7 @@
except EnvironmentError, e:
if e.errno <> errno.ENOTDIR:
raise
@@ -49,7 +76,7 @@
-@@ -528,7 +528,7 @@
+@@ -538,7 +538,7 @@
msg = data = None
except EOFError:
# For some reason the pckfile was empty. Just delete it.
@@ -58,31 +85,10 @@
os.unlink(pckfile)
finally:
if msgfp:
---- mailman-2.1.9/bin/newlist.ctypo 2007-08-27 13:27:11.000000000 +0200
-+++ mailman-2.1.9/bin/newlist 2007-08-27 13:27:11.000000000 +0200
-@@ -243,7 +243,7 @@
- try:
- msg = Message.UserNotification(
- owner_mail, siteowner,
-- _('Your new mailing list: %(listname)s'),
-+ C_('Your new mailing list: %(listname)s'),
- text, mlist.preferred_language)
- msg.send(mlist)
- finally:
---- mailman-2.1.9/bin/check_perms.ctypo 2007-08-27 13:27:11.000000000 +0200
-+++ mailman-2.1.9/bin/check_perms 2007-08-27 13:27:11.000000000 +0200
-@@ -213,7 +213,7 @@
- # In addition, on a multiuser system you may want to hide the private
- # archives so other users can't read them.
- if mode & S_IXOTH:
-- print _("""\
-+ print C_("""\
- Warning: Private archive directory is other-executable (o+x).
- This could allow other users on your system to read private archives.
- If you're on a shared multiuser system, you should consult the
---- mailman-2.1.9/Mailman/MTA/Postfix.py.ctypo 2007-08-27 13:27:11.000000000 +0200
-+++ mailman-2.1.9/Mailman/MTA/Postfix.py 2007-08-27 13:27:11.000000000 +0200
-@@ -351,9 +351,9 @@
+diff -ruN mailman-2.1.12-a/Mailman/MTA/Postfix.py mailman-2.1.12-b/Mailman/MTA/Postfix.py
+--- mailman-2.1.12-a/Mailman/MTA/Postfix.py 2009-07-28 12:19:49.000000000 +0200
++++ mailman-2.1.12-b/Mailman/MTA/Postfix.py 2009-07-28 12:19:50.000000000 +0200
+@@ -356,9 +356,9 @@
if stat and (stat[ST_MODE] & targetmode) <> targetmode:
state.ERRORS += 1
octmode = oct(stat[ST_MODE])
mailman-2.1.9-header-folding.patch:
Generator.py | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mailbox.py | 4 ++--
Message.py | 13 +++++++++++++
3 files changed, 70 insertions(+), 2 deletions(-)
Index: mailman-2.1.9-header-folding.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1.9-header-folding.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mailman-2.1.9-header-folding.patch 24 Oct 2007 14:10:31 -0000 1.1
+++ mailman-2.1.9-header-folding.patch 28 Jul 2009 10:46:48 -0000 1.2
@@ -1,11 +1,6 @@
-Patch: 77_header_folding_in_attachments.patch
-Author: Lionel Elie Mamane <lionel at mamane.lu>
-Don't fold headers into message/rfc822 attachments.
-This avoids breaking signatures.
-Index: Mailman/Generator.py
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ Mailman/Generator.py 2006-08-15 15:14:57.000000000 +0800
+diff -ruN mailman-2.1.12-a/Mailman/Generator.py mailman-2.1.12-b/Mailman/Generator.py
+--- mailman-2.1.12-a/Mailman/Generator.py 1970-01-01 01:00:00.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Generator.py 2009-07-28 12:19:51.000000000 +0200
@@ -0,0 +1,55 @@
+# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+# 2005 Lionel Elie Mamane <lionel at mamane.lu>
@@ -62,10 +57,9 @@ Index: Mailman/Generator.py
+ """Clone this generator with maxheaderlen set for children"""
+ return self.__class__(fp, self._mangle_from_, self.__children_maxheaderlen, self.__children_maxheaderlen)
+
-Index: Mailman/Mailbox.py
-===================================================================
---- Mailman/Mailbox.py.orig 2006-08-15 15:12:10.000000000 +0800
-+++ Mailman/Mailbox.py 2006-08-15 15:14:57.000000000 +0800
+diff -ruN mailman-2.1.12-a/Mailman/Mailbox.py mailman-2.1.12-b/Mailman/Mailbox.py
+--- mailman-2.1.12-a/Mailman/Mailbox.py 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Mailbox.py 2009-07-28 12:19:51.000000000 +0200
@@ -22,10 +22,10 @@
import email
@@ -87,10 +81,9 @@ Index: Mailman/Mailbox.py
g.flatten(msg, unixfrom=True)
# Add one more trailing newline for separation with the next message
# to be appended to the mbox.
-Index: Mailman/Message.py
-===================================================================
---- Mailman/Message.py.orig 2006-08-15 15:12:10.000000000 +0800
-+++ Mailman/Message.py 2006-08-15 15:14:57.000000000 +0800
+diff -ruN mailman-2.1.12-a/Mailman/Message.py mailman-2.1.12-b/Mailman/Message.py
+--- mailman-2.1.12-a/Mailman/Message.py 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Message.py 2009-07-28 12:19:51.000000000 +0200
@@ -22,6 +22,8 @@
"""
@@ -108,7 +101,7 @@ Index: Mailman/Message.py
COMMASPACE = ', '
-@@ -199,6 +202,16 @@
+@@ -207,6 +210,16 @@
except (UnicodeError, LookupError, ValueError):
return failobj
mailman-2.1.9-selinux.patch:
mailman.in | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
Index: mailman-2.1.9-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1.9-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mailman-2.1.9-selinux.patch 24 Oct 2007 14:10:31 -0000 1.1
+++ mailman-2.1.9-selinux.patch 28 Jul 2009 10:46:48 -0000 1.2
@@ -1,5 +1,6 @@
---- mailman-2.1.9/misc/mailman.in.selinux 2007-10-24 15:50:58.000000000 +0200
-+++ mailman-2.1.9/misc/mailman.in 2007-10-24 15:52:25.000000000 +0200
+diff -ruN mailman-2.1.12-a/misc/mailman.in mailman-2.1.12-b/misc/mailman.in
+--- mailman-2.1.12-a/misc/mailman.in 2009-07-28 12:19:49.000000000 +0200
++++ mailman-2.1.12-b/misc/mailman.in 2009-07-28 12:19:53.000000000 +0200
@@ -32,7 +32,6 @@
# config: @prefix@/Mailman/mm_cfg.py
# pidfile: @PID_DIR@/master-qrunner.pid
mailman-2.1.9-unicode.patch:
pipermail.py | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
Index: mailman-2.1.9-unicode.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1.9-unicode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mailman-2.1.9-unicode.patch 15 Jan 2008 07:30:08 -0000 1.1
+++ mailman-2.1.9-unicode.patch 28 Jul 2009 10:46:48 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up mailman-2.1.9/Mailman/Archiver/pipermail.py.unicode mailman-2.1.9/Mailman/Archiver/pipermail.py
---- mailman-2.1.9/Mailman/Archiver/pipermail.py.unicode 2008-01-14 11:50:24.000000000 +0100
-+++ mailman-2.1.9/Mailman/Archiver/pipermail.py 2008-01-14 11:51:48.000000000 +0100
-@@ -45,24 +45,27 @@ smallNameParts = ['van', 'von', 'der', '
+diff -ruN mailman-2.1.12-a/Mailman/Archiver/pipermail.py mailman-2.1.12-b/Mailman/Archiver/pipermail.py
+--- mailman-2.1.12-a/Mailman/Archiver/pipermail.py 2009-02-23 22:23:35.000000000 +0100
++++ mailman-2.1.12-b/Mailman/Archiver/pipermail.py 2009-07-28 12:19:53.000000000 +0200
+@@ -45,24 +45,27 @@
def fixAuthor(author):
"Canonicalize a name into Last, First format"
mailman-python-compile.patch:
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: mailman-python-compile.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-python-compile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mailman-python-compile.patch 9 Nov 2004 22:39:08 -0000 1.1
+++ mailman-python-compile.patch 28 Jul 2009 10:46:48 -0000 1.2
@@ -1,49 +1,7 @@
-This patch is to fix bug #137863
-
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=137863
-
-The problem arose when the SELinux security policy detected mailman
-attempting to open files under /usr/src/build (i.e. the buildroot
-where the RPM is created). It was a bit of a mystery what in mailmain
-was causing access to a hardcoded absolute path that only exists on
-the machine mailman was built on and doesn't exist on the machine it
-was installed on. It was finally determined the path had been embedded
-in the .pyc files when they were compiled during the build
-process. These path names are used as debug output when exceptions
-occur in the .pyc file (e.g. file, line number in stack traces). The
-SELinux security violations occurred only after a python exception
-occurred in mailman. The solution to supply the "ddir" parameter
-(debug directory) in the compile_dir function call. Given that mailman
-expects to build on the machine and in its install directory it was
-never necessary to suppy a "ddir" parameter in addition to "dir"
-because they were the same. But when building for an alternate
-installation it is necessary to supply both parameters because they
-are different. Note in the default case of building on the target both
-$(DESTDIR)$(prefix)" and "$(prefix)" will evaluate to the same value
-and the original behavior will be retained.
-
-The compile_dir command used to recurse from the $(prefix)/Mailman
-root to find .py files, but this missed .py files also located here:
-
-$(prefix)/bin
-$(prefix)/cron
-$(prefix)/pythonlib
-$(prefix)/scripts
-$(prefix)/tests
-
-In particular it missed $(prefix)/pythonlib. When $(prefix)/pythonlib
-was added a new problem was observed, that path contained pre-compiled
-.pyc files that are unpacked from a codecs tar file and since the .pyc
-files already existed in the tar file the compile_dir command skipped
-compiling them. This resulting in leaving the wrong debug path in the
-.pyc file (the ddir arg to compile_dir). Therefore we added "force" to
-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
-@@ -124,7 +124,7 @@
+diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
+--- mailman-2.1.12-a/Makefile.in 2009-07-28 12:19:49.000000000 +0200
++++ mailman-2.1.12-b/Makefile.in 2009-07-28 12:19:49.000000000 +0200
+@@ -146,7 +146,7 @@
do \
(cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
done
Index: mailman.spec
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- mailman.spec 25 Jul 2009 11:40:21 -0000 1.85
+++ mailman.spec 28 Jul 2009 10:46:48 -0000 1.86
@@ -1,7 +1,7 @@
Summary: Mailing list manager with built in Web access
Name: mailman
Version: 2.1.12
-Release: 8%{?dist}
+Release: 9%{?dist}
Epoch: 3
Group: Applications/Internet
Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -96,8 +96,8 @@ additional installation steps, these are
%{docdir}/INSTALL.REDHAT
%prep
-#FIXME -- This is a temporary solution
-%define _default_patch_fuzz 3
+#not needed anymore
+#%%define _default_patch_fuzz 3
%setup -q
%patch1 -p1 -b .multimail
@@ -110,7 +110,7 @@ additional installation steps, these are
#%%patch8 -p1 -b .lctype
%patch9 -p1 -b .ctypo
%patch10 -p1 -b .ctypefix
-%patch11 -p0 -b .header
+%patch11 -p1 -b .header
%patch12 -p1 -b .selinux
%patch13 -p1 -b .unicode
%patch14 -p1 -b .fhsinit
@@ -427,9 +427,7 @@ exit 0
%{mmdir}/Mailman/Message.py
%{mmdir}/Mailman/Message.pyc
%{mmdir}/Mailman/Message.pyo
-%{mmdir}/Mailman/mm_cfg.pyc
%{mmdir}/Mailman/mm_cfg.py.dist
-%{mmdir}/Mailman/mm_cfg.pyo
%{mmdir}/Mailman/MTA
%{mmdir}/Mailman/OldStyleMemberships.py
%{mmdir}/Mailman/OldStyleMemberships.pyc
@@ -469,6 +467,8 @@ exit 0
%dir %attr(0755,root,root) %{contentdir}/icons
%attr(0644,root,root) %{contentdir}/icons/*
%attr(0644, root, %{mmgroup}) %config(noreplace) %verify(not md5 size mtime) %{mmdir}/Mailman/mm_cfg.py
+%verify(not md5 size mtime) %{mmdir}/Mailman/mm_cfg.pyc
+%verify(not md5 size mtime) %{mmdir}/Mailman/mm_cfg.pyo
%config(noreplace) %{httpdconfdir}/%{httpdconffile}
/etc/logrotate.d/%{name}
/etc/smrsh/%{mail_wrapper}
@@ -485,6 +485,10 @@ exit 0
%attr(0755,root,root) %{_bindir}/mailman-update-cfg
%changelog
+* Tue Jul 28 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.12-9
+- regenerated patches so patch fuzz 3 is not needed (bz#513207)
+- mm_cfg.pyc and .pyo are now %%verify(not md5 size mtime) (bz#512794)
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3:2.1.12-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
- Previous message (by thread): rpms/python-iwlib/F-11 import.log, NONE, 1.1 python-iwlib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/valgrind/devel valgrind-3.4.1-futex.patch, NONE, 1.1 valgrind.spec, 1.65, 1.66
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list