Fix bug #365137: allow to build on systems without O_CLOEXEC

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

5 files changed, 41 insertions, 10 deletions

diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog
index dbb783723220..11d0ed518d88 100644
--- a/app-admin/logrotate/ChangeLog
+++ b/app-admin/logrotate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/logrotate
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.98 2011/04/17 15:01:06 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.99 2011/04/29 00:03:00 dang Exp $
+
+  29 Apr 2011; Daniel Gryniewicz <dang@gentoo.org> logrotate-3.7.9-r1.ebuild,
+  logrotate-3.7.9-r2.ebuild, +files/logrotate-3.7.9-no-cloexec.patch:
+  Fix bug #365137: allow to build on systems without O_CLOEXEC
 
 *logrotate-3.7.9-r2 (17 Apr 2011)
 
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index c596d1b9350b..ef8ccf213f82 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -6,6 +6,7 @@ AUX logrotate-3.7.7-fbsd.patch 983 RMD160 727327c302e48a3cbea73f3429322c72a67e32
 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-3.7.9-atomic-create.patch 1788 RMD160 ce1a9b520567a38b6e134e2d8996ca63084d06d2 SHA1 a7c41b06a4037d36193dfb8e30922bf7b824d409 SHA256 6a4f4a325c49c9a7eaa4a5a9fb4a049cad5b3b7864a55135b42ed624d2a7cbdf
+AUX logrotate-3.7.9-no-cloexec.patch 831 RMD160 365dff5e562c7c960d49e4a7c9394ec637840f64 SHA1 31c085d620dd0feb2b6070a0ff06eee0277025ac SHA256 5b0ddcb52c7f0eacd764bcae87a3afb385deedb7430fa0d6364f78209fba4c1f
 AUX logrotate-3.7.9-shred.patch 3988 RMD160 0a4f4ced9b533eb79d29fdb7f3614cd745d56d31 SHA1 8518457a9c206d7d1229b3b686343c586fa9a7f9 SHA256 e1ab3027cf5697d59b6b9da4c96bcb967a66f2110a68b6105bdb73e38b965bf3
 AUX logrotate-3.7.9-skip-empty-files.patch 653 RMD160 2695c688ad7965599a944c8be3fc530a69e82c4a SHA1 2a745713d4d04b51a1036c5822d529b8775061be SHA256 668dd10d3980b8cd71098dda9c3bc9ebac6b3d8b3981367478ce91b9ace3934e
 AUX logrotate-3.7.9-statefile.patch 1847 RMD160 51d5d9a09d8388d19be7cbf12e1dc1a0cfe4140b SHA1 8748af9f2690bf00a016550f95b9481cf1a9234c SHA256 014dd543785ccdd74e47084be3c77c78b22d240252197f88caa680a32e397549
@@ -14,15 +15,15 @@ AUX logrotate.cron 52 RMD160 fc2606fcd6d6bbdcf189ff3aa3a112e481182a9e SHA1 0a681
 DIST logrotate-3.7.8.tar.gz 43246 RMD160 c90de0efe013b533eff50bb52e2bf6948b839572 SHA1 5742dc0d9541ac59eba5f5718520f7504aea2159 SHA256 21aa3dc830e8cc895ee4199d9325aa1e37cd3b525d0eaef400f66f6c7fc536dd
 DIST logrotate-3.7.9.tar.gz 45301 RMD160 e3fb77e37c454a52566f7d5b017d70c9dddf9b66 SHA1 b920f9664a2c930f1ccdabc0db4f31f67cf95661 SHA256 080caf904e70e04da16b8dfa95a5a787ec7d722ee1af18ccea437d3ffdd6fec0
 EBUILD logrotate-3.7.8.ebuild 1753 RMD160 47e46705c1c7d5be3122d580499fc2f2fe152ed1 SHA1 db51844d03b426888c9c17a5274c178c6be3674f SHA256 2ffbe523f4211212d1b6691e6e6901e1b520e3a473844163a29a270ec094af6b
-EBUILD logrotate-3.7.9-r1.ebuild 1891 RMD160 f7906bec74ce7ee3d4f7a00f6f75ceb6578c29a6 SHA1 762447e6a975241f7c46ae92f6561c4dc83d74fe SHA256 25ea3ca64913ffdda74f974f7a57e2012ea8a75e7995dfef69ac9e57424ff06a
-EBUILD logrotate-3.7.9-r2.ebuild 1909 RMD160 1ba778d07d7e1a2bd7dd2aeca9d0c9be4b3052a8 SHA1 63e1ac172e3a8994c3c503d3c17be347e1afb5ad SHA256 29e25da594677501c80c34e9506fda5da92c5530dd5ea7775400f950f784b965
+EBUILD logrotate-3.7.9-r1.ebuild 1935 RMD160 7178f43f3b504413c3d2fd54a75c6cd9724f789c SHA1 7e0cb7b08e764165b1eb35d2d03d201962761667 SHA256 727dc947b1eac3037ef2aecce0d87f9d39e7c2a94db2b290e3f804ce4569dd44
+EBUILD logrotate-3.7.9-r2.ebuild 1956 RMD160 6a6bb12adf48a067604b2eaf8e2efdaa4a6b5b17 SHA1 450726d0a032ba7feef9f2c365bf17134ec5747e SHA256 31a0587d45cfe80cfd6c2c271b1d7216f9ed784ade7ed34fd5cf4ca3e93a9721
 EBUILD logrotate-3.7.9.ebuild 1758 RMD160 36e056060804869f0befcc28d982ba35943f3208 SHA1 c8a2a49b36014b5182f0b0a80990a22cb98e778a SHA256 71a6ce06a1280878b12525e0348ac91bb24be410ddf05391727d8e1863977609
-MISC ChangeLog 14010 RMD160 7f6c4e5f74061c2c3703256917c1226d5cebb50f SHA1 0571b6f44e85899ff179d11572f4f9ea91806d83 SHA256 1219ff27e7f8bd73d77b4bab31a26a097eb16f189bf887fa2ce2d2509e65ff9a
+MISC ChangeLog 14222 RMD160 ca0214767961efd9ec7212190e7f132c11f5007a SHA1 77e6aa678a520546c492cbd67451ba17557b23b8 SHA256 2d06988ecf899b341eabeb50e7611801096f2c5eb7cef090268d2ca8a5d85a0d
 MISC metadata.xml 216 RMD160 9bd928268bad8d343ce07f1c2f875b7c296db426 SHA1 df32457660dc43f2fd8b867c0b01ff7aed8e8f98 SHA256 4285dde164ce71c8922ac0cb88e9ea655f517c2d5c25437090466df3988658c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2rAKAACgkQomPajV0RnrG/5QCfTVGbcPj4muI+t4W5hrsYMS9d
-DaIAoIDq5QF0xED591oV9Nan5Cif0RUG
-=LI6c
+iEYEARECAAYFAk26AEMACgkQomPajV0RnrERAgCfSLE7UgMbD0/P6U7Q/h9ESKsA
+tcwAn2cK/ZcdsvNyjTw8YQg9Mk4s32yi
+=yjVq
 -----END PGP SIGNATURE-----
diff --git a/app-admin/logrotate/files/logrotate-3.7.9-no-cloexec.patch b/app-admin/logrotate/files/logrotate-3.7.9-no-cloexec.patch
new file mode 100644
index 000000000000..367f396d0734
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.7.9-no-cloexec.patch
@@ -0,0 +1,24 @@
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.7.9.orig//config.c logrotate-3.7.9/config.c
+--- logrotate-3.7.9.orig//config.c	2010-06-28 04:04:56.000000000 -0400
++++ logrotate-3.7.9/config.c	2011-04-28 19:16:55.422051174 -0400
+@@ -514,12 +514,19 @@ static int readConfigFile(const char *co
+ 		.l_whence = SEEK_SET,
+ 		.l_type = F_RDLCK
+ 	};
++	int flags;
+ 
+     /* FIXME: createOwner and createGroup probably shouldn't be fixed
+        length arrays -- of course, if we aren't run setuid it doesn't
+        matter much */
+ 
+-    fd = open(configFile, O_RDONLY | O_CLOEXEC);
++#ifdef O_CLOEXEC
++	flags = O_RDONLY | O_CLOEXEC;
++#else
++	flags = O_RDONLY;
++#endif
++
++    fd = open(configFile, flags);
+     if (fd < 0) {
+ 	message(MESS_ERROR, "failed to open config file %s: %s\n",
+ 		configFile, strerror(errno));
diff --git a/app-admin/logrotate/logrotate-3.7.9-r1.ebuild b/app-admin/logrotate/logrotate-3.7.9-r1.ebuild
index 6bf5ea10da07..e6c2cf6d1328 100644
--- a/app-admin/logrotate/logrotate-3.7.9-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.7.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.7.9-r1.ebuild,v 1.7 2011/04/16 15:52:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.7.9-r1.ebuild,v 1.8 2011/04/29 00:03:00 dang Exp $
 
 EAPI="2"
 
@@ -35,7 +35,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-3.7.7-fbsd.patch \
 		"${FILESDIR}"/${PN}-3.7.9-atomic-create.patch \
 		"${FILESDIR}"/${PN}-3.7.9-shred.patch \
-		"${FILESDIR}"/${PN}-3.7.9-statefile.patch
+		"${FILESDIR}"/${PN}-3.7.9-statefile.patch \
+		"${FILESDIR}"/${PN}-3.7.9-no-cloexec.patch
 }
 
 src_configure() {
diff --git a/app-admin/logrotate/logrotate-3.7.9-r2.ebuild b/app-admin/logrotate/logrotate-3.7.9-r2.ebuild
index 2810782672e6..1d83615f6123 100644
--- a/app-admin/logrotate/logrotate-3.7.9-r2.ebuild
+++ b/app-admin/logrotate/logrotate-3.7.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.7.9-r2.ebuild,v 1.1 2011/04/17 15:01:06 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.7.9-r2.ebuild,v 1.2 2011/04/29 00:03:00 dang Exp $
 
 EAPI="2"
 
@@ -35,6 +35,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-3.7.9-atomic-create.patch \
 		"${FILESDIR}"/${PN}-3.7.9-shred.patch \
 		"${FILESDIR}"/${PN}-3.7.9-statefile.patch \
+		"${FILESDIR}"/${PN}-3.7.9-no-cloexec.patch \
 		"${FILESDIR}"/${PN}-3.7.9-skip-empty-files.patch
 }