add libgpg-error

upgrade libgcrypt
upgrade vpnc

BKrev: 4020edfa6n8QGBFQn-qrYPPxvlQ2CQ

diff --git a/libgcrypt/libgcrypt_1.1.12.oe b/libgcrypt/libgcrypt_1.1.12.oe
deleted file mode 100644 (file)
index ad06ceb..0000000
--- a/libgcrypt/libgcrypt_1.1.12.oe
+++ /dev/null
@@ -1,30 +0,0 @@
-LICENSE = GPL LGPL FDL
-
-SECTION="libs"
-PRIORITY="optional"
-RDEPENDS="libc6"
-SECTION="libs"
-DEPENDS=virtual/libc
-PROVIDES=virtual/libgcrypt
-
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/${PN}-${PV}.tar.gz"
-
-inherit autotools libtool
-
-do_stage () {
-       install -m 0644 src/.libs/libgcrypt.a ${STAGING_LIBDIR}/
-       install -m 0755 src/.libs/libgcrypt.so.1.5.1 ${STAGING_LIBDIR}/
-
-       ln -sf ${STAGING_LIBDIR}/libgcrypt.so.1.5.1 ${STAGING_LIBDIR}/libgcrypt.so.1.5
-       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
-               install -m 0644 src/${X} ${STAGING_DIR}/target/include/${X}
-       done
-
-}

diff --git a/libgcrypt/libgcrypt_1.1.91.oe b/libgcrypt/libgcrypt_1.1.91.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/libgpg-error/libgpg-error_0.6.oe b/libgpg-error/libgpg-error_0.6.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/vpnc/vpnc-0.2-rm+zomb-pre6/attribute.patch b/vpnc/vpnc-0.2-rm+zomb-pre6/attribute.patch
deleted file mode 100644 (file)
index 8cf0fe5..0000000
--- a/vpnc/vpnc-0.2-rm+zomb-pre6/attribute.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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-pre7/attribute.patch b/vpnc/vpnc-0.2-rm+zomb-pre7/attribute.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/vpnc/vpnc_0.2-rm+zomb-pre6.oe b/vpnc/vpnc_0.2-rm+zomb-pre6.oe
deleted file mode 100644 (file)
index e3e781a..0000000
--- a/vpnc/vpnc_0.2-rm+zomb-pre6.oe
+++ /dev/null
@@ -1,16 +0,0 @@
-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}
-}

diff --git a/vpnc/vpnc_0.2-rm+zomb-pre7.oe b/vpnc/vpnc_0.2-rm+zomb-pre7.oe
new file mode 100644 (file)
index 0000000..e69de29