Date: Fri, 18 Jul 2003 13:24:22 +0200 From: Kirill Ponomarew <ponomarew@oberon.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ycheng@sinica.edu.tw Subject: ports/54613: Update sysutils/logrotate: fix build with gcc-3.3 Message-ID: <E19dTLa-000HFm-UV@voodoo.oberon.net> Resent-Message-ID: <200307181130.h6IBUGF7098949@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 54613
>Category: ports
>Synopsis: Update sysutils/logrotate: fix build with gcc-3.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 18 04:30:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Kirill Ponomarew
>Release: FreeBSD 4.8-STABLE i386
>Organization:
Oberon.net
>Environment:
>Description:
Update sysutils/logrotate: fix build with gcc-3.3
Reported by bento:
http://bento.freebsd.org/errorlogs/i386-5-latest/logrotate-3.5.2.log
>How-To-Repeat:
>Fix:
diff -urN logrotate.orig/files/patch-ac logrotate/files/patch-ac
--- logrotate.orig/files/patch-ac Thu Dec 30 13:35:51 1999
+++ logrotate/files/patch-ac Thu Jan 1 01:00:00 1970
@@ -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 -urN logrotate.orig/files/patch-logrotate.c logrotate/files/patch-logrotate.c
--- logrotate.orig/files/patch-logrotate.c Thu Jan 1 01:00:00 1970
+++ logrotate/files/patch-logrotate.c Fri Jul 18 13:20:50 2003
@@ -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;
+ }
+ }
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E19dTLa-000HFm-UV>