From cdb123adf23412f578ff8d10fd45513d88db7a05 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 20 Sep 2007 09:14:15 +0000
Subject: [PATCH 1/1] add opencdk update patch by Simon Josefsson (#2399)

SVN-Revision: 8859
---
 libs/opencdk/Makefile                        | 16 +++--------
 libs/opencdk/patches/100-fix-tests-build     | 24 +++++++++++++++++
 libs/opencdk/patches/500-cross-compile.patch | 28 --------------------
 3 files changed, 28 insertions(+), 40 deletions(-)
 create mode 100644 libs/opencdk/patches/100-fix-tests-build
 delete mode 100644 libs/opencdk/patches/500-cross-compile.patch

diff --git a/libs/opencdk/Makefile b/libs/opencdk/Makefile
index 296f72dd8a..a7016c18f7 100644
--- a/libs/opencdk/Makefile
+++ b/libs/opencdk/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006, 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=opencdk
-PKG_VERSION:=0.5.5
+PKG_VERSION:=0.6.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -18,7 +18,7 @@ PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/opencdk/ \
 	http://www.mirrors.wiretapped.net/security/network-security/gnutls/opencdk/ \
 	ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/opencdk/ \
 	http://josefsson.org/gnutls/releases/opencdk/
-PKG_MD5SUM:=aaff60107f0153873192ffda00699a96
+PKG_MD5SUM:=7bfc820bcdc08f0c31f860710368071e
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libopencdk
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libgcrypt
+  DEPENDS:=+libgcrypt zlib
   TITLE:=The Open Crypto Development Kit library
   DESCRIPTION:=\
 	This library provides basic parts of the OpenPGP message format.\\\
@@ -41,14 +41,6 @@ define Package/libopencdk
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); touch \
-		configure.ac \
-		acinclude.m4 \
-		aclocal.m4 \
-		Makefile.in \
-		config.h.in \
-		configure \
-	);
 	$(call Build/Configure/Default, \
 		--enable-shared \
 		--enable-static \
diff --git a/libs/opencdk/patches/100-fix-tests-build b/libs/opencdk/patches/100-fix-tests-build
new file mode 100644
index 0000000000..3fa9063e03
--- /dev/null
+++ b/libs/opencdk/patches/100-fix-tests-build
@@ -0,0 +1,24 @@
+diff -ur opencdk-0.6.4-/tests/Makefile.am opencdk-0.6.4/tests/Makefile.am
+--- opencdk-0.6.4-/tests/Makefile.am	2007-06-11 12:16:37.000000000 +0200
++++ opencdk-0.6.4/tests/Makefile.am	2007-09-13 19:54:03.000000000 +0200
+@@ -33,7 +33,7 @@
+ 
+ CLEANFILES = plain-test
+ 
+-LDADD = ../src/libopencdk.la
++LDADD = ../src/libopencdk.la $(LIBGCRYPT_LIBS)
+ 
+ if HAVE_W32_SYSTEM
+ # there is a problem with some tests and WINE
+diff -ur opencdk-0.6.4-/tests/Makefile.in opencdk-0.6.4/tests/Makefile.in
+--- opencdk-0.6.4-/tests/Makefile.in	2007-06-11 12:25:38.000000000 +0200
++++ opencdk-0.6.4/tests/Makefile.in	2007-09-13 19:54:21.000000000 +0200
+@@ -257,7 +257,7 @@
+ AM_LDFLAGS = -no-install
+ AM_CPPFLAGS = $(LIBGCRYPT_CFLAGS)
+ CLEANFILES = plain-test
+-LDADD = ../src/libopencdk.la
++LDADD = ../src/libopencdk.la $(LIBGCRYPT_LIBS)
+ noinst_HEADER = t-support.h
+ all: all-am
+ 
diff --git a/libs/opencdk/patches/500-cross-compile.patch b/libs/opencdk/patches/500-cross-compile.patch
deleted file mode 100644
index e8b6707284..0000000000
--- a/libs/opencdk/patches/500-cross-compile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ruN opencdk-0.5.5-orig/configure opencdk-0.5.5-1/configure
---- opencdk-0.5.5-orig/configure	2004-06-20 15:54:29.000000000 +0200
-+++ opencdk-0.5.5-1/configure	2005-03-15 22:36:53.000000000 +0100
-@@ -19788,8 +19788,8 @@
- 
- 
- 
--LIBOPENCDK_LIBS="$LIBS -L${libdir} -lopencdk $LIBGCRYPT_LIBS"
--LIBOPENCDK_CFLAGS="$LIBGCRYPT_CFLAGS -I${includedir}"
-+LIBOPENCDK_LIBS="$LIBS -lopencdk $LIBGCRYPT_LIBS"
-+LIBOPENCDK_CFLAGS="$LIBGCRYPT_CFLAGS"
- 
- 
- 
-diff -ruN opencdk-0.5.5-orig/configure.ac opencdk-0.5.5-1/configure.ac
---- opencdk-0.5.5-orig/configure.ac	2004-06-05 19:46:31.000000000 +0200
-+++ opencdk-0.5.5-1/configure.ac	2005-03-15 22:36:26.000000000 +0100
-@@ -96,8 +96,8 @@
- ***
- ]]))
- 
--LIBOPENCDK_LIBS="$LIBS -L${libdir} -lopencdk $LIBGCRYPT_LIBS"
--LIBOPENCDK_CFLAGS="$LIBGCRYPT_CFLAGS -I${includedir}"
-+LIBOPENCDK_LIBS="$LIBS -lopencdk $LIBGCRYPT_LIBS"
-+LIBOPENCDK_CFLAGS="$LIBGCRYPT_CFLAGS"
- AC_SUBST(LIBOPENCDK_LIBS)
- AC_SUBST(LIBOPENCDK_CFLAGS)
- 
-- 
2.30.2