Changes 1.4.3:

* Try to auto-initialize Libgcrypt to minimize the effect of
  applications not doing that correctly.  This is not a perfect
  solution but given that many applicationion would totally fail
  without such a hack, we try to help at least with the most common
  cases.  Folks, please read the manual to learn how to properly
  initialize Libgcrypt!
* Auto-initialize the secure memory to 32k instead of aborting the
  process.
* Log fatal errors via syslog.
* Changed the name and the semantics of the fips mode config file.
* Add convenience macro gcry_fips_mode_active.
* More self-tests.
* Documentation cleanups.

8 files changed, 40 insertions, 38 deletions

diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 7c55b69f6ed..db28c0a82da 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.41 2008/04/29 11:03:50 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2008/10/14 11:33:13 adam Exp $
 
-DISTNAME=	libgcrypt-1.4.1
+DISTNAME=	libgcrypt-1.4.3
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \
 		http://gd.tuwien.ac.at/privacy/gnupg/libgcrypt/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://directory.fsf.org/security/libgcrypt.html
diff --git a/security/libgcrypt/PLIST b/security/libgcrypt/PLIST
index e54778f1070..6cb4837d966 100644
--- a/security/libgcrypt/PLIST
+++ b/security/libgcrypt/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.9 2008/03/07 16:16:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/10/14 11:33:13 adam Exp $
 bin/dumpsexp
+bin/hmac256
 bin/libgcrypt-config
 include/gcrypt-module.h
 include/gcrypt.h
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo
index db8a1481d56..226bc8588a6 100644
--- a/security/libgcrypt/distinfo
+++ b/security/libgcrypt/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.25 2008/04/29 11:03:50 wiz Exp $
+$NetBSD: distinfo,v 1.26 2008/10/14 11:33:13 adam Exp $
 
-SHA1 (libgcrypt-1.4.1.tar.gz) = 36f1c6632fa06a6d3c92f83c3cdca8c7731a4220
-RMD160 (libgcrypt-1.4.1.tar.gz) = bc8129a2d096fb4ad7b08d24a86914de730869b2
-Size (libgcrypt-1.4.1.tar.gz) = 1207465 bytes
-SHA1 (patch-aa) = d8f659e4aac872abb152252731fd29bdaac635e3
-SHA1 (patch-ab) = bd713f7cbc6782ced8c2fd2b5541ac52d2a10fbe
-SHA1 (patch-ac) = e264795e3f0f5bcbcb0979cf8f7b22f6b2ef2438
+SHA1 (libgcrypt-1.4.3.tar.bz2) = bdc67c1fdcec464a94dca691615f2335a12db5ce
+RMD160 (libgcrypt-1.4.3.tar.bz2) = 5c66365e23798289fedcd9ea837cb887fa610ff4
+Size (libgcrypt-1.4.3.tar.bz2) = 1087215 bytes
+SHA1 (patch-aa) = 27db0d01f6a95566ccf0471a12f9a16dd7f994eb
+SHA1 (patch-ab) = eb6d759e98acdce7aebc9ca28fff84e07a06e11c
+SHA1 (patch-ac) = b8333a4c7a4a6d34c2e6840a5dd3af070280b42a
 SHA1 (patch-ad) = f32281612b51c5bb3788cf03c6f5615bdfc0d3e8
-SHA1 (patch-ae) = 4606cff84fe77c7799081883dd9b3f25d54a5868
-SHA1 (patch-af) = f62f9f5b8ebc9e5f3a2570ec609de66e2d77e587
+SHA1 (patch-ae) = 7199ed8fe571b8c892d6eafb868820d625c2b7fa
+SHA1 (patch-af) = e6d33b3e9c25a560c1df11843c6be3c9319bd018
diff --git a/security/libgcrypt/patches/patch-aa b/security/libgcrypt/patches/patch-aa
index 86a38bcee47..6893ad423b0 100644
--- a/security/libgcrypt/patches/patch-aa
+++ b/security/libgcrypt/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2004/05/22 10:07:48 adam Exp $
+$NetBSD: patch-aa,v 1.6 2008/10/14 11:33:13 adam Exp $
 
---- src/libgcrypt-config.in.orig	Mon Mar 29 10:49:19 2004
+--- src/libgcrypt-config.in.orig	2008-08-19 17:20:04.000000000 +0200
 +++ src/libgcrypt-config.in
-@@ -139,7 +139,7 @@ if test "$echo_libs" = "yes"; then
+@@ -147,7 +147,7 @@ if test "$echo_libs" = "yes"; then
  
      # Set up `libdirs'.
      if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
diff --git a/security/libgcrypt/patches/patch-ab b/security/libgcrypt/patches/patch-ab
index c98930604b3..a61fd67cb5d 100644
--- a/security/libgcrypt/patches/patch-ab
+++ b/security/libgcrypt/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2004/07/02 13:14:28 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2008/10/14 11:33:13 adam Exp $
 
---- cipher/rndunix.c.orig	2003-12-11 16:43:01.000000000 +0100
-+++ cipher/rndunix.c
-@@ -676,6 +676,15 @@ start_gatherer( int pipefd )
+--- random/rndunix.c.orig	2008-09-03 12:04:43.000000000 +0200
++++ random/rndunix.c
+@@ -710,6 +710,15 @@ start_gatherer( int pipefd )
  	    if( i != n1 && i != n2 && i != pipefd )
  		close(i);
  	}
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.1 2004/07/02 13:14:28 jmmv Exp $
  	errno = 0;
      }
  
-@@ -703,6 +712,10 @@ start_gatherer( int pipefd )
+@@ -737,6 +746,10 @@ start_gatherer( int pipefd )
  #endif
  
      fclose(stderr);		/* Arrghh!!  It's Stuart code!! */
diff --git a/security/libgcrypt/patches/patch-ac b/security/libgcrypt/patches/patch-ac
index 39070b9ced0..b3d1dbdb405 100644
--- a/security/libgcrypt/patches/patch-ac
+++ b/security/libgcrypt/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.6 2008/03/07 16:16:22 wiz Exp $
+$NetBSD: patch-ac,v 1.7 2008/10/14 11:33:13 adam Exp $
 
---- src/gcrypt.h.orig	2007-12-10 09:05:46.000000000 +0000
+--- src/gcrypt.h.orig	2008-09-18 17:11:53.000000000 +0200
 +++ src/gcrypt.h
-@@ -171,6 +171,11 @@ gcry_err_code_t gcry_error_from_errno (i
- 
- 
+@@ -173,6 +173,11 @@ gcry_err_code_t gcry_error_from_errno (i
+ /* This enum is deprecated; it is only declared for the sake of
+    complete API compatibility.  */
  enum gcry_thread_option
 +#elif defined(__INTERIX)
 +#define _GCRY_PTH_FD_SET    fd_set
@@ -12,5 +12,5 @@ $NetBSD: patch-ac,v 1.6 2008/03/07 16:16:22 wiz Exp $
 +#define _GCRY_PTH_SOCKLEN_T int
 +#define _GCRY_PTH_MSGHDR    void
    {
-     GCRY_THREAD_OPTION_DEFAULT = 0,
-     GCRY_THREAD_OPTION_USER = 1,
+     _GCRY_THREAD_OPTION_DUMMY
+   } _GCRY_GCC_ATTR_DEPRECATED;
diff --git a/security/libgcrypt/patches/patch-ae b/security/libgcrypt/patches/patch-ae
index 2551cadc880..32281bf7a70 100644
--- a/security/libgcrypt/patches/patch-ae
+++ b/security/libgcrypt/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.4 2008/03/07 16:16:22 wiz Exp $
+$NetBSD: patch-ae,v 1.5 2008/10/14 11:33:13 adam Exp $
 
---- src/ath.h.orig	2007-02-22 11:15:20.000000000 +0000
+--- src/ath.h.orig	2008-08-19 17:20:04.000000000 +0200
 +++ src/ath.h
 @@ -31,6 +31,12 @@
  
@@ -15,7 +15,7 @@ $NetBSD: patch-ae,v 1.4 2008/03/07 16:16:22 wiz Exp $
  
  /* Define _ATH_EXT_SYM_PREFIX if you want to give all external symbols
     a prefix.  */
-@@ -83,6 +89,14 @@ struct ath_ops
+@@ -89,6 +95,14 @@ struct ath_ops
    int (*connect) (int s, void *addr, int length);
    int (*sendmsg) (int s, const void *msg, int flags);
    int (*recvmsg) (int s, void *msg, int flags);
@@ -30,7 +30,7 @@ $NetBSD: patch-ae,v 1.4 2008/03/07 16:16:22 wiz Exp $
  #else
    ssize_t (*select) (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
  		     struct timeval *timeout);
-@@ -119,6 +133,14 @@ int ath_accept (int s, void *addr, int *
+@@ -125,6 +139,14 @@ int ath_accept (int s, void *addr, int *
  int ath_connect (int s, void *addr, int length);
  int ath_sendmsg (int s, const void *msg, int flags);
  int ath_recvmsg (int s, void *msg, int flags);
diff --git a/security/libgcrypt/patches/patch-af b/security/libgcrypt/patches/patch-af
index 9d166daad22..fe02614ec5c 100644
--- a/security/libgcrypt/patches/patch-af
+++ b/security/libgcrypt/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.2 2005/03/10 15:38:33 tv Exp $
+$NetBSD: patch-af,v 1.3 2008/10/14 11:33:13 adam Exp $
 
---- src/ath.c.orig	Sat Dec 18 13:31:53 2004
+--- src/ath.c.orig	2008-09-03 12:04:42.000000000 +0200
 +++ src/ath.c
 @@ -24,11 +24,6 @@
  
- #include <assert.h>
+ #include <assert.h>  /* Right: We need to use assert and not gcry_assert.  */
  #include <unistd.h>
 -#ifdef HAVE_SYS_SELECT_H
 -# include <sys/select.h>
@@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.2 2005/03/10 15:38:33 tv Exp $
  #include <sys/types.h>
  #ifndef _WIN32
  #include <sys/wait.h>
-@@ -300,7 +295,7 @@ ath_connect (int s, struct sockaddr *add
+@@ -309,7 +304,7 @@ ath_connect (int s, struct sockaddr *add
  
  
  int
@@ -23,7 +23,7 @@ $NetBSD: patch-af,v 1.2 2005/03/10 15:38:33 tv Exp $
  ath_sendmsg (int s, const void *msg, int flags)
  #else
  ath_sendmsg (int s, const struct msghdr *msg, int flags)
-@@ -309,7 +304,7 @@ ath_sendmsg (int s, const struct msghdr 
+@@ -318,7 +313,7 @@ ath_sendmsg (int s, const struct msghdr 
    if (ops_set && ops.sendmsg)
      return (*ops.sendmsg) (s, msg, flags);
    else
@@ -32,7 +32,7 @@ $NetBSD: patch-af,v 1.2 2005/03/10 15:38:33 tv Exp $
      return -1;
  #else
      return sendmsg (s, msg, flags);
-@@ -318,7 +313,7 @@ ath_sendmsg (int s, const struct msghdr 
+@@ -327,7 +322,7 @@ ath_sendmsg (int s, const struct msghdr 
  
  
  int
@@ -41,7 +41,7 @@ $NetBSD: patch-af,v 1.2 2005/03/10 15:38:33 tv Exp $
  ath_recvmsg (int s, void *msg, int flags)
  #else
  ath_recvmsg (int s, struct msghdr *msg, int flags)
-@@ -327,7 +322,7 @@ ath_recvmsg (int s, struct msghdr *msg, 
+@@ -336,7 +331,7 @@ ath_recvmsg (int s, struct msghdr *msg, 
    if (ops_set && ops.recvmsg)
      return (*ops.recvmsg) (s, msg, flags);
    else