diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
| commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
| tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch | |
| parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch')
| -rw-r--r-- | app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch b/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch deleted file mode 100644 index b622c8d70e70..000000000000 --- a/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 |