8 files changed, 15 insertions, 97 deletions
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index eb335cbcb..51f97b17d 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		openswan
-PKG_VERSION:=		2.6.43
+PKG_VERSION:=		2.6.46
 PKG_RELEASE:=		1
-PKG_HASH:=		ac7ef1d78766801f23c458cc7c3b080ca6e20c5144a1979598c319bc3bc7c88b
+PKG_HASH:=		c1605c96d3c3cf357cefea7622f3acbc7a02d6a3cebfb76979327b566084a5ea
 PKG_DESCR:=		ipsec software
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		libgmp
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
- 
diff --git a/package/openswan/patches/patch-lib_libdns_Makefile b/package/openswan/patches/patch-lib_libdns_Makefile
deleted file mode 100644
index ec4c4ef8b..000000000
--- a/package/openswan/patches/patch-lib_libdns_Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- openswan-2.6.28.orig/lib/libdns/Makefile	2010-07-29 20:45:59.000000000 +0200
-+++ openswan-2.6.28/lib/libdns/Makefile	2011-01-21 19:15:22.484901748 +0100
-@@ -53,7 +53,7 @@ SRCS +=         time.c key.c lib.c
- programs all: ${LIB}.a
- 
- version.o: version.c
--	${LIBTOOL} --mode=compile ${CC} ${ALL_CFLAGS} \
-+	${CC} ${CFLAGS} ${ALL_CFLAGS} \
- 		-DVERSION=\"${VERSION}\" \
- 		-DLIBINTERFACE=${LIBINTERFACE} \
- 		-DLIBREVISION=${LIBREVISION} \
-@@ -100,7 +100,6 @@ code.h:	gen
- 
- # this program is to be built on the host, and should not be
- # cross-compiled!
--HOSTCC?=cc
- gen: gen.c
--	${HOSTCC} ${HOSTCINCLUDES} ${LDFLAGS} -o $@ ${srcdir}gen.c ${LIBS}
-+	${CC_FOR_BUILD} ${HOSTCINCLUDES} -o $@ ${srcdir}gen.c ${LIBS}
- 
diff --git a/package/openswan/patches/patch-lib_libdns_Makefile_in b/package/openswan/patches/patch-lib_libdns_Makefile_in
deleted file mode 100644
index dcef159ea..000000000
--- a/package/openswan/patches/patch-lib_libdns_Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- openswan-2.6.28.orig/lib/libdns/Makefile.in	2010-07-29 20:45:59.000000000 +0200
-+++ openswan-2.6.28/lib/libdns/Makefile.in	2011-01-21 19:01:49.208658272 +0100
-@@ -103,7 +103,7 @@ DEPENDEXTRA =	./gen -F include/dns/rdata
- @BIND9_MAKE_RULES@
- 
- version.@O@: version.c
--	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
-+	${CC} ${CFLAGS} ${ALL_CFLAGS} \
- 		-DVERSION=\"${VERSION}\" \
- 		-DLIBINTERFACE=${LIBINTERFACE} \
- 		-DLIBREVISION=${LIBREVISION} \
-@@ -160,7 +160,7 @@ code.h:	gen
- 	./gen -s ${srcdir} > code.h
- 
- gen: gen.c
--	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
-+	${CC_FOR_BUILD} ${ALL_CFLAGS} ${CFLAGS_FOR_BUILD} -o $@ ${srcdir}/gen.c ${LIBS}
- 
- rbtdb64.@O@: rbtdb.c
- 
diff --git a/package/openswan/patches/patch-lib_libipsecconf_confread_c b/package/openswan/patches/patch-lib_libipsecconf_confread_c
index 5d28ed79f..59afc8bf3 100644
--- a/package/openswan/patches/patch-lib_libipsecconf_confread_c
+++ b/package/openswan/patches/patch-lib_libipsecconf_confread_c
@@ -1,6 +1,6 @@
---- openswan-2.6.38.orig/lib/libipsecconf/confread.c	2012-03-23 22:33:43.000000000 +0100
-+++ openswan-2.6.38/lib/libipsecconf/confread.c	2014-03-26 21:15:56.000000000 +0100
-@@ -20,7 +20,7 @@
+--- openswan-2.6.46.orig/lib/libipsecconf/confread.c	2016-01-22 16:50:30.000000000 +0100
++++ openswan-2.6.46/lib/libipsecconf/confread.c	2016-02-15 20:55:32.000000000 +0100
+@@ -32,7 +32,7 @@
  #include <string.h>
  #include <limits.h>
  #include <assert.h>
@@ -8,4 +8,4 @@
 +#include "queue.h"
  
  #include "oswalloc.h"
- 
+ #include "libopenswan.h"
diff --git a/package/openswan/patches/patch-lib_libisc_Makefile b/package/openswan/patches/patch-lib_libisc_Makefile
deleted file mode 100644
index 77844c089..000000000
--- a/package/openswan/patches/patch-lib_libisc_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- openswan-2.6.28.orig/lib/libisc/Makefile	2010-07-29 20:45:59.000000000 +0200
-+++ openswan-2.6.28/lib/libisc/Makefile	2011-01-21 19:10:30.838658764 +0100
-@@ -50,7 +50,7 @@ SRCS +=		rwlock.c random.c inet_aton.c i
- programs all: ${LIB}.a
- 
- version.o: version.c
--	${LIBTOOL} --mode=compile ${CC} ${ALL_CFLAGS} \
-+	${CC} ${CFLAGS} ${ALL_CFLAGS} \
- 		-DVERSION=\"${VERSION}\" \
- 		-DLIBINTERFACE=${LIBINTERFACE} \
- 		-DLIBREVISION=${LIBREVISION} \
diff --git a/package/openswan/patches/patch-lib_libisc_Makefile_in b/package/openswan/patches/patch-lib_libisc_Makefile_in
deleted file mode 100644
index 4cde48e35..000000000
--- a/package/openswan/patches/patch-lib_libisc_Makefile_in
+++ /dev/null
@@ -1,23 +0,0 @@
---- openswan-2.6.28.orig/lib/libisc/Makefile.in	2010-07-29 20:45:59.000000000 +0200
-+++ openswan-2.6.28/lib/libisc/Makefile.in	2011-01-21 19:04:37.798658397 +0100
-@@ -82,7 +82,7 @@ TARGETS =	timestamp
- @BIND9_MAKE_RULES@
- 
- version.@O@: version.c
--	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
-+	${CC} ${CFLAGS} ${ALL_CFLAGS} \
- 		-DVERSION=\"${VERSION}\" \
- 		-DLIBINTERFACE=${LIBINTERFACE} \
- 		-DLIBREVISION=${LIBREVISION} \
-@@ -94,10 +94,7 @@ libisc.@SA@: ${OBJS}
- 	${RANLIB} $@
- 
- libisc.la: ${OBJS}
--	${LIBTOOL_MODE_LINK} \
--		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la -rpath ${libdir} \
--		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
--		${OBJS} ${LIBS}
-+	${CC} ${CFLAGS} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la ${OBJS} ${LIBS}
- 
- timestamp: libisc.@A@
- 	touch timestamp
diff --git a/package/openswan/patches/patch-programs_ikeping_ikeping_c b/package/openswan/patches/patch-programs_ikeping_ikeping_c
index 075963e51..f29e313f1 100644
--- a/package/openswan/patches/patch-programs_ikeping_ikeping_c
+++ b/package/openswan/patches/patch-programs_ikeping_ikeping_c
@@ -1,6 +1,6 @@
---- openswan-2.6.38.orig/programs/ikeping/ikeping.c	2012-03-23 22:33:43.000000000 +0100
-+++ openswan-2.6.38/programs/ikeping/ikeping.c	2012-07-25 18:17:21.000000000 +0200
-@@ -318,7 +318,7 @@ main(int argc, char **argv)
+--- openswan-2.6.46.orig/programs/ikeping/ikeping.c	2016-01-22 16:50:30.000000000 +0100
++++ openswan-2.6.46/programs/ikeping/ikeping.c	2016-02-15 20:55:32.000000000 +0100
+@@ -321,7 +321,7 @@ main(int argc, char **argv)
    verbose=0;
    natt=0;
    listen_only=0;