SOURCES: mailman-cron.patch - removed unused/misleading hunks

[baggins]

Author: baggins                      Date: Thu Apr 17 14:23:42 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- removed unused/misleading hunks

---- Files affected:
SOURCES:
   mailman-cron.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/mailman-cron.patch
diff -u SOURCES/mailman-cron.patch:1.1 SOURCES/mailman-cron.patch:1.2
--- SOURCES/mailman-cron.patch:1.1	Fri Apr 15 22:09:38 2005
+++ SOURCES/mailman-cron.patch	Thu Apr 17 16:23:36 2008
@@ -19,30 +19,7 @@
 diff -r -u mailman-2.1.5.orig/cron/crontab.in.in mailman-2.1.5/cron/crontab.in.in
 --- mailman-2.1.5.orig/cron/crontab.in.in	2002-01-06 01:28:12.000000000 -0500
 +++ mailman-2.1.5/cron/crontab.in.in	2004-09-02 17:43:27.000000000 -0400
-@@ -1,24 +1,47 @@
-+#
-+# -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- 
-+# ------------------  EDIT THE CORRECT FILE  -------------------------
-+# 
-+# This file is copied to /etc/cron.d/mailman from
-+# @prefix@/cron/crontab.in when the mailman service is started via its
-+# init.d script and the file /etc/cron.d/mailman is removed when the
-+# service is stopped.  Therefore any edits made directly to
-+# /etc/cron.d/mailman will be lost anytime the mailman service
-+# restarts.
-+#
-+# To make changes edit the master copy @prefix@/cron/crontab.in and then
-+# restart the service to pick up the changes (/sbin/service mailman restart).
-+#
-+# The reason this is done this way is because the mailman cron jobs
-+# should only be invoked if the mailman service is enabled and not
-+# just as a consequence of installing the rpm as was the case
-+# previously. The file /etc/cron.d/mailman cannot simply be linked to
-+# the master copy in @prefix@/cron because for security reasons cron
-+# will not process crontab files that are links or writeable by
-+# anybody else but root, thus the file must be copied into /etc/cron.d
-+# with the right ownership and permissions.
-+#
+@@ -1,24 +1,24 @@
  # At 8AM every day, mail reminders to admins as to pending requests.
  # They are less likely to ignore these reminders if they're mailed
  # early in the morning, but of course, this is local time... ;)
@@ -118,69 +95,3 @@
  #
  # Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
  #
-diff -u mailman-2.1.5.orig/misc/mailman.in mailman-2.1.5/misc/mailman.in
---- mailman-2.1.5/misc/mailman.in.1	2005-02-15 11:08:47.244527000 -0500
-+++ mailman-2.1.5/misc/mailman.in	2005-02-15 11:15:53.615729000 -0500
-@@ -36,6 +36,36 @@
- 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
- }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mailman-cron.patch?r1=1.1&r2=1.2&f=u