Update to 1.6.0:

Noteworthy changes in version 1.6.0 (2013-12-16)
------------------------------------------------

 * Removed the long deprecated gcry_ac interface.  Thus Libgcrypt is
   not anymore ABI compatible to previous versions if they used the ac
   interface.

 * Removed the module register subsystem.

 * The deprecated message digest debug macros have been removed.  Use
   gcry_md_debug instead.

 * Removed deprecated control codes.

 * Improved performance of most cipher algorithms as well as for the
   SHA family of hash functions.

 * Added support for the IDEA cipher algorithm.

 * Added support for the Salsa20 and reduced Salsa20/12 stream ciphers.

 * Added limited support for the GOST 28147-89 cipher algorithm.

 * Added support for the GOST R 34.11-94 and R 34.11-2012 (Stribog)
   hash algorithms.

 * Added a random number generator to directly use the system's RNG.
   Also added an interface to prefer the use of a specified RNG.

 * Added support for the SCRYPT algorithm.

 * Mitigated the Yarom/Falkner flush+reload side-channel attack on RSA
   secret keys.  See <http://eprint.iacr.org/2013/448> [CVE-2013-4242].

 * Added support for Deterministic DSA as per RFC-6969.

 * Added support for curve Ed25519.

 * Added a scatter gather hash convenience function.

 * Added several MPI amd SEXP helper functions.

 * Added support for negative numbers to gcry_mpi_print,
   gcry_mpi_aprint and gcry_mpi_scan.

 * The algorithm ids GCRY_PK_ECDSA and GCRY_PK_ECDH are now
   deprecated.  Use GCRY_PK_ECC if you need an algorithm id.

 * Changed gcry_pk_genkey for "ecc" to only include the curve name and
   not the parameters.  The flag "param" may be used to revert this.

 * Added a feature to globally disable selected hardware features.

 * Added debug helper functions.

7 files changed, 11 insertions, 115 deletions

diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index b95969bf1fa..39d839fc9d7 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2013/07/25 11:51:59 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2014/01/01 11:49:59 wiz Exp $
 
-DISTNAME=	libgcrypt-1.5.3
+DISTNAME=	libgcrypt-1.6.0
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \
 		http://gd.tuwien.ac.at/privacy/gnupg/libgcrypt/
diff --git a/security/libgcrypt/PLIST b/security/libgcrypt/PLIST
index 6cb4837d966..960e5c50af0 100644
--- a/security/libgcrypt/PLIST
+++ b/security/libgcrypt/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.10 2008/10/14 11:33:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2014/01/01 11:49:59 wiz Exp $
 bin/dumpsexp
 bin/hmac256
 bin/libgcrypt-config
-include/gcrypt-module.h
+bin/mpicalc
 include/gcrypt.h
 info/gcrypt.info
 lib/libgcrypt.la
+man/man1/hmac256.1
 share/aclocal/libgcrypt.m4
diff --git a/security/libgcrypt/buildlink3.mk b/security/libgcrypt/buildlink3.mk
index c0c11074b9b..509da27773a 100644
--- a/security/libgcrypt/buildlink3.mk
+++ b/security/libgcrypt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2011/04/22 13:42:47 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2014/01/01 11:49:59 wiz Exp $
 
 BUILDLINK_TREE+=	libgcrypt
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libgcrypt
 LIBGCRYPT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.2.0
-BUILDLINK_ABI_DEPENDS.libgcrypt+=	libgcrypt>=1.4.6nb2
+BUILDLINK_ABI_DEPENDS.libgcrypt+=	libgcrypt>=1.6.0
 BUILDLINK_PKGSRCDIR.libgcrypt?=	../../security/libgcrypt
 
 .include "../../security/libgpg-error/buildlink3.mk"
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo
index 96f058516d2..e3a722ac561 100644
--- a/security/libgcrypt/distinfo
+++ b/security/libgcrypt/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.39 2013/07/25 11:51:59 wiz Exp $
+$NetBSD: distinfo,v 1.40 2014/01/01 11:49:59 wiz Exp $
 
-SHA1 (libgcrypt-1.5.3.tar.bz2) = 2c6553cc17f2a1616d512d6870fe95edf6b0e26e
-RMD160 (libgcrypt-1.5.3.tar.bz2) = e958693ed6fbb781ca5cf42128dc8e39d682eb2f
-Size (libgcrypt-1.5.3.tar.bz2) = 1508530 bytes
+SHA1 (libgcrypt-1.6.0.tar.bz2) = 43283c0b41c41e3d3bc13c2d8f937dfe2aaa1a77
+RMD160 (libgcrypt-1.6.0.tar.bz2) = 33e4e45116a64999c4cd0d132a4a968612057f40
+Size (libgcrypt-1.6.0.tar.bz2) = 2499149 bytes
 SHA1 (patch-aa) = 7c46612f912d45dfd4ce4f4b510e72c00bd38585
 SHA1 (patch-ab) = 6fac21daa26b7de3b13839d076f78a74400efce7
-SHA1 (patch-ac) = c59d7bb73fa0e79522b287054633e276ffbb069d
 SHA1 (patch-ad) = 19345b7d164521d526a44eb3f1a465ff09d8266c
-SHA1 (patch-ae) = 50eeea5a193e14012e0d127a0618dfc03727d96c
-SHA1 (patch-af) = e6d33b3e9c25a560c1df11843c6be3c9319bd018
diff --git a/security/libgcrypt/patches/patch-ac b/security/libgcrypt/patches/patch-ac
deleted file mode 100644
index 06142d0c695..00000000000
--- a/security/libgcrypt/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2011/07/13 21:21:52 adam Exp $
-
---- src/gcrypt.h.orig	2008-09-18 17:11:53.000000000 +0200
-+++ src/gcrypt.h
-@@ -177,6 +177,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
-+#define _GCRY_PTH_SOCKADDR  struct sockaddr
-+#define _GCRY_PTH_SOCKLEN_T int
-+#define _GCRY_PTH_MSGHDR    void
-   {
-     _GCRY_THREAD_OPTION_DUMMY
-   } _GCRY_GCC_ATTR_DEPRECATED;
diff --git a/security/libgcrypt/patches/patch-ae b/security/libgcrypt/patches/patch-ae
deleted file mode 100644
index be8473c9f0a..00000000000
--- a/security/libgcrypt/patches/patch-ae
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2011/07/13 21:21:52 adam Exp $
-
---- src/ath.h.orig	2011-02-04 19:17:33.000000000 +0000
-+++ src/ath.h
-@@ -98,6 +104,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);
-+#elif defined(__INTERIX)
-+  ssize_t (*select) (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
-+		     struct timeval *timeout);
-+  ssize_t (*waitpid) (pid_t pid, int *status, int options);
-+  int (*accept) (int s, struct sockaddr *addr, socklen_t *length_ptr);
-+  int (*connect) (int s, struct sockaddr *addr, socklen_t length);
-+  int (*sendmsg) (int s, const void *msg, int flags);
-+  int (*recvmsg) (int s, void *msg, int flags);
- #else
-   ssize_t (*select) (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
- 		     struct timeval *timeout);
-@@ -134,6 +148,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);
-+#elif defined(__INTERIX)
-+ssize_t ath_select (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
-+		    struct timeval *timeout);
-+ssize_t ath_waitpid (pid_t pid, int *status, int options);
-+int ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr);
-+int ath_connect (int s, struct sockaddr *addr, socklen_t length);
-+int ath_sendmsg (int s, const void *msg, int flags);
-+int ath_recvmsg (int s, void *msg, int flags);
- #else
- ssize_t ath_select (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
- 		    struct timeval *timeout);
diff --git a/security/libgcrypt/patches/patch-af b/security/libgcrypt/patches/patch-af
deleted file mode 100644
index fe02614ec5c..00000000000
--- a/security/libgcrypt/patches/patch-af
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-af,v 1.3 2008/10/14 11:33:13 adam Exp $
-
---- src/ath.c.orig	2008-09-03 12:04:42.000000000 +0200
-+++ src/ath.c
-@@ -24,11 +24,6 @@
- 
- #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>
--#else
--# include <sys/time.h>
--#endif
- #include <sys/types.h>
- #ifndef _WIN32
- #include <sys/wait.h>
-@@ -309,7 +304,7 @@ ath_connect (int s, struct sockaddr *add
- 
- 
- int
--#ifdef _WIN32
-+#if defined(_WIN32) || defined(__INTERIX)
- ath_sendmsg (int s, const void *msg, int flags)
- #else
- ath_sendmsg (int s, const struct msghdr *msg, int flags)
-@@ -318,7 +313,7 @@ ath_sendmsg (int s, const struct msghdr 
-   if (ops_set && ops.sendmsg)
-     return (*ops.sendmsg) (s, msg, flags);
-   else
--#ifdef _WIN32
-+#if defined(_WIN32) || defined(__INTERIX)
-     return -1;
- #else
-     return sendmsg (s, msg, flags);
-@@ -327,7 +322,7 @@ ath_sendmsg (int s, const struct msghdr 
- 
- 
- int
--#ifdef _WIN32
-+#if defined(_WIN32) || defined(__INTERIX)
- ath_recvmsg (int s, void *msg, int flags)
- #else
- ath_recvmsg (int s, struct msghdr *msg, int flags)
-@@ -336,7 +331,7 @@ ath_recvmsg (int s, struct msghdr *msg, 
-   if (ops_set && ops.recvmsg)
-     return (*ops.recvmsg) (s, msg, flags);
-   else
--#ifdef _WIN32
-+#if defined(_WIN32) || defined(__INTERIX)
-     return -1;
- #else
-     return recvmsg (s, msg, flags);