Avoid config test with -pie -static, bug #533862

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 95 insertions, 17 deletions

diff --git a/net-proxy/torsocks/ChangeLog b/net-proxy/torsocks/ChangeLog
index 88f4dc1ae1e3..bd8491109307 100644
--- a/net-proxy/torsocks/ChangeLog
+++ b/net-proxy/torsocks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/torsocks
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/ChangeLog,v 1.17 2015/01/04 13:26:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/ChangeLog,v 1.18 2015/01/11 17:08:50 blueness Exp $
+
+*torsocks-2.0.0-r1 (11 Jan 2015)
+
+  11 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +files/avoid-pie-static.patch, +torsocks-2.0.0-r1.ebuild,
+  -torsocks-2.0.0.ebuild:
+  Avoid config test with -pie -static, bug #533862
 
   04 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
   -torsocks-2.0.0_rc2.ebuild, -torsocks-2.0.0_rc3.ebuild, torsocks-2.0.0.ebuild:
diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest
index 344e2388ddee..0612a7706eda 100644
--- a/net-proxy/torsocks/Manifest
+++ b/net-proxy/torsocks/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX avoid-pie-static.patch 2657 SHA256 3f06fcaa88f2a9adfafc7768ddc14b6cda287481cbd8d3075f6b890e244aedf6 SHA512 c11160df15514d7e73b84d3236b704a14b076669d394f567427b06e0c07f904f9cf6e13dcd8d0e15edfe7a418c80034da8208e53a12d331794fcd651a44b5fea WHIRLPOOL f569e3f5b7d95ea9cbf2c5955c3a608cf610926cb6c7af902c83950e478f40c56c2fbccbb975792c78b30e8dc4931e0a65cd26f77b94d6a5116976558a7c820f
 AUX fix-docdir-r2.patch 818 SHA256 119103f6c6e9a8891fe026ac0071b9b9b74197b3b92ff9328cc54bb6600c3564 SHA512 64468f0d4784e9c4b7009ed5e6ac1a1291f57c82a8226d1a35065435d790c8b9d99310998e7f0ac3a5a06634e7f5db13403dc08753ab3dcabb1660e9883372f7 WHIRLPOOL 5f7e68d05d14ed6cd1e2f195fa29272e58c92798ea80b1f65c6eb5b2a6c3d5c016d43f2c02a23b4507d0119d769b72ac75f16c5a6aaf3d890d4898532ff097eb
 AUX fix-docdir.patch 1245 SHA256 0f5e2a84b1c77893902a35f2df5575087558822536bd64335c543f91d4bb70f0 SHA512 ff137987df93ad9ff6eb9e82cd1b0bee06088d8ca87bf4a87c4bf4496d21cc0a65c8fb8fa8746bbd521aca6a97b1e4e79918435c61236d3a814c99e7da1c8999 WHIRLPOOL cbf0c8609d3247396d380542c769e61f625ac5ddf50a89c4f8b5ac6e9043b1e5c84c053e0bf0ab1a34e43de5cb322bdb61d7b8f07a52f83c06d8469c0ecff424
 AUX fix-find-libc.so.patch 634 SHA256 f355092a265584b560ec8255b99ce54b8708c5a0ef1ae3efc518721641aa039f SHA512 bcaacf3c270cec290d0ee3949ec3cbb1b0b228ae11eec3c18663f2db96d199a1174b80d855047a0e44a7f36f5877a1385f5f77f1864b3ff944327940413b72c2 WHIRLPOOL ba0fef2bd5ee7e04feb31ea008df7968a0e950295315fbe07ccc0d61aa08995392e2cbe76aecf5bf12d783e7a8618a93aec3aab4bdac08284cb43822ef9826a6
@@ -9,23 +10,23 @@ DIST torsocks-1.2.tar.gz 456453 SHA256 bea57d3624d723724fd1e260f0e6b2a354c0da742
 DIST torsocks-2.0.0.tar.gz 96281 SHA256 a01f9e5ccc8a6e1d4e13704581ec9675129c147d10d08f86635f7bceb8001f48 SHA512 fa30244a5a06c6371a86090088b3abe9f4513eefce90580e7c7899843887b8a1eac641500dee81e576f27fa0f1b447b34f7b8300a889bcda2119779deb69d77d WHIRLPOOL 41ea31225866c50153dd0d46bc0659311835c5617f42a3c8275d5046cc0019fc4caa0ab9ef06d1b3552c1f082cb01a2036fc14c61a061378d01f988ff586a9c5
 EBUILD torsocks-1.2-r2.ebuild 981 SHA256 87f50b8a941a23492aa1ed4250df01dc1d13409ed5b6d821695d6f5711c61536 SHA512 253ffe340bec3611fe7269298d0bebfebcb7ae314683119d242df4ab84ebe3dba5a5d05ca961ccb026f3fb9e3801f9bd05a2f961a355fda07622b75e2cf2ee1d WHIRLPOOL a7331db87b9975d99bc0578baf16483f376a29367116fe12514f92ca1ef6d585862545e4a00f35d85bb70ca2a95f55077c0440bc9d7c1a513bd9901028911a74
 EBUILD torsocks-1.2.ebuild 767 SHA256 7b6fc94c85685ce6191ac9381ff90f3b9aae2b76e00075da777dc0e6a1bb1cb1 SHA512 a004fc2ed9350a7e2e3929c754b21ff943604aa84a3c505bfe417f97fd997462c0e45ef1e77b9f861be76d75d5635fd4b2760dfd6bf7213bffcb22fec50de98a WHIRLPOOL 16a3f017f4f6cd8084cb5b25a64061be265741055894db444ae88112f9e315d1180db0e5112ea5ef603e191e318afd23c64f61844c0485203002a1e61657c035
-EBUILD torsocks-2.0.0.ebuild 1230 SHA256 f0e321fd17ff9bf9c8436092b6dbd49360e6378f39e6ce28a858d6e61568371c SHA512 4d504d95534f013e8d00a43c8f486667b48b8abb0d950d214f1ef41a684492a07aab491e2f251e7130b90c5cadd0e728fbb62114e54c8953f7034900feefb4ac WHIRLPOOL fe13e016d0bcc6abfb57a98bb54b78bf9a9a38f62384a13d1335347347d93f42d0d3769d50cfb966a11a99d1b55648d7c9d7d6dd0803416fef594136b5b61b2c
-MISC ChangeLog 2663 SHA256 82de23623536e3e4d40b55936e9f6ce8e2d83447af89513e7de86c8e87adb36d SHA512 d1f0601eac28b030bf7c55f376d844e2402966ac165bb64d1d295f36e81a8dd25e731adbdc72511c495ab71a7ad99b95bf747c701a0182b3610360fccd9483c1 WHIRLPOOL 180638d62128401a851802000435e71c7bd43b5c68058321151d91395ac0e548772c579dbbdf1d1aa4f9434cc870c1ae7f09b8829c603671fa1778580ae1b76f
+EBUILD torsocks-2.0.0-r1.ebuild 1294 SHA256 98b2974b8df9d42f6f589c31d24f37d2e4516822e6d66bff15f44e4f69a5bc0a SHA512 efd3f954e5074804819a4197477f68502864f1f0e4c5291eb7a93a650fe72979cb23566a3eee6e81030a55ac1d4beebeb689d0e48db5ef87c7e887685f434158 WHIRLPOOL bfb0beb16da4941c503383fea7764235fb87a8022016ac43b401d85c03255ac3355a78b2c9b77a3dca062855d7f483f824a3e25ecdda2b7a26dae309425f2c16
+MISC ChangeLog 2890 SHA256 89bb7710ceb093497d487b5054083a2e1e3c05bc31fb36ce138e3f20684e3af8 SHA512 9e501e2119a4e4866ca4fe4b0b8cf54b511ea624491ad46099b565df0f0a8390340ebae0a19afd3dd996cd1bcb6e09ce522a49180e9382a07cab492baf90768d WHIRLPOOL 3a92a173f95efb018e5ff0a7d88174aa5da20a3fff4b52322927726e6bf47ad8fd51b440ba13966c2b1dd5f0c5d4f36049f11c55e3bb327c1b206faf3585cc3a
 MISC metadata.xml 316 SHA256 4c32e171681ab5fdd7689307fe5fbca67e4b2c64d1ab5f60b17171ee08066234 SHA512 e7dfd938efe4cadbd14069d6c81e541354829da8737e2a6282627cd54cfb7c2081f7bcb1dd2bc30312f97a8c14fa43398e5e09e17a1649e486031b87155a2810 WHIRLPOOL 3e0a03584d3c3df7c8fe4fc62e6dd24f007be4d7e9cbc4db7fc4a16f1c93a601077b378d9bc26ba8a5e4011047e248e40ca8952dbeb8436813bfb1a65d720ac9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUqUAWAAoJEJOE+m71LUu6tnUP/3tKzw6Lhk9zFl0ECAG2kpme
-Wbqj8TQG0irmKEUrku2dvwBlCHKtZIqiXb6jrv/i3rt3SEGgXcLFiEihd9V2nF2E
-5lylUjXhYqxAywWe8bCEIFYfmAIFDP2tUTSZOSDi7UVVOThVto8mtnkSmydlJPn+
-C1Mu3Oh4hL59b+Qnc87+7slGuHiy9fBDNml/sCsUjZyGZ+8Swe8bXqSg0INeEqtj
-wQWdbX6NnNtqFv+lchJfijUGsU2qyyIOlKAAxgtzUK0jUXQ4ZBzmQav4ZkUj1ZPC
-xk/q36aa9Gc/pXWfYFIEvcec7dBAo50ia8XguDc/OEhwjmE3LAnVnUOWYUdapL8N
-fK8upcLPfMlJ4bbThhuD/PNo2rKRvpsFOdy8M3LYs1pkXzVRUblWqOTzSewH5wlY
-uXw1Ev219OfRZdMs4WsOZOolfxHmsiP5q407Eq/GqbksVC6Aq8ZDIbStowE61QGM
-YOBEMIF547GvLLjMRLyyH5pXj8ggPYqDBznGIqMwo5hPZJcSp7RK5tEFe1fUtv42
-nZfx/9EpgPbKS7b5tkcN3wp+TwnisdWrWkiPDcLLh0XHAWmnTHKlaMHAuATviIlP
-WQGYx1vstpTmPcvSB0/0IuumDEZZsGmC/W44+eJfZ+Fuf7oiLEHXFpl/lLg94eg+
-COHh02u+cBgHYKpeuZYI
-=kTPI
+iQIcBAEBCAAGBQJUsq56AAoJEJOE+m71LUu6bXoQAKNPFEPyaB49URH7A6XOrYEU
+xmDVjIqFwiZVbOYCbZaJSinFETgBsOhjexAZUbnkv5U/jrEcTm3XzlZdu3c101qk
+AmODQGdywl5ebTmu0cptsVxOVzvK7EKmHQ+J6RfQ2I0ASIFYyekXnA1wDlFmRZUg
+dCloTyrJA8AARgLUuekaBfV6F5qLEBIiW+7L0RDaB//hXB3Xe/4xJZPmP1xgqXjv
+6aA4YykXaJOoDO5to/lJsO7vNy7ff/j2LKY7bnwHqvEddwg5WE2Y7AOYzg9zGAzd
+mYcP3m/n3gFwKminfeeFBegNGtQiUSEWBCukDnVN2/wY1T2HqRWunQlXCxuK0ceF
+PMU9mgBdmXptdedsRE69NYOf+V9aOOjJBAjI+XrjWGRVHfB1pJSkVAOYGmKjyeOi
+z0qMqg9mEWkHREyzkT6rttWEO4LRUsxcIIRtihB+oa/yJWY9h7mljlb43DEgihqH
+1zFZynQuUJilDrMk8QcXI+keZguSygynWONV8Nx3KAKSIZhumhBnsBnN/JHmAAnJ
+zB0eH/ZO4GBlUXCaWTiGOS2JCi6Uh5DLzju/xlTuXxKfYuyGQq/UWGyrP4tG0XU/
+oqudYdwcVw2sRNccRZHIpHzynlWMvPc3yoYQdzd0QPB0O5UfpRplmxPKYPoRcw3M
+T2fjtqu0Ob4qkGRxaGJx
+=E5XU
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/torsocks/files/avoid-pie-static.patch b/net-proxy/torsocks/files/avoid-pie-static.patch
new file mode 100644
index 000000000000..75565569b6e9
--- /dev/null
+++ b/net-proxy/torsocks/files/avoid-pie-static.patch
@@ -0,0 +1,67 @@
+We need to avoid tests which have -static and -pie together.
+
+See https://bugs.gentoo.org/show_bug.cgi?id=533862
+
+diff -Naur torsocks-2.0.0.orig/configure.ac torsocks-2.0.0/configure.ac
+--- torsocks-2.0.0.orig/configure.ac	2014-08-11 12:44:46.000000000 -0400
++++ torsocks-2.0.0/configure.ac	2015-01-11 12:00:21.174826622 -0500
+@@ -144,24 +144,6 @@
+ # Version information for libtorsocks
+ TORSOCKSLDFLAGS="$LDFLAGS -version-info 1:0:0"
+ 
+-# Check for the gcc hardening flags.
+-AX_CHECK_COMPILE_FLAG([-fPIE],[CFLAGS="$CFLAGS -fPIE"],[],[])
+-AX_CHECK_COMPILE_FLAG([-fwrapv],[CFLAGS="$CFLAGS -fwrapv"],[],[])
+-AX_CHECK_COMPILE_FLAG([--param ssp-buffer-size=1],
+-	[CFLAGS="$CFLAGS --param ssp-buffer-size=1"],[],[])
+-AX_CHECK_COMPILE_FLAG([-fstack-protector-all],
+-	[CFLAGS="$CFLAGS -fstack-protector-all"],[],[]
+-)
+-AX_CHECK_COMPILE_FLAG([-fno-strict-overflow],
+-	[CFLAGS="$CFLAGS -fno-strict-overflow"],[],[]
+-)
+-
+-dnl Add hardening linker flags
+-AX_CHECK_LINK_FLAG([-pie],[LDFLAGS="$LDFLAGS -pie"],[],[])
+-AX_CHECK_LINK_FLAG([-z relro],[LDFLAGS="$LDFLAGS -z relro"],[],[])
+-AX_CHECK_LINK_FLAG([-z now],[LDFLAGS="$LDFLAGS -z now"],[],[])
+-LDFLAGS="$LDFLAGS -D_FORTIFY_SOURCE=2"
+-
+ dnl Linker checks for Mac OSX, which uses DYLD_INSERT_LIBRARIES
+ dnl instead of LD_PRELOAD
+ case "$host_os" in
+@@ -255,6 +237,34 @@
+ DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include -include config.h"
+ AC_SUBST(DEFAULT_INCLUDES)
+ 
++##############################################################################
++# 9. Test and add hardening flags
++##############################################################################
++
++# Check for the gcc hardening flags.
++AX_CHECK_COMPILE_FLAG([-fPIE],[CFLAGS="$CFLAGS -fPIE"],[],[])
++AX_CHECK_COMPILE_FLAG([-fwrapv],[CFLAGS="$CFLAGS -fwrapv"],[],[])
++AX_CHECK_COMPILE_FLAG([--param ssp-buffer-size=1],
++	[CFLAGS="$CFLAGS --param ssp-buffer-size=1"],[],[])
++AX_CHECK_COMPILE_FLAG([-fstack-protector-all],
++	[CFLAGS="$CFLAGS -fstack-protector-all"],[],[]
++)
++AX_CHECK_COMPILE_FLAG([-fno-strict-overflow],
++	[CFLAGS="$CFLAGS -fno-strict-overflow"],[],[]
++)
++
++dnl Add hardening linker flags
++AX_CHECK_LINK_FLAG([-pie],[LDFLAGS="$LDFLAGS -pie"],[],[])
++AX_CHECK_LINK_FLAG([-z relro],[LDFLAGS="$LDFLAGS -z relro"],[],[])
++AX_CHECK_LINK_FLAG([-z now],[LDFLAGS="$LDFLAGS -z now"],[],[])
++
++dnl Add glibc hardening
++CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
++
++##############################################################################
++# 10. Finish up
++##############################################################################
++
+ AC_CONFIG_FILES([
+ 	Makefile
+ 	extras/Makefile
diff --git a/net-proxy/torsocks/torsocks-2.0.0.ebuild b/net-proxy/torsocks/torsocks-2.0.0-r1.ebuild
index 39564e3b4635..3068ca7c98c1 100644
--- a/net-proxy/torsocks/torsocks-2.0.0.ebuild
+++ b/net-proxy/torsocks/torsocks-2.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/torsocks-2.0.0.ebuild,v 1.2 2015/01/04 13:26:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/torsocks-2.0.0-r1.ebuild,v 1.1 2015/01/11 17:08:50 blueness Exp $
 
 EAPI=5
 
@@ -30,6 +30,9 @@ src_prepare() {
 	sed -i -e '/^\.\/test_dns$/d' tests/test_list || \
 		die "failed to disable network tests"
 
+	# Bug #533862
+	epatch "${FILESDIR}"/avoid-pie-static.patch
+
 	eautoreconf
 }