summaryrefslogtreecommitdiff
path: root/package/openswan/patches/patch-Makefile_inc
diff options
context:
space:
mode:
Diffstat (limited to 'package/openswan/patches/patch-Makefile_inc')
-rw-r--r--package/openswan/patches/patch-Makefile_inc20
1 files changed, 6 insertions, 14 deletions
diff --git a/package/openswan/patches/patch-Makefile_inc b/package/openswan/patches/patch-Makefile_inc
index b6c272859..82a9d5878 100644
--- a/package/openswan/patches/patch-Makefile_inc
+++ b/package/openswan/patches/patch-Makefile_inc
@@ -1,23 +1,15 @@
---- openswan-2.6.43.orig/Makefile.inc 2015-03-13 13:49:09.000000000 -0500
-+++ openswan-2.6.43/Makefile.inc 2015-05-01 04:11:06.067427001 -0500
-@@ -194,17 +194,17 @@ BISONOSFLAGS=
+--- openswan-2.6.46.orig/Makefile.inc 2016-01-22 16:50:30.000000000 +0100
++++ openswan-2.6.46/Makefile.inc 2016-02-15 21:06:59.000000000 +0100
+@@ -194,10 +194,10 @@ BISONOSFLAGS=
#Example for a cross compile:
#USERCOMPILE?=-g ${PORTDEFINE} -I/usr/local/arm_tools/arm-elf/inc -L/usr/local/arm_tools/lib/gcc-lib
GCC_LINT ?= -DGCC_LINT
-USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA}
-+USERCOMPILE?=
++USERCOMPILE?=-g -O3 -fPIE -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA}
# on fedora/rhel
#USERCOMPILE?=-g -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fPIE -pie -DSUPPORT_BROKEN_ANDROID_ICS
-KLIPSCOMPILE=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
-+KLIPSCOMPILE=-DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
++KLIPSCOMPILE=-O2 -fPIE -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
# Additional debugging for developers (warning: can crash openswan!)
- #USERCOMPILE?=-g -DLEAK_DETECTIVE -lefence
+ #USERCOMPILE?=-g -DLEAK_DETECTIVE ${LIBEFENCE}
# You can also run this before starting openswan on glibc systems:
- #export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
-
- # extra link flags
--USERLINK?=-Wl,-Bsymbolic-functions -fPIE -pie -Wl,-z,relro -Wl,-z,now ${USERLINKEXTRA}
-+USERLINK?=${USERLINKEXTRA}
- # on fedora/rhel
- #USERLINK=-g -pie
-