Drop old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key D628E536)

7 files changed, 8 insertions, 254 deletions

diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog
index 56c5bde9f742..bd0129b5513c 100644
--- a/app-admin/logrotate/ChangeLog
+++ b/app-admin/logrotate/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/logrotate
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.160 2013/10/26 16:27:42 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.161 2013/10/26 16:53:38 nimiux Exp $
+
+  26 Oct 2013; Chema Alonso <nimiux@gentoo.org> -logrotate-3.8.5.ebuild,
+  -files/logrotate-3.8.5-atomic-create.patch,
+  -files/logrotate-3.8.5-datehack.patch, -files/logrotate-3.8.5-fbsd.patch,
+  -files/logrotate-3.8.5-ignore-hidden.patch,
+  -files/logrotate-3.8.5-noasprintf.patch:
+  Drop old
 
 *logrotate-3.8.7 (26 Oct 2013)
 
diff --git a/app-admin/logrotate/files/logrotate-3.8.5-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.8.5-atomic-create.patch
deleted file mode 100644
index 41da2b4e0c05..000000000000
--- a/app-admin/logrotate/files/logrotate-3.8.5-atomic-create.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nur a/logrotate.c b/logrotate.c
---- a/logrotate.c	2013-06-10 14:02:36.000000000 +0200
-+++ b/logrotate.c	2013-06-18 18:42:28.759999695 +0200
-@@ -300,15 +300,21 @@
- 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;
-+    int acl_set = 0;
- 
--	fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW),
--		(S_IRUSR | S_IWUSR) & sb->st_mode);
-+    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)) {
-@@ -359,6 +365,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.5-datehack.patch b/app-admin/logrotate/files/logrotate-3.8.5-datehack.patch
deleted file mode 100644
index 5beb18b6f76e..000000000000
--- a/app-admin/logrotate/files/logrotate-3.8.5-datehack.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur a/logrotate.c b/logrotate.c
---- a/logrotate.c	2013-06-10 14:02:36.000000000 +0200
-+++ b/logrotate.c	2013-06-18 18:34:09.329999708 +0200
-@@ -2035,7 +2035,7 @@
- 	}
- 
- 	/* Hack to hide earlier bug */
--	if ((year != 1900) && (year < 1996 || year > 2100)) {
-+	if ((year != 1900) && (year < 1970 || year > 2100)) {
- 	    message(MESS_ERROR,
- 		    "bad year %d for file %s in state file %s\n", year,
- 		    argv[0], stateFilename);
diff --git a/app-admin/logrotate/files/logrotate-3.8.5-fbsd.patch b/app-admin/logrotate/files/logrotate-3.8.5-fbsd.patch
deleted file mode 100644
index cf4c6935ab01..000000000000
--- a/app-admin/logrotate/files/logrotate-3.8.5-fbsd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur a/Makefile b/Makefile
---- a/Makefile	2013-06-10 14:02:36.000000000 +0200
-+++ b/Makefile	2013-06-18 18:36:30.899999705 +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 -Nur a/config.c b/config.c
---- a/config.c	2013-06-10 14:02:36.000000000 +0200
-+++ b/config.c	2013-06-18 18:37:05.729999704 +0200
-@@ -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 -Nur a/logrotate.c b/logrotate.c
---- a/logrotate.c	2013-06-10 14:02:36.000000000 +0200
-+++ b/logrotate.c	2013-06-18 18:37:40.499999703 +0200
-@@ -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>
-@@ -43,6 +43,10 @@
- 
- static acl_type prev_acl = NULL;
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
diff --git a/app-admin/logrotate/files/logrotate-3.8.5-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.8.5-ignore-hidden.patch
deleted file mode 100644
index e8c3da56335b..000000000000
--- a/app-admin/logrotate/files/logrotate-3.8.5-ignore-hidden.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur a/config.c b/config.c
---- a/config.c	2013-06-10 14:02:36.000000000 +0200
-+++ b/config.c	2013-06-18 18:35:33.009999706 +0200
-@@ -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.5-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.8.5-noasprintf.patch
deleted file mode 100644
index cf1c51d13564..000000000000
--- a/app-admin/logrotate/files/logrotate-3.8.5-noasprintf.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nur a/config.c b/config.c
---- a/config.c	2013-06-10 14:02:36.000000000 +0200
-+++ b/config.c	2013-06-18 18:39:26.799999700 +0200
-@@ -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 -Nur a/logrotate.h b/logrotate.h
---- a/logrotate.h	2013-06-10 14:02:36.000000000 +0200
-+++ b/logrotate.h	2013-06-18 18:39:38.149999700 +0200
-@@ -67,8 +67,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.5.ebuild b/app-admin/logrotate/logrotate-3.8.5.ebuild
deleted file mode 100644
index a5df804b8a9d..000000000000
--- a/app-admin/logrotate/logrotate-3.8.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.5.ebuild,v 1.2 2013/06/18 17:25:26 nimiux Exp $
-
-EAPI=5
-
-inherit 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl selinux"
-
-RDEPEND="
-	>=dev-libs/popt-1.5
-	selinux? (
-		sys-libs/libselinux
-		sec-policy/selinux-logrotate
-	)
-	acl? ( virtual/acl )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-datehack.patch \
-		"${FILESDIR}"/${P}-ignore-hidden.patch \
-		"${FILESDIR}"/${P}-fbsd.patch \
-		"${FILESDIR}"/${P}-noasprintf.patch \
-		"${FILESDIR}"/${P}-atomic-create.patch
-}
-
-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
-}