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

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

3 files changed, 79 insertions, 2 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/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
 }