[Pkg-mailman-hackers] Pkg-mailman commit - rev 374 -
branches/2.1.8/debian
Hector Garcia
hector at costa.debian.org
Tue Sep 19 18:54:50 UTC 2006
Author: hector
Date: 2006-09-19 18:54:50 +0000 (Tue, 19 Sep 2006)
New Revision: 374
Removed:
branches/2.1.8/debian/cron.daily
branches/2.1.8/debian/cron.monthly
Modified:
branches/2.1.8/debian/changelog
branches/2.1.8/debian/postinst
branches/2.1.8/debian/preinst
branches/2.1.8/debian/rules
Log:
Merging revisions 330 to 335 from trunk
Modified: branches/2.1.8/debian/changelog
===================================================================
--- branches/2.1.8/debian/changelog 2006-09-19 18:47:15 UTC (rev 373)
+++ branches/2.1.8/debian/changelog 2006-09-19 18:54:50 UTC (rev 374)
@@ -5,8 +5,9 @@
[ Thijs Kinkhorst ]
* Use LSB output functions in init script.
+ * Use chown root:list instead of deprecated root.list.
- -- Thijs Kinkhorst <thijs at debian.org> Tue, 15 Aug 2006 13:49:48 +0200
+ -- Thijs Kinkhorst <thijs at debian.org> Wed, 16 Aug 2006 15:12:04 +0200
mailman (1:2.1.8-2) unstable; urgency=low
Deleted: branches/2.1.8/debian/cron.daily
===================================================================
--- branches/2.1.8/debian/cron.daily 2006-09-19 18:47:15 UTC (rev 373)
+++ branches/2.1.8/debian/cron.daily 2006-09-19 18:54:50 UTC (rev 374)
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if [ ! -x /usr/bin/python ]
-then
- exit 0
-fi
-
-cd /var/lib/mailman/cron 2> /dev/null
-
-# Mail reminders to admins as to pending requests.
-if [ -e /var/lib/mailman/cron/checkdbs ]
-then
- su -s /bin/sh list -c "/usr/bin/python /var/lib/mailman/cron/checkdbs"
-fi
-
-# Mail digests for lists that do periodic as well as threshhold delivery.
-if [ -e /var/lib/mailman/cron/senddigests ]
-then
- su -s /bin/sh list -c "/usr/bin/python /var/lib/mailman/cron/senddigests"
-fi
Deleted: branches/2.1.8/debian/cron.monthly
===================================================================
--- branches/2.1.8/debian/cron.monthly 2006-09-19 18:47:15 UTC (rev 373)
+++ branches/2.1.8/debian/cron.monthly 2006-09-19 18:54:50 UTC (rev 374)
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-if [ ! -x /usr/bin/python ]
-then
- exit 0
-fi
-
-cd /var/lib/mailman/cron 2> /dev/null
-
-# Send password reminders for all lists to all users.
-if [ -e /var/lib/mailman/cron/mailpasswds ]
-then
- su -s /bin/sh list -c "/usr/bin/python /var/lib/mailman/cron/mailpasswds"
-fi
Modified: branches/2.1.8/debian/postinst
===================================================================
--- branches/2.1.8/debian/postinst 2006-09-19 18:47:15 UTC (rev 373)
+++ branches/2.1.8/debian/postinst 2006-09-19 18:54:50 UTC (rev 374)
@@ -152,7 +152,7 @@
done
# Done with site language stuff
- # Don't forget the qmail specific stuff (but why support non-free?)
+ # Don't forget the qmail specific stuff
ucf --debconf-ok --three-way ${mm_dist}/qmail-to-mailman.py ${mm_etc}/qmail-to-mailman.py 2>/dev/null
# Install postfix-to-mailman.py as well
ucf --debconf-ok --three-way ${mm_dist}/postfix-to-mailman.py ${mm_etc}/postfix-to-mailman.py 2>/dev/null
@@ -176,7 +176,7 @@
# reminded to re-enable their accounts.
0 9 * * * list [ -x /usr/lib/mailman/cron/disabled ] && /usr/lib/mailman/cron/disabled
#
-# Noon, mail digests for lists that do periodic as well as threshhold delivery.
+# Noon, mail digests for lists that do periodic as well as threshold delivery.
0 12 * * * list [ -x /usr/lib/mailman/cron/senddigests ] && /usr/lib/mailman/cron/senddigests
#
# 5 AM on the first of each month, mail out password reminders.
@@ -185,7 +185,7 @@
# Every 5 mins, try to gate news to mail. You can comment this one out
# if you don't want to allow gating, or don't have any going on right now,
# or want to exclusively use a callback strategy instead of polling.
-# 0,5,10,15,20,25,30,35,40,45,50,55 * * * * list [ -x /usr/lib/mailman/cron/gate_news ] && /usr/lib/mailman/cron/gate_news
+# */5 * * * * list [ -x /usr/lib/mailman/cron/gate_news ] && /usr/lib/mailman/cron/gate_news
#
# At 3:27am every night, regenerate the gzip'd archive file. Only
# turn this on if the internal archiver is used and
@@ -337,33 +337,10 @@
fi
sg list -c "umask 002; /usr/lib/mailman/bin/update;"
- if [ "$1" = "configure" -a "$2" != "" ] && dpkg --compare-versions "$2" lt "1.0b10"; then
- echo
- echo "You will need to manually update your mailing lists."
- echo "For each mailing list you need to copy the file /etc/mailman/options.html to"
- echo "/var/lib/mailman/lists/<listname>/options.html."
- echo
- echo "However, if you have edited this file via the Web interface, you will have to"
- echo "merge your changes into this file, otherwise you will lose your changes."
- fi
-
# fix permissions
find /var/lib/mailman/ -type d -exec chmod g+s \{\} \;
chmod o-rx /var/lib/mailman/archives/private
chown www-data /var/lib/mailman/archives/private
-
-
- if [ "$1" = "configure" -a "$2" != "" ] && dpkg --compare-versions "$2" lt "1.0rel"; then
- echo ""
- echo "Please read /usr/share/doc/mailman/README.Debian to learn how"
- echo "to integrate mailman best with your MTA and webserver"
-
- echo -n "Press RETURN to continue..."
- DEBIAN_FRONTEND=`echo "$DEBIAN_FRONTEND" | tr A-Z a-z`
- if [ ! "$DEBIAN_FRONTEND" = "noninteractive" ]; then
- read foo
- fi
- fi
;;
*)
Modified: branches/2.1.8/debian/preinst
===================================================================
--- branches/2.1.8/debian/preinst 2006-09-19 18:47:15 UTC (rev 373)
+++ branches/2.1.8/debian/preinst 2006-09-19 18:54:50 UTC (rev 374)
@@ -14,20 +14,6 @@
fi
fi
-if [ "$1" = "install" -o "$1" = "upgrade" ]; then
- if [ -d /var/lib/mailman/logs -a ! -L /var/lib/mailman/logs ]; then
- echo "Moving the current logs to /var/lib/mailman/logs.old"
- echo "New logs will be generated in /var/log/mailman"
- mv /var/lib/mailman/logs /var/lib/mailman/logs.old
- mkdir /var/log/mailman && true
- chown root:list /var/log/mailman
- chmod 2775 /var/log/mailman
- ln -s /var/log/mailman /var/lib/mailman/logs
- echo -n "Press RETURN to continue"
- read foo
- fi
-fi
-
#DEBHELPER#
# make sure the qfiles directory is empty.
Modified: branches/2.1.8/debian/rules
===================================================================
--- branches/2.1.8/debian/rules 2006-09-19 18:47:15 UTC (rev 373)
+++ branches/2.1.8/debian/rules 2006-09-19 18:54:50 UTC (rev 374)
@@ -139,11 +139,11 @@
dh_strip
dh_compress
dh_fixperms
- chown -R root.root debian/mailman
- chown -R root.list \
+ chown -R root:root debian/mailman
+ chown -R root:list \
debian/mailman/{etc/$(package),var/lib/$(package),usr/lib/{$(package),cgi-bin/$(package)}}
- chown list.list debian/mailman/var/{lock/mailman,lib/mailman/qfiles,run/mailman}
- chown root.list debian/mailman/var/log/mailman
+ chown list:list debian/mailman/var/{lock/mailman,lib/mailman/qfiles,run/mailman}
+ chown root:list debian/mailman/var/log/mailman
find debian/mailman/var/lib/$(package) -type d | xargs chmod 2775
find debian/mailman/var/lib/$(package)/messages -type d | xargs chmod 755
More information about the Pkg-mailman-hackers
mailing list