diff options
Diffstat (limited to 'net-proxy/torsocks/files/avoid-pie-static.patch')
| -rw-r--r-- | net-proxy/torsocks/files/avoid-pie-static.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/net-proxy/torsocks/files/avoid-pie-static.patch b/net-proxy/torsocks/files/avoid-pie-static.patch deleted file mode 100644 index 75565569b6e9..000000000000 --- a/net-proxy/torsocks/files/avoid-pie-static.patch +++ /dev/null @@ -1,67 +0,0 @@ -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 |