Bug #276715: Failure to compile with newer kernel headers due to COMMAND_LINE_SIZE definition.

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

4 files changed, 105 insertions, 14 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 7315cad25581..77d21c302938 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.74 2009/06/15 11:11:23 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.75 2009/07/11 15:12:25 robbat2 Exp $
+
+  11 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +files/0.4.3/0003-command-line-size-fix.patch, openrc-0.4.3-r3.ebuild:
+  Bug #276715: Failure to compile with newer kernel headers due to
+  COMMAND_LINE_SIZE definition.
 
   15 Jun 2009; Matthias Schwarzott <zzam@gentoo.org> openrc-9999.ebuild:
   Add missing leading slash to LIBEXECDIR.
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 12014134c0d3..1f8666a8872f 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.4.0/0001-msg-style.patch 1709 RMD160 c8f22d90c66cd99da701d0840094694d96269def SHA1 2983c97f1b3c770d9b2afce4540d6d8a7db8abe7 SHA256 5a5d7cd9c0289eb9e7332b01aa15331e8497579efc78ea4d833400d00cb46f7b
 AUX 0.4.0/0002-useful-functions.patch 1803 RMD160 be1963ad7d51deb8ffc96d9ce5d7c59903e9dbcd SHA1 d07901d1c65af2c37a4817d05b364f736b66470c SHA256 d270bba9141333df12c5b5795566bba9f59ba6d6c26a58f09abf0c394f802475
 AUX 0.4.0/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA1 d3489d7a34f9984b4267819677b5e4549c12fc00 SHA256 dab3a00036718ea99058f362d84a4bac5e9bbd4eff934f1ad1d4da85c8551539
@@ -12,6 +9,7 @@ AUX 0.4.2/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA
 AUX 0.4.2/0004-svn-version.patch 450 RMD160 7e85a0b4e08bd9554749ab384ce61bab4b7ddd21 SHA1 bfcd2eb61affc819f2ecabc420dc9e9c08dc4179 SHA256 f3877a994690912998daae1144a3564eea7a15d841df41af4ca93a37566cce46
 AUX 0.4.3/0001-fix-is_older_than.patch 896 RMD160 8e0cf759932312ddab7e6dfc06c0e08c27f94629 SHA1 a3d9d3ab2d47f2f75529bd32a02ad4541b4aef18 SHA256 d047b14b49c7ce5bf53167a6e0b47d7c23830d91eeeb25d9e0df1330f9f1b1ab
 AUX 0.4.3/0002-support-custom-status.patch 5529 RMD160 b86c26a3f4190dcafc9061e360cac2b45b801fbd SHA1 7e3381e8e13cff93037fe85a9047563348b8aff4 SHA256 f8bbd189054873179d5fa03a50ca513d28efde5888b2b93ffd9de51ed21af362
+AUX 0.4.3/0003-command-line-size-fix.patch 2640 RMD160 0989fd8f26533651bb8290b69d88abca5ade6aec SHA1 a005fdd8bfbf20aaedc660979d57562148cc32d3 SHA256 f0275e3beeeb08d6c910a92581e78e076d2ee9c7700ae0ff862e74ffbb1d7dcb
 AUX 9999/0001-msg-style.patch 1714 RMD160 15a9a9075dce18fb0beece6a3324c143ec973ed2 SHA1 b9082ab1160952a3412be3deb3825d901cce5d49 SHA256 4c819af483240b1c822d25ae3e604376b6255b4577c191bddfc84c309efab08e
 AUX 9999/0002-useful-functions.patch 1801 RMD160 5b4ca22e434a3c3d9202e5e95d7dfd4518e0393a SHA1 86f4a4f49989c688269a6e1f95c27ef00f5186ca SHA256 de5e11cd8c514353a5f97b13df52a7220b1b967dd0586336d16864d6c372c62f
 AUX 9999/0003-KV.patch 2565 RMD160 62ebe49be43f9b3691400a5a6ebf05c8cb048f0b SHA1 b61e1fe0fc49705a44b0e9fde1d8ec0cfc1e343a SHA256 44be27f8bf419489b29507a8ddab74ff890d6ebcfa316570077393f1c6bac082
@@ -22,14 +20,7 @@ EBUILD openrc-0.4.1-r1.ebuild 10257 RMD160 09b1f0ef469dadb4db344e87f5695cbf40a48
 EBUILD openrc-0.4.2.ebuild 10228 RMD160 769c35cd085c3b45d722321c1d13d35b8c4c7283 SHA1 111aa2392d965846dc9ddf1c535010eec1524ed0 SHA256 b17d081ec30ae557bf5d2664b25e51f1b0425f08d4d8eba932c5a33672555681
 EBUILD openrc-0.4.3-r1.ebuild 10401 RMD160 441494782af660a954102d347411d0905d9f2520 SHA1 7826444c7fafd4a20f0feca79449e1fc5dc7f8ed SHA256 8bb06d5f79a3010b2060a75ef7770cd95baf71c6be9c59cda7e7288531c5fa06
 EBUILD openrc-0.4.3-r2.ebuild 10556 RMD160 2335ae861e4dc0c24c7a4948cc468545b93e8591 SHA1 56eb224e8b1c87f29ec19ef71554497191314308 SHA256 034a3b67c861b1b75f2cff8b58f7e220ae3f30158962bf0d1cae1cca64f263b2
-EBUILD openrc-0.4.3-r3.ebuild 10650 RMD160 529f2b0978722539ca8bed510dc23f7c16fd458f SHA1 836f3abe38e07d572ecc47d95325e743e736ec25 SHA256 bdf5d2d0956fc378eb583bdab190585fb1fbbe5ceece0fc2460e8d6bddeb004d
+EBUILD openrc-0.4.3-r3.ebuild 10712 RMD160 db8596789995c964d2936fb36012e5a7c0406b2f SHA1 7b1e8775a1f581ccd922af5503ab291fb0839ec4 SHA256 cc2fa654698e549c6fad77049d2e9fdca089647a1f19f2c4a54922a9655bf309
 EBUILD openrc-9999.ebuild 10387 RMD160 eff6df130dcf021a8beee295345f26cd1f3c81a0 SHA1 1eca942502123fa6e47cf5d8eb3a3211823505a2 SHA256 04df595f59d75be627fa77fec97fb72cc15f1f939973752786c4b9792ecadbb0
-MISC ChangeLog 15186 RMD160 fac37d94ca644557844ad2c8a41b8125de40bccb SHA1 674f40ee4774d16d65a93596ac57f33711104800 SHA256 46eb2fbc9de95f527635b69db7cb1e63e895590a08e96eb471b95206851bce51
+MISC ChangeLog 15415 RMD160 9ab3915a8a1e82ff5e2182db55c0c80090e48962 SHA1 25cfc7daa5975e03f9ee3dd2ef763bd57b96efa3 SHA256 b5aedbb95eaf4555c5f02075725b6767f0f0640717d90df35dbb15a256ff019a
 MISC metadata.xml 314 RMD160 ff92ab9cd3f1f3caf25d0be59cf658343d44991c SHA1 d9febb1ce1499c949a2478defda945a3ce716f73 SHA256 4eb82a61b3697027b5ccb1a328a763308c7e090aa23f69fe87b7b7966165fb33
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAko2LGUACgkQt2vP6XvVdOeumwCeMlkw8kL5olQOEJFDSiQ2satE
-uI4An3aoUOlzmZLgiHU446mvLiHqrwjJ
-=Ab6c
------END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/files/0.4.3/0003-command-line-size-fix.patch b/sys-apps/openrc/files/0.4.3/0003-command-line-size-fix.patch
new file mode 100644
index 000000000000..85805b9db03c
--- /dev/null
+++ b/sys-apps/openrc/files/0.4.3/0003-command-line-size-fix.patch
@@ -0,0 +1,94 @@
+Index: src/librc/librc.h
+===================================================================
+--- src/librc/librc.h (revision 7c81f74b60b9d15ed472f1ca63cab0a105a84c08)
++++ src/librc/librc.h (revision 6abeec74301d8406ebbbd653b9fe9a0e234c09bf)
+@@ -73,6 +73,4 @@
+ #define librc_hidden_def(x) hidden_def(x)
+ 
+-ssize_t rc_getline(char **, size_t *, FILE *);
+-
+ librc_hidden_proto(rc_config_list)
+ librc_hidden_proto(rc_config_load)
+Index: src/librc/rc.h.in
+===================================================================
+--- src/librc/rc.h.in (revision c0fd1b49e49cec28c1f5a3a76f9db11c62e550dc)
++++ src/librc/rc.h.in (revision 6abeec74301d8406ebbbd653b9fe9a0e234c09bf)
+@@ -518,4 +518,8 @@
+ RC_PIDLIST *rc_find_pids(const char *, const char *const *, uid_t, pid_t);
+ 
++/* getline is a handy glibc function that not all libcs have, so
++ * we have our own */
++ssize_t rc_getline(char **, size_t *, FILE *);
++
+ __END_DECLS
+ #endif
+Index: src/librc/rc.map
+===================================================================
+--- src/librc/rc.map (revision 6615eb4b689d7aa1d047bd9ed75eca80beac9767)
++++ src/librc/rc.map (revision 6abeec74301d8406ebbbd653b9fe9a0e234c09bf)
+@@ -13,4 +13,5 @@
+ 	rc_environ_fd;
+ 	rc_find_pids;
++	rc_getline;
+ 	rc_newer_than;
+ 	rc_older_than;
+Index: src/rc/rc.c
+===================================================================
+--- src/rc/rc.c
++++ src/rc/rc.c
+@@ -43,10 +43,6 @@
+ #include <sys/utsname.h>
+ #include <sys/wait.h>
+ 
+-#ifdef __linux__
+-# include <asm/setup.h> /* for COMMAND_LINE_SIZE */
+-#endif
+-
+ #include <errno.h>
+ #include <dirent.h>
+ #include <ctype.h>
+@@ -176,10 +172,8 @@
+ proc_getent(const char *ent)
+ {
+ 	FILE *fp;
+-	char proc[COMMAND_LINE_SIZE];
+-	char *p;
+-	char *value = NULL;
+-	int i;
++	char *proc, *p, *value = NULL;
++	size_t i;
+ 
+ 	if (!exists("/proc/cmdline"))
+ 		return NULL;
+@@ -189,8 +183,10 @@
+ 		return NULL;
+ 	}
+ 
+-	memset(proc, 0, sizeof(proc));
+-	fgets(proc, sizeof(proc), fp);
++	proc = NULL;
++	i = 0;
++	if (rc_getline(&proc, &i, fp) == -1 || proc == NULL)
++		eerror("rc_getline: %s", strerror(errno));
+ 	if (*proc && (p = strstr(proc, ent))) {
+ 		i = p - proc;
+ 		if (i == '\0' || proc[i - 1] == ' ') {
+@@ -202,6 +198,7 @@
+ 	} else
+ 		errno = ENOENT;
+ 	fclose(fp);
++	free(proc);
+ 
+ 	return value;
+ }
+Index: src/test/rc.funcs.list
+===================================================================
+--- src/test/rc.funcs.list (revision 6615eb4b689d7aa1d047bd9ed75eca80beac9767)
++++ src/test/rc.funcs.list (revision 6abeec74301d8406ebbbd653b9fe9a0e234c09bf)
+@@ -21,4 +21,6 @@
+ rc_find_pids
+ rc_find_pids@@RC_1.0
++rc_getline
++rc_getline@@RC_1.0
+ rc_newer_than
+ rc_newer_than@@RC_1.0
diff --git a/sys-apps/openrc/openrc-0.4.3-r3.ebuild b/sys-apps/openrc/openrc-0.4.3-r3.ebuild
index f168f306c218..bb476bb3da1b 100644
--- a/sys-apps/openrc/openrc-0.4.3-r3.ebuild
+++ b/sys-apps/openrc/openrc-0.4.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.3-r3.ebuild,v 1.2 2009/06/08 19:38:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.3-r3.ebuild,v 1.3 2009/07/11 15:12:25 robbat2 Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -67,6 +67,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/0.4.2/0003-KV.patch
 	epatch "${FILESDIR}"/0.4.3/0001-fix-is_older_than.patch
 	epatch "${FILESDIR}"/0.4.3/0002-support-custom-status.patch
+	epatch "${FILESDIR}"/0.4.3/0003-command-line-size-fix.patch
 }
 
 src_compile() {