diff options
Diffstat (limited to 'app-admin/tmpwatch/files')
| -rw-r--r-- | app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch | 30 | ||||
| -rw-r--r-- | app-admin/tmpwatch/files/tmpwatch.cron | 47 |
2 files changed, 77 insertions, 0 deletions
diff --git a/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch b/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch new file mode 100644 index 000000000000..b622c8d70e70 --- /dev/null +++ b/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch @@ -0,0 +1,30 @@ +Make boot time detection failures non-fatal. Taken from PLD Linux + +Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=468444 +PLD bug: https://bugs.launchpad.net/pld-linux/+bug/1034364 +Patch: https://github.com/pld-linux/tmpwatch/blob/master/tmpwatch-boottime.patch + +--- tmpwatch-2.11/tmpwatch.c~ ++++ tmpwatch-2.11/tmpwatch.c +@@ -666,9 +666,11 @@ + time_t boot_time; + + if (clock_gettime(CLOCK_REALTIME, &real_clock) != 0 +- || clock_gettime(CLOCK_BOOTTIME, &boot_clock) != 0) +- message(LOG_FATAL, "Error determining boot time: %s\n", ++ || clock_gettime(CLOCK_BOOTTIME, &boot_clock) != 0) { ++ message(LOG_DEBUG, "Error determining boot time: %s\n", + strerror(errno)); ++ socket_kill_time = 0; /* Never remove sockets */ ++ } else { + boot_time = real_clock.tv_sec - boot_clock.tv_sec; + if (real_clock.tv_nsec < boot_clock.tv_nsec) + boot_time--; +@@ -677,6 +679,7 @@ + boot_time -= 2; + + socket_kill_time = boot_time - grace_seconds; ++ } + #else + socket_kill_time = 0; /* Never remove sockets */ + #endif diff --git a/app-admin/tmpwatch/files/tmpwatch.cron b/app-admin/tmpwatch/files/tmpwatch.cron new file mode 100644 index 000000000000..806b1453e552 --- /dev/null +++ b/app-admin/tmpwatch/files/tmpwatch.cron @@ -0,0 +1,47 @@ +#!/bin/sh +# vim: ft=sh + +# This cron script contains several (commented out) examples. You may use +# them as is, by uncommenting them, or modify them to suit your needs. Read +# tmpwatch(8) for more information on tmpwatch parameters. + +### Variables ### + +TMPWATCH="/usr/sbin/tmpwatch" +#PORTAGE_TMPDIR="$(portageq envvar PORTAGE_TMPDIR)/portage" +#PORTAGE_LOGDIR="$(portageq envvar PORT_LOGDIR)" +#DISTDIR="$(portageq distdir)" + +### EXAMPLES ### + +# NOTE: if you have noatime in /etc/fstab for any partitions you plan on +# running tmpwatch on, you should obviously change any of the examples that +# use atime (-u|--atime). Those that don't specify anything, default to +# atime. + +# NOTE2: the time value is in HOURS! + +# Delete everything in /tmp that haven't been accessed in a week (>=168 hrs). +# +# if [[ -d /tmp ]]; then +# ${TMPWATCH} --atime 168 /tmp +# fi + +# Delete everything in PORTAGE_TMPDIR that hasn't been modified in 2 weeks. +# +# if [[ -d ${PORTAGE_TMPDIR:-/var/tmp/portage} && -z $(/usr/bin/pgrep emerge) ]]; then +# ${TMPWATCH} --mtime --all 336 ${PORTAGE_TMPDIR:-/var/tmp/portage} +# fi + +# Delete everything in DISTDIR that hasn't been accessed in 6 months (going +# by 30 day months) +# +# if [[ -d ${DISTDIR:-/usr/portage/distfiles} ]]; then +# ${TMPWATCH} --atime --fuser 4320 ${DISTDIR:-/usr/portage/distfiles} +# fi + +# Delete everything in PORTAGE_LOGDIR that hasn't been accessed in 4 weeks +# +# if [[ -d ${PORTAGE_LOGDIR:-/var/log/portage} ]]; then +# ${TMPWATCH} --atime 772 ${PORTAGE_LOGDIR:-/var/log/portage} +# fi |