From owner-svn-ports-all@freebsd.org Fri Sep 4 04:03:19 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B5FF03D543A; Fri, 4 Sep 2020 04:03:19 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjPD74SFMz4TLB; Fri, 4 Sep 2020 04:03:19 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7C25326860; Fri, 4 Sep 2020 04:03:19 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08443J9k068129; Fri, 4 Sep 2020 04:03:19 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08443IrX068126; Fri, 4 Sep 2020 04:03:18 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202009040403.08443IrX068126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 4 Sep 2020 04:03:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547508 - head/sysutils/logrotate/files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/sysutils/logrotate/files X-SVN-Commit-Revision: 547508 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 04:03:19 -0000 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 #endif #include +@@ -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 #endif #include +@@ -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;