Permalink
Browse files

glorious funtoo updates

merged:

  gentoo: ef65ef0754b3907184d93390e74c752176ccee1c
  funtoo-overlay: 42a271b5dd70ce941e4d9c989e33dfd09f888e70
  foo-overlay: 735d96fb5a1390c37cecee05bc065560c14cc37d
  bar-overlay: fb087c5a693ccc4195a2b824a60290a724802b2c
  flora: dc22df8f7543768d588738ca9a9c0deec23cd63d
  • Loading branch information...
1 parent e9fe670 commit dc58faa6a60fc706cf27973149fd9f9841873321 @danielrobbins danielrobbins committed Jun 8, 2012
Showing 457 changed files with 4,584 additions and 3,032 deletions.
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/durep/durep-0.9-r3.ebuild,v 1.3 2012/06/07 21:31:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/durep/durep-0.9-r3.ebuild,v 1.4 2012/06/08 11:42:36 phajdan.jr Exp $
EAPI=4
inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://www.hibernaculum.net/download/${P}.tar.gz"
LICENSE="Artistic"
SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
DEPEND="dev-lang/perl
@@ -1,14 +1,14 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-rails/eselect-rails-0.18.ebuild,v 1.5 2012/06/07 22:14:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-rails/eselect-rails-0.18.ebuild,v 1.6 2012/06/08 11:43:28 phajdan.jr Exp $
DESCRIPTION="Manages Ruby on Rails symlinks"
HOMEPAGE="http://www.gentoo.org/"
SRC_URI="http://dev.gentoo.org/~flameeyes/ruby-team/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-admin/eselect-1.2.0"
@@ -1,4 +1 @@
-DIST logrotate-3.7.8.tar.gz 43246 RMD160 c90de0efe013b533eff50bb52e2bf6948b839572 SHA1 5742dc0d9541ac59eba5f5718520f7504aea2159 SHA256 21aa3dc830e8cc895ee4199d9325aa1e37cd3b525d0eaef400f66f6c7fc536dd
-DIST logrotate-3.7.9.tar.gz 45301 RMD160 e3fb77e37c454a52566f7d5b017d70c9dddf9b66 SHA1 b920f9664a2c930f1ccdabc0db4f31f67cf95661 SHA256 080caf904e70e04da16b8dfa95a5a787ec7d722ee1af18ccea437d3ffdd6fec0
-DIST logrotate-3.8.0.tar.gz 48199 RMD160 7e1e24f53db5230eee2e1db8d90fe3a33692ca01 SHA1 a79c500c4ce45177b47bb473a6bff4021af7121e SHA256 5e52edc8c1894ab079ea3666cfd828085e3949388703f7236c39b2d20968536e
DIST logrotate-3.8.1.tar.gz 48827 RMD160 cec3bc6a4cb4226b31696977935818695027b0f8 SHA1 1df36cee76a9c4c7438f35ca3599a7bdd68a09b5 SHA256 c12471e70ae8bc923bd5c4f25e8fd6483b68c6301f3cd79f7cfe37bc5b370169
@@ -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"
@@ -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]);
@@ -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 */
@@ -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;
- }
-
@@ -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));
@@ -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;
- }
@@ -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) {
Oops, something went wrong.

0 comments on commit dc58faa

Please sign in to comment.