Update to 1.2.4:

Noteworthy changes in version 1.2.4 (2007-02-01)
------------------------------------------------

 * Fixed a bug in the memory allocator which could have been the
   reason for some of non-duplicable bugs.

 * Other minor bug fixes.

6 files changed, 29 insertions, 31 deletions

diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index c5ff77be6eb..fdb16cc61e0 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2007/01/30 06:53:32 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2007/02/03 00:08:51 wiz Exp $
 
-DISTNAME=	libgcrypt-1.2.3
-PKGREVISION=	2
+DISTNAME=	libgcrypt-1.2.4
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \
 		http://gd.tuwien.ac.at/privacy/gnupg/libgcrypt/
@@ -19,7 +18,7 @@ GNU_CONFIGURE=		yes
 TEST_TARGET=		check
 
 TEXINFO_REQD=		4.0
-INFO_FILES=		# PLIST
+INFO_FILES=		yes # PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo
index 769d4aca51a..4e17f89ac4b 100644
--- a/security/libgcrypt/distinfo
+++ b/security/libgcrypt/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.19 2007/01/30 06:53:32 wiz Exp $
+$NetBSD: distinfo,v 1.20 2007/02/03 00:08:51 wiz Exp $
 
-SHA1 (libgcrypt-1.2.3.tar.gz) = 9680c8b3ffa20a82c32aa0d8947202c74c82f6eb
-RMD160 (libgcrypt-1.2.3.tar.gz) = 6e6290ec4bb89e19ac312e76d0f0a12856bfe3bc
-Size (libgcrypt-1.2.3.tar.gz) = 985735 bytes
+SHA1 (libgcrypt-1.2.4.tar.gz) = d279e7a4464cccf0cc4e29c374a1e8325fc65b9a
+RMD160 (libgcrypt-1.2.4.tar.gz) = 6a5ba284efe48c6963e21d8558a69096aea03d84
+Size (libgcrypt-1.2.4.tar.gz) = 1013625 bytes
 SHA1 (patch-aa) = d8f659e4aac872abb152252731fd29bdaac635e3
 SHA1 (patch-ab) = bd713f7cbc6782ced8c2fd2b5541ac52d2a10fbe
-SHA1 (patch-ac) = bc846d21e3842103ec50679d69169a8472c12a66
+SHA1 (patch-ac) = 7c0db64d351c3bdd8b9763d94714db84f05b0a96
 SHA1 (patch-ad) = f32281612b51c5bb3788cf03c6f5615bdfc0d3e8
 SHA1 (patch-ae) = 7285281151403af32837e24b795959899d6a3bcb
 SHA1 (patch-af) = f62f9f5b8ebc9e5f3a2570ec609de66e2d77e587
-SHA1 (patch-ag) = 02b4ae62ef71f7127861473a2072709b5effecd7
-SHA1 (patch-ah) = 9a6f8a264658c752fa2304df56e5da37ecbceb65
+SHA1 (patch-ag) = 104bbbbb20317e9b12a7d2f645f31fa039294b41
+SHA1 (patch-ai) = 95e72bf9ba6980f0509f2bcd8ad4e0a6cf9e7b41
diff --git a/security/libgcrypt/patches/patch-ac b/security/libgcrypt/patches/patch-ac
index b9ed2eae88e..fcf92badd38 100644
--- a/security/libgcrypt/patches/patch-ac
+++ b/security/libgcrypt/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2005/03/10 15:38:33 tv Exp $
+$NetBSD: patch-ac,v 1.5 2007/02/03 00:08:51 wiz Exp $
 
---- src/gcrypt.h.orig	Wed Jan  5 08:52:55 2005
+--- src/gcrypt.h.orig	2007-02-01 18:43:13.000000000 +0000
 +++ src/gcrypt.h
-@@ -168,6 +168,11 @@ enum gcry_thread_option
+@@ -171,6 +171,11 @@ enum gcry_thread_option
  #define _GCRY_PTH_SOCKADDR  void
  #define _GCRY_PTH_SOCKLEN_T int
  #define _GCRY_PTH_MSGHDR    void
diff --git a/security/libgcrypt/patches/patch-ag b/security/libgcrypt/patches/patch-ag
index 63c298ff9aa..7ddb7191295 100644
--- a/security/libgcrypt/patches/patch-ag
+++ b/security/libgcrypt/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2006/09/06 11:41:41 markd Exp $
+$NetBSD: patch-ag,v 1.2 2007/02/03 00:08:51 wiz Exp $
 
---- configure.orig	2006-09-06 15:55:58.000000000 +1200
+--- configure.orig	2007-02-01 18:41:37.000000000 +0000
 +++ configure
-@@ -19575,7 +19575,7 @@ case "${target}" in
+@@ -20971,7 +20971,7 @@ case "${target}" in
  #       DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
          ;;
  
diff --git a/security/libgcrypt/patches/patch-ah b/security/libgcrypt/patches/patch-ah
deleted file mode 100644
index 784f91e5f87..00000000000
--- a/security/libgcrypt/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2007/01/30 06:53:32 wiz Exp $
-
---- src/secmem.h.orig	2005-07-29 13:45:42.000000000 +0000
-+++ src/secmem.h
-@@ -32,7 +32,7 @@ unsigned _gcry_secmem_get_flags(void) GC
- int _gcry_private_is_secure (const void *p) GCC_ATTR_PURE;
- 
- /* Flags for _gcry_secmem_{set,get}_flags.  */
--#define GCRY_SECMEM_FLAG_NO_WARNING      1 << 0
--#define GCRY_SECMEM_FLAG_SUSPEND_WARNING 1 << 1
-+#define GCRY_SECMEM_FLAG_NO_WARNING      (1 << 0)
-+#define GCRY_SECMEM_FLAG_SUSPEND_WARNING (1 << 1)
- 
- #endif /* G10_SECMEM_H */
diff --git a/security/libgcrypt/patches/patch-ai b/security/libgcrypt/patches/patch-ai
new file mode 100644
index 00000000000..0ac98317752
--- /dev/null
+++ b/security/libgcrypt/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2007/02/03 00:08:51 wiz Exp $
+
+--- autogen.sh.orig	2007-02-01 15:45:43.000000000 +0000
++++ autogen.sh
+@@ -30,7 +30,7 @@ check_version () {
+ 
+ DIE=no
+ FORCE=
+-if test "$1" == "--force"; then
++if test "$1" = "--force"; then
+   FORCE=" --force"
+   shift
+ fi