* [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/files/
@ 2016-02-25 9:08 José María Alonso
0 siblings, 0 replies; 6+ messages in thread
From: José María Alonso @ 2016-02-25 9:08 UTC (permalink / raw
To: gentoo-commits
commit: 65bcd33f0e024cfd20ddc58852d20dd392a422d4
Author: José María Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 09:11:38 2016 +0000
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 09:12:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65bcd33f
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(-)
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 53570e1..0000000
--- 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 dbb2063..0000000
--- 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 4c6c8cf..0000000
--- 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 <alloca.h>
- #endif
- #include <limits.h>
-@@ -24,6 +24,10 @@
- #include <fnmatch.h>
- #include <sys/mman.h>
-
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#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 <alloca.h>
- #endif
- #include <limits.h>
-@@ -25,6 +25,10 @@
- #include <limits.h>
- #endif
-
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#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 d092668..0000000
--- 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 aee5702..0000000
--- 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 <stdarg.h>
--
--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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/files/
@ 2017-04-22 21:35 José María Alonso
0 siblings, 0 replies; 6+ messages in thread
From: José María Alonso @ 2017-04-22 21:35 UTC (permalink / raw
To: gentoo-commits
commit: 964f1cc9a4fda702a3878470cfb12f4deeeb9109
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 21:34:51 2017 +0000
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 21:34:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=964f1cc9
app-admin/logrotate: Drops old files
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../logrotate/files/logrotate-3.10.0-Werror.patch | 9 ----
.../files/logrotate-3.10.0-atomic-create.patch | 43 ----------------
.../logrotate/files/logrotate-3.10.0-fbsd.patch | 57 ----------------------
.../files/logrotate-3.10.0-ignore-hidden.patch | 14 ------
.../logrotate/files/logrotate-3.10.0-lfs.patch | 11 -----
.../files/logrotate-3.10.0-noasprintf.patch | 55 ---------------------
.../logrotate/files/logrotate-3.9.2-Werror.patch | 12 -----
.../files/logrotate-3.9.2-atomic-create.patch | 42 ----------------
.../logrotate/files/logrotate-3.9.2-fbsd.patch | 57 ----------------------
.../files/logrotate-3.9.2-ignore-hidden.patch | 15 ------
.../logrotate/files/logrotate-3.9.2-lfs.patch | 12 -----
.../files/logrotate-3.9.2-noasprintf.patch | 55 ---------------------
12 files changed, 382 deletions(-)
diff --git a/app-admin/logrotate/files/logrotate-3.10.0-Werror.patch b/app-admin/logrotate/files/logrotate-3.10.0-Werror.patch
deleted file mode 100644
index 86b45a4f106..00000000000
--- a/app-admin/logrotate/files/logrotate-3.10.0-Werror.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nuar a/Makefile.am b/Makefile.am
---- a/Makefile.am 2016-08-03 12:25:47.000000000 +0200
-+++ b/Makefile.am 2016-08-03 23:28:16.420071763 +0200
-@@ -1,4 +1,4 @@
--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.10.0-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.10.0-atomic-create.patch
deleted file mode 100644
index 46c36b8deeb..00000000000
--- a/app-admin/logrotate/files/logrotate-3.10.0-atomic-create.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c 2016-08-03 23:20:52.900062834 +0200
-+++ b/logrotate.c 2016-08-03 23:25:18.080068173 +0200
-@@ -368,15 +368,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)) {
-@@ -427,6 +430,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.10.0-fbsd.patch b/app-admin/logrotate/files/logrotate-3.10.0-fbsd.patch
deleted file mode 100644
index 4952ab8125f..00000000000
--- a/app-admin/logrotate/files/logrotate-3.10.0-fbsd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c 2016-08-03 23:19:33.730061240 +0200
-+++ b/config.c 2016-08-03 23:20:31.200062397 +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>
-@@ -24,6 +24,10 @@
- #include <fnmatch.h>
- #include <sys/mman.h>
-
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c 2016-08-03 12:25:47.000000000 +0200
-+++ b/logrotate.c 2016-08-03 23:20:52.900062834 +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>
-@@ -26,6 +27,10 @@
- #include <limits.h>
- #endif
-
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
-diff -Nuar a/Makefile.legacy b/Makefile.legacy
---- a/Makefile.legacy 2016-08-03 12:25:47.000000000 +0200
-+++ b/Makefile.legacy 2016-08-03 23:21:07.370063125 +0200
-@@ -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.10.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.10.0-ignore-hidden.patch
deleted file mode 100644
index 3496a6d65a3..00000000000
--- a/app-admin/logrotate/files/logrotate-3.10.0-ignore-hidden.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c 2016-08-03 12:25:47.000000000 +0200
-+++ b/config.c 2016-08-03 23:19:33.730061240 +0200
-@@ -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.10.0-lfs.patch b/app-admin/logrotate/files/logrotate-3.10.0-lfs.patch
deleted file mode 100644
index 9c7b3606b2c..00000000000
--- a/app-admin/logrotate/files/logrotate-3.10.0-lfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar a/configure.ac b/configure.ac
---- a/configure.ac 2016-08-03 12:25:47.000000000 +0200
-+++ b/configure.ac 2016-08-03 23:29:44.540073537 +0200
-@@ -9,6 +9,7 @@
- AC_PROG_CC_STDC
- AC_STRUCT_ST_BLKSIZE
- AC_STRUCT_ST_BLOCKS
-+AC_SYS_LARGEFILE
-
- AC_CHECK_LIB([popt],[poptParseArgvString],,
- AC_MSG_ERROR([libpopt required but not found]))
diff --git a/app-admin/logrotate/files/logrotate-3.10.0-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.10.0-noasprintf.patch
deleted file mode 100644
index 608a1095a57..00000000000
--- a/app-admin/logrotate/files/logrotate-3.10.0-noasprintf.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c 2016-08-03 23:20:31.200062397 +0200
-+++ b/config.c 2016-08-03 23:22:52.830065248 +0200
-@@ -49,39 +49,6 @@
- #include "asprintf.c"
- #endif
-
--#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
--#include <stdarg.h>
--
--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 2016-08-03 12:25:47.000000000 +0200
-+++ b/logrotate.h 2016-08-03 23:23:15.220065699 +0200
-@@ -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
diff --git a/app-admin/logrotate/files/logrotate-3.9.2-Werror.patch b/app-admin/logrotate/files/logrotate-3.9.2-Werror.patch
deleted file mode 100644
index 659a66c0483..00000000000
--- a/app-admin/logrotate/files/logrotate-3.9.2-Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/Makefile.am b/Makefile.am
---- a/Makefile.am 2016-01-20 10:47:36.000000000 +0100
-+++ b/Makefile.am 2016-01-25 20:04:28.270050499 +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.9.2-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.9.2-atomic-create.patch
deleted file mode 100644
index 3914e65608e..00000000000
--- a/app-admin/logrotate/files/logrotate-3.9.2-atomic-create.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c 2016-01-25 19:55:46.740039999 +0100
-+++ b/logrotate.c 2016-01-25 20:03:15.290049030 +0100
-@@ -367,15 +367,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)) {
-@@ -425,6 +428,12 @@
- return -1;
- }
- }
-+ 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.9.2-fbsd.patch b/app-admin/logrotate/files/logrotate-3.9.2-fbsd.patch
deleted file mode 100644
index 5f6059628d4..00000000000
--- a/app-admin/logrotate/files/logrotate-3.9.2-fbsd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c 2016-01-25 19:50:48.840034001 +0100
-+++ b/config.c 2016-01-25 19:54:37.170038598 +0100
-@@ -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>
-@@ -24,6 +24,10 @@
- #include <fnmatch.h>
- #include <sys/mman.h>
-
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c 2016-01-20 10:47:36.000000000 +0100
-+++ b/logrotate.c 2016-01-25 19:55:46.740039999 +0100
-@@ -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>
-@@ -26,6 +26,10 @@
- #include <limits.h>
- #endif
-
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
-diff -Nuar a/Makefile b/Makefile
---- a/Makefile 2016-01-20 10:47:36.000000000 +0100
-+++ b/Makefile 2016-01-25 19:56:43.380041139 +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.9.2-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.9.2-ignore-hidden.patch
deleted file mode 100644
index df1ed8de564..00000000000
--- a/app-admin/logrotate/files/logrotate-3.9.2-ignore-hidden.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c 2016-01-20 10:47:36.000000000 +0100
-+++ b/config.c 2016-01-25 19:50:48.840034001 +0100
-@@ -359,7 +359,10 @@
- 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.9.2-lfs.patch b/app-admin/logrotate/files/logrotate-3.9.2-lfs.patch
deleted file mode 100644
index 66ea73fd0de..00000000000
--- a/app-admin/logrotate/files/logrotate-3.9.2-lfs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/configure.ac b/configure.ac
---- a/configure.ac 2016-01-20 10:47:36.000000000 +0100
-+++ b/configure.ac 2016-01-25 20:05:49.310052130 +0100
-@@ -10,6 +10,8 @@
- AC_STRUCT_ST_BLKSIZE
- AC_STRUCT_ST_BLOCKS
-
-+AC_SYS_LARGEFILE
-+
- AC_CHECK_LIB([popt],[poptParseArgvString],,
- AC_MSG_ERROR([libpopt required but not found]))
-
diff --git a/app-admin/logrotate/files/logrotate-3.9.2-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.9.2-noasprintf.patch
deleted file mode 100644
index f9e07695716..00000000000
--- a/app-admin/logrotate/files/logrotate-3.9.2-noasprintf.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c 2016-01-25 19:54:37.170038598 +0100
-+++ b/config.c 2016-01-25 19:58:56.040043810 +0100
-@@ -49,39 +49,6 @@
- #include "asprintf.c"
- #endif
-
--#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
--#include <stdarg.h>
--
--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 2016-01-20 10:47:36.000000000 +0100
-+++ b/logrotate.h 2016-01-25 19:59:39.760044690 +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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/files/
@ 2017-09-26 15:25 José María Alonso
0 siblings, 0 replies; 6+ messages in thread
From: José María Alonso @ 2017-09-26 15:25 UTC (permalink / raw
To: gentoo-commits
commit: df999ecff616a4007972bb75b167c36e7524b26a
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 15:25:28 2017 +0000
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 15:25:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df999ecf
app-admin/logrotate: Removes unused patch
Closes: https://github.com/gentoo/gentoo/pull/5793#
Package-Manager: Portage-2.3.8, Repoman-2.3.1
app-admin/logrotate/files/logrotate-3.9.1-lfs.patch | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-lfs.patch b/app-admin/logrotate/files/logrotate-3.9.1-lfs.patch
deleted file mode 100644
index 57449d0f657..00000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-lfs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/559572
-
-make sure we can handle large files properly (like log files over 2GiB)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -10,6 +10,8 @@
- AC_STRUCT_ST_BLKSIZE
- AC_STRUCT_ST_BLOCKS
-
-+AC_SYS_LARGEFILE
-+
- AC_CHECK_LIB([popt],[poptParseArgvString],,
- AC_MSG_ERROR([libpopt required but not found]))
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/files/
@ 2021-01-20 23:04 Conrad Kostecki
0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2021-01-20 23:04 UTC (permalink / raw
To: gentoo-commits
commit: 82abdea39b819ce26a5ec385170f5b506e7d3656
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jan 18 19:42:31 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 23:04:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82abdea3
app-admin/logrotate: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/19109
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
app-admin/logrotate/files/gcc-fnocommon.patch | 41 ---------------------------
1 file changed, 41 deletions(-)
diff --git a/app-admin/logrotate/files/gcc-fnocommon.patch b/app-admin/logrotate/files/gcc-fnocommon.patch
deleted file mode 100644
index d490c20ce0a..00000000000
--- a/app-admin/logrotate/files/gcc-fnocommon.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/files/
@ 2021-02-25 15:21 Louis Sautier
0 siblings, 0 replies; 6+ messages in thread
From: Louis Sautier @ 2021-02-25 15:21 UTC (permalink / raw
To: gentoo-commits
commit: 6bca1d8c9fb26f5603e3d45744b94a6220b438db
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 15:14:57 2021 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 15:20:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bca1d8c
app-admin/logrotate: fix a typo in logrotate.conf
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Acked-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
app-admin/logrotate/files/logrotate.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-admin/logrotate/files/logrotate.conf b/app-admin/logrotate/files/logrotate.conf
index ff3319fd835..d25e0238586 100644
--- a/app-admin/logrotate/files/logrotate.conf
+++ b/app-admin/logrotate/files/logrotate.conf
@@ -39,4 +39,4 @@ include /etc/logrotate.d
rotate 1
}
-# system-specific logs may be also be configured here.
+# system-specific logs may also be configured here.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/files/
@ 2024-06-30 0:00 Conrad Kostecki
0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2024-06-30 0:00 UTC (permalink / raw
To: gentoo-commits
commit: e0afbee7c774aa88efb223d0cea12f593b17f7c1
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jun 29 09:12:47 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 23:56:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0afbee7
app-admin/logrotate: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/logrotate-3.20.1-log-changes.patch | 147 ---------------------
1 file changed, 147 deletions(-)
diff --git a/app-admin/logrotate/files/logrotate-3.20.1-log-changes.patch b/app-admin/logrotate/files/logrotate-3.20.1-log-changes.patch
deleted file mode 100644
index b7c4bb5275db..000000000000
--- a/app-admin/logrotate/files/logrotate-3.20.1-log-changes.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-https://bugs.gentoo.org/847382#c3
-https://github.com/logrotate/logrotate/commit/31cf1099ab8514dfcae5a980bc77352edd5292f8
-https://github.com/logrotate/logrotate/commit/7b1fa328bf70eb8434166f151bd075cd1440d0dc
-
-From 31cf1099ab8514dfcae5a980bc77352edd5292f8 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Fri, 27 May 2022 09:56:07 +0200
-Subject: [PATCH] lockState: do not print `error:` when exit code is unaffected
-
-Closes: https://github.com/logrotate/logrotate/pull/448
---- a/logrotate.c
-+++ b/logrotate.c
-@@ -3050,8 +3050,8 @@ static int lockState(const char *stateFilename, int skip_state_lock)
- }
-
- if (sb.st_mode & S_IROTH) {
-- message(MESS_ERROR, "state file %s is world-readable and thus can"
-- " be locked from other unprivileged users."
-+ message(MESS_NORMAL, "warning: state file %s is world-readable"
-+ " and thus can be locked from other unprivileged users."
- " Skipping lock acquisition...\n",
- stateFilename);
- close(lockFd);
-
-From 7b1fa328bf70eb8434166f151bd075cd1440d0dc Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Fri, 27 May 2022 16:02:57 +0200
-Subject: [PATCH] log: unify handling of log levels
-
-Use MESS_WARN instead of MESS_NORMAL and make it always use
-the `warning:` prefix. MESS_WARN is now mapped to LOG_WARNING
-for syslog.
-
-Also drop MESS_VERBOSE, which was not set anywhere.
-
-Closes: https://github.com/logrotate/logrotate/pull/239
-Closes: https://github.com/logrotate/logrotate/pull/449
---- a/config.c
-+++ b/config.c
-@@ -643,7 +643,7 @@ static void set_criterium(enum criterium *pDst, enum criterium src, int *pSet)
- {
- if (*pSet && (*pDst != src)) {
- /* we are overriding a previously set criterium */
-- message(MESS_VERBOSE, "warning: '%s' overrides previously specified '%s'\n",
-+ message(MESS_DEBUG, "note: '%s' overrides previously specified '%s'\n",
- crit_to_string(src), crit_to_string(*pDst));
- }
- *pDst = src;
-@@ -1021,7 +1021,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
-
- if (getuid() == ROOT_UID) {
- if ((sb_config.st_mode & 07533) != 0400) {
-- message(MESS_NORMAL,
-+ message(MESS_WARN,
- "Potentially dangerous mode on %s: 0%o\n",
- configFile, (unsigned) (sb_config.st_mode & 07777));
- }
-@@ -1386,7 +1386,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
- RAISE_ERROR();
- }
- } else if (!strcmp(key, "errors")) {
-- message(MESS_NORMAL,
-+ message(MESS_WARN,
- "%s: %d: the errors directive is deprecated and no longer used.\n",
- configFile, lineNum);
- } else if (!strcmp(key, "mail")) {
---- a/log.c
-+++ b/log.c
-@@ -40,9 +40,12 @@ static void log_once(FILE *where, int level, const char *format, va_list args)
- {
- switch (level) {
- case MESS_DEBUG:
-- case MESS_NORMAL:
-- case MESS_VERBOSE:
- break;
-+
-+ case MESS_WARN:
-+ fprintf(where, "warning: ");
-+ break;
-+
- default:
- fprintf(where, "error: ");
- break;
-@@ -78,10 +81,11 @@ void message(int level, const char *format, ...)
- priority |= LOG_DEBUG;
- break;
- case MESS_DEBUG:
-- case MESS_VERBOSE:
-- case MESS_NORMAL:
- priority |= LOG_INFO;
- break;
-+ case MESS_WARN:
-+ priority |= LOG_WARNING;
-+ break;
- case MESS_ERROR:
- priority |= LOG_ERR;
- break;
---- a/log.h
-+++ b/log.h
-@@ -5,8 +5,7 @@
-
- #define MESS_REALDEBUG 1
- #define MESS_DEBUG 2
--#define MESS_VERBOSE 3
--#define MESS_NORMAL 4
-+#define MESS_WARN 4
- #define MESS_ERROR 5
- #define MESS_FATAL 6
-
---- a/logrotate.c
-+++ b/logrotate.c
-@@ -3050,7 +3050,7 @@ static int lockState(const char *stateFilename, int skip_state_lock)
- }
-
- if (sb.st_mode & S_IROTH) {
-- message(MESS_NORMAL, "warning: state file %s is world-readable"
-+ message(MESS_WARN, "state file %s is world-readable"
- " and thus can be locked from other unprivileged users."
- " Skipping lock acquisition...\n",
- stateFilename);
-@@ -3106,7 +3106,7 @@ int main(int argc, const char **argv)
- POPT_AUTOHELP { NULL, 0, 0, NULL, 0, NULL, NULL }
- };
-
-- logSetLevel(MESS_NORMAL);
-+ logSetLevel(MESS_WARN);
- setlocale (LC_ALL, "");
-
- optCon = poptGetContext("logrotate", argc, argv, options, 0);
-@@ -3117,7 +3117,7 @@ int main(int argc, const char **argv)
- switch (arg) {
- case 'd':
- debug = 1;
-- message(MESS_NORMAL, "WARNING: logrotate in debug mode does nothing"
-+ message(MESS_WARN, "logrotate in debug mode does nothing"
- " except printing debug messages! Consider using verbose"
- " mode (-v) instead if this is not what you want.\n\n");
- /* fallthrough */
---- a/test/test-0080.sh
-+++ b/test/test-0080.sh
-@@ -10,4 +10,4 @@ cleanup 80
- preptest test.log 80 1 0
-
- $RLR -d test-config.80 2>&1 | \
-- grep -q "warning: 'daily' overrides previously specified 'size'"
-+ grep -q "note: 'daily' overrides previously specified 'size'"
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-30 0:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-25 9:08 [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/files/ José María Alonso
-- strict thread matches above, loose matches on Subject: below --
2017-04-22 21:35 José María Alonso
2017-09-26 15:25 José María Alonso
2021-01-20 23:04 Conrad Kostecki
2021-02-25 15:21 Louis Sautier
2024-06-30 0:00 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox