[mailman] update to new upstream version 2.1.17 (#1034083)
Jan Kaluža
jkaluza at fedoraproject.org
Tue Dec 3 08:38:26 UTC 2013
commit ff6868415210ca51275c4a4e349221dceca0c2a1
Author: Jan Kaluza <jkaluza at redhat.com>
Date: Tue Dec 3 09:18:00 2013 +0100
update to new upstream version 2.1.17 (#1034083)
- remove patches patching unused init script
.gitignore | 1 +
mailman-2.1-mailmanctl-status.patch | 86 +-------------------------------
mailman-2.1.11-cron.patch | 91 -----------------------------------
mailman-2.1.11-fhsinit.patch | 39 ---------------
mailman-2.1.11-footer.patch | 13 -----
mailman-2.1.12-init-not-on.patch | 13 -----
mailman-2.1.12-initcleanup.patch | 65 -------------------------
mailman-2.1.12-mmcfg.patch | 19 -------
mailman-2.1.9-selinux.patch | 47 ------------------
mailman-python-compile.patch | 13 +++--
mailman.spec | 18 ++-----
sources | 2 +-
12 files changed, 17 insertions(+), 390 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8910a48..83fb780 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ mailman-2.1.13.tgz
/mailman-2.1.14.tgz
/mailman-2.1.15.tgz
/mailman-2.1.16.tgz
+/mailman-2.1.17.tgz
diff --git a/mailman-2.1-mailmanctl-status.patch b/mailman-2.1-mailmanctl-status.patch
index 87a2d8e..bf7345d 100644
--- a/mailman-2.1-mailmanctl-status.patch
+++ b/mailman-2.1-mailmanctl-status.patch
@@ -1,5 +1,5 @@
diff --git a/bin/mailmanctl b/bin/mailmanctl
-index 613f909..3d59d57 100644
+index fa14a2c..e291df1 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
@@ -74,7 +74,7 @@ index 613f909..3d59d57 100644
def acquire_lock_1(force):
# Be sure we can acquire the master qrunner lock. If not, it means some
-@@ -337,13 +386,15 @@ def main():
+@@ -338,13 +387,15 @@ def main():
command = COMMASPACE.join(args)
usage(1, _('Bad command: %(command)s'))
@@ -92,7 +92,7 @@ index 613f909..3d59d57 100644
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 @@ def main():
+@@ -363,6 +414,14 @@ def main():
if not quiet:
print _('Re-opening all log files')
kill_watcher(signal.SIGHUP)
@@ -107,83 +107,3 @@ index 613f909..3d59d57 100644
elif command == 'start':
# First, complain loudly if there's no site list.
check_for_site_list()
-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
-
-+# Source function library.
-+. /etc/rc.d/init.d/functions
-+
-+RETVAL=0
-+prog="mailman"
-+
-+function start()
-+{
-+ echo -n $"Starting $prog: "
-+ daemon $PYTHON $MAILMANCTL -s -q start
-+ RETVAL=$?
-+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-+ echo
-+ return $RETVAL
-+}
-+
-+function stop()
-+{
-+ echo -n $"Shutting down $prog: "
-+ daemon $PYTHON $MAILMANCTL -q stop
-+ RETVAL=$?
-+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-+ echo
-+ return $RETVAL
-+}
-+
-+function restart()
-+{
-+ stop
-+ start
-+ RETVAL=$?
-+ return $RETVAL
-+}
-+
- case "$1" in
- 'start')
-- #rm -f $MAILMANHOME/locks/*
-- $PYTHON $MAILMANCTL -s -q start
-+ start
-+ RETVAL=$?
- ;;
-
- 'stop')
-- $PYTHON $MAILMANCTL -q stop
-+ stop
-+ RETVAL=$?
- ;;
-
- 'restart')
-- $PYTHON $MAILMANCTL -q restart
-+ restart
-+ RETVAL=$?
-+ ;;
-+
-+'condrestart')
-+ $PYTHON $MAILMANCTL -q -u status
-+ retval=$?
-+ if [ $retval -eq 0 ]
-+ then
-+ restart
-+ RETVAL=$?
-+ fi
-+ ;;
-+
-+'status')
-+ $PYTHON $MAILMANCTL -u status
-+ RETVAL=$?
- ;;
-
- esac
--exit 0
-+exit $RETVAL
diff --git a/mailman-2.1.11-cron.patch b/mailman-2.1.11-cron.patch
index 45ddfea..d729516 100644
--- a/mailman-2.1.11-cron.patch
+++ b/mailman-2.1.11-cron.patch
@@ -130,94 +130,3 @@ index edf27a2..c64adc1 100755
#
# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
#
-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"
- #
--# 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 --git a/mailman-python-compile.patch b/mailman-python-compile.patch
index 221f8cf..15e752a 100644
--- a/mailman-python-compile.patch
+++ b/mailman-python-compile.patch
@@ -1,12 +1,13 @@
-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 @@
+diff --git a/Makefile.in b/Makefile.in
+index dc2fc59..45988b4 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -129,7 +129,7 @@ doinstall: $(SUBDIRS)
do \
(cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
done
-- $(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)/Mailman")'
-+ $(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)", 20, "$(prefix)", 1)'
+- $(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)/Mailman", ddir="$(prefix)/Mailman")'
++ $(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)/Mailman", 20, "$(prefix)", 1)'
# Only run bin/update if we aren't installing in DESTDIR, as this
# means there are probably no lists to deal with, and it wouldn't
diff --git a/mailman.spec b/mailman.spec
index 5e82a13..e79de21 100644
--- a/mailman.spec
+++ b/mailman.spec
@@ -3,7 +3,7 @@
Summary: Mailing list manager with built in Web access
Name: mailman
-Version: 2.1.16
+Version: 2.1.17
Release: 1%{?dist}
Epoch: 3
Group: Applications/Internet
@@ -26,14 +26,7 @@ Patch4: mailman-2.1.11-cron.patch
Patch5: mailman-2.1.13-FHS.patch
Patch6: mailman-python-compile.patch
Patch7: mailman-2.1.13-archive-reply.patch
-Patch12: mailman-2.1.9-selinux.patch
Patch13: mailman-2.1.9-unicode.patch
-Patch14: mailman-2.1.11-fhsinit.patch
-#Patch15: mailman-2.1.11-footer.patch
-Patch17: mailman-2.1.12-mmcfg.patch
-Patch18: mailman-2.1.12-initcleanup.patch
-# the service is now off by default
-Patch20: mailman-2.1.12-init-not-on.patch
Patch21: mailman-2.1.13-env-python.patch
Patch22: mailman-2.1.15-check_perms.patch
@@ -119,12 +112,7 @@ additional installation steps, these are described in:
%patch5 -p1 -b .FHS
%patch6 -p1 -b .python-compile
%patch7 -p1 -b .archive-in-reply-to
-%patch12 -p1 -b .selinux
%patch13 -p1 -b .unicode
-%patch14 -p1 -b .fhsinit
-%patch17 -p1 -b .mmcfg
-%patch18 -p1 -b .initcleanup
-%patch20 -p1
%patch21 -p1
%patch22 -p1
@@ -577,6 +565,10 @@ exit 0
%dir %attr(775,root,%{mmgroup}) %{lockdir}
%changelog
+* Tue Dec 03 2013 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.17-1
+- update to new upstream version 2.1.17 (#1034083)
+- remove patches patching unused init script
+
* Fri Oct 18 2013 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.16-1
- update to new upstream version 2.1.16 (#984536)
diff --git a/sources b/sources
index 07baeb5..c0d5a4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab8969dc68661f7a7af3beb797a46b3e mailman-2.1.16.tgz
+39043257f91eb876082fa90470aa8d28 mailman-2.1.17.tgz
More information about the scm-commits
mailing list