summaryrefslogtreecommitdiff
path: root/package/stunnel/patches/patch-configure_ac
diff options
context:
space:
mode:
Diffstat (limited to 'package/stunnel/patches/patch-configure_ac')
-rw-r--r--package/stunnel/patches/patch-configure_ac35
1 files changed, 20 insertions, 15 deletions
diff --git a/package/stunnel/patches/patch-configure_ac b/package/stunnel/patches/patch-configure_ac
index b9ccb30ab..fc9533b21 100644
--- a/package/stunnel/patches/patch-configure_ac
+++ b/package/stunnel/patches/patch-configure_ac
@@ -1,16 +1,21 @@
---- stunnel-5.24.orig/configure.ac 2015-09-02 23:21:07.000000000 +0200
-+++ stunnel-5.24/configure.ac 2015-10-21 10:48:27.000000000 +0200
-@@ -72,13 +72,6 @@ AX_APPEND_COMPILE_FLAGS([-Wformat=2])
- AX_APPEND_COMPILE_FLAGS([-Wconversion])
- AX_APPEND_COMPILE_FLAGS([-Wno-long-long])
- AX_APPEND_COMPILE_FLAGS([-Wno-deprecated-declarations])
--AX_APPEND_COMPILE_FLAGS([-fstack-protector])
--AX_APPEND_COMPILE_FLAGS([-fPIE])
--AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2])
--AX_APPEND_LINK_FLAGS([-fPIE -pie])
--AX_APPEND_LINK_FLAGS([-Wl,-z,relro])
--AX_APPEND_LINK_FLAGS([-Wl,-z,now])
--AX_APPEND_LINK_FLAGS([-Wl,-z,noexecstack])
+--- stunnel-5.31.orig/configure.ac 2016-02-03 18:23:10.000000000 +0100
++++ stunnel-5.31/configure.ac 2016-03-13 13:33:26.000000000 +0100
+@@ -86,18 +86,6 @@ if test "$GCC" = yes; then
+ AX_APPEND_COMPILE_FLAGS([-Wconversion])
+ AX_APPEND_COMPILE_FLAGS([-Wno-long-long])
+ AX_APPEND_COMPILE_FLAGS([-Wno-deprecated-declarations])
+- AX_APPEND_COMPILE_FLAGS([-fPIE])
+- case "${host}" in
+- avr-*.* | powerpc-*-aix* | rl78-*.* | visium-*.*)
+- ;;
+- *)
+- AX_APPEND_COMPILE_FLAGS([-fstack-protector])
+- ;;
+- esac
+- AX_APPEND_LINK_FLAGS([-fPIE -pie])
+- AX_APPEND_LINK_FLAGS([-Wl,-z,relro])
+- AX_APPEND_LINK_FLAGS([-Wl,-z,now])
+- AX_APPEND_LINK_FLAGS([-Wl,-z,noexecstack])
+ fi
+ AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2])
- AC_MSG_NOTICE([**************************************** libtool])
- LT_INIT([disable-static])