fix isakmpd

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5811 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 96 insertions, 6 deletions

diff --git a/package/isakmpd/Makefile b/package/isakmpd/Makefile
index 00153fd73..628b97fd9 100644
--- a/package/isakmpd/Makefile
+++ b/package/isakmpd/Makefile
@@ -26,15 +26,16 @@ include $(INCLUDE_DIR)/kernel.mk
 define Package/isakmpd
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=@BROKEN @LINUX_2_6 +libopenssl +keynote +libgmp
+  DEPENDS:=@LINUX_2_6 +libopenssl +keynote +libgmp
   TITLE:=IPsec management tools
   URL:=http://isakmpd.sourceforge.net/
 endef
 
 define Build/Compile
-	$(call Build/Compile/Default,LINUX_DIR="$(LINUX_DIR)" \
-		STAGING_DIR="$(STAGING_DIR)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
+	$(call Build/Compile/Default, \
+		LINUX_DIR="$(LINUX_DIR)" \
+		EXTRA_CPPFLAGS="-I$(STAGING_DIR)/usr/include/openssl -I$(STAGING_DIR)/usr/include/keynote  -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
 	)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		STAGING_DIR="$(STAGING_DIR)" \
diff --git a/package/isakmpd/patches/020-standardize.patch b/package/isakmpd/patches/020-standardize.patch
index d3dfabf34..d6c5e87b5 100644
--- a/package/isakmpd/patches/020-standardize.patch
+++ b/package/isakmpd/patches/020-standardize.patch
@@ -46,14 +46,103 @@ diff -urN isakmp.old/sysdep/linux/GNUmakefile.sysdep isakmp.dev/sysdep/linux/GNU
  LIBSYSDEP:=	${LIBSYSDEPDIR}/libsysdep.a
  
 -LDADD+=		-lgmp ${LIBSYSDEP} ${LIBCRYPTO}
-+LDADD+=		-L$(STAGING_DIR)/usr/lib -lgmp ${LIBSYSDEP} ${LIBCRYPTO}
++LDADD+=		$(EXTRA_LDFLAGS) -lgmp ${LIBSYSDEP} ${LIBCRYPTO}
  DPADD+=		${LIBGMP} ${LIBSYSDEP}
  
  CFLAGS+=	-DHAVE_GETNAMEINFO -DUSE_OLD_SOCKADDR -DHAVE_PCAP \
  		-DNEED_SYSDEP_APP -DMP_FLAVOUR=MP_FLAVOUR_GMP -DUSE_AES \
  		-I${.CURDIR}/sysdep/linux/include -I${.CURDIR}/sysdep/common \
 -		-I/usr/include/openssl
-+		-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/openssl -I$(LINUX_DIR)/include
++		$(EXTRA_CPPFLAGS)
  
  FEATURES=	debug tripledes blowfish cast ec aggressive x509 policy
  FEATURES+=	dpd nat_traversal isakmp_cfg des aes
+diff -ruN isakmpd-20041012.orig/GNUmakefile isakmpd-20041012.new/GNUmakefile
+--- isakmpd-20041012.orig/GNUmakefile	2006-12-16 22:41:26.000000000 +0100
++++ isakmpd-20041012.new/GNUmakefile	2006-12-16 22:48:27.000000000 +0100
+@@ -169,7 +169,6 @@
+ X509=		x509.c
+ CFLAGS+=	-DUSE_LIBCRYPTO
+ LDADD+=		-lcrypto
+-DPADD+=		${LIBCRYPTO}
+ endif
+ 
+ ifdef USE_RAWKEY
+diff -ruN isakmpd-20041012.orig/Makefile isakmpd-20041012.new/Makefile
+--- isakmpd-20041012.orig/Makefile	2004-10-12 23:25:52.000000000 +0200
++++ isakmpd-20041012.new/Makefile	2006-12-16 22:46:48.000000000 +0100
+@@ -147,7 +147,6 @@
+ .ifdef USE_LIBCRYPTO
+ CFLAGS+=	-DUSE_LIBCRYPTO
+ LDADD+=		-lcrypto
+-DPADD+=		${LIBCRYPTO}
+ .endif
+ 
+ .ifdef USE_LIBDES
+diff -ruN isakmpd-20041012.orig/apps/certpatch/Makefile isakmpd-20041012.new/apps/certpatch/Makefile
+--- isakmpd-20041012.orig/apps/certpatch/Makefile	2004-10-12 23:25:52.000000000 +0200
++++ isakmpd-20041012.new/apps/certpatch/Makefile	2006-12-16 22:48:58.000000000 +0100
+@@ -40,7 +40,6 @@
+ .PATH:		${TOPSRC} ${TOPSRC}/sysdep/${OS} ${TOPOBJ}
+ CFLAGS+=	-I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall
+ LDADD+=		-lcrypto
+-DPADD+=		${LIBCRYPTO}
+ MAN=		certpatch.8
+ 
+ .if ${FEATURES:Mgmp} == "gmp"
+diff -ruN isakmpd-20041012.orig/regress/crypto/Makefile isakmpd-20041012.new/regress/crypto/Makefile
+--- isakmpd-20041012.orig/regress/crypto/Makefile	2004-10-12 23:25:52.000000000 +0200
++++ isakmpd-20041012.new/regress/crypto/Makefile	2006-12-16 22:50:02.000000000 +0100
+@@ -13,7 +13,7 @@
+ 		-DUSE_TRIPLEDES -DUSE_CAST -DUSE_BLOWFISH -DUSE_DES \
+ 		-DUSE_AES
+ LDADD+=		-lcrypto -ldes
+-DPADD+=		${LIBCRYPTO} ${LIBDES}
++DPADD+=		${LIBDES}
+ NOMAN=
+ DEBUG=		-g
+ 
+diff -ruN isakmpd-20041012.orig/regress/dh/Makefile isakmpd-20041012.new/regress/dh/Makefile
+--- isakmpd-20041012.orig/regress/dh/Makefile	2004-10-12 23:25:52.000000000 +0200
++++ isakmpd-20041012.new/regress/dh/Makefile	2006-12-16 22:49:25.000000000 +0100
+@@ -15,7 +15,6 @@
+ 		-DUSE_EC
+ NOMAN=
+ LDADD+=		-lcrypto
+-DPADD+=		${LIBCRYPTO}
+ DEBUG=		-g
+ 
+ .if ${FEATURES:Mgmp} == "gmp"
+diff -ruN isakmpd-20041012.orig/regress/group/Makefile isakmpd-20041012.new/regress/group/Makefile
+--- isakmpd-20041012.orig/regress/group/Makefile	2004-10-12 23:25:52.000000000 +0200
++++ isakmpd-20041012.new/regress/group/Makefile	2006-12-16 22:49:30.000000000 +0100
+@@ -15,7 +15,6 @@
+ 		-DUSE_EC
+ NOMAN=
+ LDADD+=		-lcrypto
+-DPADD+=		${LIBCRYPTO}
+ DEBUG=		-g
+ 
+ .if ${FEATURES:Mgmp} == "gmp"
+diff -ruN isakmpd-20041012.orig/regress/rsakeygen/Makefile isakmpd-20041012.new/regress/rsakeygen/Makefile
+--- isakmpd-20041012.orig/regress/rsakeygen/Makefile	2004-10-12 23:25:52.000000000 +0200
++++ isakmpd-20041012.new/regress/rsakeygen/Makefile	2006-12-16 22:49:41.000000000 +0100
+@@ -62,7 +62,6 @@
+ .ifdef USE_LIBCRYPTO
+ CFLAGS+=	-DUSE_LIBCRYPTO
+ LDADD+=		-lcrypto
+-DPADD+=		${LIBCRYPTO}
+ .endif
+ 
+ .if !defined (HAVE_DLOPEN) && !defined (USE_LIBCRYPTO)
+diff -ruN isakmpd-20041012.orig/regress/x509/Makefile isakmpd-20041012.new/regress/x509/Makefile
+--- isakmpd-20041012.orig/regress/x509/Makefile	2004-10-12 23:25:52.000000000 +0200
++++ isakmpd-20041012.new/regress/x509/Makefile	2006-12-16 22:49:49.000000000 +0100
+@@ -78,7 +78,6 @@
+ X509=		x509.c
+ CFLAGS+=	-DUSE_LIBCRYPTO
+ LDADD+=		-lcrypto ${LIBLWRES}
+-DPADD+=		${LIBCRYPTO}
+ .endif
+ 
+ .if !defined (HAVE_DLOPEN) && !defined (USE_LIBCRYPTO) || !defined (USE_KEYNOTE)