CVS commit: pkgsrc/security/gnutls

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Oct  4 17:25:54 UTC 2019

Modified Files:
        pkgsrc/security/gnutls: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/security/gnutls: PLIST.dane
Removed Files:
        pkgsrc/security/gnutls/patches: patch-cfg.mk patch-config.h.in
            patch-configure patch-lib_accelerated_x86_elf_aesni-x86.s
            patch-lib_accelerated_x86_x86-common.c

Log Message:
gnutls: Update to 3.6.10

* Version 3.6.10 (released 2019-09-29)

** libgnutls: Added support for deterministic ECDSA/DSA (RFC6979)
   Deterministic signing can be enabled by setting
   GNUTLS_PRIVKEY_FLAG_REPRODUCIBLE when calling gnutls_privkey_sign_*()
   functions (#94).

** libgnutls: add gnutls_aead_cipher_encryptv2 and gnutls_aead_cipher_decryptv2
   functions that will perform in-place encryption/decryption on data buffers (#718).

** libgnutls: Corrected issue in gnutls_session_get_data2() which could fail under
   TLS1.3, if a timeout callback was not set using gnutls_transport_set_pull_timeout_function()
   (#823).

** libgnutls: added interoperability tests with gnutls 2.12.x; addressed
   issue with large record handling due to random padding (#811).

** libgnutls: the server now selects the highest TLS protocol version,
   if TLS 1.3 is enabled and the client advertises an older protocol version first (#837).

** libgnutls: fix non-PIC assembly on i386 (#818).

** libgnutls: added support for GOST 28147-89 cipher in CNT (GOST counter) mode
   and MAC generation based on GOST 28147-89 (IMIT). For description of the
   modes see RFC 5830. S-Box is id-tc26-gost-28147-param-Z (TC26Z) defined in
   RFC 7836.

** certtool: when outputting an encrypted private key do not insert the textual description
   of it. This fixes a regression since 3.6.5 (#840).

** API and ABI modifications:
gnutls_aead_cipher_encryptv2: Added
gnutls_aead_cipher_decryptv2: Added
GNUTLS_CIPHER_GOST28147_TC26Z_CNT: Added
GNUTLS_MAC_GOST28147_TC26Z_IMIT: Added


To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 pkgsrc/security/gnutls/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/security/gnutls/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/security/gnutls/PLIST.dane
cvs rdiff -u -r1.139 -r1.140 pkgsrc/security/gnutls/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/gnutls/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/security/gnutls/patches/patch-cfg.mk \
    pkgsrc/security/gnutls/patches/patch-config.h.in \
    pkgsrc/security/gnutls/patches/patch-lib_accelerated_x86_elf_aesni-x86.s
cvs rdiff -u -r1.3 -r0 pkgsrc/security/gnutls/patches/patch-configure \
    pkgsrc/security/gnutls/patches/patch-lib_accelerated_x86_x86-common.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/gnutls/Makefile
diff -u pkgsrc/security/gnutls/Makefile:1.202 pkgsrc/security/gnutls/Makefile:1.203
--- pkgsrc/security/gnutls/Makefile:1.202       Tue Oct  1 14:34:08 2019
+++ pkgsrc/security/gnutls/Makefile     Fri Oct  4 17:25:53 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.202 2019/10/01 14:34:08 nia Exp $
+# $NetBSD: Makefile,v 1.203 2019/10/04 17:25:53 nia Exp $
 
-DISTNAME=      gnutls-3.6.9
-PKGREVISION=   2
+DISTNAME=      gnutls-3.6.10
 CATEGORIES=    security devel
 MASTER_SITES=  https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/
 EXTRACT_SUFX=  .tar.xz
@@ -13,6 +12,8 @@ LICENSE=      gnu-gpl-v3 AND gnu-lgpl-v2.1
 
 DEPENDS+=      mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts
 
+PLIST_SRC=     PLIST
+
 USE_LANGUAGES=                 c c++
 USE_LIBTOOL=                   yes
 USE_PKGLOCALEDIR=              yes

Index: pkgsrc/security/gnutls/PLIST
diff -u pkgsrc/security/gnutls/PLIST:1.67 pkgsrc/security/gnutls/PLIST:1.68
--- pkgsrc/security/gnutls/PLIST:1.67   Wed Sep 18 19:00:13 2019
+++ pkgsrc/security/gnutls/PLIST        Fri Oct  4 17:25:53 2019
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.67 2019/09/18 19:00:13 tnn Exp $
+@comment $NetBSD: PLIST,v 1.68 2019/10/04 17:25:53 nia Exp $
 bin/certtool
-${PLIST.dane}bin/danetool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
@@ -11,7 +10,6 @@ bin/srptool
 include/gnutls/abstract.h
 include/gnutls/compat.h
 include/gnutls/crypto.h
-${PLIST.dane}include/gnutls/dane.h
 include/gnutls/dtls.h
 include/gnutls/gnutls.h
 include/gnutls/gnutlsxx.h
@@ -38,13 +36,10 @@ info/gnutls-modauth.png
 info/gnutls-x509.png
 info/gnutls.info
 info/pkcs11-vision.png
-${PLIST.dane}lib/libgnutls-dane.la
 lib/libgnutls.la
 lib/libgnutlsxx.la
-${PLIST.dane}lib/pkgconfig/gnutls-dane.pc
 lib/pkgconfig/gnutls.pc
 man/man1/certtool.1
-${PLIST.dane}man/man1/danetool.1
 man/man1/gnutls-cli-debug.1
 man/man1/gnutls-cli.1
 man/man1/gnutls-serv.1
@@ -72,9 +67,11 @@ man/man3/dane_verify_crt.3
 man/man3/dane_verify_crt_raw.3
 man/man3/dane_verify_session_crt.3
 man/man3/gnutls_aead_cipher_decrypt.3
+man/man3/gnutls_aead_cipher_decryptv2.3
 man/man3/gnutls_aead_cipher_deinit.3
 man/man3/gnutls_aead_cipher_encrypt.3
 man/man3/gnutls_aead_cipher_encryptv.3
+man/man3/gnutls_aead_cipher_encryptv2.3
 man/man3/gnutls_aead_cipher_init.3
 man/man3/gnutls_alert_get.3
 man/man3/gnutls_alert_get_name.3

Index: pkgsrc/security/gnutls/distinfo
diff -u pkgsrc/security/gnutls/distinfo:1.139 pkgsrc/security/gnutls/distinfo:1.140
--- pkgsrc/security/gnutls/distinfo:1.139       Mon Sep 30 09:51:16 2019
+++ pkgsrc/security/gnutls/distinfo     Fri Oct  4 17:25:53 2019
@@ -1,15 +1,10 @@
-$NetBSD: distinfo,v 1.139 2019/09/30 09:51:16 maya Exp $
+$NetBSD: distinfo,v 1.140 2019/10/04 17:25:53 nia Exp $
 
-SHA1 (gnutls-3.6.9.tar.xz) = 4a12757b129562ae92a01ca890ed282050595296
-RMD160 (gnutls-3.6.9.tar.xz) = 2771adabb5342b24fbebcb69b324924ee2b56513
-SHA512 (gnutls-3.6.9.tar.xz) = a9fd0f4edae4c081d5c539ba2e5574a4d7294bc00c5c73ea25ce26cb7fd126299c2842a282d45ef5cf0544108f27066e587df28776bc7915143d190d7d5b9d07
-Size (gnutls-3.6.9.tar.xz) = 5773928 bytes
-SHA1 (patch-cfg.mk) = c91374a0f9c3031ea90d7f8c455d9e7e42de464b
-SHA1 (patch-config.h.in) = 9f403bd91ddb90d970ba56f91a56e0339848c026
-SHA1 (patch-configure) = 0fcfa9255f15a43aced7262bc2c5084945910aec
+SHA1 (gnutls-3.6.10.tar.xz) = c073c6b0c57506a592854471576321be80f809d4
+RMD160 (gnutls-3.6.10.tar.xz) = fe2df3aead55853711a0dbd80ef5dd648a4e09a7
+SHA512 (gnutls-3.6.10.tar.xz) = fe0481f9e4219e983b01b91e69ffd95819a4c0d0c09028509106d561967e9c5d900bc5e3a48140a34fa4467feda2a619085adf3fa8fdade96c8debf125e91ae8
+Size (gnutls-3.6.10.tar.xz) = 5795984 bytes
 SHA1 (patch-lib_Makefile.in) = c9a6bbe6238ccd9de41c708012e36b202d2a86e7
-SHA1 (patch-lib_accelerated_x86_elf_aesni-x86.s) = 834fe259954c1806185d95a5029ba0379bd31cce
-SHA1 (patch-lib_accelerated_x86_x86-common.c) = ccbf4e01f5bcb01b998e80294ecae2f0413680b8
 SHA1 (patch-lib_system_certs.c) = fba74b2834a36d66bddcd7d3405d0c91c1b14efc
 SHA1 (patch-src_libopts_autoopts_options.h) = 9202c55314fe8764ac82c95bbfabfa1b031e9ba4
 SHA1 (patch-src_libopts_compat_compat.h) = 240fbfc0ba20af35e0634ba873fe9e34bfbcc921

Index: pkgsrc/security/gnutls/options.mk
diff -u pkgsrc/security/gnutls/options.mk:1.1 pkgsrc/security/gnutls/options.mk:1.2
--- pkgsrc/security/gnutls/options.mk:1.1       Wed Sep 18 15:27:05 2019
+++ pkgsrc/security/gnutls/options.mk   Fri Oct  4 17:25:53 2019
@@ -1,15 +1,14 @@
-# $NetBSD: options.mk,v 1.1 2019/09/18 15:27:05 ng0 Exp $
+# $NetBSD: options.mk,v 1.2 2019/10/04 17:25:53 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gnutls
 PKG_SUPPORTED_OPTIONS= dane
-PLIST_VARS+=           dane
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdane)
 .include "../../net/unbound/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-libdane
-PLIST.dane=            yes
+PLIST_SRC+=            PLIST.dane
 .else
 CONFIGURE_ARGS+=       --disable-libdane
 .endif

Added files:

Index: pkgsrc/security/gnutls/PLIST.dane
diff -u /dev/null pkgsrc/security/gnutls/PLIST.dane:1.1
--- /dev/null   Fri Oct  4 17:25:54 2019
+++ pkgsrc/security/gnutls/PLIST.dane   Fri Oct  4 17:25:53 2019
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST.dane,v 1.1 2019/10/04 17:25:53 nia Exp $
+bin/danetool
+include/gnutls/dane.h
+lib/libgnutls-dane.la
+lib/pkgconfig/gnutls-dane.pc
+man/man1/danetool.1