full build on Darwin fixes

6 files changed, 22 insertions, 38 deletions

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index e63435c2c..22c52ea73 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openswan
-PKG_VERSION:=		2.6.37
+PKG_VERSION:=		2.6.38
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e5c948555088df06cfadcfbe6c13adfe
+PKG_MD5SUM:=		13073eb5314b83a31be88e4117e8bbcd
 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_top b/package/openswan/patches/patch-Makefile_top
index 7b47163e5..410670312 100644
--- a/package/openswan/patches/patch-Makefile_top
+++ b/package/openswan/patches/patch-Makefile_top
@@ -1,6 +1,6 @@
---- 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
+--- 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
  
diff --git a/package/openswan/patches/patch-lib_liblwres_Makefile b/package/openswan/patches/patch-lib_liblwres_Makefile
new file mode 100644
index 000000000..5aaa2112e
--- /dev/null
+++ b/package/openswan/patches/patch-lib_liblwres_Makefile
@@ -0,0 +1,11 @@
+--- openswan-2.6.38.orig/lib/liblwres/Makefile	2012-03-23 22:33:43.000000000 +0100
++++ openswan-2.6.38/lib/liblwres/Makefile	2012-07-25 18:21:02.000000000 +0200
+@@ -23,7 +23,7 @@ CINCLUDES =	-I${srcdir}${ISCARCH}/includ
+ 		-I${srcdir}../libisc/include \
+ 		-I. -I./include -I${srcdir}include 
+ CDEFINES =
+-CWARNINGS = -Werror
++#CWARNINGS = -Werror
+ 
+ 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 4f09f3030..3ac8e824b 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.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
+--- 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;
      
diff --git a/package/openswan/patches/patch-programs__realsetup__realsetup_in b/package/openswan/patches/patch-programs__realsetup__realsetup_in
deleted file mode 100644
index 2a1adecc9..000000000
--- a/package/openswan/patches/patch-programs__realsetup__realsetup_in
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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 \
--			xfrm_ipcomp tunnel6
--		    do
--			lsmod 2>&1 | grep "^$mod" > /dev/null && rmmod  $mod
--		    done
--	fi 
-+	#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 \
-+	#		xfrm_ipcomp tunnel6
-+	#	    do
-+	#		lsmod 2>&1 | grep "^$mod" > /dev/null && rmmod  $mod
-+	#	    done
-+	#fi 
- 
- 	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 98762b332..075963e51 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.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)
+--- 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)
    verbose=0;
    natt=0;
    listen_only=0;