From bd7908c6630f38067350d396ac5d18c3cc2434a0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Oct 2017 11:22:34 +0000 Subject: gentoo resync : 29.10.2017 --- .../logrotate/files/logrotate-3.11.0-Werror.patch | 12 ----- .../logrotate/files/logrotate-3.11.0-fbsd.patch | 57 ---------------------- .../files/logrotate-3.11.0-ignore-hidden.patch | 14 ------ .../logrotate/files/logrotate-3.11.0-lfs.patch | 11 ----- .../files/logrotate-3.11.0-noasprintf.patch | 55 --------------------- .../logrotate/files/logrotate-3.12.2-fbsd.patch | 36 -------------- .../files/logrotate-3.12.2-ignore-hidden.patch | 14 ------ 7 files changed, 199 deletions(-) delete mode 100644 app-admin/logrotate/files/logrotate-3.11.0-Werror.patch delete mode 100644 app-admin/logrotate/files/logrotate-3.11.0-fbsd.patch delete mode 100644 app-admin/logrotate/files/logrotate-3.11.0-ignore-hidden.patch delete mode 100644 app-admin/logrotate/files/logrotate-3.11.0-lfs.patch delete mode 100644 app-admin/logrotate/files/logrotate-3.11.0-noasprintf.patch delete mode 100644 app-admin/logrotate/files/logrotate-3.12.2-fbsd.patch delete mode 100644 app-admin/logrotate/files/logrotate-3.12.2-ignore-hidden.patch (limited to 'app-admin/logrotate/files') diff --git a/app-admin/logrotate/files/logrotate-3.11.0-Werror.patch b/app-admin/logrotate/files/logrotate-3.11.0-Werror.patch deleted file mode 100644 index 43c0ebaeb189..000000000000 --- a/app-admin/logrotate/files/logrotate-3.11.0-Werror.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar a/Makefile.am b/Makefile.am ---- a/Makefile.am 2016-11-30 13:05:55.000000000 +0100 -+++ b/Makefile.am 2016-12-02 23:46:15.288908073 +0100 -@@ -8,7 +8,7 @@ - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # GNU General Public License for more details. - # --AM_CFLAGS = -Wall -Werror -+AM_CFLAGS = -Wall - sbin_PROGRAMS = logrotate - logrotate_SOURCES = basenames.c config.c log.c logrotate.c \ - basenames.h config.h log.h logrotate.h queue.h diff --git a/app-admin/logrotate/files/logrotate-3.11.0-fbsd.patch b/app-admin/logrotate/files/logrotate-3.11.0-fbsd.patch deleted file mode 100644 index f5aa65272b88..000000000000 --- a/app-admin/logrotate/files/logrotate-3.11.0-fbsd.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Nuar a/config.c b/config.c ---- a/config.c 2016-12-02 23:33:36.768905615 +0100 -+++ b/config.c 2016-12-02 23:36:15.568906130 +0100 -@@ -1,6 +1,6 @@ - #include "queue.h" - /* Alloca is defined in stdlib.h in NetBSD */ --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) - #include - #endif - #include -@@ -24,6 +24,10 @@ - #include - #include - -+#if !defined(PATH_MAX) && defined(__FreeBSD__) -+#include -+#endif -+ - #include "basenames.h" - #include "log.h" - #include "logrotate.h" -diff -Nuar a/logrotate.c b/logrotate.c ---- a/logrotate.c 2016-11-30 14:07:15.000000000 +0100 -+++ b/logrotate.c 2016-12-02 23:36:44.218906223 +0100 -@@ -1,6 +1,6 @@ - #include "queue.h" - /* alloca() is defined in stdlib.h in NetBSD */ --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) - #include - #endif - #include -@@ -26,6 +26,10 @@ - #include - #endif - -+#if !defined(PATH_MAX) && defined(__FreeBSD__) -+#include -+#endif -+ - #include "basenames.h" - #include "log.h" - #include "logrotate.h" -diff -Nuar a/Makefile.legacy b/Makefile.legacy ---- a/Makefile.legacy 2016-11-30 13:05:55.000000000 +0100 -+++ b/Makefile.legacy 2016-12-02 23:37:33.938906384 +0100 -@@ -22,7 +22,9 @@ - - ifeq ($(WITH_ACL),yes) - CFLAGS += -DWITH_ACL -+ifneq ($(OS_NAME),FreeBSD) - LOADLIBES += -lacl -+endif - # See pretest - TEST_ACL=1 - else diff --git a/app-admin/logrotate/files/logrotate-3.11.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.11.0-ignore-hidden.patch deleted file mode 100644 index 104f202efd27..000000000000 --- a/app-admin/logrotate/files/logrotate-3.11.0-ignore-hidden.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar a/config.c b/config.c ---- a/config.c 2016-11-30 13:05:55.000000000 +0100 -+++ b/config.c 2016-12-02 23:33:36.768905615 +0100 -@@ -383,7 +383,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 */ diff --git a/app-admin/logrotate/files/logrotate-3.11.0-lfs.patch b/app-admin/logrotate/files/logrotate-3.11.0-lfs.patch deleted file mode 100644 index 9cd5745e846a..000000000000 --- a/app-admin/logrotate/files/logrotate-3.11.0-lfs.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nuar a/configure.ac b/configure.ac ---- a/configure.ac 2016-12-02 14:08:40.000000000 +0100 -+++ b/configure.ac 2016-12-02 23:48:03.878908425 +0100 -@@ -12,6 +12,7 @@ - AC_PROG_CC_STDC - AC_STRUCT_ST_BLKSIZE - AC_STRUCT_ST_BLOCKS -+AC_SYS_LARGEFILE - - dnl Use 64-bit file offsets on 32-bit systems (defines C macros if necessary) - AC_SYS_LARGEFILE diff --git a/app-admin/logrotate/files/logrotate-3.11.0-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.11.0-noasprintf.patch deleted file mode 100644 index 36733a25d03b..000000000000 --- a/app-admin/logrotate/files/logrotate-3.11.0-noasprintf.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Nuar a/config.c b/config.c ---- a/config.c 2016-12-02 23:36:15.568906130 +0100 -+++ b/config.c 2016-12-02 23:41:17.438907108 +0100 -@@ -49,39 +49,6 @@ - #include "asprintf.c" - #endif - --#if !defined(HAVE_ASPRINTF) && !defined(_FORTIFY_SOURCE) --#include -- --int asprintf(char **string_ptr, const char *format, ...) --{ -- va_list arg; -- char *str; -- int size; -- int rv; -- -- va_start(arg, format); -- size = vsnprintf(NULL, 0, format, arg); -- size++; -- va_start(arg, format); -- str = malloc(size); -- if (str == NULL) { -- va_end(arg); -- /* -- * Strictly speaking, GNU asprintf doesn't do this, -- * but the caller isn't checking the return value. -- */ -- fprintf(stderr, "failed to allocate memory\\n"); -- exit(1); -- } -- rv = vsnprintf(str, size, format, arg); -- va_end(arg); -- -- *string_ptr = str; -- return (rv); --} -- --#endif -- - #if !defined(HAVE_STRNDUP) - char *strndup(const char *s, size_t n) - { -diff -Nuar a/logrotate.h b/logrotate.h ---- a/logrotate.h 2016-11-30 13:05:55.000000000 +0100 -+++ b/logrotate.h 2016-12-02 23:40:54.518907034 +0100 -@@ -82,8 +82,5 @@ - extern int debug; - - int readAllConfigPaths(const char **paths); --#if !defined(asprintf) && !defined(_FORTIFY_SOURCE) --int asprintf(char **string_ptr, const char *format, ...); --#endif - - #endif diff --git a/app-admin/logrotate/files/logrotate-3.12.2-fbsd.patch b/app-admin/logrotate/files/logrotate-3.12.2-fbsd.patch deleted file mode 100644 index 67a60e3af177..000000000000 --- a/app-admin/logrotate/files/logrotate-3.12.2-fbsd.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nuar a/config.c b/config.c ---- a/config.c 2017-04-22 23:46:08.201991730 +0200 -+++ b/config.c 2017-04-22 23:49:43.021996055 +0200 -@@ -25,6 +25,10 @@ - #include - #include - -+#if !defined(PATH_MAX) && defined(__FreeBSD__) -+#include -+#endif -+ - #include "log.h" - #include "logrotate.h" - -diff -Nuar a/logrotate.c b/logrotate.c ---- a/logrotate.c 2017-04-21 10:52:10.000000000 +0200 -+++ b/logrotate.c 2017-04-22 23:50:20.691996814 +0200 -@@ -1,6 +1,6 @@ - #include "queue.h" - /* alloca() is defined in stdlib.h in NetBSD */ --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) - #include - #endif - #include -@@ -27,6 +27,10 @@ - #include - #endif - -+#if !defined(PATH_MAX) && defined(__FreeBSD__) -+#include -+#endif -+ - #include "log.h" - #include "logrotate.h" - diff --git a/app-admin/logrotate/files/logrotate-3.12.2-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.12.2-ignore-hidden.patch deleted file mode 100644 index 0bbb91dcb4fc..000000000000 --- a/app-admin/logrotate/files/logrotate-3.12.2-ignore-hidden.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar a/config.c b/config.c ---- a/config.c 2017-04-18 14:57:02.000000000 +0200 -+++ b/config.c 2017-04-22 23:46:08.201991730 +0200 -@@ -389,7 +389,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