From 1daa24f9ae8b1e511ed9bb9961fe6fd8892b852b Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Thu, 11 Dec 2003 23:22:17 +0000
Subject: [PATCH] Fix vpnc build and move out of nonworking.

BKrev: 3fd8fc29CkEvfN6RduH7TMBCFIWsNQ
---
 libgcrypt/libgcrypt_1.1.12.oe                    |  4 ++++
 .../{alsadriver_0_9_8.oe => alsadriver_0.9.8.oe} |  0
 .../vpnc/vpnc-0.2-rm+zomb-pre6/attribute.patch   |  0
 nonworking/vpnc/vpnc_0.2-rm+zomb-pre6.oe         |  0
 vpnc/vpnc-0.2-rm+zomb-pre6/attribute.patch       | 12 ++++++++++++
 vpnc/vpnc_0.2-rm+zomb-pre6.oe                    | 16 ++++++++++++++++
 6 files changed, 32 insertions(+)
 rename nonworking/alsa-driver/{alsadriver_0_9_8.oe => alsadriver_0.9.8.oe} (100%)
 delete mode 100644 nonworking/vpnc/vpnc-0.2-rm+zomb-pre6/attribute.patch
 delete mode 100644 nonworking/vpnc/vpnc_0.2-rm+zomb-pre6.oe
 create mode 100644 vpnc/vpnc-0.2-rm+zomb-pre6/attribute.patch
 create mode 100644 vpnc/vpnc_0.2-rm+zomb-pre6.oe

diff --git a/libgcrypt/libgcrypt_1.1.12.oe b/libgcrypt/libgcrypt_1.1.12.oe
index fa6f246b70..ad06ceb185 100644
--- a/libgcrypt/libgcrypt_1.1.12.oe
+++ b/libgcrypt/libgcrypt_1.1.12.oe
@@ -1,3 +1,5 @@
+LICENSE = GPL LGPL FDL
+
 SECTION="libs"
 PRIORITY="optional"
 RDEPENDS="libc6"
@@ -17,6 +19,8 @@ do_stage () {
 	ln -sf ${STAGING_LIBDIR}/libgcrypt.so.1.5.1 ${STAGING_LIBDIR}/libgcrypt.so.1
 	ln -sf ${STAGING_LIBDIR}/libgcrypt.so.1.5.1 ${STAGING_LIBDIR}/libgcrypt.so
 
+	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+
 	install -d ${STAGING_DIR}/target/include/
 	for X in gcrypt.h
 	do
diff --git a/nonworking/alsa-driver/alsadriver_0_9_8.oe b/nonworking/alsa-driver/alsadriver_0.9.8.oe
similarity index 100%
rename from nonworking/alsa-driver/alsadriver_0_9_8.oe
rename to nonworking/alsa-driver/alsadriver_0.9.8.oe
diff --git a/nonworking/vpnc/vpnc-0.2-rm+zomb-pre6/attribute.patch b/nonworking/vpnc/vpnc-0.2-rm+zomb-pre6/attribute.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/nonworking/vpnc/vpnc_0.2-rm+zomb-pre6.oe b/nonworking/vpnc/vpnc_0.2-rm+zomb-pre6.oe
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/vpnc/vpnc-0.2-rm+zomb-pre6/attribute.patch b/vpnc/vpnc-0.2-rm+zomb-pre6/attribute.patch
new file mode 100644
index 0000000000..8cf0fe5485
--- /dev/null
+++ b/vpnc/vpnc-0.2-rm+zomb-pre6/attribute.patch
@@ -0,0 +1,12 @@
+--- vpnc-0.2-rm+zomb-pre6/vpnc.c~	2003-11-01 16:21:47.000000000 -0800
++++ vpnc-0.2-rm+zomb-pre6/vpnc.c	2003-11-14 23:23:43.000000000 -0800
+@@ -1193,7 +1193,8 @@
+ 		       ? "\n" : "")));
+ 	    break;
+ 	  default:
+-	    reject = ISAKMP_N_ATTRIBUTES_NOT_SUPPORTED;
++	    //reject = ISAKMP_N_ATTRIBUTES_NOT_SUPPORTED;
++            DEBUG(1, printf("Unknow attribute: ap->type: %d.  Continuing anyway.\n", ap->type));
+ 	  }
+ DEBUG(2, printf("S5.5\n"));
+       if (reject != 0)
diff --git a/vpnc/vpnc_0.2-rm+zomb-pre6.oe b/vpnc/vpnc_0.2-rm+zomb-pre6.oe
new file mode 100644
index 0000000000..e3e781a849
--- /dev/null
+++ b/vpnc/vpnc_0.2-rm+zomb-pre6.oe
@@ -0,0 +1,16 @@
+DEPENDS=virtual/libc virtual/libgcrypt
+
+SRC_URI = http://www.unix-ag.uni-kl.de/~massar/vpnc/${PN}-${PV}.tar.gz \
+          file://${FILESDIR}/attribute.patch;patch=1
+
+
+do_compile () {
+oe_runmake \
+"CFLAGS=${CFLAGS} '-DVERSION=\"\$(shell cat ${S}/VERSION)\"' \$(shell libgcrypt-config --cflags)" \
+"LDFLAGS=${LDFLAGS} \$(shell libgcrypt-config --libs)"
+}
+
+do_install () {
+        install -d ${D}/${sbindir}
+	install -m 0755 vpnc ${D}/${sbindir}
+}
-- 
2.39.5