summaryrefslogtreecommitdiff
path: root/package/openswan/patches/patch-Makefile_inc
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-30 13:24:21 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-30 13:31:20 +0200
commit30d6f21d2fb3ca89a86346994a70a436afbb2e14 (patch)
tree92abfa15ff5ebdbc6da5c9e5b8db54e63c553343 /package/openswan/patches/patch-Makefile_inc
parentfdfc7843aa85f23a3211afeb289042ec89738ace (diff)
update openswan
Diffstat (limited to 'package/openswan/patches/patch-Makefile_inc')
-rw-r--r--package/openswan/patches/patch-Makefile_inc21
1 files changed, 17 insertions, 4 deletions
diff --git a/package/openswan/patches/patch-Makefile_inc b/package/openswan/patches/patch-Makefile_inc
index 2a2040949..9c73c7ce0 100644
--- a/package/openswan/patches/patch-Makefile_inc
+++ b/package/openswan/patches/patch-Makefile_inc
@@ -1,5 +1,5 @@
---- openswan-2.6.37.orig/Makefile.inc 2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/Makefile.inc 2011-12-01 17:30:31.000000000 +0100
+--- openswan-2.6.41.orig/Makefile.inc 2014-02-21 21:46:57.000000000 +0100
++++ openswan-2.6.41/Makefile.inc 2014-03-12 18:39:50.906115397 +0100
@@ -169,7 +169,7 @@ INSTALL=install
# how backup names are composed.
# Note that the install procedures will never overwrite an existing config
@@ -9,7 +9,20 @@
INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
INSTMANFLAGS=
INSTCONFFLAGS=
-@@ -279,12 +279,12 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
+@@ -191,10 +191,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)
++USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT)
+ # 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=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
+ # Additional debugging for developers (warning: can crash openswan!)
+ #USERCOMPILE?=-g -DLEAK_DETECTIVE -lefence
+ # You can also run this before starting openswan on glibc systems:
+@@ -283,12 +283,12 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
# Note you need a locally running bind9 nameserver with lwres{} enabled
# to use this, or have the "lwres" package installed and running.
# This only affects conns that use DNS for keys in lookups.
@@ -23,4 +36,4 @@
+USE_DYNAMICDNS?=false
# Do we want all the configuration files like ipsec.conf and ipsec.secrets
- # and any certificates to be in a single directory defined by
+ # and any certificates to be in a single directory defined by