Fix TEXTRELs when building fuser as a PIE #394443 by Attila Tóth.

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

4 files changed, 47 insertions, 13 deletions

diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index be5854f6f28a..cd281d437fb5 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/psmisc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.123 2012/03/12 14:17:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.124 2012/05/17 04:39:29 vapier Exp $
+
+  17 May 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/psmisc-22.16-fuser-pic.patch, psmisc-22.16.ebuild:
+  Fix TEXTRELs when building fuser as a PIE #394443 by Attila Tóth.
 
 *psmisc-22.16 (12 Mar 2012)
 
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index e285fb211c03..671eae5e1034 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -3,22 +3,29 @@ Hash: SHA1
 
 AUX psmisc-22.13-no-nls.patch 693 RMD160 10170e0d3a593185781c8e5c866b49fd3070beaa SHA1 48a94c3796680fd20103a3938f546ca32246d3e0 SHA256 493e2b1a1a45da3f2334340af58950320108161c6e1fd43bc086b2b85f23a5bc
 AUX psmisc-22.15-COMM_LEN-to-18.patch 2819 RMD160 9b20be171434bf0091f67284b747dd8b9f32d649 SHA1 dba5213fcea739c9796f1f55118aa57de2838725 SHA256 781c5c78c41203d77dddc4b11fe6eea6786517f297c86bd6a844db88ec9341c5
+AUX psmisc-22.16-fuser-pic.patch 598 RMD160 a4849d45221fda30b929492b7516e08062d5e3c9 SHA1 1f46f8ddce4cb4aec02e7bcb9f2b77c0d2c4874a SHA256 075c1406d995cafb4d8fac83b984fc5a0e03215548def65da565c97644a0a817
 DIST psmisc-22.14.tar.gz 382024 RMD160 56a1b2ab415013ac18fa8a49b9cd67dc1f735822 SHA1 dc6fc0ec131c11796d01512bbd80089719b04a66 SHA256 22bbf4561837af475c0d8d14e3b9cab453998c787212c107fac7faf2f281e26e
 DIST psmisc-22.15.tar.gz 390766 RMD160 572c738202061f60ab965ba8f7e0b024d385d647 SHA1 06f507d889afab70ac7ff20fbd419ca2ffcf90c0 SHA256 5fbe908618d7ccf08164a733a361ce9823355fd0da754e53982d842158973754
 DIST psmisc-22.16.tar.gz 465138 RMD160 3f51ae4d93082111cd649513ac85fbc6cfb4586e SHA1 27f1c8deab06e79101af1914ff81a9d561f2fcfe SHA256 ae426d7238e5353fdf51b1d313897c2bbed0023e66e5b4af2be9cd03d87a9d01
 EBUILD psmisc-22.14.ebuild 1695 RMD160 53f776d73f61855e088789e0f15cc06ce436cba3 SHA1 ca356ac21b43c7b899a3d8d83c3f1eaa95fe5b23 SHA256 5bc21e953ac9f7b50239668ee09880568fce744a6b766483d4fdc3dfc7397241
 EBUILD psmisc-22.15.ebuild 1384 RMD160 5e486fdb80df6fa78d0e01616b00091ea6d9d97c SHA1 e71fec6a2b4ac128874cc3b750375c646af49592 SHA256 044411a7682dfe0ac748d233aea2948413d371aaead81bfe59652fd00d936bac
-EBUILD psmisc-22.16.ebuild 1328 RMD160 f4a8664fea955689397267e219b10569fffc80e1 SHA1 eed6de320eee90752f1a5760b5129ad4fccef02e SHA256 f2aad4167212308ff86e216aee35e84f75e2d081af88f4e66b70fdf0c39eb814
-MISC ChangeLog 20787 RMD160 68a64dd1c4153d4f4cce6b2a0f012bb0601ef86e SHA1 2166d488811842ebfeefc33609f6d17137fbf560 SHA256 064a012206bcd9b96792d78bf4fd55749d8d1ffc271e157087786b52c03071e8
+EBUILD psmisc-22.16.ebuild 1420 RMD160 f804d4885181cfb2220b06f23768d252d183d487 SHA1 e02e850ed7841663d2585098c91ff8456bdade7a SHA256 84c92b9eeb170a87ef54b4c4cd08cbb699b9761c81e4e10ed1b8c6f8a2dd59de
+MISC ChangeLog 20964 RMD160 3dbd47185a64bae9573214e0c9f85338c2c0150e SHA1 b27e999aa66660767ec4d3e62f54df139043da50 SHA256 6ca0b06067d0d13e26fc362eaea69c219909984b554f43fda88796b567de6be9
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPXgSFAAoJEEdUh39IaPFNracH/0whjiF2g+XticWvdghIz4v7
-8qCTSMYZ6CGmlSe5PWWyCtq73eJhztVUxI/GO6ftBjwa0xnixQTmXbDQtPkglYuQ
-QMbPmsVuAZ3vpnmFBmfFdpiHQ+E1PftLPgjMPuFiiYwWwQFROCZoZPvqefpVNLmr
-Fw9ZFR68Vz7H/net4ki3ra4jCadDpRsu5+vb1O/5TwVMD91MKJ1sGiSm2sYvANI1
-W6iHB9Dnkki9Fbdc9R996YgmhZyQ4sbBlRojdMTNf4TBqctg1oK4Ma7IEUlPA6yu
-QC16gwy4Zja1Zicl22Y3LG+4UtSkt6+DWf3LKPR14dp17ogpsPTaJ/IpI1a/Rzk=
-=U22r
+iQIcBAEBAgAGBQJPtIEfAAoJELEHsLL7fEFWZIkP/jUaBbhLCaBIjD4pFN20m+5p
+reak6bGHjRih8fxhHQqEL9oDLrMuiW5ezc6tCm3trcwnfAUuONkvJXY4WLfXq9SS
+8EvK8WeaOYs5bpAhzXVk5sYJNwGGl7PyDTi97GXbUpPX1zpkiURWBH5tnNCyrwVg
+xK0prC8gJjohb+mmkuEctXZ2MvZNTjqO6Jhs1SgMe/3QL8ClLL71EJs7n5GlZcjY
+vPE7mPGsnM++z0ofecBdng0vwEo75Ako/Dvs83+hGCfsABffF/7CMTDx2Pi8dEDi
+tezJlLpvVDZBONCIin2OpTK1kDEGm8ralisG3nkG56PYNCzGbxNBwb1M+gvGxMwD
+tDRaQyPQspmqY+aKs9JWWE1h+b9wkobVnrlyUY8w+/IKBqMacJ22jpTqMQfbpN4V
+cEaEQc3BxfMQy8t+Ko3u56wmIa6KjHfg9DlhEoukOf4CoQQN5nZJgVHBlbgJIJYA
+HjE2AE7faa5nOx2QdLn5VSeVzE0RBcvMPdb7HDhqtuwbGanYwTJUj1skQjG2Bct0
+U67QGXe/MsgJSbMjBLmtXZim3hpm6vxYsf+JcluJVZn+tQfw8pvJ0GtwJSx35Jy7
+ZcQy6j96To1fgDFu+AqumQfKkgNTbaTDlH0dBUlxj+U7dqTo0KsgROnBCRFDniUV
+n5Sev/yVrUGnL8U7ohcH
+=jWuc
 -----END PGP SIGNATURE-----
diff --git a/sys-process/psmisc/files/psmisc-22.16-fuser-pic.patch b/sys-process/psmisc/files/psmisc-22.16-fuser-pic.patch
new file mode 100644
index 000000000000..40a3c0c0d35f
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-22.16-fuser-pic.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/401851
+http://sourceforge.net/tracker/?func=detail&aid=3504801&group_id=15273&atid=115273
+
+the x86 asm code is not PIC friendly, so disable it and fall back to the
+gcc builtin for doing prefetching
+
+--- src/lists.h
++++ src/lists.h
+@@ -68,7 +68,7 @@
+     asm volatile ("lfetch [%0]"    :: "r" (x))
+ #elif defined(__powerpc64__)
+     asm volatile ("dcbt 0,%0"      :: "r" (x))
+-#elif !defined(__CYGWIN__) && defined(__i386__)
++#elif !defined(__CYGWIN__) && !defined(__PIC__) && defined(__i386__)
+     asm volatile ("661:\n\t"
+ 		  ".byte 0x8d,0x74,0x26,0x00\n"
+ 		  "\n662:\n"
diff --git a/sys-process/psmisc/psmisc-22.16.ebuild b/sys-process/psmisc/psmisc-22.16.ebuild
index 7d928f72013a..213c8cd7c41c 100644
--- a/sys-process/psmisc/psmisc-22.16.ebuild
+++ b/sys-process/psmisc/psmisc-22.16.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.16.ebuild,v 1.1 2012/03/12 14:17:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.16.ebuild,v 1.2 2012/05/17 04:39:29 vapier Exp $
 
-EAPI=4
+EAPI="4"
+
+inherit eutils
 
 DESCRIPTION="A set of tools that use the proc filesystem"
 HOMEPAGE="http://psmisc.sourceforge.net/"
@@ -22,6 +24,10 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-22.16-fuser-pic.patch #394443
+}
+
 src_configure() {
 	econf \
 		$(use_enable selinux) \