Fix building on hardened due to PIC/cpuid #269001 by Juergen Rose.

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

4 files changed, 71 insertions, 4 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index bbb02a9fcb23..05793688f950 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.261 2009/05/09 15:10:56 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.262 2009/05/10 21:02:47 vapier Exp $
+
+  10 May 2009; Mike Frysinger <vapier@gentoo.org> util-linux-2.15.ebuild,
+  +files/util-linux-2.15-cpuid-pic.patch:
+  Fix building on hardened due to PIC/cpuid #269001 by Juergen Rose.
 
   09 May 2009; Tobias Klausmann <klausman@gentoo.org>
   util-linux-2.14.2.ebuild:
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 93ddd10ded48..1a511ff682da 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
 AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810
 AUX no-symlink-resolve.patch 316 RMD160 a38941174577c046e982d696b245e8c64d491caa SHA1 8cb06d4ed19ab4330b1e3841d0f824d19ea66a7c SHA256 e02ba35bde41df4fcbf215a4598427711bd8104b883f9bd7aeab76c1c8741db9
@@ -29,6 +32,7 @@ AUX util-linux-2.13-setuid-checks.patch 1860 RMD160 9146bad2a5593424f52cea4615e4
 AUX util-linux-2.13-uclibc.patch 1627 RMD160 3c52bac5b792c3ee6ccf69324729793314f279af SHA1 d85ad97b602daec290cc28858269ae4bcc0666f3 SHA256 7f0c5dcf91d3143c99006ada59ccb7842427933ad14e39c88bfaa7985d91a392
 AUX util-linux-2.13.1-no-a.out.patch 659 RMD160 8398db67db7224038e51cd9febc239d0cd6072d7 SHA1 29573af66b0e1fd68cfacf7109ad8470fbebc432 SHA256 4b70927a0c635c514d2ee71a33d71e43292e70b4fcfaae2fc789383f3486b51b
 AUX util-linux-2.14-AC_BIG_ENDIAN.patch 6651 RMD160 19e09c9c00461306065c194188529ffb137e7c7f SHA1 1b51e7c12014e817a3125b6dcc5bef47cb344aac SHA256 77f699a5e648dd89126172ae4c36b99dac7b1eb146c6036d0373851fe71eb304
+AUX util-linux-2.15-cpuid-pic.patch 1434 RMD160 d6d461897ce6e758c6d277be4c846386cd94277a SHA1 8f1422d4602a6b4a5405d40bb395ce6fb0912676 SHA256 14ecbf5b30ffdd7efc6ceb5ef00c79b27cc594eb5fd29eaac4a3fd0a49f4be13
 DIST loop-AES-v3.2c.tar.bz2 222421 RMD160 d6b3781103aa64aa6db738083ff2d1adb4f9ca8f SHA1 63102863459370e35f4edb26e83f548f8ce1a7bb SHA256 c0313b445cb41ef586ba9774fc7cbf41114d93064b3417cf8512da6f746d3542
 DIST util-linux-ng-2.13.1.1.tar.bz2 2829838 RMD160 a9197881ff75214cfdcd9e9aaa372495f4ba0dda SHA1 9eb78ee1fc20ab11712fb58b3bb96c528d918e16 SHA256 5d3739fa2ba45ffffa0c61667a0b767a360be2fefec6b0dd165bab124cea5861
 DIST util-linux-ng-2.14.1-20081015.diff.bz2 51788 RMD160 eb657a6e5a0cdd3545716ce2af55ad100bde3a84 SHA1 4bb9ca2385ddf55dec21f631d4f8df5e802fa24b SHA256 5db0c61f1ab07ceda04a6ee465c2d2ca4abc7ff3a5f92c2114361b3cffbf818f
@@ -39,7 +43,14 @@ DIST util-linux-ng-2.15.tar.bz2 10184100 RMD160 93df61ee935cd9a524df68b28bc4e3ad
 EBUILD util-linux-2.13.1.1.ebuild 2546 RMD160 592f2c38b3c01a58d2bc430f11a7db697be21cdc SHA1 aaac3b9b08bcb7918753c5ac46afa2c02608f0b2 SHA256 6954ec92e5e04058f1900df62fc1efc445fe8444f4b28e36aaef40eda332f707
 EBUILD util-linux-2.14.1.ebuild 2662 RMD160 875be20d417b3a4a2f1cd469e30e9280f1f14708 SHA1 63aedd3e6dd039b38b8637db26a0d0b0d2f99b77 SHA256 82ceb5da0a8ddfbb6cb58bc71cc63073aa59e9863000494559187e29470ac32f
 EBUILD util-linux-2.14.2.ebuild 2544 RMD160 7c005d333f1965ba453681c47c6e9d0fbe4848a4 SHA1 4c7837a4a84b444a9f93e80ece856f3fc5bb08b2 SHA256 f188d7c51efa949a6b75e83bd220689ab7f22bf1560991e85c70a11558280a6a
-EBUILD util-linux-2.15.ebuild 2544 RMD160 2311617cde7508a0c18b022de9ca1175242686d4 SHA1 767f99640bd43b7dfe929d9e3dfd30432d659374 SHA256 d97e7f8d9d3fc8e0e52e3a461a7b32c245f60d8ed3badb1b87c7411acf907a84
+EBUILD util-linux-2.15.ebuild 2596 RMD160 b71a19f2555f8aa1ba0334e7b2233773c4f15221 SHA1 bc2d3764212b922367a8192a279139e738f7c024 SHA256 f6639049ab0b49b12ca39fa608520dd7e03a907b90a927d2aa8b980ff3be47ab
 EBUILD util-linux-9999.ebuild 2112 RMD160 4c302634deb9bea06c8ba2647ec0fbdbcf2ae930 SHA1 5b3e888032ecebe8e1c5504347279dd13e6241d5 SHA256 04848332d95c545ba2553a82b912ce2aa67586deece74c63d04bc8a531c94ee8
-MISC ChangeLog 39835 RMD160 8b3b627876402dd3e984fe98ca2920dbcab87bbc SHA1 d5f3778adb49018e59a733c0597513b7895a17d1 SHA256 733d2e5dc2ee6b3e83be6f9e717b22d4229a0ea1040b049c2f4ee1977805aae9
+MISC ChangeLog 40019 RMD160 ae9d03152be6a6062e4407591f5b5a510f59e754 SHA1 93a352eeea564ff4319443c5b78943be14ad25e2 SHA256 e33824a2445f05b9e65ac5eb8dfa25fa91fafb730197bde48ec7dbe35449215f
 MISC metadata.xml 247 RMD160 233aa38a3ce28f169d18de949377c5c26f23bdff SHA1 b908dc27f495e4313a30a8883346d6cef6467f27 SHA256 4e9e787bd294b0810c142758275e148780035c7d00618e7808d34fe14f26c3b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoHQPwACgkQn/5bYzqsSmGTnwCgwIGWC4f/UqGzyC4okF39h3lU
+MT8An3ZefminKIKD5Ul2l25s3y4pnIwS
+=mewB
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/util-linux-2.15-cpuid-pic.patch b/sys-apps/util-linux/files/util-linux-2.15-cpuid-pic.patch
new file mode 100644
index 000000000000..feaa1af8e37f
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.15-cpuid-pic.patch
@@ -0,0 +1,51 @@
+http://bugs.gentoo.org/269001
+http://thread.gmane.org/gmane.linux.utilities.util-linux-ng/2203
+
+From 89dbd3ee8678bc43de027a99974451acbfc04cf3 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 10 May 2009 16:34:33 -0400
+Subject: [PATCH] lscpu: fix cpuid code on x86/PIC
+
+If we build lscpu as PIE, we currently get a build failure:
+lscpu.c: In function 'main':
+lscpu.c:333: error: can't find a register in class 'BREG' while reloading 'asm'
+lscpu.c:333: error: 'asm' operand has impossible constraints
+make[2]: *** [lscpu.o] Error 1
+
+So we need a little bit of register shuffling to keep gcc happy.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ sys-utils/lscpu.c |   16 +++++++++++++---
+ 1 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
+index 3e3fbbe..6b6082f 100644
+--- a/sys-utils/lscpu.c
++++ b/sys-utils/lscpu.c
+@@ -330,9 +330,19 @@ static inline void
+ cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx,
+ 			 unsigned int *ecx, unsigned int *edx)
+ {
+-	__asm__("cpuid"
+-		: "=a" (*eax),
+-		  "=b" (*ebx),
++	__asm__(
++#if defined(__PIC__) && defined(__i386__)
++		/* x86 PIC cannot clobber ebx -- gcc bitches */
++		"pushl %%ebx;"
++		"cpuid;"
++		"movl %%ebx, %%esi;"
++		"popl %%ebx;"
++		: "=S" (*ebx),
++#else
++		"cpuid;"
++		: "=b" (*ebx),
++#endif
++		  "=a" (*eax),
+ 		  "=c" (*ecx),
+ 		  "=d" (*edx)
+ 		: "0" (op), "c"(0));
+-- 
+1.6.2.3
+
diff --git a/sys-apps/util-linux/util-linux-2.15.ebuild b/sys-apps/util-linux/util-linux-2.15.ebuild
index 7f88c657548b..68f3b82e3413 100644
--- a/sys-apps/util-linux/util-linux-2.15.ebuild
+++ b/sys-apps/util-linux/util-linux-2.15.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/util-linux/util-linux-2.15.ebuild,v 1.1 2009/05/05 22:07:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.15.ebuild,v 1.2 2009/05/10 21:02:46 vapier Exp $
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
 inherit eutils
@@ -43,6 +43,7 @@ src_unpack() {
 		unpack ${A}
 		cd "${S}"
 		#epatch "${FILESDIR}"/${PN}-2.13-uclibc.patch #203711
+		epatch "${FILESDIR}"/${P}-cpuid-pic.patch #269001
 		use loop-aes && epatch "${WORKDIR}"/util-linux-ng-*.diff
 	fi
 	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c