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
-}

Reply via email to