Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	BUGS
	package/autoconf/Makefile

4 files changed, 10 insertions, 143 deletions

diff --git a/package/openswan/Config.in b/package/openswan/Config.in
deleted file mode 100644
index 543a80f58..000000000
--- a/package/openswan/Config.in
+++ /dev/null
@@ -1,30 +0,0 @@
-config ADK_PACKAGE_OPENSWAN
-	prompt "openswan.......................... VPN solution using IPsec"
-	tristate
-	default n
-	select ADK_PACKAGE_IP
-	select ADK_PACKAGE_LIBGMP
-	help
-	  Openswan is an implementation of IPsec for Linux.
-	  
-	  http://www.openswan.org/
-
-choice
-prompt "IPSec stack to use"
-depends on ADK_PACKAGE_OPENSWAN
-config ADK_COMPILE_OPENSWAN_WITH_NETKEY
-	prompt "NETKEY - use Linux integrated IPSec Stack"
-	select ADK_KPACKAGE_KMOD_NET_KEY
-	select ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TUNNEL
-	select ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TRANSPORT
-	select ADK_KPACKAGE_KMOD_INET_ESP
-	select ADK_KPACKAGE_KMOD_INET_AH
-	bool
-	help
-
-config ADK_COMPILE_OPENSWAN_WITH_KLIPS
-	prompt "KLIPS - use OpenS/WAN IPSec Stack"
-	bool
-	help
-
-endchoice
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 3c417135d..c5588f549 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -4,12 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openswan
-PKG_VERSION:=		2.6.22
+PKG_VERSION:=		2.6.24
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9a30009bade8a1b09fba27680c87cf72
+PKG_MD5SUM:=		1c76b6982c05392f7c360afb92699661
 PKG_DESCR:=		IPSec software
 PKG_SECTION:=		net
 PKG_DEPENDS:=		ip libgmp
+PKG_BUILDDEP+=		gmp
 PKG_URL:=		http://www.openswan.org
 PKG_SITES:=		http://www.openswan.org/download/ \
 			ftp://ftp.openswan.org/openswan/
@@ -26,15 +27,15 @@ $(eval $(call PKG_template,OPENSWAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${
 #XAKE_FLAGS+=		USE_KLIPS=true USE_NETKEY=false
 #endif
 
+CONFIG_STYLE:=		manual
+
 XAKE_FLAGS+=		KERNELSRC="${LINUX_DIR}" \
 			IPSECDIR="/usr/lib/ipsec" \
 			INC_USRLOCAL="/usr" \
 			MODPROBE="insmod" \
 			OSDEP="linux" \
+			WERROR="" \
 			BUILDENV="linux"
-
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 ALL_TARGET:=		programs
 
 post-install:
@@ -42,12 +43,10 @@ post-install:
 	${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/libexec/ipsec
 	${INSTALL_DIR} ${IDIR_OPENSWAN}/etc/ipsec.d 
 	${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/sbin
-	${CP} ${WRKINST}/etc/ipsec.conf ${IDIR_OPENSWAN}/etc/
+	${INSTALL_DATA} ${WRKINST}/etc/ipsec.conf ${IDIR_OPENSWAN}/etc/
 	${CP} ${WRKINST}/etc/ipsec.d/* ${IDIR_OPENSWAN}/etc/ipsec.d
 	${CP} ${WRKINST}/usr/lib/ipsec/* ${IDIR_OPENSWAN}/usr/lib/ipsec
 	${CP} ${WRKINST}/usr/libexec/ipsec/* ${IDIR_OPENSWAN}/usr/libexec/ipsec
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/ipsec ${IDIR_OPENSWAN}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/etc/rc.d/init.d/ipsec \
-		${IDIR_OPENSWAN}/usr/libexec/ipsec/setup
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openswan/patches/patch-lib_libopenswan_alg_info_c b/package/openswan/patches/patch-lib_libopenswan_alg_info_c
index 0c616e07c..0da5f9ad1 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.18.orig/lib/libopenswan/alg_info.c	2008-10-06 18:52:49.000000000 +0200
-+++ openswan-2.6.18/lib/libopenswan/alg_info.c	2008-10-14 13:08:49.000000000 +0200
-@@ -749,7 +749,7 @@ alg_info_discover_pfsgroup_hack(struct a
+--- 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
      static char err_buf[256];
      int ret;
      
diff --git a/package/openswan/patches/patch-programs_Makefile_program b/package/openswan/patches/patch-programs_Makefile_program
deleted file mode 100644
index 154fd06c2..000000000
--- a/package/openswan/patches/patch-programs_Makefile_program
+++ /dev/null
@@ -1,102 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.22.orig/programs/Makefile.program	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/programs/Makefile.program	2009-07-23 19:46:18.635264333 +0200
-@@ -49,9 +49,9 @@ CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFIL
- CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\"
- 
- # die if there are any warnings
--ifndef WERROR
--WERROR:= -Werror
--endif
-+#ifndef WERROR
-+#WERROR:= -Werror
-+#endif
- 
- CFLAGS+= ${WERROR}
- 
-@@ -104,67 +104,67 @@ endif
- ifneq ($(NOINSTALL),true)
- 
- doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES)
--	@mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR)
-+	mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR)
- 	@if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi
--	@$(foreach f, $(addsuffix .8, $(PROGRAM)), \
-+	$(foreach f, $(addsuffix .8, $(PROGRAM)), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		$(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR8)/$(MANPROGPREFIX)$f || exit 1; \
- 	)
--	@$(foreach f, $(EXTRA8MAN), \
-+	$(foreach f, $(EXTRA8MAN), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		$(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR8)/ipsec_$f || exit 1; \
- 	)
--	@$(foreach f, $(EXTRA5MAN), \
-+	$(foreach f, $(EXTRA5MAN), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		$(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR5)/$f || exit 1 ;\
- 	)
--	@$(foreach f, $(EXTRA5PROC), \
-+	$(foreach f, $(EXTRA5PROC), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		$(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR5)/ipsec_$f || exit 1 ;\
- 	)
--	@$(foreach f, $(LIBFILES), \
-+	$(foreach f, $(LIBFILES), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		$(INSTALL) $(INSTCONFFLAGS) $$g $(LIBDIR)/$f || exit 1 ;\
- 	)
--	@$(foreach f, $(CONFFILES), \
-+	$(foreach f, $(CONFFILES), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		if [ ! -f $(CONFDIR)/$f ]; then $(INSTALL) $(INSTCONFFLAGS) $$g $(CONFDIR)/$f || exit 1; fi;\
- 		$(INSTALL) $(INSTCONFFLAGS) $$g $(EXAMPLECONFDIR)/$f-sample || exit 1; \
- 	)
--	@$(foreach f, $(EXCONFFILES), \
-+	$(foreach f, $(EXCONFFILES), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		$(INSTALL) $(INSTCONFFLAGS) $$g $(EXAMPLECONFDIR)/$f-sample || exit 1; \
- 	)
--	@$(foreach f, $(CONFDFILES), \
-+	$(foreach f, $(CONFDFILES), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		if [ ! -f $(CONFDDIR)/$(CONFDSUBDIR)/$f ]; then $(INSTALL) $(INSTCONFFLAGS) $$g $(CONFDDIR)/$(CONFDSUBDIR)/$f || exit 1; fi;\
- 	)
- 
- install_file_list::
--	@if [ -n "$(PROGRAM)" ]; then echo $(PROGRAMDIR)/$(PROGRAM); fi
--	@$(foreach f, $(addsuffix .8, $(PROGRAM)), \
-+	if [ -n "$(PROGRAM)" ]; then echo $(PROGRAMDIR)/$(PROGRAM); fi
-+	$(foreach f, $(addsuffix .8, $(PROGRAM)), \
- 		echo $(MANDIR8)/${MANPROGPREFIX}$f; \
- 	)
--	@$(foreach f, $(EXTRA8MAN), \
-+	$(foreach f, $(EXTRA8MAN), \
- 		echo $(MANDIR8)/ipsec_$f; \
- 	)
--	@$(foreach f, $(EXTRA5MAN), \
-+	$(foreach f, $(EXTRA5MAN), \
- 		echo $(MANDIR5)/$f;\
- 	)
--	@$(foreach f, $(EXTRA5PROC), \
-+	$(foreach f, $(EXTRA5PROC), \
- 		echo $(MANDIR5)/ipsec_$f; \
- 	)
--	@$(foreach f, $(LIBFILES), \
-+	$(foreach f, $(LIBFILES), \
- 		echo $(LIBDIR)/$f;\
- 	)
--	@$(foreach f, $(CONFFILES), \
-+	$(foreach f, $(CONFFILES), \
- 		echo $(CONFDIR)/$f;\
- 		echo $(EXAMPLECONFDIR)/$f-sample;\
- 	)
--	@$(foreach f, $(EXCONFFILES), \
-+	$(foreach f, $(EXCONFFILES), \
- 		echo $(EXAMPLECONFDIR)/$f-sample;\
- 	)
--	@$(foreach f, $(CONFDFILES), \
-+	$(foreach f, $(CONFDFILES), \
- 		echo $(CONFDDIR)/${CONFDSUBDIR}/$f;\
- 	)
-