Fix weekly log rotation. bug #107906

Package-Manager: portage-2.0.53_rc5

diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog
index 474b01af6e8c3a99538a060667ce61509e2ae583..030436ccbc2a7e766344c9c49dcbcf5ccfc0b4cf 100644 (file)
--- a/app-admin/logrotate/ChangeLog
+++ b/app-admin/logrotate/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/logrotate
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.44 2005/09/14 19:14:08 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.45 2005/10/15 22:08:08 dang Exp $
+
+*logrotate-3.7.1-r2 (15 Oct 2005)
+
+  15 Oct 2005; <dang@gentoo.org> -files/logrotate-3.6.5-selinux.diff.bz2,
+  +files/logrotate-3.7.1-weekly.patch, -logrotate-3.6.5-r1.ebuild,
+  -logrotate-3.7.ebuild, -logrotate-3.7.1.ebuild,
+  +logrotate-3.7.1-r2.ebuild:
+  Fix weekly log rotation. bug #107906
 
   14 Sep 2005; <dang@gentoo.org> files/logrotate-3.7.1-manpage-fixes.patch:
   Fix default status file in manpage.  Bug #105958

diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index f15ea7b79c8853fe07679281960f04e373d0f3bf..798fc1a89e504b08175b91fca60809ddca7acb86 100644 (file)
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,29 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5990c6a2393224efe2d067d10de0a97c logrotate-3.7.1.ebuild 1723
-MD5 56b2e40af8f7d88199bcd55bf9b1d55a logrotate-3.7.1-r1.ebuild 1764
-MD5 098cc168fade54d752abb4316bf4860f logrotate-3.7.ebuild 1679
-MD5 af9e66d8014737b2344afe21501fae5f logrotate-3.6.5-r1.ebuild 1730
-MD5 5f15f4b9340ac15a0ce9cf1c29ec1db3 ChangeLog 6808
-MD5 c7533062993ae53a9a32d0a58416cd84 metadata.xml 216
-MD5 6ebaa619f7cd1621eb7203fb8f651cee files/logrotate-3.7.1-manpage-fixes.patch 15684
+MD5 457917413851c31a99c16802a3f7045e ChangeLog 7104
+MD5 746e982f984139e917c7d7ee39af40fa files/digest-logrotate-3.7.1-r1 67
+MD5 746e982f984139e917c7d7ee39af40fa files/digest-logrotate-3.7.1-r2 67
+MD5 8259bf9cd3b5bc37dd4cdda62cc9c2de files/logrotate-3.7.1-dateext-maxage.patch 14282
+MD5 8d4271dd12289c4da96b3e4f1fbd0868 files/logrotate-3.7.1-datehack.patch 516
 MD5 d268cc741e71398dc2a14bcdc0bcfeb2 files/logrotate-3.7.1-ignore-hidden.patch 517
+MD5 6ebaa619f7cd1621eb7203fb8f651cee files/logrotate-3.7.1-manpage-fixes.patch 15684
 MD5 721a9af5171ca27c48c51ba338db3036 files/logrotate-3.7.1-no-tmpdir.patch 1266
 MD5 b6b2dec981e0b573366f5d0e74783b5b files/logrotate-3.7.1-taboo-to-debug.patch 517
-MD5 8d4271dd12289c4da96b3e4f1fbd0868 files/logrotate-3.7.1-datehack.patch 516
-MD5 ef1405c48d23249f97330709d1d2a093 files/logrotate-3.6.5-selinux.diff.bz2 1440
-MD5 4942e4ea3f05b91d9d24504c4ddbc776 files/digest-logrotate-3.7 69
-MD5 bdf48119e016d4ee8b829da9e83959bf files/digest-logrotate-3.6.5-r1 71
-MD5 746e982f984139e917c7d7ee39af40fa files/digest-logrotate-3.7.1-r1 67
-MD5 8259bf9cd3b5bc37dd4cdda62cc9c2de files/logrotate-3.7.1-dateext-maxage.patch 14282
+MD5 99475aa9bd9e42d158c0584f3c4544fd files/logrotate-3.7.1-weekly.patch 1165
 MD5 5692e613153f372df5b7510b39ba9c5c files/logrotate.conf 731
 MD5 cf1ca2cfa810abaefc504a76ca38b52a files/logrotate.cron 52
-MD5 746e982f984139e917c7d7ee39af40fa files/digest-logrotate-3.7.1 67
+MD5 56b2e40af8f7d88199bcd55bf9b1d55a logrotate-3.7.1-r1.ebuild 1764
+MD5 b173c5de8be193de7d0e47e4f719c3a6 logrotate-3.7.1-r2.ebuild 1807
+MD5 c7533062993ae53a9a32d0a58416cd84 metadata.xml 216
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDKHa0omPajV0RnrERAquBAJ9lh//gsAm2s31PtkO3ev0TjYhrTACfXsvk
-VeEcYfhWcgh2Tr0pNDBPDT8=
-=Cclj
+iD8DBQFDUX3YomPajV0RnrERAhCGAJoDMqq+mM6RSCRghjpsFRcnJLBkTQCeIgw/
+TMgSzxXmiOKoJ4w0D9cj/LY=
+=Uuot
 -----END PGP SIGNATURE-----

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 (file)
index a2b611f..0000000
--- 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 (file)
index 7206c34..0000000
--- 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
similarity index 100%
rename from app-admin/logrotate/files/digest-logrotate-3.7.1
rename to 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 (file)
index 48bb387..0000000
Binary files a/app-admin/logrotate/files/logrotate-3.6.5-selinux.diff.bz2 and /dev/null differ

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 (file)
index 0000000..8a371e8
--- /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:

diff --git a/app-admin/logrotate/logrotate-3.6.5-r1.ebuild b/app-admin/logrotate/logrotate-3.6.5-r1.ebuild
deleted file mode 100644 (file)
index ea5898a..0000000
--- a/app-admin/logrotate/logrotate-3.6.5-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.6.5-r1.ebuild,v 1.19 2005/05/30 03:31:34 kumba Exp $
-
-inherit eutils
-
-SELINUX_PATCH="logrotate-3.6.5-selinux.diff.bz2"
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="http://packages.debian.org/unstable/admin/logrotate.html"
-SRC_URI="mirror://debian/pool/main/l/logrotate/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ia64 amd64 ppc64 s390 hppa mips"
-IUSE="selinux"
-
-DEPEND=">=sys-apps/portage-2.0.47-r10
-       >=dev-libs/popt-1.5
-       >=sys-apps/sed-4
-       selinux? ( sys-libs/libselinux )"
-
-RDEPEND="${DEPEND}
-       selinux? ( sec-policy/selinux-logrotate )"
-
-src_unpack() {
-       unpack ${PN}_${PV}.orig.tar.gz
-
-       use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
-
-       sed -i \
-               -e "s:CFLAGS += -g:CFLAGS += -g ${CFLAGS}:" \
-               -e "/CVSROOT =/d" \
-               ${S}/Makefile || die "sed failed"
-
-       #small fix for a tipo in man page
-       sed -i -e "s:logrotate/status:logrotate.status:" ${S}/logrotate.8 || die \
-               "sed failed!"
-}
-
-src_compile() {
-       emake || 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() {
-       einfo "If you wish to have logrotate e-mail you updates, please"
-       einfo "emerge mail-client/mailx and configure logrotate in"
-       einfo "/etc/logrotate.conf appropriately"
-       einfo
-       einfo "Additionally, /etc/logrotate.conf may need to be modified"
-       einfo "for your particular needs.  See man logrotate for details."
-}

diff --git a/app-admin/logrotate/logrotate-3.7.1.ebuild b/app-admin/logrotate/logrotate-3.7.1-r2.ebuild
similarity index 88%
rename from app-admin/logrotate/logrotate-3.7.1.ebuild
rename to app-admin/logrotate/logrotate-3.7.1-r2.ebuild
index a87374aa019457fe43bdc62b2bf42d139f392512..da090fab524b35deb9b2c440f348fdbd8b9255fe 100644 (file)
--- a/app-admin/logrotate/logrotate-3.7.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.7.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.7.1.ebuild,v 1.2 2005/07/09 13:51:53 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.7.1-r2.ebuild,v 1.1 2005/10/15 22:08:08 dang Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64 ~ppc64 ~s390 ~hppa"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="selinux"
 
 RDEPEND="
@@ -37,6 +37,8 @@ src_unpack() {
        epatch ${FILESDIR}/${P}-ignore-hidden.patch
        epatch ${FILESDIR}/${P}-manpage-fixes.patch
        epatch ${FILESDIR}/${P}-taboo-to-debug.patch
+       epatch ${FILESDIR}/${P}-no-tmpdir.patch
+       epatch ${FILESDIR}/${P}-weekly.patch
 }
 
 src_compile() {

diff --git a/app-admin/logrotate/logrotate-3.7.ebuild b/app-admin/logrotate/logrotate-3.7.ebuild
deleted file mode 100644 (file)
index 05308d5..0000000
--- a/app-admin/logrotate/logrotate-3.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.7.ebuild,v 1.3 2005/01/02 03:56:46 pebenito Exp $
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="http://packages.debian.org/unstable/admin/logrotate.html"
-SRC_URI="mirror://debian/pool/main/l/logrotate/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64 ~ppc64 ~s390 ~hppa"
-IUSE="selinux"
-
-DEPEND=">=sys-apps/portage-2.0.47-r10
-       >=dev-libs/popt-1.5
-       >=sys-apps/sed-4
-       selinux? ( sys-libs/libselinux )"
-
-RDEPEND="${DEPEND}
-       selinux? ( sec-policy/selinux-logrotate )"
-
-src_unpack() {
-       unpack ${PN}_${PV}.orig.tar.gz
-
-       sed -i \
-               -e "s:CFLAGS += -g:CFLAGS += -g ${CFLAGS}:" \
-               -e "/CVSROOT =/d" \
-               ${S}/Makefile || die "sed failed"
-
-       #small fix for a tipo in man page
-       sed -i -e "s:logrotate/status:logrotate.status:" ${S}/logrotate.8 || die \
-               "sed failed!"
-}
-
-src_compile() {
-       local myconf
-       useq selinux && myconf='WITH_SELINUX=yes'
-       emake ${myconf} || 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() {
-       einfo "If you wish to have logrotate e-mail you updates, please"
-       einfo "emerge mail-client/mailx and configure logrotate in"
-       einfo "/etc/logrotate.conf appropriately"
-       einfo
-       einfo "Additionally, /etc/logrotate.conf may need to be modified"
-       einfo "for your particular needs.  See man logrotate for details."
-}