From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 5 Feb 2020 18:44:56 +0000
Subject: gentoo resync : 05.02.2020

---
 app-admin/logrotate/files/gcc-fnocommon.patch      | 41 ++++++++++++++++++++++
 .../logrotate/files/logrotate-3.13.0-fbsd.patch    | 36 -------------------
 .../files/logrotate-3.13.0-ignore-hidden.patch     | 14 --------
 3 files changed, 41 insertions(+), 50 deletions(-)
 create mode 100644 app-admin/logrotate/files/gcc-fnocommon.patch
 delete mode 100644 app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
 delete mode 100644 app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch

(limited to 'app-admin/logrotate/files')

diff --git a/app-admin/logrotate/files/gcc-fnocommon.patch b/app-admin/logrotate/files/gcc-fnocommon.patch
new file mode 100644
index 000000000000..d490c20ce0a9
--- /dev/null
+++ b/app-admin/logrotate/files/gcc-fnocommon.patch
@@ -0,0 +1,41 @@
+From 908e86191bf062711ea44c922e66d27203e90214 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
+Date: Wed, 8 Jan 2020 10:54:53 +0100
+Subject: [PATCH] split declaration and definition of queue variable
+
+Support compilation with -fno-common flag, which is the default for GCC 10.
+
+Fixes: #288
+Closes #289
+---
+ config.c    | 2 ++
+ logrotate.h | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/config.c b/config.c
+index 0e9a828..f027c7e 100644
+--- a/config.c
++++ b/config.c
+@@ -28,6 +28,8 @@
+ #include "log.h"
+ #include "logrotate.h"
+ 
++struct logInfoHead logs;
++
+ #if !defined(GLOB_ABORTED) && defined(GLOB_ABEND)
+ #define GLOB_ABORTED GLOB_ABEND
+ #endif
+diff --git a/logrotate.h b/logrotate.h
+index 1c178da..6c1c2e7 100644
+--- a/logrotate.h
++++ b/logrotate.h
+@@ -89,7 +89,8 @@ struct logInfo {
+     TAILQ_ENTRY(logInfo) list;
+ };
+ 
+-TAILQ_HEAD(logInfoHead, logInfo) logs;
++TAILQ_HEAD(logInfoHead, logInfo);
++extern struct logInfoHead logs;
+ 
+ extern int numLogs;
+ extern int debug;
diff --git a/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch b/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
deleted file mode 100644
index 028dc0551f17..000000000000
--- a/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2017-10-14 18:52:56.829467653 +0200
-+++ b/config.c	2017-10-14 18:54:57.049467139 +0200
-@@ -25,6 +25,10 @@
- #include <sys/mman.h>
- #include <libgen.h>
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "log.h"
- #include "logrotate.h"
- 
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c	2017-10-12 17:19:41.000000000 +0200
-+++ b/logrotate.c	2017-10-14 18:56:23.419466769 +0200
-@@ -1,6 +1,6 @@
- #include "queue.h"
- /* alloca() is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -27,6 +27,10 @@
- #include <limits.h>
- #endif
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "log.h"
- #include "logrotate.h"
- 
diff --git a/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch
deleted file mode 100644
index f3ade248d38c..000000000000
--- a/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2017-10-12 16:05:41.000000000 +0200
-+++ b/config.c	2017-10-14 18:52:56.829467653 +0200
-@@ -432,7 +432,9 @@
- 	int i;
- 
- 	/* Check if fname is '.' or '..'; if so, return false */
--	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
-+  /* Don't include 'hidden' files either; this breaks Gentoo
-+     portage config file management http://bugs.gentoo.org/87683 */
-+  if (fname[0] == '.')
- 		return 0;
- 
- 	/* Check if fname is ending in a taboo-extension; if so, return false */
-- 
cgit v1.2.3