commit 96d902b2d1607785f0698b4530a9e8910bd5649e
Author: Elan Ruusamäe <[email protected]>
Date: Mon Apr 10 20:17:24 2017 +0300
drop migration from 2.11-2
commit 04662a6587abddd5c6363d14b6b94ac194a809aa
Date: Mon Mar 11 15:54:14 2013 +0200
everybody should have upgraded by now,
and if hasn't then that can't be supported.
tmpwatch.cron | 16 +++++-----------
tmpwatch.spec | 16 ----------------
2 files changed, 5 insertions(+), 27 deletions(-)
---
diff --git a/tmpwatch.spec b/tmpwatch.spec
index 4fbfb41..f6ead9f 100644
--- a/tmpwatch.spec
+++ b/tmpwatch.spec
@@ -132,22 +132,6 @@ rm -rf $RPM_BUILD_ROOT
%postun
%systemd_reload
-%triggerpostun -- %{name} < 2.9.1-4
-if [ -f /usr/sbin/amavisd ]; then
- echo "WARNING!! Take a look at /etc/sysconfig/%{name}"
- echo "That version has enabled amavis-spool cleaning"
-fi
-
-%triggerun -- %{name} < 2.11-2.1
-# if previous install had /etc/cron.daily/* files unlinked, disable the cronjob
-if [ ! -e /etc/cron.daily/tmpwatch ]; then
- echo DISABLE_TMPWATCH_CRON=yes >> /etc/sysconfig/tmpwatch
-fi
-
-if [ ! -e /etc/cron.daily/tmpwatch.directories ]; then
- echo DISABLE_TMPWATCH_CRON_DIRS=yes >> /etc/sysconfig/tmpwatch
-fi
-
%triggerpostun -- %{name} < 2.11-10
%systemd_service_enable cronjob-%{name}.timer
diff --git a/tmpwatch.cron b/tmpwatch.cron
index 61024e8..f0896a2 100755
--- a/tmpwatch.cron
+++ b/tmpwatch.cron
@@ -8,20 +8,14 @@ if [ -f /etc/sysconfig/tmpwatch ]; then
. /etc/sysconfig/tmpwatch
fi
-# NOTE: DISABLE_TMPWATCH_* vars are not official, only here to handle
migration from < 2.11-2.1
+/usr/sbin/tmpwatch ${OPTIONS} -x /tmp/.X11-unix -x /tmp/.XIM-unix -x
/tmp/.font-unix \
+ -x /tmp/.ICE-unix -x /tmp/.Test-unix -X /tmp/.s.PGSQL.\* 240 /tmp
-if [ "$DISABLE_TMPWATCH_CRON" != "yes" ]; then
- /usr/sbin/tmpwatch ${OPTIONS} -x /tmp/.X11-unix -x /tmp/.XIM-unix -x
/tmp/.font-unix \
- -x /tmp/.ICE-unix -x /tmp/.Test-unix -X /tmp/.s.PGSQL.\* 240
/tmp
-
- # Cleanup amavis quarantine:
- if [ ${AMAVIS_QUARANTINE} -gt 0 ] && [ -d /var/spool/amavis/virusmails
]; then
- /usr/sbin/tmpwatch ${OPTIONS} ${AMAVIS_QUARANTINE}
/var/spool/amavis/virusmails
- fi
+# Cleanup amavis quarantine:
+if [ ${AMAVIS_QUARANTINE} -gt 0 ] && [ -d /var/spool/amavis/virusmails ]; then
+ /usr/sbin/tmpwatch ${OPTIONS} ${AMAVIS_QUARANTINE}
/var/spool/amavis/virusmails
fi
-[ "$DISABLE_TMPWATCH_CRON_DIRS" = "yes" ] && exit 0
-
# process extra .conf files
for file in /etc/tmpwatch/*.conf; do
grep ^/ ${file} | while read DIRECTORY TIME OPTS; do
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tmpwatch.git/commitdiff/96d902b2d1607785f0698b4530a9e8910bd5649e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
