From 622008afcaaa99bb87dba14a12ccd02aaa925208 Mon Sep 17 00:00:00 2001 From: José María Alonso Josa Date: Tue, 6 Oct 2015 10:58:06 +0200 Subject: app-admin/logrotate: Drop old Package-Manager: portage-2.2.20.1 --- .../logrotate/files/logrotate-3.8.8-Werror.patch | 11 ----- .../files/logrotate-3.8.8-atomic-create.patch | 45 ----------------- .../logrotate/files/logrotate-3.8.8-fbsd.patch | 57 ---------------------- .../files/logrotate-3.8.8-ignore-hidden.patch | 14 ------ .../files/logrotate-3.8.8-noasprintf.patch | 55 --------------------- 5 files changed, 182 deletions(-) delete mode 100644 app-admin/logrotate/files/logrotate-3.8.8-Werror.patch delete mode 100644 app-admin/logrotate/files/logrotate-3.8.8-atomic-create.patch delete mode 100644 app-admin/logrotate/files/logrotate-3.8.8-fbsd.patch delete mode 100644 app-admin/logrotate/files/logrotate-3.8.8-ignore-hidden.patch delete mode 100644 app-admin/logrotate/files/logrotate-3.8.8-noasprintf.patch (limited to 'app-admin/logrotate/files') diff --git a/app-admin/logrotate/files/logrotate-3.8.8-Werror.patch b/app-admin/logrotate/files/logrotate-3.8.8-Werror.patch deleted file mode 100644 index db965296d9e4..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.8-Werror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -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.8-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.8.8-atomic-create.patch deleted file mode 100644 index 281612531262..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.8-atomic-create.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Nuar a/logrotate.c b/logrotate.c ---- a/logrotate.c 2014-10-16 13:12:35.000000000 +0200 -+++ b/logrotate.c 2014-11-04 20:26:46.080067315 +0100 -@@ -359,15 +359,20 @@ - 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]; -+ char *fname; -+ mode_t umask_value; -+ snprintf(template, PATH_MAX, "%s/logrotate_temp.XXXXXX", ourDirName(fileName)); -+ umask_value = umask(0000); -+ fname = mktemp(template); -+ fd = open(fname, (flags | O_EXCL | O_NOFOLLOW), (S_IRUSR | S_IWUSR) & sb->st_mode); -+ 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)) { -@@ -418,6 +423,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.8-fbsd.patch b/app-admin/logrotate/files/logrotate-3.8.8-fbsd.patch deleted file mode 100644 index ff10211de83a..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.8-fbsd.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Nuar a/config.c b/config.c ---- a/config.c 2014-10-16 13:12:35.000000000 +0200 -+++ b/config.c 2014-11-04 19:22:31.750055957 +0100 -@@ -1,6 +1,6 @@ - #include - /* 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 2014-10-16 13:12:35.000000000 +0200 -+++ b/logrotate.c 2014-11-04 19:25:35.440056498 +0100 -@@ -1,6 +1,6 @@ - #include - /* 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 2014-10-16 13:12:35.000000000 +0200 -+++ b/Makefile 2014-11-04 19:26:07.850056594 +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.8-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.8.8-ignore-hidden.patch deleted file mode 100644 index bdd0fbd9f553..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.8-ignore-hidden.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar a/config.c b/config.c ---- a/config.c 2014-10-16 13:12:35.000000000 +0200 -+++ b/config.c 2014-11-04 19:19:55.200055496 +0100 -@@ -255,7 +255,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.8-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.8.8-noasprintf.patch deleted file mode 100644 index 31ad70717bb9..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.8-noasprintf.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Nuar a/config.c b/config.c ---- a/config.c 2014-10-16 13:12:35.000000000 +0200 -+++ b/config.c 2014-11-04 19:28:58.110057096 +0100 -@@ -45,39 +45,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 2014-10-16 13:12:35.000000000 +0200 -+++ b/logrotate.h 2014-11-04 19:29:15.610057147 +0100 -@@ -75,8 +75,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