From 5cb614777cfc6dd71d579ff0f4193edcd2e57ec1 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme>
Date: Sat, 6 Dec 2003 00:26:59 +0000
Subject: Updated to 1.1.90, provided by Min Sik Kim PR pkg/23322.

Changes:

 * The use of the GCRY_WEAK_RANDOM level is now deprecated in favor of
   the new gcry_create_nonce function.
 * gcry_sexp_build now supports a "%b" format to include a memory buffer.
 * Minor configuration fixes.
 * Interface changes relative to the 1.1.44 release:
 * Bug fixes and more code cleanups.
 * Enhanced the prime API.
 * Support for the Serpent cipher algorithm.

And more...
---
 security/libgcrypt/Makefile         | 12 +++++++++---
 security/libgcrypt/PLIST            | 16 +++++++++-------
 security/libgcrypt/buildlink2.mk    | 13 ++++++++++---
 security/libgcrypt/distinfo         |  8 ++++----
 security/libgcrypt/patches/patch-aa | 16 ----------------
 5 files changed, 32 insertions(+), 33 deletions(-)
 delete mode 100644 security/libgcrypt/patches/patch-aa

(limited to 'security')

diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index b578ae1337b..c6a3df13e06 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/11/02 19:57:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2003/12/06 00:26:59 xtraeme Exp $
 #
 
-DISTNAME=	libgcrypt-1.1.12
-PKGREVISION=	1
+DISTNAME=	libgcrypt-1.1.90
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/ \
 		http://gd.tuwien.ac.at/privacy/gnupg/alpha/libgcrypt/
@@ -30,4 +29,11 @@ CONFIGURE_ARGS+=	--disable-asm
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libtool
 .endif
 
+.if exists(/usr/include/pthread.h)
+CONFIGURE_ARGS+=	--without-pth
+.endif
+
+.include "../../mk/pthread.buildlink2.mk"
+.include "../../security/libgpg-error/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libgcrypt/PLIST b/security/libgcrypt/PLIST
index 8e806ac7dc8..8abb638a10a 100644
--- a/security/libgcrypt/PLIST
+++ b/security/libgcrypt/PLIST
@@ -1,14 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2003/08/05 10:14:22 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/12/06 00:26:59 xtraeme Exp $
 bin/libgcrypt-config
+include/gcrypt-module.h
 include/gcrypt.h
 info/gcrypt.info
-info/gcrypt.info-1
-info/gcrypt.info-2
-info/gcrypt.info-3
-info/gcrypt.info-4
+lib/libgcrypt-pthread.a
+lib/libgcrypt-pthread.la
+lib/libgcrypt-pthread.so
+lib/libgcrypt-pthread.so.10
+lib/libgcrypt-pthread.so.10.0
 lib/libgcrypt.a
 lib/libgcrypt.la
 lib/libgcrypt.so
-lib/libgcrypt.so.6
-lib/libgcrypt.so.6.1
+lib/libgcrypt.so.10
+lib/libgcrypt.so.10.0
 share/aclocal/libgcrypt.m4
diff --git a/security/libgcrypt/buildlink2.mk b/security/libgcrypt/buildlink2.mk
index be7d8f0ee6e..04318174246 100644
--- a/security/libgcrypt/buildlink2.mk
+++ b/security/libgcrypt/buildlink2.mk
@@ -1,17 +1,24 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/11/02 19:57:51 hubertf Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/06 00:26:59 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use libgcrypt.
+#
+# This file was created automatically using createbuildlink 2.8.
 #
 
 .if !defined(LIBGCRYPT_BUILDLINK2_MK)
 LIBGCRYPT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libgcrypt
-BUILDLINK_DEPENDS.libgcrypt?=		libgcrypt>=1.1.12nb1
+BUILDLINK_DEPENDS.libgcrypt?=		libgcrypt>=1.1.90
 BUILDLINK_PKGSRCDIR.libgcrypt?=		../../security/libgcrypt
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgcrypt=libgcrypt
 BUILDLINK_PREFIX.libgcrypt_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libgcrypt+=	include/gcrypt-module.h
 BUILDLINK_FILES.libgcrypt+=	include/gcrypt.h
-BUILDLINK_FILES.libgcrypt+=	lib/libgcrypt.*
+BUILDLINK_FILES.libgcrypt+=	lib/libgcrypt*
+
+.include "../../security/libgpg-error/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	libgcrypt-buildlink
 
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo
index b2496a0a800..5934cc6f54d 100644
--- a/security/libgcrypt/distinfo
+++ b/security/libgcrypt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/11/02 19:57:51 hubertf Exp $
+$NetBSD: distinfo,v 1.4 2003/12/06 00:26:59 xtraeme Exp $
 
-SHA1 (libgcrypt-1.1.12.tar.gz) = 7c52f7b6add1079c8aa773fae55e9668027420a1
-Size (libgcrypt-1.1.12.tar.gz) = 741606 bytes
-SHA1 (patch-aa) = 140a9913fd027fabbfced2823e7b319ee3d07899
+SHA1 (libgcrypt-1.1.90.tar.gz) = b250427cf01fa47588779710185c262fa37cf491
+Size (libgcrypt-1.1.90.tar.gz) = 845664 bytes
+SHA1 (patch-aa) = 9227c83091b9d809ac085e5abbba7d692344b0c3
diff --git a/security/libgcrypt/patches/patch-aa b/security/libgcrypt/patches/patch-aa
deleted file mode 100644
index 5ffb9913fe5..00000000000
--- a/security/libgcrypt/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/11/02 19:57:51 hubertf Exp $
-
---- src/libgcrypt-config.in.orig	Fri Aug 23 15:10:57 2002
-+++ src/libgcrypt-config.in
-@@ -103,9 +103,9 @@ fi
- 
- if test "$echo_libs" = "yes"; then
-     if test "@libdir@" != "/usr/lib" ; then
--      libdirs="-L@libdir@"
-+      libdirs="-L@libdir@ -Wl,-R@libdir@"
-       for i in $libs ; do
--	if test "$i" = "-L@libdir@" ; then
-+	if test "$i" = "-L@libdir@ -Wl,-R@libdir@" ; then
- 	  libdirs=""
- 	fi
-       done
-- 
cgit v1.2.3