diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2003-07-30 09:41:58 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2003-07-30 09:41:58 +0000 |
| commit | c08de746349dc18a7128bb26bfaf7716e56e4e20 (patch) | |
| tree | 546e26bff9c2b3c1bd7103e1d5cd13c3c4cc7207 /sysutils/logrotate | |
| parent | 358875200d6f0a1971e66d4531945cce0797bc06 (diff) | |
Fix build on -current
PR: 54613
Submitted by: krion
Approved by: fjoe (mentor) (implicit)
Maintainer timeout: one week
Notes
Notes:
svn path=/head/; revision=85906
Diffstat (limited to 'sysutils/logrotate')
| -rw-r--r-- | sysutils/logrotate/files/patch-ac | 22 | ||||
| -rw-r--r-- | sysutils/logrotate/files/patch-logrotate.c | 43 |
2 files changed, 43 insertions, 22 deletions
diff --git a/sysutils/logrotate/files/patch-ac b/sysutils/logrotate/files/patch-ac deleted file mode 100644 index 1c3ca0adb866..000000000000 --- a/sysutils/logrotate/files/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ ---- logrotate.c.orig Thu Jun 17 04:37:19 1999 -+++ logrotate.c Wed Dec 29 11:31:57 1999 -@@ -1,9 +1,7 @@ --#include <alloca.h> - #include <ctype.h> - #include <dirent.h> - #include <errno.h> - #include <fcntl.h> --#include <getopt.h> - #include <popt.h> - #include <stdio.h> - #include <stdlib.h> -@@ -457,6 +455,9 @@ - hasErrors = 1; - } - } -+ -+ message(MESS_DEBUG, "sleep 10 to wait daemon close log\n"); -+ sleep(10); - - if (!hasErrors && !log->rotateCount) { - message(MESS_DEBUG, "removing rotated log (rotateCount == 0)"); diff --git a/sysutils/logrotate/files/patch-logrotate.c b/sysutils/logrotate/files/patch-logrotate.c new file mode 100644 index 000000000000..527211d5677b --- /dev/null +++ b/sysutils/logrotate/files/patch-logrotate.c @@ -0,0 +1,43 @@ +--- logrotate.c.orig Fri Aug 4 20:27:38 2000 ++++ logrotate.c Fri Jul 18 15:20:13 2003 +@@ -1,9 +1,7 @@ +-#include <alloca.h> + #include <ctype.h> + #include <dirent.h> + #include <errno.h> + #include <fcntl.h> +-#include <getopt.h> + #include <popt.h> + #include <stdio.h> + #include <stdlib.h> +@@ -395,8 +393,7 @@ + if (log->pre && !(log->flags & LOG_FLAG_SHAREDSCRIPTS)) { + message(MESS_DEBUG, "running prerotate script\n"); + if (runScript(log->files[logNum], log->pre)) { +- fprintf(errorFile, "error running prerotate script -- +- leaving old log in place\n"); ++ fprintf(errorFile, "error running prerotate script -- leaving old log in place\n"); + hasErrors = 1; + } + } +@@ -471,6 +468,9 @@ + } + } + ++ message(MESS_DEBUG, "sleep 10 to wait daemon close log\n"); ++ sleep(10); ++ + if (!hasErrors && !log->rotateCount) { + message(MESS_DEBUG, "removing rotated log (rotateCount == 0)"); + if (unlink(finalName)) { +@@ -634,8 +634,8 @@ + if (log->pre && (log->flags & LOG_FLAG_SHAREDSCRIPTS)) { + message(MESS_DEBUG, "running shared prerotate script\n"); + if (runScript(log->pattern, log->pre)) { +- fprintf(errorFile, "error running shared prerotate script for %s-- +- leaving old logs in place\n", log->pattern); ++ fprintf(errorFile, "error running shared prerotate script for %s-- " ++ "leaving old logs in place\n", log->pattern); + hasErrors = 1; + } + } |