[mailman] remove fuzz=3 and rebase patches
Jan Kaluža
jkaluza at fedoraproject.org
Thu Dec 6 10:36:33 UTC 2012
commit b62706bb882d790dc2215e5c4fc28dbd97529234
Author: Jan Kaluza <hanzz.k at gmail.com>
Date: Thu Dec 6 11:36:25 2012 +0100
remove fuzz=3 and rebase patches
mailman-2.1-build.patch | 367 ++++++++++++++++++----------------
mailman-2.1-mailmanctl-status.patch | 26 ++--
mailman-2.1-multimail.patch | 257 ++++++-------------------
mailman-2.1.11-cron.patch | 73 ++++---
mailman.spec | 8 +-
5 files changed, 308 insertions(+), 423 deletions(-)
---
diff --git a/mailman-2.1-build.patch b/mailman-2.1-build.patch
index d00613a..3c5d99d 100644
--- a/mailman-2.1-build.patch
+++ b/mailman-2.1-build.patch
@@ -1,7 +1,8 @@
-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 @@
+diff --git a/Mailman/Archiver/Makefile.in b/Mailman/Archiver/Makefile.in
+index 65e46cb..dc3a1c6 100644
+--- a/Mailman/Archiver/Makefile.in
++++ b/Mailman/Archiver/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -9,7 +10,7 @@ diff -ruN mailman-2.1.12-a/bin/Makefile.in mailman-2.1.12-b/bin/Makefile.in
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -56,7 +55,7 @@
+@@ -47,7 +46,7 @@ pipermail.py
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -18,28 +19,8 @@ diff -ruN mailman-2.1.12-a/bin/Makefile.in mailman-2.1.12-b/bin/Makefile.in
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -72,8 +71,6 @@
- $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \
- done
-
--finish:
--
- clean:
-
- distclean:
-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=
-
- CC= @CC@
--CHMOD= @CHMOD@
- INSTALL= @INSTALL@
-
- DEFS= @DEFS@
-@@ -68,8 +67,6 @@
- $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \
+@@ -63,8 +62,6 @@ install:
+ $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
done
-finish:
@@ -47,10 +28,11 @@ diff -ruN mailman-2.1.12-a/cron/Makefile.in mailman-2.1.12-b/cron/Makefile.in
clean:
distclean:
-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 @@
+diff --git a/Mailman/Bouncers/Makefile.in b/Mailman/Bouncers/Makefile.in
+index 8865a9f..8878cd9 100644
+--- a/Mailman/Bouncers/Makefile.in
++++ b/Mailman/Bouncers/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -58,7 +40,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Archiver/Makefile.in mailman-2.1.12-b/Mailman
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -47,7 +46,7 @@
+@@ -45,7 +44,7 @@ MODULES= *.py
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -67,7 +49,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Archiver/Makefile.in mailman-2.1.12-b/Mailman
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -63,8 +62,6 @@
+@@ -61,8 +60,6 @@ install:
$(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
done
@@ -76,10 +58,11 @@ diff -ruN mailman-2.1.12-a/Mailman/Archiver/Makefile.in mailman-2.1.12-b/Mailman
clean:
distclean:
-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 @@
+diff --git a/Mailman/Cgi/Makefile.in b/Mailman/Cgi/Makefile.in
+index 47929e9..e20c07e 100644
+--- a/Mailman/Cgi/Makefile.in
++++ b/Mailman/Cgi/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -87,7 +70,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Bouncers/Makefile.in mailman-2.1.12-b/Mailman
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -45,7 +44,7 @@
+@@ -47,7 +46,7 @@ CGI_MODULES= *.py
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -96,19 +79,20 @@ diff -ruN mailman-2.1.12-a/Mailman/Bouncers/Makefile.in mailman-2.1.12-b/Mailman
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- done
+@@ -63,8 +62,6 @@ install:
+ $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \
+ done
-finish:
-
clean:
distclean:
-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 @@
+diff --git a/Mailman/Commands/Makefile.in b/Mailman/Commands/Makefile.in
+index 645d78b..12bbc1b 100644
+--- a/Mailman/Commands/Makefile.in
++++ b/Mailman/Commands/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -116,7 +100,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Cgi/Makefile.in mailman-2.1.12-b/Mailman/Cgi/
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -47,7 +46,7 @@
+@@ -45,7 +44,7 @@ MODULES= *.py
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -125,19 +109,20 @@ diff -ruN mailman-2.1.12-a/Mailman/Cgi/Makefile.in mailman-2.1.12-b/Mailman/Cgi/
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -63,8 +62,6 @@
- $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \
- done
+@@ -61,8 +60,6 @@ install:
+ $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
+ done
-finish:
-
clean:
distclean:
-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 @@
+diff --git a/Mailman/Gui/Makefile.in b/Mailman/Gui/Makefile.in
+index 000441e..9273b8a 100644
+--- a/Mailman/Gui/Makefile.in
++++ b/Mailman/Gui/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -145,7 +130,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Commands/Makefile.in mailman-2.1.12-b/Mailman
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -45,7 +44,7 @@
+@@ -45,7 +44,7 @@ MODULES= *.py
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -154,7 +139,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Commands/Makefile.in mailman-2.1.12-b/Mailman
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
+@@ -61,8 +60,6 @@ install:
$(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
done
@@ -163,10 +148,11 @@ diff -ruN mailman-2.1.12-a/Mailman/Commands/Makefile.in mailman-2.1.12-b/Mailman
clean:
distclean:
-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 @@
+diff --git a/Mailman/Handlers/Makefile.in b/Mailman/Handlers/Makefile.in
+index 71e5576..56ee2eb 100644
+--- a/Mailman/Handlers/Makefile.in
++++ b/Mailman/Handlers/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -174,7 +160,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Gui/Makefile.in mailman-2.1.12-b/Mailman/Gui/
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -45,7 +44,7 @@
+@@ -45,7 +44,7 @@ MODULES= *.py
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -183,7 +169,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Gui/Makefile.in mailman-2.1.12-b/Mailman/Gui/
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
+@@ -61,8 +60,6 @@ install:
$(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
done
@@ -192,10 +178,11 @@ diff -ruN mailman-2.1.12-a/Mailman/Gui/Makefile.in mailman-2.1.12-b/Mailman/Gui/
clean:
distclean:
-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 @@
+diff --git a/Mailman/Logging/Makefile.in b/Mailman/Logging/Makefile.in
+index e185775..ad5c128 100644
+--- a/Mailman/Logging/Makefile.in
++++ b/Mailman/Logging/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -203,7 +190,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Handlers/Makefile.in mailman-2.1.12-b/Mailman
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -45,7 +44,7 @@
+@@ -45,7 +44,7 @@ MODULES= *.py
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -212,7 +199,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Handlers/Makefile.in mailman-2.1.12-b/Mailman
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
+@@ -61,8 +60,6 @@ install:
$(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
done
@@ -221,10 +208,11 @@ diff -ruN mailman-2.1.12-a/Mailman/Handlers/Makefile.in mailman-2.1.12-b/Mailman
clean:
distclean:
-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 @@
+diff --git a/Mailman/MTA/Makefile.in b/Mailman/MTA/Makefile.in
+index 0338806..e1de296 100644
+--- a/Mailman/MTA/Makefile.in
++++ b/Mailman/MTA/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -232,7 +220,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Logging/Makefile.in mailman-2.1.12-b/Mailman/
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -45,7 +44,7 @@
+@@ -45,7 +44,7 @@ MODULES= *.py
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -241,7 +229,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Logging/Makefile.in mailman-2.1.12-b/Mailman/
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
+@@ -61,8 +60,6 @@ install:
$(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
done
@@ -250,9 +238,10 @@ diff -ruN mailman-2.1.12-a/Mailman/Logging/Makefile.in mailman-2.1.12-b/Mailman/
clean:
distclean:
-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
+diff --git a/Mailman/Makefile.in b/Mailman/Makefile.in
+index 93c7efd..45439f0 100644
+--- a/Mailman/Makefile.in
++++ b/Mailman/Makefile.in
@@ -20,8 +20,6 @@
# Variables set by configure
@@ -262,7 +251,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile
VPATH= @srcdir@
srcdir= @srcdir@
bindir= @bindir@
-@@ -30,7 +28,6 @@
+@@ -30,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -270,7 +259,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -48,7 +45,7 @@
+@@ -48,7 +45,7 @@ SUBDIRS= Cgi Logging Archiver Handlers Bouncers Queue MTA Gui Commands
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -279,7 +268,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -79,12 +76,6 @@
+@@ -79,12 +76,6 @@ install: install-here
(cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
done
@@ -292,39 +281,11 @@ diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile
clean:
for d in $(SUBDIRS); \
do \
-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=
-
- CC= @CC@
--CHMOD= @CHMOD@
- INSTALL= @INSTALL@
-
- DEFS= @DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process. Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE= 775
-+DIRMODE= 2775
- EXEMODE= 755
- FILEMODE= 644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- done
-
--finish:
--
- clean:
-
- distclean:
-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 @@
+diff --git a/Mailman/Queue/Makefile.in b/Mailman/Queue/Makefile.in
+index 179f3d9..e0e97ad 100644
+--- a/Mailman/Queue/Makefile.in
++++ b/Mailman/Queue/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -332,7 +293,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Queue/Makefile.in mailman-2.1.12-b/Mailman/Qu
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -45,7 +44,7 @@
+@@ -45,7 +44,7 @@ MODULES= *.py
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -341,7 +302,7 @@ diff -ruN mailman-2.1.12-a/Mailman/Queue/Makefile.in mailman-2.1.12-b/Mailman/Qu
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
+@@ -61,8 +60,6 @@ install:
$(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
done
@@ -350,10 +311,11 @@ diff -ruN mailman-2.1.12-a/Mailman/Queue/Makefile.in mailman-2.1.12-b/Mailman/Qu
clean:
distclean:
-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 @@
+diff --git a/Makefile.in b/Makefile.in
+index 40e04f5..eb40844 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -61,11 +61,10 @@ SUBDIRS= bin cron misc Mailman scripts src templates messages tests
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -366,7 +328,7 @@ diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
DATE = $(shell python -c 'import time; print time.strftime("%d-%b-%Y"),')
LANGPACK = README-I18N.en templates messages
-@@ -85,14 +84,24 @@
+@@ -85,14 +84,24 @@ install: doinstall update
doinstall: $(SUBDIRS)
@echo "Creating architecture independent directories..."
@@ -394,7 +356,7 @@ diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
else true; \
fi; \
done
-@@ -102,9 +111,7 @@
+@@ -102,9 +111,7 @@ doinstall: $(SUBDIRS)
dir=$(DESTDIR)$(prefix)/$$d; \
if test ! -d $$dir; then \
echo "Creating directory hierarchy $$dir"; \
@@ -405,7 +367,7 @@ diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
else true; \
fi; \
done
-@@ -114,9 +121,7 @@
+@@ -114,9 +121,7 @@ doinstall: $(SUBDIRS)
dir=$(DESTDIR)$(exec_prefix)/$$d; \
if test ! -d $$dir; then \
echo "Creating directory hierarchy $$dir"; \
@@ -416,10 +378,11 @@ diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
else true; \
fi; \
done
-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 @@
+diff --git a/bin/Makefile.in b/bin/Makefile.in
+index 22c24b0..d795333 100644
+--- a/bin/Makefile.in
++++ b/bin/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -427,7 +390,58 @@ diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefi
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -43,7 +42,6 @@
+@@ -56,7 +55,7 @@ BUILDDIR= ../build/bin
+ # Modes for directories and executables created by the install
+ # process. Default to group-writable directories but
+ # user-only-writable for executables.
+-DIRMODE= 775
++DIRMODE= 2775
+ EXEMODE= 755
+ FILEMODE= 644
+ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+@@ -72,8 +71,6 @@ install:
+ $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \
+ done
+
+-finish:
+-
+ clean:
+
+ distclean:
+diff --git a/cron/Makefile.in b/cron/Makefile.in
+index 2a7c8fd..c14d119 100644
+--- a/cron/Makefile.in
++++ b/cron/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+ DESTDIR=
+
+ CC= @CC@
+-CHMOD= @CHMOD@
+ INSTALL= @INSTALL@
+
+ DEFS= @DEFS@
+@@ -68,8 +67,6 @@ install:
+ $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \
+ done
+
+-finish:
+-
+ clean:
+
+ distclean:
+diff --git a/messages/Makefile.in b/messages/Makefile.in
+index 2bbec3f..0b8b7d6 100644
+--- a/messages/Makefile.in
++++ b/messages/Makefile.in
+@@ -32,7 +32,6 @@ exec_prefix= @exec_prefix@
+ DESTDIR=
+
+ CC= @CC@
+-CHMOD= @CHMOD@
+ INSTALL= @INSTALL@
+
+ DEFS= @DEFS@
+@@ -43,7 +42,6 @@ OPT= @OPT@
CFLAGS= $(OPT) $(DEFS)
PACKAGEDIR= $(prefix)/messages
SHELL= /bin/sh
@@ -435,7 +449,7 @@ diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefi
MSGFMT= @PYTHON@ ../build/bin/msgfmt.py
MSGMERGE= msgmerge
-@@ -60,7 +58,7 @@
+@@ -60,7 +58,7 @@ TARGETS= $(MOFILES)
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -444,7 +458,7 @@ diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefi
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -90,9 +88,8 @@
+@@ -90,9 +88,8 @@ doinstall: mofiles
do \
dir=$(DESTDIR)$(prefix)/$$d; \
echo "Creating language directory $$dir"; \
@@ -456,7 +470,7 @@ diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefi
done
@for d in $(LANGUAGES); \
do \
-@@ -113,8 +110,6 @@
+@@ -113,8 +110,6 @@ doinstall: mofiles
mofiles: $(MOFILES)
@@ -465,10 +479,11 @@ diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefi
clean:
-rm -f */LC_MESSAGES/mailman.mo
-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 @@
+diff --git a/misc/Makefile.in b/misc/Makefile.in
+index 5125cd8..af99c04 100644
+--- a/misc/Makefile.in
++++ b/misc/Makefile.in
+@@ -30,7 +30,6 @@ var_prefix= @VAR_PREFIX@
DESTDIR=
CC= @CC@
@@ -476,7 +491,7 @@ diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in
INSTALL= @INSTALL@
PYTHON= @PYTHON@
-@@ -62,7 +61,7 @@
+@@ -62,7 +61,7 @@ PACKAGES= $(EMAILPKG) $(JACODECSPKG) $(KOCODECSPKG)
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -485,7 +500,7 @@ diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in
EXEMODE= 755
FILEMODE= 644
DATAMODE= 664
-@@ -101,8 +100,6 @@
+@@ -101,8 +100,6 @@ install-packages:
(cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
done
@@ -494,10 +509,11 @@ diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in
clean:
distclean:
-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 @@
+diff --git a/scripts/Makefile.in b/scripts/Makefile.in
+index 49b82ec..cea250c 100644
+--- a/scripts/Makefile.in
++++ b/scripts/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -505,7 +521,7 @@ diff -ruN mailman-2.1.12-a/scripts/Makefile.in mailman-2.1.12-b/scripts/Makefile
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -49,7 +48,7 @@
+@@ -49,7 +48,7 @@ SCRIPTS= bounces confirm driver join leave owner post request
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -514,7 +530,7 @@ diff -ruN mailman-2.1.12-a/scripts/Makefile.in mailman-2.1.12-b/scripts/Makefile
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -68,8 +67,6 @@
+@@ -68,8 +67,6 @@ install:
$(INSTALL) -m $(FILEMODE) $(srcdir)/join $(DESTDIR)$(SCRIPTSDIR)/subscribe
$(INSTALL) -m $(FILEMODE) $(srcdir)/leave $(DESTDIR)$(SCRIPTSDIR)/unsubscribe
@@ -523,10 +539,11 @@ diff -ruN mailman-2.1.12-a/scripts/Makefile.in mailman-2.1.12-b/scripts/Makefile
clean:
distclean:
-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 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index ce52356..7ed820b 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -28,7 +28,6 @@ bindir= @bindir@
DESTDIR=
CC= @CC@
@@ -534,7 +551,7 @@ diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in
INSTALL= @INSTALL@
PYTHON= @PYTHON@
-@@ -63,10 +62,9 @@
+@@ -65,10 +64,9 @@ COMMON_FLAGS= -DPREFIX="\"$(prefix)\"" \
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -547,7 +564,7 @@ diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in
# Fixed definitions
-@@ -110,20 +108,10 @@
+@@ -112,20 +110,10 @@ install: all
do \
exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
$(INSTALL_PROGRAM) $$f $$exe; \
@@ -568,10 +585,11 @@ diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in
done
clean:
-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 @@
+diff --git a/templates/Makefile.in b/templates/Makefile.in
+index 3dfee3a..b23d7c1 100644
+--- a/templates/Makefile.in
++++ b/templates/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -579,7 +597,7 @@ diff -ruN mailman-2.1.12-a/templates/Makefile.in mailman-2.1.12-b/templates/Make
INSTALL= @INSTALL@
TRUE= @TRUE@
-@@ -48,7 +47,7 @@
+@@ -48,7 +47,7 @@ LANGUAGES= ar ast ca cs da de el en es et eu fi fr gl he hr hu ia it ja \
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -588,7 +606,7 @@ diff -ruN mailman-2.1.12-a/templates/Makefile.in mailman-2.1.12-b/templates/Make
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,15 +60,13 @@
+@@ -61,15 +60,13 @@ all:
install:
for d in $(LANGUAGES); \
do \
@@ -605,10 +623,11 @@ diff -ruN mailman-2.1.12-a/templates/Makefile.in mailman-2.1.12-b/templates/Make
clean:
distclean:
-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 @@
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 26d6e31..ca92425 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -616,7 +635,7 @@ diff -ruN mailman-2.1.12-a/tests/bounces/Makefile.in mailman-2.1.12-b/tests/boun
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -46,7 +45,7 @@
+@@ -46,7 +45,7 @@ EXECS= $(srcdir)/onebounce.py $(srcdir)/fblast.py
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -625,8 +644,8 @@ diff -ruN mailman-2.1.12-a/tests/bounces/Makefile.in mailman-2.1.12-b/tests/boun
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -60,8 +59,6 @@
- $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \
+@@ -71,8 +70,6 @@ install:
+ (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
done
-finish:
@@ -634,10 +653,11 @@ diff -ruN mailman-2.1.12-a/tests/bounces/Makefile.in mailman-2.1.12-b/tests/boun
clean:
distclean:
-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 @@
+diff --git a/tests/bounces/Makefile.in b/tests/bounces/Makefile.in
+index 5798097..f7014cb 100644
+--- a/tests/bounces/Makefile.in
++++ b/tests/bounces/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -645,7 +665,7 @@ diff -ruN mailman-2.1.12-a/tests/Makefile.in mailman-2.1.12-b/tests/Makefile.in
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -46,7 +45,7 @@
+@@ -46,7 +45,7 @@ BOUNCE_FILES= $(srcdir)/*.txt
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -654,8 +674,8 @@ diff -ruN mailman-2.1.12-a/tests/Makefile.in mailman-2.1.12-b/tests/Makefile.in
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -71,8 +70,6 @@
- (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
+@@ -60,8 +59,6 @@ install:
+ $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \
done
-finish:
@@ -663,10 +683,11 @@ diff -ruN mailman-2.1.12-a/tests/Makefile.in mailman-2.1.12-b/tests/Makefile.in
clean:
distclean:
-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 @@
+diff --git a/tests/msgs/Makefile.in b/tests/msgs/Makefile.in
+index 736d721..edef5ae 100644
+--- a/tests/msgs/Makefile.in
++++ b/tests/msgs/Makefile.in
+@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
DESTDIR=
CC= @CC@
@@ -674,7 +695,7 @@ diff -ruN mailman-2.1.12-a/tests/msgs/Makefile.in mailman-2.1.12-b/tests/msgs/Ma
INSTALL= @INSTALL@
DEFS= @DEFS@
-@@ -46,7 +45,7 @@
+@@ -46,7 +45,7 @@ MSG_FILES= $(srcdir)/*.txt
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
@@ -683,7 +704,7 @@ diff -ruN mailman-2.1.12-a/tests/msgs/Makefile.in mailman-2.1.12-b/tests/msgs/Ma
EXEMODE= 755
FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -60,8 +59,6 @@
+@@ -60,8 +59,6 @@ install:
$(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(MSGSDIR); \
done
diff --git a/mailman-2.1-mailmanctl-status.patch b/mailman-2.1-mailmanctl-status.patch
index 08dd0bb..87a2d8e 100644
--- a/mailman-2.1-mailmanctl-status.patch
+++ b/mailman-2.1-mailmanctl-status.patch
@@ -1,7 +1,8 @@
-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 @@
+diff --git a/bin/mailmanctl b/bin/mailmanctl
+index 613f909..3d59d57 100644
+--- a/bin/mailmanctl
++++ b/bin/mailmanctl
+@@ -36,7 +36,7 @@ in the file data/master-qrunner.pid but you normally don't need to use this
pid directly. The `start', `stop', `restart', and `reopen' commands handle
everything for you.
@@ -10,7 +11,7 @@ diff -ruN mailman-2.1.12-a/bin/mailmanctl mailman-2.1.12-b/bin/mailmanctl
Options:
-@@ -90,6 +90,9 @@
+@@ -90,6 +90,9 @@ Commands:
reopen - This will close all log files, causing them to be re-opened the
next time a message is written to them
@@ -20,7 +21,7 @@ diff -ruN mailman-2.1.12-a/bin/mailmanctl mailman-2.1.12-b/bin/mailmanctl
"""
import sys
-@@ -190,6 +193,52 @@
+@@ -190,6 +193,52 @@ def qrunner_state():
return 0
return 1
@@ -73,7 +74,7 @@ diff -ruN mailman-2.1.12-a/bin/mailmanctl mailman-2.1.12-b/bin/mailmanctl
def acquire_lock_1(force):
# Be sure we can acquire the master qrunner lock. If not, it means some
-@@ -337,13 +386,15 @@
+@@ -337,13 +386,15 @@ def main():
command = COMMASPACE.join(args)
usage(1, _('Bad command: %(command)s'))
@@ -91,7 +92,7 @@ diff -ruN mailman-2.1.12-a/bin/mailmanctl mailman-2.1.12-b/bin/mailmanctl
if command == 'stop':
# Sent the master qrunner process a SIGINT, which is equivalent to
# giving cron/qrunner a ctrl-c or KeyboardInterrupt. This will
-@@ -362,6 +413,14 @@
+@@ -362,6 +413,14 @@ def main():
if not quiet:
print _('Re-opening all log files')
kill_watcher(signal.SIGHUP)
@@ -106,10 +107,11 @@ diff -ruN mailman-2.1.12-a/bin/mailmanctl mailman-2.1.12-b/bin/mailmanctl
elif command == 'start':
# First, complain loudly if there's no site list.
check_for_site_list()
-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 @@
+diff --git a/misc/mailman.in b/misc/mailman.in
+index 2f5fbc7..bce344c 100644
+--- a/misc/mailman.in
++++ b/misc/mailman.in
+@@ -36,19 +36,70 @@ PYTHON=@PYTHON@
MAILMANHOME=@prefix@
MAILMANCTL=$MAILMANHOME/bin/mailmanctl
diff --git a/mailman-2.1-multimail.patch b/mailman-2.1-multimail.patch
index d345964..ce6c461 100644
--- a/mailman-2.1-multimail.patch
+++ b/mailman-2.1-multimail.patch
@@ -1,166 +1,8 @@
---- 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 @@
- fi
-
- # new macro for finding group names
--AC_DEFUN(MM_FIND_GROUP_NAME, [
-+# returns a comma separated list of quoted group names
-+# the list is returned in the same order as specified with any duplicates removed
-+# the filter flag must be "yes" or "no", e.g. this is permcheck
-+# "no" ==> none existing groups are not filtered out
-+# "yes" ==> only those groups that are in the group database are included
-+# in the list
-+AC_DEFUN(MM_FIND_GROUP_LIST, [
- # $1 == variable name
--# $2 == user id to check for
-+# $2 == white space separated list of groups to check,
-+# list may contain mix of id's and names
-+# $3 == filter, if == 'yes' then remove any non-existing groups
- AC_SUBST($1)
- changequote(,)
- if test -z "$$1"
- then
- cat > conftest.py <<EOF
- import grp
--gid = ''
-+group_names = []
-+seen = {}
-+filter = "$3"
-+
- for group in "$2".split():
- try:
-+ gid = int(group)
-+ try:
-+ gname = grp.getgrgid(gid)[0]
-+ except KeyError:
-+ gname = ''
-+ except ValueError:
- try:
-- gname = grp.getgrgid(int(group))[0]
-- break
-- except ValueError:
- gname = grp.getgrnam(group)[0]
-+ except KeyError:
-+ if filter == "yes":
-+ gname = ''
-+ else:
-+ gname = group
-+ if gname:
-+ if gname not in seen:
-+ seen[gname] = 1
-+ group_names.append(gname)
-+
-+if group_names:
-+ val = '"' + '", "'.join(group_names) + '"'
-+ #val = "'"+val+"'"
-+else:
-+ val = ''
-+
-+fp = open("conftest.out", "w")
-+fp.write("%s\n" % val)
-+fp.close()
-+EOF
-+ $PYTHON conftest.py
-+ $1=`cat conftest.out`
-+fi
-+changequote([, ])
-+rm -f conftest.out conftest.py])
-+
-+
-+# new macro for finding group names
-+AC_DEFUN(MM_FIND_GROUP_NAME, [
-+# Given a list of tokens, either a name or a number (gid)
-+# return the first one in the list that is found in the
-+# group database. The return value is always a name, possibly
-+# translated from a gid. If permcheck is "no" then the group
-+# database is not checked, instead the first token in the list
-+# which is a name is returned (e.g. the default value). If permcheck
-+# is no and only gid's are in the list then the null string is returned.
-+# $1 == variable name
-+# $2 == group id to check for
-+# $3 == permcheck, either "yes" or "no"
-+AC_SUBST($1)
-+changequote(,)
-+if test -z "$$1"
-+then
-+ cat > conftest.py <<EOF
-+import grp
-+gname=''
-+if "$3" == "yes":
-+ for group in "$2".split():
-+ try:
-+ try:
-+ gname = grp.getgrgid(int(group))[0]
-+ break
-+ except ValueError:
-+ gname = grp.getgrnam(group)[0]
-+ break
-+ except KeyError:
-+ gname = ''
-+else:
-+ for group in "$2".split():
-+ try:
-+ int(group)
-+ except ValueError:
-+ gname = group
- break
-- except KeyError:
-- gname = ''
- fp = open("conftest.out", "w")
- fp.write("%s\n" % gname)
- fp.close()
-@@ -241,25 +316,41 @@
-
- # new macro for finding UIDs
- 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
-+# translated from a uid. If permcheck is "no" then the password
-+# database is not checked, instead the first token in the list
-+# which is a name is returned (e.g. the default value). If permcheck
-+# is no and only uid's are in the list then the null string is returned.
- # $1 == variable name
- # $2 == user id to check for
-+# $3 == permcheck, either "yes" or "no"
- AC_SUBST($1)
- changequote(,)
- if test -z "$$1"
- then
- cat > conftest.py <<EOF
- import pwd
--uid = ''
--for user in "$2".split():
-- try:
-+uname=''
-+if "$3" == "yes":
-+ for user in "$2".split():
- try:
-- uname = pwd.getpwuid(int(user))[0]
-- break
-+ try:
-+ uname = pwd.getpwuid(int(user))[0]
-+ break
-+ except ValueError:
-+ uname = pwd.getpwnam(user)[0]
-+ break
-+ except KeyError:
-+ uname = ''
-+else:
-+ for user in "$2".split():
-+ try:
-+ int(user)
- except ValueError:
-- uname = pwd.getpwnam(user)[0]
-+ uname = user
- break
-- except KeyError:
-- uname = ''
- fp = open("conftest.out", "w")
- fp.write("%s\n" % uname)
- fp.close()
-@@ -285,7 +376,7 @@
+diff --git a/configure.in b/configure.in
+index b2cae85..f6b919d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -383,7 +383,7 @@ AC_MSG_RESULT($USERNAME)
# User `mailman' must exist
AC_SUBST(MAILMAN_USER)
AC_MSG_CHECKING(for user name \"$USERNAME\")
@@ -169,7 +11,7 @@
if test -z "$MAILMAN_USER"
then
if test "$with_permcheck" = "yes"
-@@ -316,7 +407,7 @@
+@@ -414,7 +414,7 @@ AC_MSG_RESULT($GROUPNAME)
# Target group must exist
AC_SUBST(MAILMAN_GROUP)
AC_MSG_CHECKING(for group name \"$GROUPNAME\")
@@ -178,7 +20,7 @@
if test -z "$MAILMAN_GROUP"
then
if test "$with_permcheck" = "yes"
-@@ -339,11 +430,11 @@
+@@ -437,11 +437,11 @@ from stat import *
prefix = "$prefixcheck"
groupname = "$GROUPNAME"
mailmangroup = "$MAILMAN_GROUP"
@@ -194,7 +36,7 @@
try: statdata = os.stat(prefix)
except OSError:
problems.append("Directory doesn't exist: " + prefix)
-@@ -393,7 +484,7 @@
+@@ -491,7 +491,7 @@ if test -z "$with_mail_gid"
then
with_mail_gid="mailman other mail daemon"
fi
@@ -203,7 +45,7 @@
if test -z "$MAIL_GROUP"
then
if test "$with_permcheck" = "yes"
-@@ -420,7 +511,7 @@
+@@ -518,7 +518,7 @@ then
with_cgi_gid="www www-data nobody"
fi
@@ -212,9 +54,11 @@
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 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index a50e495..ce52356 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -51,9 +51,9 @@ MAILDIR= $(exec_prefix)/mail
SHELL= /bin/sh
@@ -226,28 +70,10 @@
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 --git a/src/cgi-wrapper.c b/src/cgi-wrapper.c
+index 29d9ec5..2ead09d 100644
+--- a/src/cgi-wrapper.c
++++ b/src/cgi-wrapper.c
@@ -28,11 +28,11 @@
/* Group name that CGI scripts run as. See your web server's documentation
* for details.
@@ -262,7 +88,7 @@
int
-@@ -42,7 +42,7 @@
+@@ -42,7 +42,7 @@ main(int argc, char** argv, char** env)
char* fake_argv[3];
running_as_cgi = 1;
@@ -271,9 +97,11 @@
/* 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
-@@ -117,13 +117,14 @@
+diff --git a/src/common.c b/src/common.c
+index 62ed765..f58d7c6 100644
+--- a/src/common.c
++++ b/src/common.c
+@@ -117,13 +117,14 @@ fatal(const char* ident, int exitcode, char* format, ...)
/* Is the parent process allowed to call us?
*/
void
@@ -289,7 +117,7 @@
if (running_as_cgi) {
option = "--with-cgi-gid";
-@@ -136,28 +137,46 @@
+@@ -136,28 +137,46 @@ check_caller(const char* ident, const char* parentgroup)
wrapper = "mail";
}
@@ -304,6 +132,8 @@
- "\"%s\".",
- mygid, wrapper, parentgroup, server, mygid, mygid,
- parentgroup, server, parentgroup);
+-
+- if (strcmp(parentgroup, mygroup->gr_name))
+ if (!mygroup)
+ fatal(ident, GROUP_ID_NOT_FOUND,
+ "Failure to lookup via getgrgid() the group info for group id %d that this Mailman %s wrapper is executing under.\n"
@@ -331,8 +161,7 @@
+ if (i < numgroups-1) strcat(groupset, ", ");
+ }
+ }
-
-- if (strcmp(parentgroup, mygroup->gr_name))
++
fatal(ident, GROUP_MISMATCH,
- "Group mismatch error. Mailman expected the %s\n"
- "wrapper script to be executed as group \"%s\", but\n"
@@ -356,8 +185,32 @@
}
---- 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 --git a/src/common.h b/src/common.h
+index 451a156..c85e257 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -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 @@ extern const char* logident;
+ #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 --git a/src/mail-wrapper.c b/src/mail-wrapper.c
+index f268d5a..0b8ac82 100644
+--- a/src/mail-wrapper.c
++++ b/src/mail-wrapper.c
@@ -23,9 +23,9 @@
/* Group name that your mail programs run as. See your mail server's
* documentation for details.
@@ -370,7 +223,7 @@
const char* logident = "Mailman mail-wrapper";
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ main(int argc, char** argv, char** env)
fatal(logident, MAIL_ILLEGAL_COMMAND,
"Illegal command: %s", argv[1]);
diff --git a/mailman-2.1.11-cron.patch b/mailman-2.1.11-cron.patch
index 3d37356..1614a29 100644
--- a/mailman-2.1.11-cron.patch
+++ b/mailman-2.1.11-cron.patch
@@ -1,24 +1,27 @@
-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
+diff --git a/cron/bumpdigests b/cron/bumpdigests
+index 57cc45e..4002731 100755
+--- a/cron/bumpdigests
++++ b/cron/bumpdigests
@@ -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/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
+diff --git a/cron/checkdbs b/cron/checkdbs
+index e776f15..c4d8179 100755
+--- a/cron/checkdbs
++++ b/cron/checkdbs
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
- # Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
#
-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
+diff --git a/cron/crontab.in.in b/cron/crontab.in.in
+index 540dfc1..45c5022 100644
+--- a/cron/crontab.in.in
++++ b/cron/crontab.in.in
@@ -1,27 +1,50 @@
+#
+# -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING --
@@ -77,54 +80,60 @@ diff -ruN mailman-2.1.12-a/cron/crontab.in.in mailman-2.1.12-b/cron/crontab.in.i
# 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 -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
+diff --git a/cron/disabled b/cron/disabled
+index ac62582..971563d 100755
+--- a/cron/disabled
++++ b/cron/disabled
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
# Copyright (C) 2001-2007 by the Free Software Foundation, Inc.
#
-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
+diff --git a/cron/gate_news b/cron/gate_news
+index c66c09e..247c834 100755
+--- a/cron/gate_news
++++ b/cron/gate_news
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
- # Copyright (C) 1998-2008 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
#
-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
+diff --git a/cron/mailpasswds b/cron/mailpasswds
+index 5745265..4d0cd3a 100755
+--- a/cron/mailpasswds
++++ b/cron/mailpasswds
@@ -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
+diff --git a/cron/nightly_gzip b/cron/nightly_gzip
+index 0a0f4e3..7dba3b1 100755
+--- a/cron/nightly_gzip
++++ b/cron/nightly_gzip
@@ -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
+diff --git a/cron/senddigests b/cron/senddigests
+index edf27a2..c64adc1 100755
+--- a/cron/senddigests
++++ b/cron/senddigests
@@ -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
+diff --git a/misc/mailman.in b/misc/mailman.in
+index bce344c..7129f14 100644
+--- a/misc/mailman.in
++++ b/misc/mailman.in
@@ -24,18 +24,48 @@
# On Debian, type "update-rc.d mailman defaults"
# On RedHat, and derivatives, install with "chkconfig --add mailman"
@@ -176,7 +185,7 @@ diff -ruN mailman-2.1.12-a/misc/mailman.in mailman-2.1.12-b/misc/mailman.in
# Source function library.
. /etc/rc.d/init.d/functions
-@@ -47,7 +77,11 @@
+@@ -47,7 +77,11 @@ function start()
echo -n $"Starting $prog: "
daemon $PYTHON $MAILMANCTL -s -q start
RETVAL=$?
@@ -189,7 +198,7 @@ diff -ruN mailman-2.1.12-a/misc/mailman.in mailman-2.1.12-b/misc/mailman.in
echo
return $RETVAL
}
-@@ -57,7 +91,11 @@
+@@ -57,7 +91,11 @@ function stop()
echo -n $"Shutting down $prog: "
daemon $PYTHON $MAILMANCTL -q stop
RETVAL=$?
@@ -202,7 +211,7 @@ diff -ruN mailman-2.1.12-a/misc/mailman.in mailman-2.1.12-b/misc/mailman.in
echo
return $RETVAL
}
-@@ -101,5 +139,9 @@
+@@ -101,5 +139,9 @@ case "$1" in
RETVAL=$?
;;
diff --git a/mailman.spec b/mailman.spec
index a439ca9..8074c36 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.15
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 3
Group: Applications/Internet
Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -109,9 +109,6 @@ additional installation steps, these are described in:
%{docdir}/INSTALL.REDHAT
%prep
-#not needed anymore
-#%global _default_patch_fuzz 3
-
%setup -q
%patch1 -p1 -b .multimail
%patch2 -p1 -b .permissions
@@ -535,6 +532,9 @@ exit 0
%dir %attr(775,root,%{mmgroup}) %{lockdir}
%changelog
+* Thu Dec 06 2012 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.15-7
+- remove fuzz=3 and rebase patches
+
* Wed Nov 21 2012 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.15-6
- clean up spec file
More information about the scm-commits
mailing list