[gentoo-commits] gentoo-x86 commit in app-admin/logrotate/files: logrotate-3.7.7-datehack.patch logrotate-3.7.7-weekly.patch logrotate-3.7.7-ignore-hidden.patch logrotate.conf

[Daniel Gryniewicz (dang)]

dang        08/12/24 20:49:10

  Modified:             logrotate.conf
  Added:                logrotate-3.7.7-datehack.patch
                        logrotate-3.7.7-weekly.patch
                        logrotate-3.7.7-ignore-hidden.patch
  Log:
  Bump to 3.7.7; now considering fedora as upstream
  (Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r6 x86_64)

Revision  Changes    Path
1.3                  app-admin/logrotate/files/logrotate.conf

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/logrotate/files/logrotate.conf?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/logrotate/files/logrotate.conf?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/logrotate/files/logrotate.conf?r1=1.2&r2=1.3

Index: logrotate.conf
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logrotate.conf	18 Jul 2004 01:58:24 -0000	1.2
+++ logrotate.conf	24 Dec 2008 20:49:10 -0000	1.3
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.2 2004/07/18 01:58:24 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.3 2008/12/24 20:49:10 dang Exp $
 #
 # Logrotate default configuration file for Gentoo Linux
 #
@@ -14,6 +14,9 @@
 # create new (empty) log files after rotating old ones
 create
 
+# use date as a suffix of the rotated file
+dateext
+
 # uncomment this if you want your log files compressed
 compress
 
@@ -31,4 +34,11 @@
     rotate 1
 }
 
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 1
+}
+
 # system-specific logs may be also be configured here.



1.1                  app-admin/logrotate/files/logrotate-3.7.7-datehack.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/logrotate/files/logrotate-3.7.7-datehack.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/logrotate/files/logrotate-3.7.7-datehack.patch?rev=1.1&content-type=text/plain

Index: logrotate-3.7.7-datehack.patch
===================================================================
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:09:09.000000000 -0500
@@ -1443,7 +1443,7 @@ static int readState(char *stateFilename
 	}
 
 	/* 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);



1.1                  app-admin/logrotate/files/logrotate-3.7.7-weekly.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/logrotate/files/logrotate-3.7.7-weekly.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/logrotate/files/logrotate-3.7.7-weekly.patch?rev=1.1&content-type=text/plain

Index: logrotate-3.7.7-weekly.patch
===================================================================
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.1                  app-admin/logrotate/files/logrotate-3.7.7-ignore-hidden.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/logrotate/files/logrotate-3.7.7-ignore-hidden.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/logrotate/files/logrotate-3.7.7-ignore-hidden.patch?rev=1.1&content-type=text/plain

Index: logrotate-3.7.7-ignore-hidden.patch
===================================================================
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]);