update openswan to latest upstream

8 files changed, 27 insertions, 50 deletions

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index f67360f10..60d725705 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openswan
-PKG_VERSION:=		2.6.28
+PKG_VERSION:=		2.6.37
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		37f2ad2664dd89e6ad96ae82f6378166
+PKG_MD5SUM:=		e5c948555088df06cfadcfbe6c13adfe
 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 872f21335..2a2040949 100644
--- a/package/openswan/patches/patch-Makefile_inc
+++ b/package/openswan/patches/patch-Makefile_inc
@@ -1,6 +1,6 @@
---- openswan-2.6.22.orig/Makefile.inc	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/Makefile.inc	2009-07-23 20:09:34.556071786 +0200
-@@ -163,7 +163,7 @@ INSTALL=install
+--- 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
+@@ -169,7 +169,7 @@ INSTALL=install
  # how backup names are composed.
  # Note that the install procedures will never overwrite an existing config
  # file, which is why -b is not specified for them.
@@ -9,7 +9,7 @@
  INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
  INSTMANFLAGS=
  INSTCONFFLAGS=
-@@ -262,12 +262,12 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
+@@ -279,12 +279,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.
diff --git a/package/openswan/patches/patch-Makefile_top b/package/openswan/patches/patch-Makefile_top
index e3edd3bd6..7b47163e5 100644
--- a/package/openswan/patches/patch-Makefile_top
+++ b/package/openswan/patches/patch-Makefile_top
@@ -1,10 +1,10 @@
---- openswan-2.6.28.orig/Makefile.top	2010-07-29 20:45:59.000000000 +0200
-+++ openswan-2.6.28/Makefile.top	2011-01-21 19:00:28.518658360 +0100
+--- openswan-2.6.37.orig/Makefile.top	2011-10-28 23:11:53.000000000 +0200
++++ openswan-2.6.37/Makefile.top	2011-12-01 17:31:34.000000000 +0100
 @@ -29,7 +29,7 @@ ERRCHECK=${MAKEUTILS}/errcheck
  KVUTIL=${MAKEUTILS}/kernelversion
  KVSHORTUTIL=${MAKEUTILS}/kernelversion-short
  
--SUBDIRS?=doc lib programs testing
+-SUBDIRS?=lib programs testing
 +SUBDIRS?=lib programs
  
  clean::
diff --git a/package/openswan/patches/patch-doc_Makefile b/package/openswan/patches/patch-doc_Makefile
deleted file mode 100644
index d5accab8c..000000000
--- a/package/openswan/patches/patch-doc_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- openswan-2.6.21.orig/doc/Makefile	2009-03-30 15:11:28.000000000 +0200
-+++ openswan-2.6.21/doc/Makefile	2009-06-13 14:35:32.000000000 +0200
-@@ -91,7 +91,7 @@ install: ${alldocs} ${SAMPLEMAN}
- 	do \
- 		$(INSTALL) $$file ${DOCDIR} || exit 1;\
- 	done;
--	/bin/bash -c 'MANDIR=${MANTREE}; /usr/bin/find ${OPENSWANSRCDIR}/programs ${OPENSWANSRCDIR}/lib ${OPENSWANSRCDIR}/linux -type f -name "*.[1-8]" -print | grep -v lwres | grep -v CVS | while read f; do if [ -f $$f ]; then  manNo=$${f##*.}; F=$${f##*/}; /bin/mkdir -p  $$MANDIR/man$$manNo; /bin/cp -fp $$f $$MANDIR/man$$manNo/ipsec_$$F; fi; done'
-+	bash -c 'MANDIR=${MANTREE}; find ${OPENSWANSRCDIR}/programs ${OPENSWANSRCDIR}/lib ${OPENSWANSRCDIR}/linux -type f -name "*.[1-8]" -print | grep -v lwres | grep -v CVS | while read f; do if [ -f $$f ]; then  manNo=$${f##*.}; F=$${f##*/}; mkdir -p  $$MANDIR/man$$manNo; cp -fp $$f $$MANDIR/man$$manNo/ipsec_$$F; fi; done'
- 
- install_file_list:
- 	@$(foreach f, $(alldocs), \
diff --git a/package/openswan/patches/patch-lib_liblwres_Makefile b/package/openswan/patches/patch-lib_liblwres_Makefile
deleted file mode 100644
index 30b4b3d8b..000000000
--- a/package/openswan/patches/patch-lib_liblwres_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.21.orig/lib/liblwres/Makefile	2009-03-30 15:11:28.000000000 +0200
-+++ openswan-2.6.21/lib/liblwres/Makefile	2009-05-22 01:07:19.000000000 +0200
-@@ -23,7 +23,7 @@ CINCLUDES =	-I${srcdir}${ISCARCH}/includ
- 		-I${srcdir}../libisc/include \
- 		-I. -I./include -I${srcdir}include 
- CDEFINES = -g
--CWARNINGS = -Werror
-+CWARNINGS =
- 
- CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} 
- 
diff --git a/package/openswan/patches/patch-lib_libopenswan_alg_info_c b/package/openswan/patches/patch-lib_libopenswan_alg_info_c
index 0da5f9ad1..4f09f3030 100644
--- a/package/openswan/patches/patch-lib_libopenswan_alg_info_c
+++ b/package/openswan/patches/patch-lib_libopenswan_alg_info_c
@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.24.orig/lib/libopenswan/alg_info.c	2010-01-10 02:34:38.000000000 +0100
-+++ openswan-2.6.24/lib/libopenswan/alg_info.c	2010-01-19 23:28:18.000000000 +0100
-@@ -765,7 +765,7 @@ alg_info_discover_pfsgroup_hack(struct a
+--- openswan-2.6.37.orig/lib/libopenswan/alg_info.c	2011-10-28 23:11:53.000000000 +0200
++++ openswan-2.6.37/lib/libopenswan/alg_info.c	2011-12-01 17:30:31.000000000 +0100
+@@ -764,7 +764,7 @@ alg_info_discover_pfsgroup_hack(struct a
      static char err_buf[256];
      int ret;
      
diff --git a/package/openswan/patches/patch-programs__realsetup__realsetup_in b/package/openswan/patches/patch-programs__realsetup__realsetup_in
index 7d4db9881..2a1adecc9 100644
--- a/package/openswan/patches/patch-programs__realsetup__realsetup_in
+++ b/package/openswan/patches/patch-programs__realsetup__realsetup_in
@@ -1,26 +1,27 @@
---- openswan-2.6.27.orig/programs/_realsetup/_realsetup.in	2010-06-21 17:43:35.000000000 +0200
-+++ openswan-2.6.27/programs/_realsetup/_realsetup.in	2010-07-27 19:27:30.327023350 +0200
-@@ -374,14 +374,15 @@ case "$1" in
- 	rm -f /var/run/pluto.pid
+--- openswan-2.6.37.orig/programs/_realsetup/_realsetup.in	2011-10-28 23:11:53.000000000 +0200
++++ openswan-2.6.37/programs/_realsetup/_realsetup.in	2011-12-01 17:35:27.000000000 +0100
+@@ -395,15 +395,15 @@ case "$1" in
+ 		"}"
  
  	# When we exit we clean up (remove) the modules we are using, even the kame'ish ones
 -	if test -e ${kamepfkey}; then
 -		for mod in ipcomp ipcomp6 xfrm6_tunnel xfrm6_mode_tunnel xfrm6_mode_beet xfrm6_mode_ro \
 -			xfrm6_mode_transport xfrm4_mode_transport xfrm4_mode_tunnel  xfrm_user \
--			xfrm4_tunnel xfrm4_mode_beet esp4 esp6 ah4 ah6 af_key
+-			xfrm4_tunnel xfrm4_mode_beet esp4 esp6 ah4 ah6 af_key \
+-			xfrm_ipcomp tunnel6
 -		    do
 -			lsmod 2>&1 | grep "^$mod" > /dev/null && rmmod  $mod
 -		    done
 -	fi 
-+	# do not touch kernel modules, no reason to unload on embedded systems
 +	#if test -e ${kamepfkey}; then
 +	#	for mod in ipcomp ipcomp6 xfrm6_tunnel xfrm6_mode_tunnel xfrm6_mode_beet xfrm6_mode_ro \
 +	#		xfrm6_mode_transport xfrm4_mode_transport xfrm4_mode_tunnel  xfrm_user \
-+	#		xfrm4_tunnel xfrm4_mode_beet esp4 esp6 ah4 ah6 af_key
++	#		xfrm4_tunnel xfrm4_mode_beet esp4 esp6 ah4 ah6 af_key \
++	#		xfrm_ipcomp tunnel6
 +	#	    do
 +	#		lsmod 2>&1 | grep "^$mod" > /dev/null && rmmod  $mod
 +	#	    done
 +	#fi 
  
- 	perform test -d $subsysdir "&&" rm -f $subsyslock
- 
+ 	if test -e ${ipsecversion}; then
+ 		lsmod 2>&1 | grep "ipsec" > /dev/null && rmmod  ipsec
diff --git a/package/openswan/patches/patch-programs_ikeping_ikeping_c b/package/openswan/patches/patch-programs_ikeping_ikeping_c
index 4be18fcdb..98762b332 100644
--- a/package/openswan/patches/patch-programs_ikeping_ikeping_c
+++ b/package/openswan/patches/patch-programs_ikeping_ikeping_c
@@ -1,12 +1,11 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.22.orig/programs/ikeping/ikeping.c	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/programs/ikeping/ikeping.c	2009-07-23 19:46:18.643265912 +0200
-@@ -319,7 +319,7 @@ main(int argc, char **argv)
+--- openswan-2.6.37.orig/programs/ikeping/ikeping.c	2011-10-28 23:11:53.000000000 +0200
++++ openswan-2.6.37/programs/ikeping/ikeping.c	2011-12-01 17:33:23.000000000 +0100
+@@ -317,7 +317,7 @@ main(int argc, char **argv)
+   verbose=0;
    natt=0;
    listen_only=0;
-   noDNS=0;
 -  bzero(&laddr, sizeof(laddr));
 +  memset(&laddr, 0, sizeof(laddr));
  
-   while((c = getopt_long(argc, argv, "hVnvsp:b:46E:w:", long_opts, 0))!=EOF) {
+   while((c = getopt_long(argc, argv, "hVvsp:b:46E:w:", long_opts, 0))!=EOF) {
        switch (c) {