20258043 /var/mail/mailman fills up with cron output if mailman is unconfigured
authorJohn Beck <John.Beck@Oracle.COM>
Tue, 17 Feb 2015 16:34:10 -0800
changeset 3832 bed646d1991c
parent 3831 33bc4f8fb536
child 3833 2b76e00d94b8
20258043 /var/mail/mailman fills up with cron output if mailman is unconfigured
components/mailman/mailman.p5m
components/mailman/patches/02-var-share-start.patch
--- a/components/mailman/mailman.p5m	Wed Feb 18 04:51:18 2015 -0800
+++ b/components/mailman/mailman.p5m	Tue Feb 17 16:34:10 2015 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr/lib/mailman/tests/.* -> \
@@ -286,6 +286,7 @@
 # so bypass to avoid confusion.
 file path=usr/lib/mailman/cron/checkdbs mode=0555 \
     pkg.depend.bypass-generate=.*/Charset.*
+file path=usr/lib/mailman/cron/crontab.in
 file path=usr/lib/mailman/cron/cull_bad_shunt mode=0555
 file path=usr/lib/mailman/cron/disabled mode=0555
 file path=usr/lib/mailman/cron/gate_news mode=0555 \
@@ -2398,9 +2399,6 @@
 link path=var/mailman/qfiles target=../../var/share/mailman/qfiles
 link path=var/mailman/spam target=../../var/share/mailman/spam
 #
-file usr/lib/mailman/cron/crontab.in path=var/spool/cron/crontabs/mailman \
-    mode=0600 overlay=allow preserve=true
-#
 group groupname=mailman gid=98
 user username=mailman ftpuser=false gcos-field=Mailman group=mailman \
     home-dir=/ password=NP uid=98
--- a/components/mailman/patches/02-var-share-start.patch	Wed Feb 18 04:51:18 2015 -0800
+++ b/components/mailman/patches/02-var-share-start.patch	Tue Feb 17 16:34:10 2015 -0800
@@ -1,8 +1,8 @@
 This patch is Solaris-specific and thus will not be contributed upstream.
 
 --- mailman-2.1.18-1/misc/mailman.in.~1~	2014-05-06 09:43:56.000000000 -0700
-+++ mailman-2.1.18-1/misc/mailman.in	2014-09-12 11:27:53.659779385 -0700
[email protected]@ -33,13 +33,53 @@
++++ mailman-2.1.18-1/misc/mailman.in	2015-02-17 16:16:08.321600825 -0800
[email protected]@ -33,13 +33,59 @@
  # config: @[email protected]/Mailman/mm_cfg.py
  # pidfile: @[email protected]/data/master-qrunner.pid
  
@@ -53,6 +53,12 @@
 +    if [[ $? -ne 0 ]]; then
 +	$MAILMANHOME/bin/newlist -q -e 127.0.0.1 mailman [email protected] mailman
 +    fi
++    # Check to see if a crontab entry exists; if not, copy the input file
++    # into place.
++    crontab -l mailman > /dev/null 2>&1
++    if [[ $? -ne 0 ]]; then
++	VISUAL="/usr/bin/cp $MAILMANHOME/cron/crontab.in" crontab -e mailman
++    fi
      $PYTHON $MAILMANCTL -s -q start
      ;;