Add umask support to cronolog. Patch by Mike Doty <kingtaco@gentoo.org>, confirmed by myself.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 129 insertions, 13 deletions

diff --git a/app-admin/cronolog/ChangeLog b/app-admin/cronolog/ChangeLog
index 68e3b7d6eadd..a893529c2f6c 100644
--- a/app-admin/cronolog/ChangeLog
+++ b/app-admin/cronolog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/cronolog
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cronolog/ChangeLog,v 1.26 2009/10/11 23:20:35 halcy0n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cronolog/ChangeLog,v 1.27 2010/01/26 09:25:19 robbat2 Exp $
+
+*cronolog-1.6.2-r4 (26 Jan 2010)
+
+  26 Jan 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +cronolog-1.6.2-r4.ebuild, +files/cronolog-1.6.2-umask.patch:
+  Add umask support to cronolog. Patch by Mike Doty <kingtaco@gentoo.org>,
+  confirmed by myself.
 
   11 Oct 2009; Mark Loeser <halcy0n@gentoo.org> cronolog-1.6.2-r2.ebuild,
   cronolog-1.6.2-r3.ebuild:
diff --git a/app-admin/cronolog/Manifest b/app-admin/cronolog/Manifest
index a2b16e5f50d1..2006c7894663 100644
--- a/app-admin/cronolog/Manifest
+++ b/app-admin/cronolog/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.6.2-patches/cronolog-define-strptime.patch.txt 328 RMD160 fdcb164d7375eddddff000cd89770bb52e3ee78d SHA1 3c35258e5f49194effab20d77b98b0910ad36d97 SHA256 13aff42a22471a10ae80b7fbf4ca3a6d9ff49db040117f047716aad9824d1db1
 AUX 1.6.2-patches/cronolog-doc.patch.txt 432 RMD160 1b2d3afd07aef6abb673c7b7baf03e1f8ea2310b SHA1 f382f91e4ae69ca7997dedb5ed61469fe825b1b8 SHA256 b6bca104cf9f562688dfe7ba024e6b705f5b994dffd2385170f4e3c90317702b
 AUX 1.6.2-patches/cronolog-getopt-long.patch.txt 1106 RMD160 d4a46ea27dcc3d7ee072ee5a7e01383c6f962525 SHA1 32b127665a0d5dcf8498f2cdc87e969b538acd36 SHA256 432ed551930d1208f8ee374cefcb7fed6af50baeae919df7936682231c56f193
@@ -9,15 +6,10 @@ AUX 1.6.2-patches/cronolog-missing-symlink-patch.txt 322 RMD160 faecb36ca0f2d672
 AUX 1.6.2-patches/cronolog-setugid-patch.txt 12375 RMD160 d3ac89135eae0afb786fed39dbc34656945be4b4 SHA1 b423e6e4fa6adcb8ab60819e3ad7af7655b10dac SHA256 6604b2c4a70a73c64ea6e60c77fe18204a83e3435a5d9bfbd44e437e1df6dce5
 AUX 1.6.2-patches/cronolog-sigusr1-patch.txt 1150 RMD160 2821e799f2d94ea68c7bef9f3b46bae8e5e5418d SHA1 d3e522114b845dd21ba5664172cf0f28bbbd73e5 SHA256 f32803108d6a25dcfe87c99371af022e47922d1a1cd6e4221c206b27d6e08bba
 AUX 1.6.2-patches/cronolog-strftime-patch.txt 465 RMD160 50816d3ef31b349fec1dd7a197ebf7d40183ffbe SHA1 8e16b649a8c06f5f61a572c97764a9e26dfa2a79 SHA256 230d4b42f06ee9c76f3e6920cb4a74b3d23254ae114331fb83d89dddb01d7047
+AUX cronolog-1.6.2-umask.patch 2362 RMD160 636f52f7a0629b7512611ef60ba7e1eb5eb9438b SHA1 dfe70eaff2832d7ed3550471811dfec3cbe96786 SHA256 065ec3aa4da4725627a2da6e28ceaeea57e84443bf1575e316b8d400c98dde70
 DIST cronolog-1.6.2.tar.gz 133591 RMD160 6181c14e69a419c633950274c3c112f6bd784f9e SHA1 6422b7c5e87241eb31d76809a2e0eea77ae4c64e SHA256 65e91607643e5aa5b336f17636fa474eb6669acc89288e72feb2f54a27edb88e
 EBUILD cronolog-1.6.2-r2.ebuild 677 RMD160 adf11524defc360e132b5c234805d7c12f01c2d0 SHA1 214022415387df4ce777ef3be48b8d5820f9111a SHA256 3f8fe80e7c71b10788edf004b70b75c905adbb72a1ed751a21e608947770e130
 EBUILD cronolog-1.6.2-r3.ebuild 656 RMD160 9dbcdaaf2c58f1d4eca1dace2684626c769fb968 SHA1 d2d4145569e8beff9c062ddffe874649b6a5c815 SHA256 8b7cabb3430fd94a746117b00448f68bdde09e41b8bd68dba436c2b2ad4d9dbe
-MISC ChangeLog 3854 RMD160 a71e932097d48e82da3e085b2335c2157f4fdd2e SHA1 7017e1e76e78f63d056fb010fc08a907c180fb21 SHA256 cc27a7f58fcdc4663576af9ce0b8f027bd269c6ede58aaf2e5e0e6683acc3377
+EBUILD cronolog-1.6.2-r4.ebuild 738 RMD160 a77bf85c5f606d1a206dc2909c9d8547400e3980 SHA1 fdf7981b4a24e8e40960e4abdc63c87ea59bd90f SHA256 aa1b63f41837bb02f77161b9c48509c4936ef5e868fad69ed229856a87de80c5
+MISC ChangeLog 4104 RMD160 c5221923503b1636f52c630cae5706721040bf35 SHA1 cfafe9c56e239c03f9ebe524928e246d585b5128 SHA256 10642e7a7cc4bd7dd3cfec91da7e2f4c8a12ef16cd493e6efd1246d887b5bce7
 MISC metadata.xml 728 RMD160 e755a475c9723e63602e5845c21dfc156815887e SHA1 925fc0a0722a01ff3b5b29b51324d7c00c8399c3 SHA256 b08fed0255b7cdec217a77b8e7ebe6da8eb18e4301614501b57d7c85e3b067e7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrSaEwACgkQCRZPokWLroS6nwCgpN8dT5pJeW+sMcw7MeM9l6t4
-34wAoNsavpMZ6TBhXBg7OjFDlCDIupsA
-=kXFL
------END PGP SIGNATURE-----
diff --git a/app-admin/cronolog/cronolog-1.6.2-r4.ebuild b/app-admin/cronolog/cronolog-1.6.2-r4.ebuild
new file mode 100644
index 000000000000..38421d1d3ce9
--- /dev/null
+++ b/app-admin/cronolog/cronolog-1.6.2-r4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cronolog/cronolog-1.6.2-r4.ebuild,v 1.1 2010/01/26 09:25:20 robbat2 Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Cronolog apache logfile rotator"
+HOMEPAGE="http://cronolog.org/"
+SRC_URI="http://cronolog.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-patches/*.txt
+	# patch written for infra usage
+	epatch "${FILESDIR}"/${PN}-1.6.2-umask.patch
+
+	eautoreconf
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+}
diff --git a/app-admin/cronolog/files/cronolog-1.6.2-umask.patch b/app-admin/cronolog/files/cronolog-1.6.2-umask.patch
new file mode 100644
index 000000000000..a02e05737d89
--- /dev/null
+++ b/app-admin/cronolog/files/cronolog-1.6.2-umask.patch
@@ -0,0 +1,86 @@
+Add umask support to cronolog.
+
+Patch-by: Mike Doty <kingtaco@gentoo.org>
+Signed-off-By: Robin H. Johnson <robbat2@gentoo.org>
+
+--- src/cronolog.c.orig	2010-01-22 16:49:41.000000000 -0800
++++ src/cronolog.c	2010-01-22 17:31:50.000000000 -0800
+@@ -106,7 +106,8 @@
+ 
+ #ifndef _WIN32
+ #define SETUGID_USAGE	"   -u USER,   --set-uid=USER  change to USER before doing anything (name or UID)\n" \
+-			"   -g GROUP,  --set-gid=GROUP change to GROUP before doing anything (name or GID)\n"
++			"   -g GROUP,  --set-gid=GROUP change to GROUP before doing anything (name or GID)\n" \
++			"   -U OCTAL,  --umask=OCTAL   sets umask of file/directory creation\n"
+ #else
+ #define SETUGID_USAGE	""
+ #endif
+@@ -134,7 +135,7 @@
+ /* Definition of the short and long program options */
+ 
+ #ifndef _WIN32
+-char          *short_options = "ad:eop:s:z:H:P:S:l:hVx:u:g:";
++char          *short_options = "ad:eop:s:z:H:P:S:l:hVx:u:g:U:";
+ #else
+ char          *short_options = "ad:eop:s:z:H:P:S:l:hVx:";
+ #endif        
+@@ -157,10 +158,16 @@
+     { "once-only", 	no_argument,       	NULL, 'o' },
+     { "help",      	no_argument,       	NULL, 'h' },
+     { "version",   	no_argument,       	NULL, 'V' },
++    { "umask",     	required_argument, 	NULL, 'U' },
+     { NULL,		0,			NULL, 0 }
+ };
+ #endif
+ 
++#ifndef _WIN32
++static mode_t saved_umask = 0;
++static mode_t new_umask = 0;
++#endif
++
+ /* Main function.
+  */
+ int
+@@ -193,6 +200,11 @@
+     int 	log_fd = -1;
+ 
+ #ifndef _WIN32
++    new_umask=umask(0);
++    umask(new_umask);
++#endif
++
++#ifndef _WIN32
+     while ((ch = getopt_long(argc, argv, short_options, long_options, NULL)) != EOF)
+ #else
+     while ((ch = getopt(argc, argv, short_options)) != EOF)
+@@ -267,6 +279,9 @@
+ 	    new_gid = parse_gid(optarg, argv[0]);
+ 	    change_gid = 1;
+ 	    break;
++	case 'U':
++	  new_umask = (mode_t)strtol(optarg, NULL, 8);
++	  break;
+ #endif
+ 	case 'o':
+ 	    periodicity = ONCE_ONLY;
+@@ -443,6 +458,9 @@
+ 	   timestamp(*pnext_period), *pnext_period,
+ 	   *pnext_period - time_now));
+     
++#ifndef _WIN32
++    saved_umask=umask(new_umask);
++#endif
+     log_fd = open(pfilename, O_WRONLY|O_CREAT|O_APPEND|O_LARGEFILE, FILE_MODE);
+     
+ #ifndef DONT_CREATE_SUBDIRS
+@@ -459,6 +477,10 @@
+ 	exit(2);
+     }
+ 
++#ifndef _WIN32
++    umask(saved_umask);
++#endif
++
+     if (linkname)
+     {
+ 	create_link(pfilename, linkname, linktype, prevlinkname);