Bugfix update to gnutls-2.12.3.

Incidentally fixes a build breakage when libgcrypt wasn't installed as
spotted by jasper@

security/gnutls/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.35 2011/04/15 16:09:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2011/05/04 15:48:10 ajacoutot Exp $
 
 COMMENT=	GNU Transport Layer Security library
 
-DISTNAME=	gnutls-2.12.2
+DISTNAME=	gnutls-2.12.3
 CATEGORIES=	security
 
 SHARED_LIBS +=  gnutls               17.0     # 44.10
@@ -71,5 +71,7 @@ post-install:
 	# needed by at least:
 	# devel/libvmime, security/prelude/manager, textproc/iksemel
 	${INSTALL} -m 555 ${FILESDIR}/libgnutls-config ${PREFIX}/bin
+	# empty manual pages
+	rm ${PREFIX}/man/man3/{gnutls_alert_send,gnutls_x509_crt_get_signature}.3
 
 .include <bsd.port.mk>

security/gnutls/distinfo

@@ -1,5 +1,5 @@
-MD5 (gnutls-2.12.2.tar.bz2) = ymkD2ZsqyipqMmvI34BbYQ==
-RMD160 (gnutls-2.12.2.tar.bz2) = WkT6C8XRn11YRKCzuDeP9xvyw6g=
-SHA1 (gnutls-2.12.2.tar.bz2) = IQEw1QoTUQmHpy1wI0B+MkN5Vn0=
-SHA256 (gnutls-2.12.2.tar.bz2) = zJZO5RNQRJFCIh5+/vLV6mBFlTlIRTjigsO0gYOrfkM=
-SIZE (gnutls-2.12.2.tar.bz2) = 7135433
+MD5 (gnutls-2.12.3.tar.bz2) = BLcrAitCsQ3xLLuuBR4tVQ==
+RMD160 (gnutls-2.12.3.tar.bz2) = 9AWpcd8eN3Pya4VAKLEXJ7KBYrY=
+SHA1 (gnutls-2.12.3.tar.bz2) = F5m96ms3PjErBV+nyvBu/+y5wDM=
+SHA256 (gnutls-2.12.3.tar.bz2) = n7PboQ0/psKBfNRyYLTDkCbGkSj7OfxQJvF5s2clOdM=
+SIZE (gnutls-2.12.3.tar.bz2) = 7021290

security/gnutls/patches/patch-doc_examples_ex-cert-select-pkcs11_c

@@ -0,0 +1,24 @@
+$OpenBSD: patch-doc_examples_ex-cert-select-pkcs11_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+
+MIN is already defined in sys/param.h.
+
+--- doc/examples/ex-cert-select-pkcs11.c.orig	Sun Apr 10 09:31:45 2011
++++ doc/examples/ex-cert-select-pkcs11.c	Wed May  4 17:35:53 2011
+@@ -11,6 +11,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <unistd.h>
+ #include <gnutls/gnutls.h>
+@@ -25,6 +26,9 @@
+ 
+ #define MAX_BUF 1024
+ #define MSG "GET / HTTP/1.0\r\n\r\n"
++#ifdef MIN
++#undef MIN
++#endif
+ #define MIN(x,y) (((x)<(y))?(x):(y))
+ 
+ #define CAFILE "ca.pem"

security/gnutls/patches/patch-doc_examples_ex-cert-select_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-doc_examples_ex-cert-select_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- doc/examples/ex-cert-select.c.orig	Wed May  4 16:59:41 2011
++++ doc/examples/ex-cert-select.c	Wed May  4 17:03:53 2011
+@@ -9,6 +9,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <unistd.h>
+ #include <gnutls/gnutls.h>

security/gnutls/patches/patch-doc_examples_ex-client-psk_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-doc_examples_ex-client-psk_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- doc/examples/ex-client-psk.c.orig	Wed May  4 16:59:41 2011
++++ doc/examples/ex-client-psk.c	Wed May  4 17:03:03 2011
+@@ -9,6 +9,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <unistd.h>
+ #include <gnutls/gnutls.h>

security/gnutls/patches/patch-doc_examples_ex-client1_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-doc_examples_ex-client1_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- doc/examples/ex-client1.c.orig	Wed May  4 16:59:41 2011
++++ doc/examples/ex-client1.c	Wed May  4 17:03:21 2011
+@@ -9,6 +9,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <unistd.h>
+ #include <gnutls/gnutls.h>

security/gnutls/patches/patch-doc_examples_ex-client2_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-doc_examples_ex-client2_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- doc/examples/ex-client2.c.orig	Wed May  4 16:59:41 2011
++++ doc/examples/ex-client2.c	Wed May  4 17:03:27 2011
+@@ -9,6 +9,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <unistd.h>
+ #include <gnutls/gnutls.h>

security/gnutls/patches/patch-doc_examples_ex-serv-anon_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-doc_examples_ex-serv-anon_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- doc/examples/ex-serv-anon.c.orig	Wed May  4 16:59:41 2011
++++ doc/examples/ex-serv-anon.c	Wed May  4 17:03:45 2011
+@@ -9,8 +9,8 @@
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <arpa/inet.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <gnutls/gnutls.h>

security/gnutls/patches/patch-doc_examples_ex-serv-pgp_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-doc_examples_ex-serv-pgp_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- doc/examples/ex-serv-pgp.c.orig	Wed May  4 16:59:41 2011
++++ doc/examples/ex-serv-pgp.c	Wed May  4 17:02:37 2011
+@@ -9,8 +9,8 @@
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <arpa/inet.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <gnutls/gnutls.h>

security/gnutls/patches/patch-doc_examples_ex-serv-psk_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-doc_examples_ex-serv-psk_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- doc/examples/ex-serv-psk.c.orig	Wed May  4 16:59:41 2011
++++ doc/examples/ex-serv-psk.c	Wed May  4 17:02:40 2011
+@@ -9,8 +9,8 @@
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <arpa/inet.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <gnutls/gnutls.h>

security/gnutls/patches/patch-doc_examples_ex-serv-srp_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-doc_examples_ex-serv-srp_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- doc/examples/ex-serv-srp.c.orig	Wed May  4 16:59:41 2011
++++ doc/examples/ex-serv-srp.c	Wed May  4 17:02:47 2011
+@@ -9,8 +9,8 @@
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <arpa/inet.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <gnutls/gnutls.h>

security/gnutls/patches/patch-doc_examples_ex-serv1_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-doc_examples_ex-serv1_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- doc/examples/ex-serv1.c.orig	Wed May  4 16:59:41 2011
++++ doc/examples/ex-serv1.c	Wed May  4 17:03:33 2011
+@@ -9,8 +9,8 @@
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <arpa/inet.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <gnutls/gnutls.h>

security/gnutls/patches/patch-doc_examples_tcp_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-doc_examples_tcp_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- doc/examples/tcp.c.orig	Wed May  4 16:59:41 2011
++++ doc/examples/tcp.c	Wed May  4 17:02:55 2011
+@@ -9,8 +9,8 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <arpa/inet.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <unistd.h>
+ 
+ #define SA struct sockaddr

security/gnutls/patches/patch-gl_inet_ntop_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-gl_inet_ntop_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- gl/inet_ntop.c.orig	Wed May  4 16:59:41 2011
++++ gl/inet_ntop.c	Wed May  4 17:02:33 2011
+@@ -36,6 +36,7 @@
+ #include <config.h>
+ 
+ /* Specification.  */
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
+ #include <stdio.h>

security/gnutls/patches/patch-gl_inet_pton_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-gl_inet_pton_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- gl/inet_pton.c.orig	Wed May  4 16:59:41 2011
++++ gl/inet_pton.c	Wed May  4 17:02:35 2011
+@@ -35,6 +35,7 @@
+ #include <config.h>
+ 
+ /* Specification.  */
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
+ #include <c-ctype.h>

security/gnutls/patches/patch-gl_tests_test-arpa_inet_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-gl_tests_test-arpa_inet_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- gl/tests/test-arpa_inet.c.orig	Wed May  4 16:59:41 2011
++++ gl/tests/test-arpa_inet.c	Wed May  4 17:02:25 2011
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
+ int

security/gnutls/patches/patch-gl_tests_test-getaddrinfo_c

@@ -0,0 +1,14 @@
+$OpenBSD: patch-gl_tests_test-getaddrinfo_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- gl/tests/test-getaddrinfo.c.orig	Wed May  4 16:59:41 2011
++++ gl/tests/test-getaddrinfo.c	Wed May  4 17:01:59 2011
+@@ -28,9 +28,9 @@ SIGNATURE_CHECK (getaddrinfo, int, (char const *, char
+                                     struct addrinfo const *,
+                                     struct addrinfo **));
+ 
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <errno.h>
+-#include <netinet/in.h>
+ #include <stdio.h>
+ #include <string.h>
+ 

security/gnutls/patches/patch-gl_tests_test-inet_ntop_c

@@ -0,0 +1,18 @@
+$OpenBSD: patch-gl_tests_test-inet_ntop_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- gl/tests/test-inet_ntop.c.orig	Wed May  4 16:59:41 2011
++++ gl/tests/test-inet_ntop.c	Wed May  4 17:02:23 2011
+@@ -18,13 +18,13 @@
+ 
+ #include <config.h>
+ 
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
+ #include "signature.h"
+ SIGNATURE_CHECK (inet_ntop, char const *, (int, void const *, char *,
+                                            socklen_t));
+ 
+-#include <netinet/in.h>
+ #include <sys/socket.h>
+ #include <string.h>
+ 

security/gnutls/patches/patch-gl_tests_test-inet_pton_c

@@ -0,0 +1,17 @@
+$OpenBSD: patch-gl_tests_test-inet_pton_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- gl/tests/test-inet_pton.c.orig	Wed May  4 16:59:41 2011
++++ gl/tests/test-inet_pton.c	Wed May  4 17:02:27 2011
+@@ -18,12 +18,12 @@
+ 
+ #include <config.h>
+ 
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
+ #include "signature.h"
+ SIGNATURE_CHECK (inet_pton, int, (int, const char *, void *));
+ 
+-#include <netinet/in.h>
+ #include <sys/socket.h>
+ 
+ #include "macros.h"

security/gnutls/patches/patch-lib_configure

@@ -1,7 +1,7 @@
-$OpenBSD: patch-lib_configure,v 1.2 2011/04/15 16:09:39 ajacoutot Exp $
---- lib/configure.orig	Fri Apr  8 18:17:13 2011
-+++ lib/configure	Wed Apr 13 12:43:14 2011
-@@ -17863,19 +17863,11 @@ else
+$OpenBSD: patch-lib_configure,v 1.3 2011/05/04 15:48:10 ajacoutot Exp $
+--- lib/configure.orig	Fri Apr 22 13:40:04 2011
++++ lib/configure	Wed May  4 14:34:57 2011
+@@ -17201,19 +17201,11 @@ else
  $as_echo "no" >&6; }
  fi
  
@@ -21,7 +21,7 @@ $OpenBSD: patch-lib_configure,v 1.2 2011/04/15 16:09:39 ajacoutot Exp $
            LIBC_FATAL_STDERR_=1
    export LIBC_FATAL_STDERR_
  
-@@ -25189,7 +25181,7 @@ fi
+@@ -24527,7 +24519,7 @@ fi
              done
            fi
            if test "X$found_dir" != "X"; then
@@ -30,7 +30,7 @@ $OpenBSD: patch-lib_configure,v 1.2 2011/04/15 16:09:39 ajacoutot Exp $
              if test "X$found_so" != "X"; then
                                                          if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                                  LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }$found_so"
-@@ -25242,7 +25234,7 @@ fi
+@@ -24580,7 +24572,7 @@ fi
                      if test "$acl_hardcode_minus_L" != no; then
                                                                                          LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }$found_so"
                      else
@@ -39,7 +39,7 @@ $OpenBSD: patch-lib_configure,v 1.2 2011/04/15 16:09:39 ajacoutot Exp $
                      fi
                    fi
                  fi
-@@ -25251,7 +25243,7 @@ fi
+@@ -24589,7 +24581,7 @@ fi
                if test "X$found_a" != "X"; then
                                  LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }$found_a"
                else
@@ -48,7 +48,7 @@ $OpenBSD: patch-lib_configure,v 1.2 2011/04/15 16:09:39 ajacoutot Exp $
                fi
              fi
                          additional_includedir=
-@@ -25401,8 +25393,8 @@ fi
+@@ -24739,8 +24731,8 @@ fi
                done
              fi
            else

security/gnutls/patches/patch-lib_opencdk_keydb_c

@@ -0,0 +1,16 @@
+$OpenBSD: patch-lib_opencdk_keydb_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+
+keydb.c:123: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'off_t'
+keydb.c:123: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'off_t'
+
+--- lib/opencdk/keydb.c.orig	Wed May  4 17:37:00 2011
++++ lib/opencdk/keydb.c	Wed May  4 17:37:34 2011
+@@ -120,7 +120,7 @@ keydb_idx_build (const char *file)
+       rc = cdk_pkt_read (inp, pkt);
+       if (rc)
+         {
+-          _cdk_log_debug ("index build failed packet off=%lu\n", pos);
++          _cdk_log_debug ("index build failed packet off=%lu\n", (long unsigned int)pos);
+           /* FIXME: The index is incomplete */
+           break;
+         }

security/gnutls/patches/patch-lib_opencdk_literal_c

@@ -0,0 +1,16 @@
+$OpenBSD: patch-lib_opencdk_literal_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+
+literal.c:124: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'off_t'
+literal.c:124: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'off_t'
+
+--- lib/opencdk/literal.c.orig	Wed May  4 17:37:45 2011
++++ lib/opencdk/literal.c	Wed May  4 17:38:11 2011
+@@ -122,7 +122,7 @@ literal_decode (void *data, FILE * in, FILE * out)
+   while (!feof (in))
+     {
+       _cdk_log_debug ("literal_decode: part on %d size %lu\n",
+-                      (int) pfx->blkmode.on, pfx->blkmode.size);
++                      (int) pfx->blkmode.on, (long unsigned int) pfx->blkmode.size);
+       if (pfx->blkmode.on)
+         bufsize = pfx->blkmode.size;
+       else

security/gnutls/patches/patch-src_certtool-cfg_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_certtool-cfg_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- src/certtool-cfg.c.orig	Wed May  4 16:59:41 2011
++++ src/certtool-cfg.c	Wed May  4 17:04:16 2011
+@@ -36,6 +36,7 @@
+ /* for inet_pton */
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
+ /* Gnulib portability files. */

security/gnutls/patches/patch-src_common_c

@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_common_c,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+
+MIN is already defined in sys/param.h.
+
+--- src/common.c.orig	Wed May  4 17:34:54 2011
++++ src/common.c	Wed May  4 17:35:27 2011
+@@ -41,6 +41,9 @@
+ #include <gnutls/pkcs11.h>
+ 
+ #define SU(x) (x!=NULL?x:"Unknown")
++#ifdef MIN
++#undef MIN
++#endif
+ #define MIN(x,y) ((x)<(y))?(x):(y)
+ 
+ int print_cert;

security/gnutls/patches/patch-src_common_h

@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_common_h,v 1.1 2011/05/04 15:48:10 ajacoutot Exp $
+--- src/common.h.orig	Wed May  4 16:59:41 2011
++++ src/common.h	Wed May  4 17:04:02 2011
+@@ -4,10 +4,10 @@
+ #include <gnutls/gnutls.h>
+ 
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <unistd.h>
+-#include <netinet/in.h>
+ #include <signal.h>
+ #ifdef _WIN32
+ #include <io.h>

security/gnutls/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2011/04/15 16:09:39 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.13 2011/05/04 15:48:10 ajacoutot Exp $
 @bin bin/certtool
 @bin bin/gnutls-cli
 @bin bin/gnutls-cli-debug
@@ -53,7 +53,6 @@ lib/pkgconfig/gnutls.pc
 @man man/man1/srptool.1
 @man man/man3/gnutls_alert_get.3
 @man man/man3/gnutls_alert_get_name.3
-@man man/man3/gnutls_alert_send.3
 @man man/man3/gnutls_alert_send_appropriate.3
 @man man/man3/gnutls_anon_allocate_client_credentials.3
 @man man/man3/gnutls_anon_allocate_server_credentials.3
@@ -620,7 +619,6 @@ lib/pkgconfig/gnutls.pc
 @man man/man3/gnutls_x509_crt_get_raw_dn.3
 @man man/man3/gnutls_x509_crt_get_raw_issuer_dn.3
 @man man/man3/gnutls_x509_crt_get_serial.3
-@man man/man3/gnutls_x509_crt_get_signature.3
 @man man/man3/gnutls_x509_crt_get_signature_algorithm.3
 @man man/man3/gnutls_x509_crt_get_subject.3
 @man man/man3/gnutls_x509_crt_get_subject_alt_name.3