From 3ced3182f43181cf1b0aebf613122da33f487d9e Mon Sep 17 00:00:00 2001
From: Oliver Ertl <oliver@ertl-net.net>
Date: Thu, 8 May 2008 19:24:07 +0000
Subject: [PATCH] libs/libgcrypt: Update to 1.4.1 (#3419)

SVN-Revision: 11079
---
 libs/libgcrypt/Makefile                       | 12 ++++------
 .../libgcrypt/patches/500-cross-compile.patch | 24 -------------------
 2 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 libs/libgcrypt/patches/500-cross-compile.patch

diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile
index 1f90edcce..81049ae68 100644
--- a/libs/libgcrypt/Makefile
+++ b/libs/libgcrypt/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2005-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,15 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgcrypt
-PKG_VERSION:=1.2.3
+PKG_VERSION:=1.4.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://ftp.gnupg.org/gcrypt/libgcrypt/
-PKG_MD5SUM:=49810175ab672b19a02509d2a670b156
+PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgcrypt/
+PKG_MD5SUM:=26703ecef4bbe113b8e6a87572b80b32
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/libs/libgcrypt/patches/500-cross-compile.patch b/libs/libgcrypt/patches/500-cross-compile.patch
deleted file mode 100644
index e7d4d5877..000000000
--- a/libs/libgcrypt/patches/500-cross-compile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN libgcrypt-1.2.1-orig/tests/Makefile.am libgcrypt-1.2.1-1/tests/Makefile.am
---- libgcrypt-1.2.1-orig/tests/Makefile.am	2004-03-03 09:08:05.000000000 +0100
-+++ libgcrypt-1.2.1-1/tests/Makefile.am	2005-03-15 21:36:49.000000000 +0100
-@@ -21,7 +21,7 @@
- TESTS = prime register ac basic tsexp keygen pubkey benchmark
- 
- INCLUDES = -I$(top_srcdir)/src
--LDADD = ../src/libgcrypt.la
-+LDADD = ../src/libgcrypt.la @LTLIBOBJS@ @GPG_ERROR_LIBS@
- 
- EXTRA_PROGRAMS = testapi
- noinst_PROGRAMS = $(TESTS)
-diff -ruN libgcrypt-1.2.1-orig/tests/Makefile.in libgcrypt-1.2.1-1/tests/Makefile.in
---- libgcrypt-1.2.1-orig/tests/Makefile.in	2005-01-05 14:53:23.000000000 +0100
-+++ libgcrypt-1.2.1-1/tests/Makefile.in	2005-03-15 21:37:12.000000000 +0100
-@@ -258,7 +258,7 @@
- target_vendor = @target_vendor@
- TESTS = prime register ac basic tsexp keygen pubkey benchmark
- INCLUDES = -I$(top_srcdir)/src
--LDADD = ../src/libgcrypt.la
-+LDADD = ../src/libgcrypt.la @LTLIBOBJS@ @GPG_ERROR_LIBS@
- AM_CFLAGS = @GPG_ERROR_CFLAGS@
- all: all-am
- 
-- 
2.30.2