From 65bcd33f0e024cfd20ddc58852d20dd392a422d4 Mon Sep 17 00:00:00 2001 From: José María Alonso Josa Date: Thu, 25 Feb 2016 10:11:38 +0100 Subject: app-admin/logrotate: Drop old patches --- .../logrotate/files/logrotate-3.8.9-Werror.patch | 12 ----- .../files/logrotate-3.8.9-atomic-create.patch | 43 ---------------- .../logrotate/files/logrotate-3.8.9-fbsd.patch | 57 ---------------------- .../files/logrotate-3.8.9-ignore-hidden.patch | 14 ------ .../files/logrotate-3.8.9-noasprintf.patch | 55 --------------------- 5 files changed, 181 deletions(-) delete mode 100644 app-admin/logrotate/files/logrotate-3.8.9-Werror.patch delete mode 100644 app-admin/logrotate/files/logrotate-3.8.9-atomic-create.patch delete mode 100644 app-admin/logrotate/files/logrotate-3.8.9-fbsd.patch delete mode 100644 app-admin/logrotate/files/logrotate-3.8.9-ignore-hidden.patch delete mode 100644 app-admin/logrotate/files/logrotate-3.8.9-noasprintf.patch (limited to 'app-admin/logrotate/files') diff --git a/app-admin/logrotate/files/logrotate-3.8.9-Werror.patch b/app-admin/logrotate/files/logrotate-3.8.9-Werror.patch deleted file mode 100644 index 53570e1124a9..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.9-Werror.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar a/Makefile.am b/Makefile.am ---- a/Makefile.am 2015-02-13 07:11:21.000000000 +0100 -+++ b/Makefile.am 2015-03-01 11:19:47.279999912 +0100 -@@ -1,7 +1,7 @@ - MAN = logrotate.8 - MAN5 = logrotate.conf.5 - --AM_CFLAGS = -Wall -Werror -+AM_CFLAGS = -Wall - sbin_PROGRAMS = logrotate - logrotate_SOURCES = logrotate.c log.c config.c basenames.c - diff --git a/app-admin/logrotate/files/logrotate-3.8.9-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.8.9-atomic-create.patch deleted file mode 100644 index dbb2063a476e..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.9-atomic-create.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Nuar a/logrotate.c b/logrotate.c ---- a/logrotate.c 2015-03-01 11:50:36.569999862 +0100 -+++ b/logrotate.c 2015-03-01 11:56:26.329999853 +0100 -@@ -372,15 +372,18 @@ - int createOutputFile(char *fileName, int flags, struct stat *sb, acl_type acl, int force_mode) - { - int fd; -- struct stat sb_create; -- int acl_set = 0; -- -- fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW), -- (S_IRUSR | S_IWUSR) & sb->st_mode); -+ int acl_set = 0; -+ struct stat sb_create; -+ char template[PATH_MAX + 1]; -+ mode_t umask_value; -+ snprintf(template, PATH_MAX, "%s/logrotate_temp.XXXXXX", ourDirName(fileName)); -+ umask_value = umask(0000); -+ fd = mkostemp(template, (flags | O_EXCL | O_NOFOLLOW)); -+ umask(umask_value); - - if (fd < 0) { -- message(MESS_ERROR, "error creating output file %s: %s\n", -- fileName, strerror(errno)); -+ message(MESS_ERROR, "error creating unique temp file: %s\n", -+ strerror(errno)); - return -1; - } - if (fchmod(fd, (S_IRUSR | S_IWUSR) & sb->st_mode)) { -@@ -431,6 +434,13 @@ - } - } - -+ if (rename(template, fileName)) { -+ message(MESS_ERROR, "error renaming temp file to %s: %s\n", -+ fileName, strerror(errno)); -+ close(fd); -+ return -1; -+ } -+ - return fd; - } - diff --git a/app-admin/logrotate/files/logrotate-3.8.9-fbsd.patch b/app-admin/logrotate/files/logrotate-3.8.9-fbsd.patch deleted file mode 100644 index 4c6c8cf7e27c..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.9-fbsd.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Nuar a/config.c b/config.c ---- a/config.c 2015-03-01 11:25:37.489999902 +0100 -+++ b/config.c 2015-03-01 11:26:31.129999901 +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 2015-02-13 07:11:21.000000000 +0100 -+++ b/logrotate.c 2015-03-01 11:27:05.769999900 +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 -@@ -25,6 +25,10 @@ - #include - #endif - -+#if !defined(PATH_MAX) && defined(__FreeBSD__) -+#include -+#endif -+ - #include "basenames.h" - #include "log.h" - #include "logrotate.h" -diff -Nuar a/Makefile b/Makefile ---- a/Makefile 2015-02-13 07:11:21.000000000 +0100 -+++ b/Makefile 2015-03-01 11:27:27.209999900 +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.8.9-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.8.9-ignore-hidden.patch deleted file mode 100644 index d09266895ccb..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.9-ignore-hidden.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar a/config.c b/config.c ---- a/config.c 2015-02-13 07:11:21.000000000 +0100 -+++ b/config.c 2015-03-01 10:51:09.669999958 +0100 -@@ -359,7 +359,9 @@ - char *pattern; - - /* 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.8.9-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.8.9-noasprintf.patch deleted file mode 100644 index aee570250f47..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.9-noasprintf.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Nuar a/config.c b/config.c ---- a/config.c 2015-03-01 10:58:18.689999946 +0100 -+++ b/config.c 2015-03-01 11:04:20.899999937 +0100 -@@ -49,39 +49,6 @@ - #include "asprintf.c" - #endif - --#if !defined(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(strndup) - char *strndup(const char *s, size_t n) - { -diff -Nuar a/logrotate.h b/logrotate.h ---- a/logrotate.h 2015-02-13 07:11:21.000000000 +0100 -+++ b/logrotate.h 2015-03-01 11:04:55.739999936 +0100 -@@ -80,8 +80,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 -- cgit v1.2.3-65-gdbad