diff options
| author |   Chema Alonso Josa <nimiux@gentoo.org> | 2017-07-02 16:08:26 +0200 |
|---|---|---|
| committer | Chema Alonso Josa <nimiux@gentoo.org> | 2017-07-02 16:09:13 +0200 |
| commit | f902818573513baad78ba32fb46ca7946ffd8d03 (patch) | |
| tree | 954aa02fde980fe1ed241104a23ffb031b84827e /app-admin/logrotate/files | |
| parent | app-text/mftrace: 1.2.19 (diff) | |
| download | gentoo-f902818573513baad78ba32fb46ca7946ffd8d03.tar.gz gentoo-f902818573513baad78ba32fb46ca7946ffd8d03.tar.bz2 gentoo-f902818573513baad78ba32fb46ca7946ffd8d03.zip | |
app-admin/logrotate: Bumps version to 3.12.3 and fixes some bugs.
Bug: https://bugs.gentoo.org/show_bug.cgi?id=525418
Bug: https://bugs.gentoo.org/show_bug.cgi?id=621850
Closes: https://github.com/gentoo/gentoo/pull/4994
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'app-admin/logrotate/files')
| -rw-r--r-- | app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch | 36 | ||||
| -rw-r--r-- | app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch | 14 |
2 files changed, 50 insertions, 0 deletions
diff --git a/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch b/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch new file mode 100644 index 000000000000..67a60e3af177 --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch @@ -0,0 +1,36 @@ +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 <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-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 <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.12.3-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch new file mode 100644 index 000000000000..0bbb91dcb4fc --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch @@ -0,0 +1,14 @@ +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 */ |