* [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/, app-admin/logrotate/files/
@ 2015-10-06 8:55 José María Alonso
0 siblings, 0 replies; 8+ messages in thread
From: José María Alonso @ 2015-10-06 8:55 UTC (permalink / raw
To: gentoo-commits
commit: 622008afcaaa99bb87dba14a12ccd02aaa925208
Author: José María Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 6 08:58:06 2015 +0000
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Tue Oct 6 08:58:50 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622008af
app-admin/logrotate: Drop old
Package-Manager: portage-2.2.20.1
app-admin/logrotate/Manifest | 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 ----------------
app-admin/logrotate/logrotate-3.8.8.ebuild | 74 ----------------------
7 files changed, 257 deletions(-)
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index d427552..25d4efc 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,3 +1,2 @@
-DIST logrotate-3.8.8.tar.gz 72014 SHA256 46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f SHA512 2b7b5fe587b3a5cbe98b8035a541b5e272e6e4c40669f65ff6c43d1524b686eca9abc0b93bc00c8eb6da4d189f14a9b79905fcc0fadb914276d884ad7493bb4b WHIRLPOOL b145d51cdcf0214e4f4b6a97aed7b9e1375c2848efecbc16181eaa6e1105ac8892c57248c89b92eb080d6cd6b23958085f39a894df7f5dce0bea6516e2d583c4
DIST logrotate-3.8.9.tar.gz 77408 SHA256 700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7 SHA512 342533f321a1d77c0ca389fd0a393377ba73f10654aae163cbd35f8d5df25673f1aa6e44d0af42be5419d152a7dae11024d9005076bce0a3b3dad1f0e12b9c0d WHIRLPOOL 005621b5dc7f6954e505876eece76e3adf03b9b89b724e5c28b845c8af3ebb8e978d20e3a82c8a503c32bfd8758517625207e23518d6d08068e237c22fe7212d
DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17
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 db96529..0000000
--- 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 2816125..0000000
--- 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 ff10211..0000000
--- 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 <sys/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 2014-10-16 13:12:35.000000000 +0200
-+++ b/logrotate.c 2014-11-04 19:25:35.440056498 +0100
-@@ -1,6 +1,6 @@
- #include <sys/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 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 bdd0fbd..0000000
--- 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 31ad707..0000000
--- 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 <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 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
diff --git a/app-admin/logrotate/logrotate-3.8.8.ebuild b/app-admin/logrotate/logrotate-3.8.8.ebuild
deleted file mode 100644
index 1085ce9..0000000
--- a/app-admin/logrotate/logrotate-3.8.8.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://fedorahosted.org/logrotate/"
-SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl selinux"
-
-CDEPEND="
- >=dev-libs/popt-1.5
- selinux? (
- sys-libs/libselinux
- )
- acl? ( virtual/acl )"
-
-DEPEND="${CDEPEND}
- >=sys-apps/sed-4
-"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-logrotate )
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-ignore-hidden.patch \
- "${FILESDIR}"/${P}-fbsd.patch \
- "${FILESDIR}"/${P}-noasprintf.patch \
- "${FILESDIR}"/${P}-atomic-create.patch \
- "${FILESDIR}"/${P}-Werror.patch
- eautoreconf
-}
-
-src_compile() {
- local myconf
- myconf="CC=$(tc-getCC)"
- use selinux && myconf="${myconf} WITH_SELINUX=yes"
- use acl && myconf="${myconf} WITH_ACL=yes"
- emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
- insinto /usr
- dosbin logrotate
- doman logrotate.8
- dodoc CHANGES examples/logrotate*
-
- exeinto /etc/cron.daily
- newexe "${S}"/examples/logrotate.cron "${PN}"
-
- insinto /etc
- doins "${FILESDIR}"/logrotate.conf
-
- keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "If you wish to have logrotate e-mail you updates, please"
- elog "emerge virtual/mailx and configure logrotate in"
- elog "/etc/logrotate.conf appropriately"
- elog
- elog "Additionally, /etc/logrotate.conf may need to be modified"
- elog "for your particular needs. See man logrotate for details."
- fi
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/, app-admin/logrotate/files/
@ 2016-01-25 19:58 José María Alonso
0 siblings, 0 replies; 8+ messages in thread
From: José María Alonso @ 2016-01-25 19:58 UTC (permalink / raw
To: gentoo-commits
commit: 0cb2e1a56954a0ae8621953eb95584c999617e5d
Author: José María Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 20:01:19 2016 +0000
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 20:01:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb2e1a5
app-admin/logrotate: bump to version 3.9.2
Package-Manager: portage-2.2.26
app-admin/logrotate/Manifest | 1 +
.../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 ++++++++++++++
app-admin/logrotate/logrotate-3.9.2.ebuild | 83 ++++++++++++++++++++++
8 files changed, 277 insertions(+)
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 25d4efc..eae536b 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,2 +1,3 @@
+DIST 3.9.2.tar.gz 80711 SHA256 2de00c65e23fa9d7909cae6594e550b9abe9a7eb1553669ddeaca92d30f97009 SHA512 62c84a98ec3373562a5c0ab0abd68e33620787cbbafbcf442cb5c7bdc1a41a7f673ee5dabc5f905ad4dd3fffebcbee0dab2ea8698f20de04cc13950212aaab33 WHIRLPOOL b77338f2cc88e6bd03310cea40c26cd4d890238455b4d9507f64a3f8de1006bf98e0d3b783f6536da963f3d695ab604ab3f9bb0e6aa1ae9575005a665b497ec1
DIST logrotate-3.8.9.tar.gz 77408 SHA256 700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7 SHA512 342533f321a1d77c0ca389fd0a393377ba73f10654aae163cbd35f8d5df25673f1aa6e44d0af42be5419d152a7dae11024d9005076bce0a3b3dad1f0e12b9c0d WHIRLPOOL 005621b5dc7f6954e505876eece76e3adf03b9b89b724e5c28b845c8af3ebb8e978d20e3a82c8a503c32bfd8758517625207e23518d6d08068e237c22fe7212d
DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17
diff --git a/app-admin/logrotate/files/logrotate-3.9.2-Werror.patch b/app-admin/logrotate/files/logrotate-3.9.2-Werror.patch
new file mode 100644
index 0000000..659a66c
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.2-Werror.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..3914e65
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.2-atomic-create.patch
@@ -0,0 +1,42 @@
+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
new file mode 100644
index 0000000..5f60596
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.2-fbsd.patch
@@ -0,0 +1,57 @@
+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
new file mode 100644
index 0000000..df1ed8d
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.2-ignore-hidden.patch
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 0000000..66ea73f
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.2-lfs.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..f9e0769
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.2-noasprintf.patch
@@ -0,0 +1,55 @@
+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
diff --git a/app-admin/logrotate/logrotate-3.9.2.ebuild b/app-admin/logrotate/logrotate-3.9.2.ebuild
new file mode 100644
index 0000000..25550cc
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.9.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://fedorahosted.org/logrotate/"
+SRC_URI="https://github.com/logrotate/logrotate/archive/${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+ >=dev-libs/popt-1.5
+ selinux? (
+ sys-libs/libselinux
+ )
+ acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+ >=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-logrotate )
+ cron? ( virtual/cron )"
+
+install_cron_file() {
+ exeinto /etc/cron.daily
+ newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-ignore-hidden.patch \
+ "${FILESDIR}"/${P}-fbsd.patch \
+ "${FILESDIR}"/${P}-noasprintf.patch \
+ "${FILESDIR}"/${P}-atomic-create.patch \
+ "${FILESDIR}"/${P}-Werror.patch \
+ "${FILESDIR}"/${P}-lfs.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_with acl) $(use_with selinux)
+}
+
+src_compile() {
+ emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ insinto /usr
+ dosbin logrotate
+ doman logrotate.8
+ dodoc CHANGES examples/logrotate*
+
+ insinto /etc
+ doins "${FILESDIR}"/logrotate.conf
+
+ use cron && install_cron_file
+
+ keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "If you wish to have logrotate e-mail you updates, please"
+ elog "emerge virtual/mailx and configure logrotate in"
+ elog "/etc/logrotate.conf appropriately"
+ elog
+ elog "Additionally, /etc/logrotate.conf may need to be modified"
+ elog "for your particular needs. See man logrotate for details."
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/, app-admin/logrotate/files/
@ 2017-10-14 17:03 José María Alonso
0 siblings, 0 replies; 8+ messages in thread
From: José María Alonso @ 2017-10-14 17:03 UTC (permalink / raw
To: gentoo-commits
commit: 32aec47551db79340d234672d6ac6c33b870abba
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 17:02:45 2017 +0000
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 17:03:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32aec475
app-admin/logrotate: Bumps version to 3.13.0
Package-Manager: Portage-2.3.8, Repoman-2.3.3
app-admin/logrotate/Manifest | 1 +
.../logrotate/files/logrotate-3.13.0-fbsd.patch | 36 ++++++++
.../files/logrotate-3.13.0-ignore-hidden.patch | 14 +++
app-admin/logrotate/logrotate-3.13.0.ebuild | 99 ++++++++++++++++++++++
4 files changed, 150 insertions(+)
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 7878d432a5c..f43f755b54c 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,4 +1,5 @@
DIST logrotate-3.11.0.tar.gz 176488 SHA256 7dcb440ed2f1937459e1e06f841c6af1e564b77b2df8009147b56c8649197910 SHA512 67ceb2e18c175a5935c81e7699af7a5e6625cef50a3f52e993d49d6c10d9c433f6c7354a8dd05cb35ab28e4393d1db198f2e46e5f6eafd3e6f040b6518438cc1 WHIRLPOOL 0a581aa5922386b84a7c40a9490364287f4e162f7180fd0e15bf191694294168b663947c7081e92755406fe4f0b3b8792b6f0c5f0e646afa5505a17995a86858
DIST logrotate-3.12.2.tar.gz 202700 SHA256 754777ada2ef2f34378e8f6025cdb0c0725e212f12195d59971c42df0ae0597f SHA512 ba8c3d7c7134b9ab5968c0dc8a1c5d24d7287a3204e1c6eed080b537d6a0ed7765a47c69b3067493304994e3f4238dc0173b593e4628316bfadf3decd002da16 WHIRLPOOL a299bc2bd50ab36acdd4ab747a479c5b94e84ac92bf55b71a8a8a7d4e1b55eb909dce94c22a5fdadda946dc783376923de5f46729084e21b54811489ce97c482
DIST logrotate-3.12.3.tar.gz 202991 SHA256 435a3f9a534a37e11657532a090f6bf521d8696bdf9cb799a360c1750ba3aea9 SHA512 ab700a50736c7ce8a6e5b9dc2504919c6d3e6ae48a7f112f6980253df5c6bab7fc507c82a0cd961d73ed1312c930da46d96d9f27046996644e0759c84c6a1ae9 WHIRLPOOL ceadd2a748850f0035702156b9a566bf3a38749edf823062f1c867e60cac1c7b40d770d6c923eed79972ce58394b3220e16e40e97e192a6a7046cf09c5fcbf77
+DIST logrotate-3.13.0.tar.gz 213726 SHA256 2ea33f69176dd2668fb85307210d7ed0411ff2a0429e4a0a2d881e740160e4b0 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76 WHIRLPOOL 952c5eda18870876ea5109d4c5ae7ac1048d3ea07c89b4a0320a48baa8170fbc200f5b4a1cc193da0f6b0e1ef8dbdcdb82f74f23d4f12e5a19bb98650c1e7d5a
DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17
diff --git a/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch b/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
new file mode 100644
index 00000000000..028dc0551f1
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
@@ -0,0 +1,36 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c 2017-10-14 18:52:56.829467653 +0200
++++ b/config.c 2017-10-14 18:54:57.049467139 +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-10-12 17:19:41.000000000 +0200
++++ b/logrotate.c 2017-10-14 18:56:23.419466769 +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.13.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch
new file mode 100644
index 00000000000..f3ade248d38
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch
@@ -0,0 +1,14 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c 2017-10-12 16:05:41.000000000 +0200
++++ b/config.c 2017-10-14 18:52:56.829467653 +0200
+@@ -432,7 +432,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/logrotate-3.13.0.ebuild b/app-admin/logrotate/logrotate-3.13.0.ebuild
new file mode 100644
index 00000000000..f0661a39594
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.13.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+ >=dev-libs/popt-1.5
+ selinux? ( sys-libs/libselinux )
+ acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+ >=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-logrotate )
+ cron? ( virtual/cron )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+ elog "logrotate state file is now located at ${STATEFILE}"
+ elog "See bug #357275"
+ if [[ -e "${OLDSTATEFILE}" ]] ; then
+ elog "Moving your current state file to new location: ${STATEFILE}"
+ mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+ fi
+}
+
+install_cron_file() {
+ exeinto /etc/cron.daily
+ newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+ "${FILESDIR}/${P}-ignore-hidden.patch"
+ "${FILESDIR}/${P}-fbsd.patch"
+)
+
+src_prepare() {
+ default
+ sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+}
+
+src_configure() {
+ econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ insinto /usr
+ dobin logrotate
+ doman logrotate.8
+ dodoc ChangeLog.md examples/logrotate-default
+
+ insinto /etc
+ doins "${FILESDIR}"/logrotate.conf
+
+ use cron && install_cron_file
+
+ systemd_dounit examples/logrotate.{service,timer}
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
+
+ keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+ elog
+ elog "The ${PN} binary is now installed under /usr/bin. Please"
+ elog "update your links"
+ elog
+ move_old_state_file
+ elog "If you are running systemd you might need to run:"
+ elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+ elog "in order to create the new location of the logrotate state file"
+ elog
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "If you wish to have logrotate e-mail you updates, please"
+ elog "emerge virtual/mailx and configure logrotate in"
+ elog "/etc/logrotate.conf appropriately"
+ elog
+ elog "Additionally, /etc/logrotate.conf may need to be modified"
+ elog "for your particular needs. See man logrotate for details."
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/, app-admin/logrotate/files/
@ 2018-02-01 20:42 José María Alonso
0 siblings, 0 replies; 8+ messages in thread
From: José María Alonso @ 2018-02-01 20:42 UTC (permalink / raw
To: gentoo-commits
commit: 49280b6dc51df4c4a73c27df24a38f8515fd4cf8
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 1 20:40:05 2018 +0000
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Thu Feb 1 20:40:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49280b6d
app-admin/logrotate: Drops old version 3.12.3
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-admin/logrotate/Manifest | 1 -
.../logrotate/files/logrotate-3.12.3-fbsd.patch | 36 --------
.../files/logrotate-3.12.3-ignore-hidden.patch | 14 ---
app-admin/logrotate/logrotate-3.12.3-r1.ebuild | 99 ----------------------
app-admin/logrotate/logrotate-3.12.3-r2.ebuild | 99 ----------------------
5 files changed, 249 deletions(-)
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 50ece1aff4f..c0753bf1cec 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,3 +1,2 @@
-DIST logrotate-3.12.3.tar.gz 202991 BLAKE2B 26e6507eeeeae15cfa1e183a64151a66600462a48aa6eb951b30634b90644b24ae7ceb9e26da5954919c83e05cab5a102589b621b7a8fdc8bea8d40dd1c813fe SHA512 ab700a50736c7ce8a6e5b9dc2504919c6d3e6ae48a7f112f6980253df5c6bab7fc507c82a0cd961d73ed1312c930da46d96d9f27046996644e0759c84c6a1ae9
DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a1623cf1aae2444e818339361c7b7762ce51fcbd124fefafbe47d529dd21ef346a6c9a267da20547914388db99dce003 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76
DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
diff --git a/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch b/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch
deleted file mode 100644
index 67a60e3af17..00000000000
--- a/app-admin/logrotate/files/logrotate-3.12.3-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 <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
deleted file mode 100644
index 0bbb91dcb4f..00000000000
--- a/app-admin/logrotate/files/logrotate-3.12.3-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 */
diff --git a/app-admin/logrotate/logrotate-3.12.3-r1.ebuild b/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
deleted file mode 100644
index 81b5ffc20c5..00000000000
--- a/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl +cron selinux"
-
-CDEPEND="
- >=dev-libs/popt-1.5
- selinux? ( sys-libs/libselinux )
- acl? ( virtual/acl )"
-
-DEPEND="${CDEPEND}
- >=sys-apps/sed-4"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-logrotate )
- cron? ( virtual/cron )"
-
-STATEFILE="/var/lib/misc/logrotate.status"
-OLDSTATEFILE="/var/lib/logrotate.status"
-
-move_old_state_file() {
- elog "logrotate state file is now located at ${STATEFILE}"
- elog "See bug #357275"
- if [[ -e "${OLDSTATEFILE}" ]] ; then
- elog "Moving your current state file to new location: ${STATEFILE}"
- mv -n "${OLDSTATEFILE}" "${STATEFILE}"
- fi
-}
-
-install_cron_file() {
- exeinto /etc/cron.daily
- newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
- "${FILESDIR}/${P}-ignore-hidden.patch"
- "${FILESDIR}/${P}-fbsd.patch"
-)
-
-src_prepare() {
- default
- sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
-}
-
-src_configure() {
- econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- insinto /usr
- dobin logrotate
- doman logrotate.8
- dodoc ChangeLog.md examples/logrotate-default
-
- insinto /etc
- doins "${FILESDIR}"/logrotate.conf
-
- use cron && install_cron_file
-
- systemd_dounit examples/logrotate.{service,timer}
-
- keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
- elog
- elog "The ${PN} binary is now installed under /usr/bin. Please"
- elog "update your links"
- elog
- move_old_state_file
- elog
- elog "If you are running systemd you might need to run:"
- elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
- elog "in order to create the new location of the logrotate state file"
- elog
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "If you wish to have logrotate e-mail you updates, please"
- elog "emerge virtual/mailx and configure logrotate in"
- elog "/etc/logrotate.conf appropriately"
- elog
- elog "Additionally, /etc/logrotate.conf may need to be modified"
- elog "for your particular needs. See man logrotate for details."
- fi
-}
diff --git a/app-admin/logrotate/logrotate-3.12.3-r2.ebuild b/app-admin/logrotate/logrotate-3.12.3-r2.ebuild
deleted file mode 100644
index f0661a39594..00000000000
--- a/app-admin/logrotate/logrotate-3.12.3-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl +cron selinux"
-
-CDEPEND="
- >=dev-libs/popt-1.5
- selinux? ( sys-libs/libselinux )
- acl? ( virtual/acl )"
-
-DEPEND="${CDEPEND}
- >=sys-apps/sed-4"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-logrotate )
- cron? ( virtual/cron )"
-
-STATEFILE="/var/lib/misc/logrotate.status"
-OLDSTATEFILE="/var/lib/logrotate.status"
-
-move_old_state_file() {
- elog "logrotate state file is now located at ${STATEFILE}"
- elog "See bug #357275"
- if [[ -e "${OLDSTATEFILE}" ]] ; then
- elog "Moving your current state file to new location: ${STATEFILE}"
- mv -n "${OLDSTATEFILE}" "${STATEFILE}"
- fi
-}
-
-install_cron_file() {
- exeinto /etc/cron.daily
- newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
- "${FILESDIR}/${P}-ignore-hidden.patch"
- "${FILESDIR}/${P}-fbsd.patch"
-)
-
-src_prepare() {
- default
- sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
-}
-
-src_configure() {
- econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- insinto /usr
- dobin logrotate
- doman logrotate.8
- dodoc ChangeLog.md examples/logrotate-default
-
- insinto /etc
- doins "${FILESDIR}"/logrotate.conf
-
- use cron && install_cron_file
-
- systemd_dounit examples/logrotate.{service,timer}
- systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
-
- keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
- elog
- elog "The ${PN} binary is now installed under /usr/bin. Please"
- elog "update your links"
- elog
- move_old_state_file
- elog "If you are running systemd you might need to run:"
- elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
- elog "in order to create the new location of the logrotate state file"
- elog
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "If you wish to have logrotate e-mail you updates, please"
- elog "emerge virtual/mailx and configure logrotate in"
- elog "/etc/logrotate.conf appropriately"
- elog
- elog "Additionally, /etc/logrotate.conf may need to be modified"
- elog "for your particular needs. See man logrotate for details."
- fi
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/, app-admin/logrotate/files/
@ 2018-12-19 15:40 José María Alonso
0 siblings, 0 replies; 8+ messages in thread
From: José María Alonso @ 2018-12-19 15:40 UTC (permalink / raw
To: gentoo-commits
commit: 3c36401dafd804f7e7f66d5e4170f46f4b19bd14
Author: Jose Maria Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 19 15:40:04 2018 +0000
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Wed Dec 19 15:40:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c36401d
app-admin/logrotate: Bump version to 3.15.0
Signed-off-by: José María Alonso <nimiux <AT> gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.11
app-admin/logrotate/Manifest | 1 +
.../files/logrotate-3.15.0-ignore-hidden.patch | 14 ++++
app-admin/logrotate/logrotate-3.15.0.ebuild | 98 ++++++++++++++++++++++
3 files changed, 113 insertions(+)
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 9fe40fb9471..1bab50d4f29 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,3 +1,4 @@
DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a1623cf1aae2444e818339361c7b7762ce51fcbd124fefafbe47d529dd21ef346a6c9a267da20547914388db99dce003 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76
DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
+DIST logrotate-3.15.0.tar.gz 219496 BLAKE2B b9f9cd0b22b79c3da1ea6092c5f3ebf9fca39da3a4bb7e1da39a8bf96f0bdb573864b77681671ad227cfc444bbc3e64a518805780580adb954bfacd564f00e2f SHA512 9520f15eaec54da426699f1f5ce31949d1372fa25c5c127dfbf29ff717a1c15a6fd14437c1d7b67b116b12c8a5c28f6012e39ad4b3ca2b053c874d02efe98d84
DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
diff --git a/app-admin/logrotate/files/logrotate-3.15.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.15.0-ignore-hidden.patch
new file mode 100644
index 00000000000..cb2fc073bc6
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.15.0-ignore-hidden.patch
@@ -0,0 +1,14 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c 2018-10-05 17:01:21.000000000 +0200
++++ b/config.c 2018-12-19 16:33:52.280129804 +0100
+@@ -417,7 +417,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/logrotate-3.15.0.ebuild b/app-admin/logrotate/logrotate-3.15.0.ebuild
new file mode 100644
index 00000000000..34b327c5d75
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.15.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+ >=dev-libs/popt-1.5
+ selinux? ( sys-libs/libselinux )
+ acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+ >=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-logrotate )
+ cron? ( virtual/cron )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+ elog "logrotate state file is now located at ${STATEFILE}"
+ elog "See bug #357275"
+ if [[ -e "${OLDSTATEFILE}" ]] ; then
+ elog "Moving your current state file to new location: ${STATEFILE}"
+ mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+ fi
+}
+
+install_cron_file() {
+ exeinto /etc/cron.daily
+ newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+ "${FILESDIR}/${P}-ignore-hidden.patch"
+)
+
+src_prepare() {
+ sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+ default
+}
+
+src_configure() {
+ econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ insinto /usr
+ dobin logrotate
+ doman logrotate.8
+ dodoc ChangeLog.md
+
+ insinto /etc
+ doins "${FILESDIR}"/logrotate.conf
+
+ use cron && install_cron_file
+
+ systemd_dounit examples/logrotate.{service,timer}
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
+
+ keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+ elog
+ elog "The ${PN} binary is now installed under /usr/bin. Please"
+ elog "update your links"
+ elog
+ move_old_state_file
+ elog "If you are running systemd you might need to run:"
+ elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+ elog "in order to create the new location of the logrotate state file"
+ elog
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "If you wish to have logrotate e-mail you updates, please"
+ elog "emerge virtual/mailx and configure logrotate in"
+ elog "/etc/logrotate.conf appropriately"
+ elog
+ elog "Additionally, /etc/logrotate.conf may need to be modified"
+ elog "for your particular needs. See man logrotate for details."
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/, app-admin/logrotate/files/
@ 2019-08-31 14:11 Mikle Kolyada
0 siblings, 0 replies; 8+ messages in thread
From: Mikle Kolyada @ 2019-08-31 14:11 UTC (permalink / raw
To: gentoo-commits
commit: 86f7551364e4556b522c529606d1563fac1d5deb
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 14:10:51 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 14:10:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86f75513
app-admin/logrotate: Drop old
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-admin/logrotate/Manifest | 1 -
.../logrotate/files/logrotate-3.9.1-Werror.patch | 12 ----
.../files/logrotate-3.9.1-atomic-create.patch | 43 ------------
.../logrotate/files/logrotate-3.9.1-fbsd.patch | 57 ---------------
.../files/logrotate-3.9.1-ignore-hidden.patch | 15 ----
.../files/logrotate-3.9.1-noasprintf.patch | 55 ---------------
app-admin/logrotate/logrotate-3.9.1.ebuild | 81 ----------------------
7 files changed, 264 deletions(-)
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 3c8b173781a..811a098c7fe 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -2,4 +2,3 @@ DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a162
DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
DIST logrotate-3.15.0.tar.gz 219496 BLAKE2B b9f9cd0b22b79c3da1ea6092c5f3ebf9fca39da3a4bb7e1da39a8bf96f0bdb573864b77681671ad227cfc444bbc3e64a518805780580adb954bfacd564f00e2f SHA512 9520f15eaec54da426699f1f5ce31949d1372fa25c5c127dfbf29ff717a1c15a6fd14437c1d7b67b116b12c8a5c28f6012e39ad4b3ca2b053c874d02efe98d84
DIST logrotate-3.15.1.tar.gz 220263 BLAKE2B c164c542a0770965f5193f5816509f566b9afeb82ce8388a184d16c2b3e79aa0ef93be10d477c85f62037f01b3e626ea56d3173ca8cf017b8aa315f2e23b1a2b SHA512 72294607762751fb1aaaca1d62ebd87d109d837d50606176159a5e74782a993123321967b7a6185df6ca9c87a54febb832ac7537ceaa580a895901a995570cd5
-DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch b/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch
deleted file mode 100644
index b8cecc4ebfb..00000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/Makefile.am b/Makefile.am
---- a/Makefile.am 2015-04-03 09:39:35.000000000 +0200
-+++ b/Makefile.am 2015-06-28 14:03:12.429999875 +0200
-@@ -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.1-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch
deleted file mode 100644
index fdad8b6ea00..00000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c 2015-06-28 13:57:18.449999884 +0200
-+++ b/logrotate.c 2015-06-28 14:02:20.799999876 +0200
-@@ -371,15 +371,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)) {
-@@ -430,6 +433,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.9.1-fbsd.patch b/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch
deleted file mode 100644
index 6e329d6149f..00000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c 2015-06-28 13:54:18.309999889 +0200
-+++ b/config.c 2015-06-28 13:56:49.599999885 +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 2015-04-03 09:39:35.000000000 +0200
-+++ b/logrotate.c 2015-06-28 13:57:18.449999884 +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 +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 2015-04-03 09:39:35.000000000 +0200
-+++ b/Makefile 2015-06-28 13:58:05.729999883 +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.9.1-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch
deleted file mode 100644
index 31d9298779c..00000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c 2015-04-03 09:39:35.000000000 +0200
-+++ b/config.c 2015-06-28 13:54:18.309999889 +0200
-@@ -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.1-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch
deleted file mode 100644
index 7983943ca89..00000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c 2015-06-28 13:56:49.599999885 +0200
-+++ b/config.c 2015-06-28 13:59:34.799999880 +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 2015-04-03 09:39:35.000000000 +0200
-+++ b/logrotate.h 2015-06-28 13:59:47.429999880 +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/logrotate-3.9.1.ebuild b/app-admin/logrotate/logrotate-3.9.1.ebuild
deleted file mode 100644
index 060e11be388..00000000000
--- a/app-admin/logrotate/logrotate-3.9.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl +cron selinux"
-
-CDEPEND="
- >=dev-libs/popt-1.5
- selinux? (
- sys-libs/libselinux
- )
- acl? ( virtual/acl )"
-
-DEPEND="${CDEPEND}
- >=sys-apps/sed-4"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-logrotate )
- cron? ( virtual/cron )"
-
-install_cron_file() {
- exeinto /etc/cron.daily
- newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-ignore-hidden.patch \
- "${FILESDIR}"/${P}-fbsd.patch \
- "${FILESDIR}"/${P}-noasprintf.patch \
- "${FILESDIR}"/${P}-atomic-create.patch \
- "${FILESDIR}"/${P}-Werror.patch
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with acl) $(use_with selinux)
-}
-
-src_compile() {
- emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- insinto /usr
- dosbin logrotate
- doman logrotate.8
- dodoc CHANGES examples/logrotate*
-
- insinto /etc
- doins "${FILESDIR}"/logrotate.conf
-
- use cron && install_cron_file
-
- keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "If you wish to have logrotate e-mail you updates, please"
- elog "emerge virtual/mailx and configure logrotate in"
- elog "/etc/logrotate.conf appropriately"
- elog
- elog "Additionally, /etc/logrotate.conf may need to be modified"
- elog "for your particular needs. See man logrotate for details."
- fi
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/, app-admin/logrotate/files/
@ 2020-01-25 17:48 Mikle Kolyada
0 siblings, 0 replies; 8+ messages in thread
From: Mikle Kolyada @ 2020-01-25 17:48 UTC (permalink / raw
To: gentoo-commits
commit: 47d22ae9aaaba1133f8f503cdb24a8a9f59494b6
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 17:47:35 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 17:47:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d22ae9
app-admin/logrotate: fix build with -fno-common
Closes: https://bugs.gentoo.org/705882
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-admin/logrotate/files/gcc-fnocommon.patch | 41 +++++++++++++++++++++++++++
app-admin/logrotate/logrotate-3.14.0.ebuild | 2 +-
app-admin/logrotate/logrotate-3.15.1.ebuild | 3 +-
3 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/app-admin/logrotate/files/gcc-fnocommon.patch b/app-admin/logrotate/files/gcc-fnocommon.patch
new file mode 100644
index 00000000000..d490c20ce0a
--- /dev/null
+++ b/app-admin/logrotate/files/gcc-fnocommon.patch
@@ -0,0 +1,41 @@
+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;
diff --git a/app-admin/logrotate/logrotate-3.14.0.ebuild b/app-admin/logrotate/logrotate-3.14.0.ebuild
index 4cb39bde390..729f5629d43 100644
--- a/app-admin/logrotate/logrotate-3.14.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.14.0.ebuild
@@ -34,7 +34,7 @@ move_old_state_file() {
elog "See bug #357275"
if [[ -e "${OLDSTATEFILE}" ]] ; then
elog "Moving your current state file to new location: ${STATEFILE}"
- mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+ mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
fi
}
diff --git a/app-admin/logrotate/logrotate-3.15.1.ebuild b/app-admin/logrotate/logrotate-3.15.1.ebuild
index 58b95631d2d..eef82c310b8 100644
--- a/app-admin/logrotate/logrotate-3.15.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.15.1.ebuild
@@ -34,7 +34,7 @@ move_old_state_file() {
elog "See bug #357275"
if [[ -e "${OLDSTATEFILE}" ]] ; then
elog "Moving your current state file to new location: ${STATEFILE}"
- mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+ mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
fi
}
@@ -45,6 +45,7 @@ install_cron_file() {
PATCHES=(
"${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch"
+ "${FILESDIR}/gcc-fnocommon.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/, app-admin/logrotate/files/
@ 2021-05-01 23:02 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2021-05-01 23:02 UTC (permalink / raw
To: gentoo-commits
commit: 7a038d936856a70945d76e5ad9dde5842aabc74c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 1 23:02:33 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 1 23:02:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a038d93
app-admin/logrotate: Remove old 3.14.0, 3.17.0
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-admin/logrotate/Manifest | 2 -
.../files/logrotate-3.14.0-ignore-hidden.patch | 14 ---
app-admin/logrotate/logrotate-3.14.0.ebuild | 101 ---------------------
app-admin/logrotate/logrotate-3.17.0.ebuild | 101 ---------------------
4 files changed, 218 deletions(-)
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index bdd1def147f..c36eb2bbb82 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,3 +1 @@
-DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
-DIST logrotate-3.17.0.tar.gz 224559 BLAKE2B 6d019bafad6986a0b6264893d36a515db75d746dd590afd26825c01c68e9ccf3c260502a29912d75c069ece8715ae14d3c13d4030f6222187be0e1ca05d60e49 SHA512 ada4415ef68ad97c1415fa0c1ba7bf108621777cd91599bf4f999dea1c1025596543aa00fd579cae4d39315b71c4d8f96a9c9d1178f78be7c523470588ab1d31
DIST logrotate-3.18.0.tar.gz 224873 BLAKE2B f73ffa2d58a5125393e6c96e158e39e0b4cadef01e6eebd172220227a7e1363e6731bc2ac511fa028078054b55d42b131cdc30232ac5762ce4c6cbff79c19681 SHA512 d1bca267fbec4acbb83ffba4d3ac4c864f4269d8513e5614e7dbe6f3b1f176685218bffdb5d62f559ee73f84cf9a8a257c9f63e30af058d12d0034240f247586
diff --git a/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch
deleted file mode 100644
index 6745126259b..00000000000
--- a/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c 2018-03-09 17:47:08.000000000 +0100
-+++ b/config.c 2018-03-09 19:47:42.274696766 +0100
-@@ -440,7 +440,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/logrotate-3.14.0.ebuild b/app-admin/logrotate/logrotate-3.14.0.ebuild
deleted file mode 100644
index bedd9e10b9b..00000000000
--- a/app-admin/logrotate/logrotate-3.14.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="acl +cron selinux"
-
-COMMON_DEPEND="
- >=dev-libs/popt-1.5
- selinux? ( sys-libs/libselinux )
- acl? ( virtual/acl )"
-
-DEPEND="${COMMON_DEPEND}
- >=sys-apps/sed-4"
-
-RDEPEND="${COMMON_DEPEND}
- selinux? ( sec-policy/selinux-logrotate )
- cron? ( virtual/cron )"
-
-STATEFILE="/var/lib/misc/logrotate.status"
-OLDSTATEFILE="/var/lib/logrotate.status"
-
-move_old_state_file() {
- elog "logrotate state file is now located at ${STATEFILE}"
- elog "See bug #357275"
- if [[ -e "${OLDSTATEFILE}" ]] ; then
- elog "Moving your current state file to new location: ${STATEFILE}"
- mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
- fi
-}
-
-install_cron_file() {
- exeinto /etc/cron.daily
- newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
- "${FILESDIR}/${P}-ignore-hidden.patch"
-)
-
-src_prepare() {
- sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
- default
-}
-
-src_configure() {
- econf \
- $(use_with acl) \
- $(use_with selinux) \
- --with-state-file-path="${STATEFILE}"
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- insinto /usr
- dobin logrotate
- doman logrotate.8
- dodoc ChangeLog.md examples/logrotate-default
-
- insinto /etc
- doins "${FILESDIR}"/logrotate.conf
-
- use cron && install_cron_file
-
- systemd_dounit examples/logrotate.{service,timer}
- newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
-
- keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
- elog
- elog "The ${PN} binary is now installed under /usr/bin. Please"
- elog "update your links"
- elog
- move_old_state_file
- elog "If you are running systemd you might need to run:"
- elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
- elog "in order to create the new location of the logrotate state file"
- elog
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "If you wish to have logrotate e-mail you updates, please"
- elog "emerge virtual/mailx and configure logrotate in"
- elog "/etc/logrotate.conf appropriately"
- elog
- elog "Additionally, /etc/logrotate.conf may need to be modified"
- elog "for your particular needs. See man logrotate for details."
- fi
-}
diff --git a/app-admin/logrotate/logrotate-3.17.0.ebuild b/app-admin/logrotate/logrotate-3.17.0.ebuild
deleted file mode 100644
index 9e712b69c69..00000000000
--- a/app-admin/logrotate/logrotate-3.17.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="acl +cron selinux"
-
-COMMON_DEPEND="
- >=dev-libs/popt-1.5
- selinux? ( sys-libs/libselinux )
- acl? ( virtual/acl )"
-
-DEPEND="${COMMON_DEPEND}
- >=sys-apps/sed-4"
-
-RDEPEND="${COMMON_DEPEND}
- selinux? ( sec-policy/selinux-logrotate )
- cron? ( virtual/cron )"
-
-STATEFILE="/var/lib/misc/logrotate.status"
-OLDSTATEFILE="/var/lib/logrotate.status"
-
-move_old_state_file() {
- elog "logrotate state file is now located at ${STATEFILE}"
- elog "See bug #357275"
- if [[ -e "${OLDSTATEFILE}" ]] ; then
- elog "Moving your current state file to new location: ${STATEFILE}"
- mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
- fi
-}
-
-install_cron_file() {
- exeinto /etc/cron.daily
- newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch"
-)
-
-src_prepare() {
- sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
- default
-}
-
-src_configure() {
- econf \
- $(use_with acl) \
- $(use_with selinux) \
- --with-state-file-path="${STATEFILE}"
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- insinto /usr
- dobin logrotate
- doman logrotate.8
- dodoc ChangeLog.md
-
- insinto /etc
- doins "${FILESDIR}"/logrotate.conf
-
- use cron && install_cron_file
-
- systemd_dounit examples/logrotate.{service,timer}
- newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
-
- keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
- elog
- elog "The ${PN} binary is now installed under /usr/bin. Please"
- elog "update your links"
- elog
- move_old_state_file
- elog "If you are running systemd you might need to run:"
- elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
- elog "in order to create the new location of the logrotate state file"
- elog
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "If you wish to have logrotate e-mail you updates, please"
- elog "emerge virtual/mailx and configure logrotate in"
- elog "/etc/logrotate.conf appropriately"
- elog
- elog "Additionally, /etc/logrotate.conf may need to be modified"
- elog "for your particular needs. See man logrotate for details."
- fi
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-05-01 23:02 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-25 17:48 [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/, app-admin/logrotate/files/ Mikle Kolyada
-- strict thread matches above, loose matches on Subject: below --
2021-05-01 23:02 David Seifert
2019-08-31 14:11 Mikle Kolyada
2018-12-19 15:40 José María Alonso
2018-02-01 20:42 José María Alonso
2017-10-14 17:03 José María Alonso
2016-01-25 19:58 José María Alonso
2015-10-06 8:55 José María Alonso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox