Date: Fri, 4 Sep 2020 04:03:18 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547508 - head/sysutils/logrotate/files Message-ID: <202009040403.08443IrX068126@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Sep 4 04:03:18 2020 New Revision: 547508 URL: https://svnweb.freebsd.org/changeset/ports/547508 Log: Ensure that there is only one variable definition per each object, as the C (and C++) standards mandated for years and compilers started to enforce as of recently (Clang 11, GCC 10). Reported by: pkg-fallout Added: head/sysutils/logrotate/files/patch-logrotate.h (contents, props changed) Modified: head/sysutils/logrotate/files/patch-config.c head/sysutils/logrotate/files/patch-logrotate.c Modified: head/sysutils/logrotate/files/patch-config.c ============================================================================== --- head/sysutils/logrotate/files/patch-config.c Fri Sep 4 04:02:38 2020 (r547507) +++ head/sysutils/logrotate/files/patch-config.c Fri Sep 4 04:03:18 2020 (r547508) @@ -1,5 +1,5 @@ ---- config.c.orig 2017-10-12 15:19:41.000000000 +0000 -+++ config.c 2017-10-14 21:59:41.716559000 +0000 +--- config.c.orig 2017-10-12 15:19:41 UTC ++++ config.c @@ -1,6 +1,6 @@ #include "queue.h" /* Alloca is defined in stdlib.h in NetBSD */ @@ -8,3 +8,12 @@ #include <alloca.h> #endif #include <limits.h> +@@ -27,6 +27,8 @@ + + #include "log.h" + #include "logrotate.h" ++ ++extern struct logInfoHead logs; + + #if !defined(GLOB_ABORTED) && defined(GLOB_ABEND) + #define GLOB_ABORTED GLOB_ABEND Modified: head/sysutils/logrotate/files/patch-logrotate.c ============================================================================== --- head/sysutils/logrotate/files/patch-logrotate.c Fri Sep 4 04:02:38 2020 (r547507) +++ head/sysutils/logrotate/files/patch-logrotate.c Fri Sep 4 04:03:18 2020 (r547508) @@ -1,5 +1,5 @@ ---- logrotate.c.orig 2017-10-12 15:19:41.000000000 +0000 -+++ logrotate.c 2017-10-14 22:00:57.613844000 +0000 +--- logrotate.c.orig 2017-10-12 15:19:41 UTC ++++ logrotate.c @@ -1,6 +1,6 @@ #include "queue.h" /* alloca() is defined in stdlib.h in NetBSD */ @@ -8,3 +8,12 @@ #include <alloca.h> #endif #include <limits.h> +@@ -29,6 +29,8 @@ + + #include "log.h" + #include "logrotate.h" ++ ++struct logInfoHead logs; + + static void *prev_context; + #ifdef WITH_SELINUX Added: head/sysutils/logrotate/files/patch-logrotate.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/logrotate/files/patch-logrotate.h Fri Sep 4 04:03:18 2020 (r547508) @@ -0,0 +1,11 @@ +--- logrotate.h.orig 2017-10-12 15:19:41 UTC ++++ logrotate.h +@@ -80,7 +80,7 @@ + TAILQ_ENTRY(logInfo) list; + }; + +-TAILQ_HEAD(logInfoHead, logInfo) logs; ++TAILQ_HEAD(logInfoHead, logInfo); + + extern int numLogs; + extern int debug;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009040403.08443IrX068126>