summaryrefslogtreecommitdiff
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
parentfdfc7843aa85f23a3211afeb289042ec89738ace (diff)
update openswan
-rw-r--r--package/openswan/Makefile4
-rw-r--r--package/openswan/patches/patch-Makefile_inc21
-rw-r--r--package/openswan/patches/patch-Makefile_top11
-rw-r--r--package/openswan/patches/patch-lib_libopenswan_alg_info_c12
4 files changed, 19 insertions, 29 deletions
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 5dc4245b6..1c981f30b 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= openswan
-PKG_VERSION:= 2.6.38
+PKG_VERSION:= 2.6.41
PKG_RELEASE:= 1
-PKG_MD5SUM:= 13073eb5314b83a31be88e4117e8bbcd
+PKG_MD5SUM:= da2e8b02ecc30a408cc5766767fef84f
PKG_DESCR:= IPsec software
PKG_SECTION:= net/security
PKG_DEPENDS:= ip libgmp libpthread kmod-net-key kmod-xfrm-user
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
diff --git a/package/openswan/patches/patch-Makefile_top b/package/openswan/patches/patch-Makefile_top
deleted file mode 100644
index 410670312..000000000
--- a/package/openswan/patches/patch-Makefile_top
+++ /dev/null
@@ -1,11 +0,0 @@
---- openswan-2.6.38.orig/Makefile.top 2012-03-23 22:33:43.000000000 +0100
-+++ openswan-2.6.38/Makefile.top 2012-07-25 18:17:21.000000000 +0200
-@@ -26,7 +26,7 @@ ERRCHECK=${MAKEUTILS}/errcheck
- KVUTIL=${MAKEUTILS}/kernelversion
- KVSHORTUTIL=${MAKEUTILS}/kernelversion-short
-
--SUBDIRS?=lib programs testing
-+SUBDIRS?=lib programs
-
- clean::
- -(cd ${OPENSWANSRCDIR} && $(MAKE) modclean && $(MAKE) mod26clean)
diff --git a/package/openswan/patches/patch-lib_libopenswan_alg_info_c b/package/openswan/patches/patch-lib_libopenswan_alg_info_c
deleted file mode 100644
index 3ac8e824b..000000000
--- a/package/openswan/patches/patch-lib_libopenswan_alg_info_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.38.orig/lib/libopenswan/alg_info.c 2012-03-23 22:33:43.000000000 +0100
-+++ openswan-2.6.38/lib/libopenswan/alg_info.c 2012-07-25 18:17:21.000000000 +0200
-@@ -778,7 +778,7 @@ alg_info_discover_pfsgroup_hack(struct a
- static char err_buf[256];
- int ret;
-
-- pfs_name=index(esp_buf, ';');
-+ pfs_name=strchr(esp_buf, ';');
-
- if(pfs_name) {
- *pfs_name='\0';