summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2012-06-08 12:51:54 +0000
committerPacho Ramos <pacho@gentoo.org>2012-06-08 12:51:54 +0000
commit1339eebc2b62da767316d8bb3cf298e382c9b247 (patch)
tree3b9da841f80b46b8f831798c4d10fceaad4ea5c0 /app-admin
parentRemove unused revision. (diff)
downloadgentoo-2-1339eebc2b62da767316d8bb3cf298e382c9b247.tar.gz
gentoo-2-1339eebc2b62da767316d8bb3cf298e382c9b247.tar.bz2
gentoo-2-1339eebc2b62da767316d8bb3cf298e382c9b247.zip
Drop maintainer from metadata as talked with him, bug #90641. Drop old.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/logrotate/ChangeLog14
-rw-r--r--app-admin/logrotate/files/logrotate-3.7.7-fbsd.patch45
-rw-r--r--app-admin/logrotate/files/logrotate-3.7.7-ignore-hidden.patch15
-rw-r--r--app-admin/logrotate/files/logrotate-3.7.7-weekly.patch28
-rw-r--r--app-admin/logrotate/files/logrotate-3.7.9-atomic-create.patch70
-rw-r--r--app-admin/logrotate/files/logrotate-3.7.9-no-cloexec.patch24
-rw-r--r--app-admin/logrotate/files/logrotate-3.7.9-shred.patch151
-rw-r--r--app-admin/logrotate/files/logrotate-3.7.9-skip-empty-files.patch19
-rw-r--r--app-admin/logrotate/files/logrotate-3.7.9-statefile.patch96
-rw-r--r--app-admin/logrotate/files/logrotate-3.8.0-noasprintf.patch55
-rw-r--r--app-admin/logrotate/logrotate-3.7.8.ebuild72
-rw-r--r--app-admin/logrotate/logrotate-3.7.9-r1.ebuild76
-rw-r--r--app-admin/logrotate/logrotate-3.7.9-r2.ebuild76
-rw-r--r--app-admin/logrotate/logrotate-3.7.9.ebuild72
-rw-r--r--app-admin/logrotate/logrotate-3.8.0.ebuild74
-rw-r--r--app-admin/logrotate/metadata.xml2
16 files changed, 14 insertions, 875 deletions
diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog
index f3f514009b05..31c7b0e3de04 100644
--- a/app-admin/logrotate/ChangeLog
+++ b/app-admin/logrotate/ChangeLog
@@ -1,6 +1,18 @@
# ChangeLog for app-admin/logrotate
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.115 2012/02/12 14:37:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.116 2012/06/08 12:51:53 pacho Exp $
+
+ 08 Jun 2012; Pacho Ramos <pacho@gentoo.org> -files/logrotate-3.7.7-fbsd.patch,
+ -files/logrotate-3.7.7-ignore-hidden.patch,
+ -files/logrotate-3.7.7-weekly.patch,
+ -files/logrotate-3.7.9-atomic-create.patch,
+ -files/logrotate-3.7.9-no-cloexec.patch, -files/logrotate-3.7.9-shred.patch,
+ -files/logrotate-3.7.9-skip-empty-files.patch,
+ -files/logrotate-3.7.9-statefile.patch,
+ -files/logrotate-3.8.0-noasprintf.patch, -logrotate-3.7.8.ebuild,
+ -logrotate-3.7.9-r1.ebuild, -logrotate-3.7.9-r2.ebuild,
+ -logrotate-3.7.9.ebuild, -logrotate-3.8.0.ebuild, metadata.xml:
+ Drop maintainer from metadata as talked with him, bug #90641. Drop old.
12 Feb 2012; Raúl Porcel <armin76@gentoo.org> logrotate-3.8.1.ebuild:
alpha/ia64/s390/sh/sparc stable wrt #398529
diff --git a/app-admin/logrotate/files/logrotate-3.7.7-fbsd.patch b/app-admin/logrotate/files/logrotate-3.7.7-fbsd.patch
deleted file mode 100644
index 6bd2e5470c4a..000000000000
--- a/app-admin/logrotate/files/logrotate-3.7.7-fbsd.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix compilation on Gentoo/FreeBSD, no alloca.h here and PATH_MAX
-is defined elsewhere.
-
-See bug 254795
-
---- logrotate-3.7.7.orig/config.c
-+++ logrotate-3.7.7/config.c
-@@ -1,5 +1,7 @@
- #include <sys/queue.h>
-+#ifndef NO_ALLOCA_H
- #include <alloca.h>
-+#endif /* NO_ALLOCA_H */
- #include <ctype.h>
- #include <dirent.h>
- #include <errno.h>
-@@ -21,6 +21,9 @@
- #include <wctype.h>
- #include <fnmatch.h>
-
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
---- logrotate-3.7.7.orig/logrotate.c
-+++ logrotate-3.7.7/logrotate.c
-@@ -1,5 +1,7 @@
- #include <sys/queue.h>
-+#ifndef NO_ALLOCA_H
- #include <alloca.h>
-+#endif /* NO_ALLOCA_H */
- #include <ctype.h>
- #include <dirent.h>
- #include <errno.h>
-@@ -24,6 +24,9 @@
- int selinux_enforce = 0;
- #endif
-
-+#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.7.7-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.7.7-ignore-hidden.patch
deleted file mode 100644
index 28581f142587..000000000000
--- a/app-admin/logrotate/files/logrotate-3.7.7-ignore-hidden.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN logrotate-3.7.7.orig/config.c logrotate-3.7.7/config.c
---- logrotate-3.7.7.orig/config.c 2008-05-09 03:28:59.000000000 -0400
-+++ logrotate-3.7.7/config.c 2008-12-23 11:11:18.000000000 -0500
-@@ -164,6 +164,11 @@ static int checkFile(const char *fname)
- if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
- return 0;
-
-+ /* 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 */
- for (i = 0; i < tabooCount; i++) {
- snprintf(pattern, sizeof(pattern), "*%s", tabooExts[i]);
diff --git a/app-admin/logrotate/files/logrotate-3.7.7-weekly.patch b/app-admin/logrotate/files/logrotate-3.7.7-weekly.patch
deleted file mode 100644
index cd817558aa56..000000000000
--- a/app-admin/logrotate/files/logrotate-3.7.7-weekly.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN logrotate-3.7.7.orig/logrotate.c logrotate-3.7.7/logrotate.c
---- logrotate-3.7.7.orig/logrotate.c 2008-05-14 06:31:35.000000000 -0400
-+++ logrotate-3.7.7/logrotate.c 2008-12-23 11:14:55.000000000 -0500
-@@ -512,16 +512,17 @@ int findNeedRotating(struct logInfo *log
- switch (log->criterium) {
- case ROT_WEEKLY:
- /* rotate if:
-- 1) the current weekday is before the weekday of the
-- last rotation
-+ 1) the day of the week is the same as the day of the week of
-+ the previous rotation but not the same day of the year
-+ this will rotate it on the same day every week, but not
-+ twice a day.
- 2) more then a week has passed since the last
- rotation */
-- state->doRotate = ((now.tm_wday < state->lastRotated.tm_wday)
-- ||
-- ((mktime(&now) -
-- mktime(&state->lastRotated)) >
-+ state->doRotate = ((now.tm_wday == state->lastRotated.tm_wday &&
-+ now.tm_yday != state->lastRotated.tm_yday) ||
-+ ((mktime(&now) - mktime(&state->lastRotated)) >
- (7 * 24 * 3600)));
-- break;
-+ break;
- case ROT_MONTHLY:
- /* rotate if the logs haven't been rotated this month or
- this year */
diff --git a/app-admin/logrotate/files/logrotate-3.7.9-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.7.9-atomic-create.patch
deleted file mode 100644
index b888dc0231a4..000000000000
--- a/app-admin/logrotate/files/logrotate-3.7.9-atomic-create.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/logrotate.c b/logrotate.c
-index 3748918..fbe232a 100644
---- a/logrotate.c
-+++ b/logrotate.c
-@@ -194,31 +194,41 @@ static int runScript(char *logfn, char *script)
- int createOutputFile(char *fileName, int flags, struct stat *sb)
- {
- int fd;
-+ char template[PATH_MAX + 1];
-+ mode_t umask_value;
-+ snprintf(template, PATH_MAX, "%s/logrotate_temp.XXXXXX", ourDirName(fileName));
-+
-+ umask_value = umask(0000);
-+ fd = mkstemp(template);
-+ umask(umask_value);
-+
-+ if (fd < 0) {
-+ message(MESS_ERROR, "error creating unique temp file: %s\n",
-+ strerror(errno));
-+ return -1;
-+ }
-+
-+ if (fchown(fd, sb->st_uid, sb->st_gid)) {
-+ message(MESS_ERROR, "error setting owner of %s: %s\n",
-+ fileName, strerror(errno));
-+ close(fd);
-+ return -1;
-+ }
-+
-+ if (fchmod(fd, sb->st_mode)) {
-+ message(MESS_ERROR, "error setting mode of %s: %s\n",
-+ fileName, strerror(errno));
-+ close(fd);
-+ return -1;
-+ }
-+
-+ if (rename(template, fileName)) {
-+ message(MESS_ERROR, "error renaming temp file to %s: %s\n",
-+ fileName, strerror(errno));
-+ close(fd);
-+ return -1;
-+ }
-
-- fd = open(fileName, flags, sb->st_mode);
-- if (fd < 0) {
-- message(MESS_ERROR, "error creating output file %s: %s\n",
-- fileName, strerror(errno));
-- return -1;
-- }
-- if (fchmod(fd, (S_IRUSR | S_IWUSR) & sb->st_mode)) {
-- message(MESS_ERROR, "error setting mode of %s: %s\n",
-- fileName, strerror(errno));
-- close(fd);
-- return -1;
-- }
-- if (fchown(fd, sb->st_uid, sb->st_gid)) {
-- message(MESS_ERROR, "error setting owner of %s: %s\n",
-- fileName, strerror(errno));
-- close(fd);
-- return -1;
-- }
-- if (fchmod(fd, sb->st_mode)) {
-- message(MESS_ERROR, "error setting mode of %s: %s\n",
-- fileName, strerror(errno));
-- close(fd);
-- return -1;
-- }
- return fd;
- }
-
diff --git a/app-admin/logrotate/files/logrotate-3.7.9-no-cloexec.patch b/app-admin/logrotate/files/logrotate-3.7.9-no-cloexec.patch
deleted file mode 100644
index 367f396d0734..000000000000
--- a/app-admin/logrotate/files/logrotate-3.7.9-no-cloexec.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.7.9.orig//config.c logrotate-3.7.9/config.c
---- logrotate-3.7.9.orig//config.c 2010-06-28 04:04:56.000000000 -0400
-+++ logrotate-3.7.9/config.c 2011-04-28 19:16:55.422051174 -0400
-@@ -514,12 +514,19 @@ static int readConfigFile(const char *co
- .l_whence = SEEK_SET,
- .l_type = F_RDLCK
- };
-+ int flags;
-
- /* FIXME: createOwner and createGroup probably shouldn't be fixed
- length arrays -- of course, if we aren't run setuid it doesn't
- matter much */
-
-- fd = open(configFile, O_RDONLY | O_CLOEXEC);
-+#ifdef O_CLOEXEC
-+ flags = O_RDONLY | O_CLOEXEC;
-+#else
-+ flags = O_RDONLY;
-+#endif
-+
-+ fd = open(configFile, flags);
- if (fd < 0) {
- message(MESS_ERROR, "failed to open config file %s: %s\n",
- configFile, strerror(errno));
diff --git a/app-admin/logrotate/files/logrotate-3.7.9-shred.patch b/app-admin/logrotate/files/logrotate-3.7.9-shred.patch
deleted file mode 100644
index 7df1e96c0d56..000000000000
--- a/app-admin/logrotate/files/logrotate-3.7.9-shred.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff --git a/logrotate.c b/logrotate.c
-index 95bc80b..8dfb3d7 100644
---- a/logrotate.c
-+++ b/logrotate.c
-@@ -56,7 +56,7 @@ int debug = 0;
- char *mailCommand = DEFAULT_MAIL_COMMAND;
- time_t nowSecs = 0;
-
--static int shred_file(char *filename, struct logInfo *log);
-+static int shred_file(int fd, char *filename, struct logInfo *log);
-
- static int globerr(const char *pathname, int theerr)
- {
-@@ -216,59 +216,79 @@ int createOutputFile(char *fileName, int flags, struct stat *sb)
- return fd;
- }
-
--#define SHRED_CALL "shred -u "
--#define SHRED_COUNT_FLAG "-n "
- #define DIGITS 10
-+
- /* unlink, but try to call shred from GNU fileutils */
--static int shred_file(char *filename, struct logInfo *log)
-+static int shred_file(int fd, char *filename, struct logInfo *log)
- {
-- int len, ret;
-- char *cmd;
- char count[DIGITS]; /* that's a lot of shredding :) */
-+ const char **fullCommand;
-+ int id = 0;
-+ int status;
-
- if (!(log->flags & LOG_FLAG_SHRED)) {
- return unlink(filename);
- }
-
-- len = strlen(filename) + strlen(SHRED_CALL);
-- len += strlen(SHRED_COUNT_FLAG) + DIGITS;
-- cmd = malloc(len);
-+ message(MESS_DEBUG, "Using shred to remove the file %s\n", filename);
-
-- if (!cmd) {
-- message(MESS_ERROR, "malloc error while shredding");
-- return unlink(filename);
-+ if (log->shred_cycles != 0) {
-+ fullCommand = alloca(sizeof(*fullCommand) * 6);
-+ }
-+ else {
-+ fullCommand = alloca(sizeof(*fullCommand) * 4);
- }
-- strcpy(cmd, SHRED_CALL);
-+ fullCommand[id++] = "shred";
-+ fullCommand[id++] = "-u";
-+
- if (log->shred_cycles != 0) {
-- strcat(cmd, SHRED_COUNT_FLAG);
-+ fullCommand[id++] = "-n";
- snprintf(count, DIGITS - 1, "%d", log->shred_cycles);
-- strcat(count, " ");
-- strcat(cmd, count);
-+ fullCommand[id++] = count;
-+ }
-+ fullCommand[id++] = "-";
-+ fullCommand[id++] = NULL;
-+
-+ if (!fork()) {
-+ dup2(fd, 1);
-+ close(fd);
-+
-+ execvp(fullCommand[0], (void *) fullCommand);
-+ exit(1);
- }
-- strcat(cmd, filename);
-- ret = system(cmd);
-- free(cmd);
-- if (ret != 0) {
-+
-+ wait(&status);
-+
-+ if (!WIFEXITED(status) || WEXITSTATUS(status)) {
- message(MESS_ERROR, "Failed to shred %s\n, trying unlink", filename);
-- if (ret != -1) {
-- message(MESS_NORMAL, "Shred returned %d\n", ret);
-- }
- return unlink(filename);
-- } else {
-- return ret;
- }
-+
-+ /* We have to unlink it after shred anyway,
-+ * because it doesn't remove the file itself */
-+ return unlink(filename);
- }
-
- static int removeLogFile(char *name, struct logInfo *log)
- {
-- message(MESS_DEBUG, "removing old log %s\n", name);
-+ int fd;
-+ message(MESS_DEBUG, "removing old log %s\n", name);
-
-- if (!debug && shred_file(name, log)) {
-- message(MESS_ERROR, "Failed to remove old log %s: %s\n",
-- name, strerror(errno));
-- return 1;
-- }
-- return 0;
-+ if ((fd = open(name, O_RDWR)) < 0) {
-+ message(MESS_ERROR, "error opening %s: %s\n",
-+ name, strerror(errno));
-+ return 1;
-+ }
-+
-+ if (!debug && shred_file(fd, name, log)) {
-+ message(MESS_ERROR, "Failed to remove old log %s: %s\n",
-+ name, strerror(errno));
-+ close(fd);
-+ return 1;
-+ }
-+
-+ close(fd);
-+ return 0;
- }
-
- static int compressLogFile(char *name, struct logInfo *log, struct stat *sb)
-@@ -294,7 +314,7 @@ static int compressLogFile(char *name, struct logInfo *log, struct stat *sb)
- compressedName = alloca(strlen(name) + strlen(log->compress_ext) + 2);
- sprintf(compressedName, "%s%s", name, log->compress_ext);
-
-- if ((inFile = open(name, O_RDONLY)) < 0) {
-+ if ((inFile = open(name, O_RDWR)) < 0) {
- message(MESS_ERROR, "unable to open %s for compression\n", name);
- return 1;
- }
-@@ -316,7 +336,6 @@ static int compressLogFile(char *name, struct logInfo *log, struct stat *sb)
- exit(1);
- }
-
-- close(inFile);
- close(outFile);
-
- wait(&status);
-@@ -326,7 +345,8 @@ static int compressLogFile(char *name, struct logInfo *log, struct stat *sb)
- return 1;
- }
-
-- shred_file(name, log);
-+ shred_file(inFile, name, log);
-+ close(inFile);
-
- return 0;
- }
diff --git a/app-admin/logrotate/files/logrotate-3.7.9-skip-empty-files.patch b/app-admin/logrotate/files/logrotate-3.7.9-skip-empty-files.patch
deleted file mode 100644
index d3855703de3f..000000000000
--- a/app-admin/logrotate/files/logrotate-3.7.9-skip-empty-files.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.7.9.orig/config.c logrotate-3.7.9/config.c
---- logrotate-3.7.9.orig/config.c 2010-06-28 04:04:56.000000000 -0400
-+++ logrotate-3.7.9/config.c 2011-04-17 10:51:13.697645782 -0400
-@@ -546,6 +546,15 @@ static int readConfigFile(const char *co
- }
-
- length = sb.st_size;
-+ /* We can't mmap empty file... */
-+ if (length == 0) {
-+ message(MESS_DEBUG,
-+ "Ignoring %s because it's empty.\n",
-+ configFile);
-+ close(fd);
-+ return 0;
-+ }
-+
- buf = mmap(NULL, (size_t)(length + 2), PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_POPULATE, fd, (off_t) 0);
- if (buf == MAP_FAILED) {
diff --git a/app-admin/logrotate/files/logrotate-3.7.9-statefile.patch b/app-admin/logrotate/files/logrotate-3.7.9-statefile.patch
deleted file mode 100644
index daa02402fad7..000000000000
--- a/app-admin/logrotate/files/logrotate-3.7.9-statefile.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Index: logrotate.c
-===================================================================
---- logrotate.c (revision 314)
-+++ logrotate.c (working copy)
-@@ -45,6 +45,12 @@
- #define GLOB_ABORTED GLOB_ABEND
- #endif
-
-+#ifdef PATH_MAX
-+#define STATEFILE_BUFFER_SIZE 2 * PATH_MAX + 16
-+#else
-+#define STATEFILE_BUFFER_SIZE 4096
-+#endif
-+
- struct logState {
- char *fn;
- struct tm lastRotated; /* only tm.mon, tm_mday, tm_year are good! */
-@@ -82,6 +88,34 @@
- return 1;
- }
-
-+static void unescape(char *arg)
-+{
-+ char *p = arg;
-+ char *next;
-+ char escaped;
-+ while ((next = strchr(p, '\\')) != NULL) {
-+
-+ p = next;
-+
-+ switch (p[1]) {
-+ case 'n':
-+ escaped = '\n';
-+ break;
-+ case '\\':
-+ escaped = '\\';
-+ break;
-+ default:
-+ ++p;
-+ continue;
-+ }
-+
-+ /* Overwrite the backslash with the intended character,
-+ * and shift everything down one */
-+ *p++ = escaped;
-+ memmove(p, p+1, 1 + strlen(p+1));
-+ }
-+}
-+
- #define HASH_SIZE_MIN 64
- static int allocateHash(void)
- {
-@@ -1546,7 +1580,13 @@
- for (chptr = p->fn; *chptr; chptr++) {
- switch (*chptr) {
- case '"':
-+ case '\\':
- fputc('\\', f);
-+ break;
-+ case '\n':
-+ fputc('\\', f);
-+ fputc('n', f);
-+ continue;
- }
-
- fputc(*chptr, f);
-@@ -1567,7 +1607,8 @@
- static int readState(char *stateFilename)
- {
- FILE *f;
-- char buf[1024];
-+ char buf[STATEFILE_BUFFER_SIZE];
-+ char *filename;
- const char **argv;
- int argc;
- int year, month, day;
-@@ -1678,7 +1719,10 @@
-
- year -= 1900, month -= 1;
-
-- if ((st = findState(argv[0])) == NULL)
-+ filename = strdup(argv[0]);
-+ unescape(filename);
-+
-+ if ((st = findState(filename)) == NULL)
- return 1;
-
- st->lastRotated.tm_mon = month;
-@@ -1690,6 +1734,7 @@
- st->lastRotated = *localtime(&lr_time);
-
- free(argv);
-+ free(filename);
- }
-
- fclose(f);
diff --git a/app-admin/logrotate/files/logrotate-3.8.0-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.8.0-noasprintf.patch
deleted file mode 100644
index b9464e23084a..000000000000
--- a/app-admin/logrotate/files/logrotate-3.8.0-noasprintf.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.0.orig/config.c logrotate-3.8.0/config.c
---- logrotate-3.8.0.orig/config.c 2011-06-21 04:12:02.000000000 -0400
-+++ logrotate-3.8.0/config.c 2011-07-12 13:47:36.274319050 -0400
-@@ -41,39 +41,6 @@
- #endif
- #endif
-
--#if !defined(asprintf)
--#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
--
- enum {
- STATE_DEFAULT = 2,
- STATE_SKIP_LINE = 4,
-diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.0.orig/logrotate.h logrotate-3.8.0/logrotate.h
---- logrotate-3.8.0.orig/logrotate.h 2011-06-21 04:12:02.000000000 -0400
-+++ logrotate-3.8.0/logrotate.h 2011-07-12 13:47:38.949285608 -0400
-@@ -66,8 +66,5 @@ extern int numLogs;
- extern int debug;
-
- int readAllConfigPaths(const char **paths);
--#if !defined(asprintf)
--int asprintf(char **string_ptr, const char *format, ...);
--#endif
-
- #endif
diff --git a/app-admin/logrotate/logrotate-3.7.8.ebuild b/app-admin/logrotate/logrotate-3.7.8.ebuild
deleted file mode 100644
index 9f739044aa12..000000000000
--- a/app-admin/logrotate/logrotate-3.7.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.7.8.ebuild,v 1.14 2011/07/08 10:15:59 ssuominen Exp $
-
-EAPI="2"
-
-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 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="selinux"
-
-RDEPEND="
- >=dev-libs/popt-1.5
- selinux? (
- sys-libs/libselinux
- sec-policy/selinux-logrotate
- )"
-
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4"
-
-src_prepare() {
- strip-flags
-
- epatch \
- "${FILESDIR}"/${PN}-3.7.7-datehack.patch \
- "${FILESDIR}"/${PN}-3.7.7-ignore-hidden.patch \
- "${FILESDIR}"/${PN}-3.7.7-weekly.patch \
- "${FILESDIR}"/${PN}-3.7.7-fbsd.patch
-}
-
-src_configure() {
- return
-}
-
-src_compile() {
- local myconf
- myconf="CC=$(tc-getCC)"
- use selinux && myconf="${myconf} WITH_SELINUX=yes"
- use elibc_FreeBSD && append-flags -DNO_ALLOCA_H
- emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
- insinto /usr
- dosbin logrotate
- doman logrotate.8
- dodoc examples/logrotate*
-
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/logrotate.cron
-
- insinto /etc
- doins "${FILESDIR}"/logrotate.conf
-
- keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
- 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."
-}
diff --git a/app-admin/logrotate/logrotate-3.7.9-r1.ebuild b/app-admin/logrotate/logrotate-3.7.9-r1.ebuild
deleted file mode 100644
index 9282f85bea32..000000000000
--- a/app-admin/logrotate/logrotate-3.7.9-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.7.9-r1.ebuild,v 1.9 2011/07/08 10:15:59 ssuominen Exp $
-
-EAPI="2"
-
-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 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="selinux"
-
-RDEPEND="
- >=dev-libs/popt-1.5
- selinux? (
- sys-libs/libselinux
- sec-policy/selinux-logrotate
- )"
-
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4"
-
-src_prepare() {
- strip-flags
-
- epatch \
- "${FILESDIR}"/${PN}-3.7.7-datehack.patch \
- "${FILESDIR}"/${PN}-3.7.7-ignore-hidden.patch \
- "${FILESDIR}"/${PN}-3.7.7-weekly.patch \
- "${FILESDIR}"/${PN}-3.7.7-fbsd.patch \
- "${FILESDIR}"/${PN}-3.7.9-atomic-create.patch \
- "${FILESDIR}"/${PN}-3.7.9-shred.patch \
- "${FILESDIR}"/${PN}-3.7.9-statefile.patch \
- "${FILESDIR}"/${PN}-3.7.9-no-cloexec.patch
-}
-
-src_configure() {
- return
-}
-
-src_compile() {
- local myconf
- myconf="CC=$(tc-getCC)"
- use selinux && myconf="${myconf} WITH_SELINUX=yes"
- use elibc_FreeBSD && append-flags -DNO_ALLOCA_H
- emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
- insinto /usr
- dosbin logrotate
- doman logrotate.8
- dodoc examples/logrotate*
-
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/logrotate.cron
-
- insinto /etc
- doins "${FILESDIR}"/logrotate.conf
-
- keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
- 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."
-}
diff --git a/app-admin/logrotate/logrotate-3.7.9-r2.ebuild b/app-admin/logrotate/logrotate-3.7.9-r2.ebuild
deleted file mode 100644
index 446a0b83eb2d..000000000000
--- a/app-admin/logrotate/logrotate-3.7.9-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.7.9-r2.ebuild,v 1.3 2011/07/08 10:15:59 ssuominen Exp $
-
-EAPI="2"
-
-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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="selinux"
-
-RDEPEND="
- >=dev-libs/popt-1.5
- selinux? (
- sys-libs/libselinux
- sec-policy/selinux-logrotate
- )"
-
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4"
-
-src_prepare() {
- strip-flags
-
- epatch \
- "${FILESDIR}"/${PN}-3.7.7-datehack.patch \
- "${FILESDIR}"/${PN}-3.7.7-ignore-hidden.patch \
- "${FILESDIR}"/${PN}-3.7.7-fbsd.patch \
- "${FILESDIR}"/${PN}-3.7.9-atomic-create.patch \
- "${FILESDIR}"/${PN}-3.7.9-shred.patch \
- "${FILESDIR}"/${PN}-3.7.9-statefile.patch \
- "${FILESDIR}"/${PN}-3.7.9-no-cloexec.patch \
- "${FILESDIR}"/${PN}-3.7.9-skip-empty-files.patch
-}
-
-src_configure() {
- return
-}
-
-src_compile() {
- local myconf
- myconf="CC=$(tc-getCC)"
- use selinux && myconf="${myconf} WITH_SELINUX=yes"
- use elibc_FreeBSD && append-flags -DNO_ALLOCA_H
- emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
- insinto /usr
- dosbin logrotate
- doman logrotate.8
- dodoc examples/logrotate*
-
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/logrotate.cron
-
- insinto /etc
- doins "${FILESDIR}"/logrotate.conf
-
- keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
- 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."
-}
diff --git a/app-admin/logrotate/logrotate-3.7.9.ebuild b/app-admin/logrotate/logrotate-3.7.9.ebuild
deleted file mode 100644
index bfc6d73bf9e9..000000000000
--- a/app-admin/logrotate/logrotate-3.7.9.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.7.9.ebuild,v 1.2 2011/07/08 10:15:59 ssuominen Exp $
-
-EAPI="2"
-
-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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="selinux"
-
-RDEPEND="
- >=dev-libs/popt-1.5
- selinux? (
- sys-libs/libselinux
- sec-policy/selinux-logrotate
- )"
-
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4"
-
-src_prepare() {
- strip-flags
-
- epatch \
- "${FILESDIR}"/${PN}-3.7.7-datehack.patch \
- "${FILESDIR}"/${PN}-3.7.7-ignore-hidden.patch \
- "${FILESDIR}"/${PN}-3.7.7-weekly.patch \
- "${FILESDIR}"/${PN}-3.7.7-fbsd.patch
-}
-
-src_configure() {
- return
-}
-
-src_compile() {
- local myconf
- myconf="CC=$(tc-getCC)"
- use selinux && myconf="${myconf} WITH_SELINUX=yes"
- use elibc_FreeBSD && append-flags -DNO_ALLOCA_H
- emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
- insinto /usr
- dosbin logrotate
- doman logrotate.8
- dodoc examples/logrotate*
-
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/logrotate.cron
-
- insinto /etc
- doins "${FILESDIR}"/logrotate.conf
-
- keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
- 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."
-}
diff --git a/app-admin/logrotate/logrotate-3.8.0.ebuild b/app-admin/logrotate/logrotate-3.8.0.ebuild
deleted file mode 100644
index 86006ad3f24f..000000000000
--- a/app-admin/logrotate/logrotate-3.8.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.0.ebuild,v 1.9 2011/08/07 17:32:21 armin76 Exp $
-
-EAPI="2"
-
-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 ~mips ppc ppc64 s390 sh sparc x86 ~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() {
- strip-flags
-
- epatch \
- "${FILESDIR}"/${PN}-3.7.7-datehack.patch \
- "${FILESDIR}"/${PN}-3.8.0-ignore-hidden.patch \
- "${FILESDIR}"/${PN}-3.8.0-fbsd.patch \
- "${FILESDIR}"/${PN}-3.8.0-atomic-create.patch \
- "${FILESDIR}"/${PN}-3.8.0-noasprintf.patch
-}
-
-src_configure() {
- return
-}
-
-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}" || die "emake failed"
-}
-
-src_install() {
- insinto /usr
- dosbin logrotate
- doman logrotate.8
- dodoc CHANGES examples/logrotate*
-
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/logrotate.cron
-
- insinto /etc
- doins "${FILESDIR}"/logrotate.conf
-
- keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
- 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."
-}
diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index 1e0a13780211..4538a68724a6 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer><email>dang@gentoo.org</email></maintainer>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
</pkgmetadata>