Fix weekly log rotation. bug #107906

(Portage version: 2.0.53_rc5)

5 files changed, 22 insertions, 2 deletions

diff --git a/app-admin/logrotate/files/digest-logrotate-3.6.5-r1 b/app-admin/logrotate/files/digest-logrotate-3.6.5-r1
deleted file mode 100644
index a2b611fc81fc..000000000000
--- a/app-admin/logrotate/files/digest-logrotate-3.6.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c707f826f783ffc461a32b34cba5056 logrotate_3.6.5.orig.tar.gz 32086
diff --git a/app-admin/logrotate/files/digest-logrotate-3.7 b/app-admin/logrotate/files/digest-logrotate-3.7
deleted file mode 100644
index 7206c3407532..000000000000
--- a/app-admin/logrotate/files/digest-logrotate-3.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bf0de3a495294300f32e71f136119c41 logrotate_3.7.orig.tar.gz 35737
diff --git a/app-admin/logrotate/files/digest-logrotate-3.7.1 b/app-admin/logrotate/files/digest-logrotate-3.7.1-r2
index 8b29cfeb69d0..8b29cfeb69d0 100644
--- a/app-admin/logrotate/files/digest-logrotate-3.7.1
+++ b/app-admin/logrotate/files/digest-logrotate-3.7.1-r2
diff --git a/app-admin/logrotate/files/logrotate-3.6.5-selinux.diff.bz2 b/app-admin/logrotate/files/logrotate-3.6.5-selinux.diff.bz2
deleted file mode 100644
index 48bb3877bbbb..000000000000
--- a/app-admin/logrotate/files/logrotate-3.6.5-selinux.diff.bz2
+++ /dev/null
diff --git a/app-admin/logrotate/files/logrotate-3.7.1-weekly.patch b/app-admin/logrotate/files/logrotate-3.7.1-weekly.patch
new file mode 100644
index 000000000000..8a371e8e003f
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.7.1-weekly.patch
@@ -0,0 +1,22 @@
+--- logrotate-3.7.1-old/logrotate.c	2004-10-19 23:41:24.000000000 +0200
++++ logrotate-3.7.1-new/logrotate.c	2005-10-02 17:29:22.380767321 +0200
+@@ -424,12 +424,15 @@ int findNeedRotating(logInfo * log, int 
+         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;
+           case ROT_MONTHLY: