Bump to 3.7.7; now considering fedora as upstream

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27-gentoo-r6 x86_64

7 files changed, 156 insertions, 7 deletions

diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog
index b48bec036ec1..eac94b72fe7f 100644
--- a/app-admin/logrotate/ChangeLog
+++ b/app-admin/logrotate/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/logrotate
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.72 2008/12/15 17:30:51 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.73 2008/12/24 20:49:12 dang Exp $
+
+*logrotate-3.7.7 (24 Dec 2008)
+
+  24 Dec 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +files/logrotate-3.7.7-datehack.patch,
+  +files/logrotate-3.7.7-ignore-hidden.patch,
+  +files/logrotate-3.7.7-weekly.patch, files/logrotate.conf,
+  +logrotate-3.7.7.ebuild:
+  Bump to 3.7.7; now considering fedora as upstream
 
   15 Dec 2008; Daniel Gryniewicz <dang@gentoo.org> logrotate-3.7.2.ebuild:
   Strip cflags; bug #250960
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 77e4b5ad3480..08370960fbf6 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -8,18 +8,23 @@ AUX logrotate-3.7.1-manpage-fixes.patch 15684 RMD160 0800474991efcd54360a0996900
 AUX logrotate-3.7.1-no-tmpdir.patch 1266 RMD160 1311c0561551890958feab495ad2109c0bea1662 SHA1 ccb6b4af3e63c19131a15373ebffe8af812fb463 SHA256 045acabd92812483629e9263c997e4e9b41ade71b422af3699dc9cce390b4f23
 AUX logrotate-3.7.1-taboo-to-debug.patch 517 RMD160 624d7f18438d6728b29acf6628fd0c5d60766fe8 SHA1 3c6505a82197bf23a2fe13feeb9cda340d051b61 SHA256 6b67762f70eef9d20f1727aa3d88ddf77fbdc4bac7cb135adb3c30886f990046
 AUX logrotate-3.7.1-weekly.patch 1165 RMD160 8799169f501316796c68e98fef0b34af963231c1 SHA1 e8a269ee0099adb50307a06f79ee188c238d348f SHA256 fc0cf229212ac458555829e12bdc9886a75e1ea0fbefd89454686cef3a1a80ac
-AUX logrotate.conf 731 RMD160 2198a4ae1ccaaa00b173516d22baef59906d7614 SHA1 3fe255599843547d918c726fe949299b6d2a7859 SHA256 80e495a8eb442a19d12e20ef1b1b5c99f5b5c6c2063979550fd1bd2ec6c9064a
+AUX logrotate-3.7.7-datehack.patch 589 RMD160 5b9314e3cd6f100cb0272146baceda01777e9614 SHA1 b5e6fb929ba777446c24e086ff8031ee3cc7ca07 SHA256 f68e360afe0a9ab28fa42775bdf0b7ddf4ff925e19a3786bcd40e0067ee4856d
+AUX logrotate-3.7.7-ignore-hidden.patch 734 RMD160 7bc3628c64eaf1c39b6d7431e0a1a06f0979cd08 SHA1 85270672cf772b10fee234a00a20310d28f60722 SHA256 717ae92f87d0c1b53d8930efb7fe61d0884fb599a5fe706dcabc41c116cd093b
+AUX logrotate-3.7.7-weekly.patch 1228 RMD160 8dbaec65fd9c2cec3cef6c01b33f95fb9bfaae50 SHA1 bd03af7849e280a1cc00118194d5fad0211c57f5 SHA256 fef846a8cd140c1d6a182de81b76c65d0ececf1b463c6d5efdb84ed2aa3a2440
+AUX logrotate.conf 860 RMD160 a7ab0fef1822d135fb1d194ced8d8ae487f729d8 SHA1 c9f1e3cab04c7fcc1a3a4bac5b0c54a88ee81fdb SHA256 5a0d6a2f331af0df8e0b87904ba522b64bfebc13f47b0a5717e03257d3f29ad7
 AUX logrotate.cron 52 RMD160 fc2606fcd6d6bbdcf189ff3aa3a112e481182a9e SHA1 0a681301e9f22178691cae25799351c220712a7f SHA256 5eeae7dfbd54f74108d49cda8285211898d29ab7d547dee267803299e7339560
 DIST logrotate-3.7.1.tar.bz2 31953 RMD160 cee80082113a6ddae8c694aa4b9a035f6aff61b1 SHA1 8177ae49ba1ed0c9db1bd76be9135249b2a5470b SHA256 d828ced574eea4900ae7a1179730503cd2984c685fa97967a2d9c743b0d4071f
 DIST logrotate-3.7.2.tar.bz2 33626 RMD160 ba247420605920fe55f6cd8c149ce83ccf92ba09 SHA1 c2dccac55b697d5a7337927aa9ab7b9363d237ac SHA256 c9cccad00604c375d66f93e39e50976a3d935b591340f99808aed60aa903a6c6
+DIST logrotate-3.7.7.tar.gz 42867 RMD160 ce4b07541f4234b9d577b1acac9153fc008276d0 SHA1 da6aadf20ffe289d93611864cbeb5a5f6a82a440 SHA256 b281c1f318417184caf2588979a04793809f2c6f558c6249248ebb07494cc93f
 EBUILD logrotate-3.7.1-r2.ebuild 1772 RMD160 bcd15a34b30e7c9860053e65caf039c7913a23ea SHA1 dada17034e9190ce076eae0e8d788400b3968583 SHA256 8204cfc744e895514066f9e1849b76ffc77a7a96d03e6f0c23445f5c27013174
 EBUILD logrotate-3.7.2.ebuild 1548 RMD160 c4873a2a51ed7c0f26871fb60e6e03f457f2ccfb SHA1 7a45d2676ddfd699f9428929fbc6966c8154b11a SHA256 36145618ea4d8b7e84b5b6e449d7f60f5e71665ea8f4f5376c3e99d9caf66e9e
-MISC ChangeLog 9961 RMD160 ce2fda1455694fa0d3b560808d834cb5bc26a5e0 SHA1 196e03014fdecac5a30d1103ad599e20d0b7923b SHA256 d14f1bd5dc8f23a01b87f1806c6b0035aff1d5ee995dd138cf94d8992958130a
+EBUILD logrotate-3.7.7.ebuild 1713 RMD160 411c6382f7756f0656ba3741bf83f5ab504ca6eb SHA1 39fa8ad1a5c2a57dd163f587ddefc33cc1d4ea5a SHA256 477943f407245fd6dd0597da0a4e5a725ff586ca7831fd679347554202cb1f0b
+MISC ChangeLog 10272 RMD160 e67d8ef0f9a4a1396ab6023b812080ae8d4d5ec5 SHA1 a1ce2be83fe070ef7e610fd332b36c64fa3a1690 SHA256 5b3792d3068d69e094a8cecb68df5124f917efe2a016995f7cd23102feea09a1
 MISC metadata.xml 216 RMD160 9bd928268bad8d343ce07f1c2f875b7c296db426 SHA1 df32457660dc43f2fd8b867c0b01ff7aed8e8f98 SHA256 4285dde164ce71c8922ac0cb88e9ea655f517c2d5c25437090466df3988658c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFJRpRWomPajV0RnrERAn3NAJ0VgeWg/V3qxaEzFLIP5ENZW+QPtQCfSq5a
-BmuTBCCReu0x4dDRk7yd2yk=
-=Z7g7
+iD8DBQFJUqBTomPajV0RnrERAhy2AJ99ByEIvMYhgDqSjrfqbsaQBEPjDQCfXHJX
+2h41S8oIZevkSqjLR/e617w=
+=nXGR
 -----END PGP SIGNATURE-----
diff --git a/app-admin/logrotate/files/logrotate-3.7.7-datehack.patch b/app-admin/logrotate/files/logrotate-3.7.7-datehack.patch
new file mode 100644
index 000000000000..c023cba0b7a5
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.7.7-datehack.patch
@@ -0,0 +1,12 @@
+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);
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
new file mode 100644
index 000000000000..28581f142587
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.7.7-ignore-hidden.patch
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000000..cd817558aa56
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.7.7-weekly.patch
@@ -0,0 +1,28 @@
+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.conf b/app-admin/logrotate/files/logrotate.conf
index f8fb039fbb46..25dd13495e13 100644
--- a/app-admin/logrotate/files/logrotate.conf
+++ b/app-admin/logrotate/files/logrotate.conf
@@ -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 @@ rotate 4
 # 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 @@ noolddir
     rotate 1
 }
 
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 1
+}
+
 # system-specific logs may be also be configured here.
diff --git a/app-admin/logrotate/logrotate-3.7.7.ebuild b/app-admin/logrotate/logrotate-3.7.7.ebuild
new file mode 100644
index 000000000000..a7c0963d8cc0
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.7.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.7.7.ebuild,v 1.1 2008/12/24 20:49:12 dang Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="http://www.gentoo.org"
+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 )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	selinux? ( sec-policy/selinux-logrotate )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd ${S}
+
+	strip-flags
+
+	sed -i \
+		-e "s:CFLAGS += -g:CFLAGS += -g ${CFLAGS}:" \
+		-e "/CVSROOT =/d" \
+		Makefile || die "sed failed"
+
+	epatch ${FILESDIR}/${P}-datehack.patch
+	epatch ${FILESDIR}/${P}-ignore-hidden.patch
+	epatch ${FILESDIR}/${P}-weekly.patch
+}
+
+src_compile() {
+	local myconf
+	myconf="CC=$(tc-getCC)"
+	useq selinux && myconf="${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() {
+	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."
+}