CVS commit: pkgsrc/security/gnutls

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/security/gnutls
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Fri, 6 Dec 2019 14:00:09 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Dec  6 14:00:09 UTC 2019

Modified Files:
        pkgsrc/security/gnutls: Makefile distinfo
        pkgsrc/security/gnutls/patches: patch-src_libopts_autoopts_options.h
            patch-src_libopts_compat_compat.h patch-src_libopts_libopts.c
            patch-src_libopts_makeshell.c patch-src_libopts_proto.h
Removed Files:
        pkgsrc/security/gnutls/patches: patch-lib_Makefile.in

Log Message:
gnutls: Update to 3.6.11.1

Not sure of 3.6.11.1's specific changes - possibly fixing an incorrectly
generated tarball?

These changes from apply:

* Version 3.6.11 (released 2019-12-01)

** libgnutls: Use KERN_ARND for the system random number generator on NetBSD.
   This syscall provides an endless stream of random numbers from the kernel's
   ChaCha20-based random number generator, without blocking or requiring an open file
   descriptor.

** libgnutls: Corrected issue with TLS 1.2 session ticket handling as client
   during resumption (#841).

** libgnutls: gnutls_base64_decode2() succeeds decoding the empty string to
   the empty string. This is a behavioral change of the API but it conforms
   to the RFC4648 expectations (#834).

** libgnutls: Fixed AES-CFB8 implementation, when input is shorter than
   the block size. Fix backported from nettle.

** certtool: CRL distribution points will be set in CA certificates even when
   non self-signed (#765).

** gnutls-cli/serv: added raw public-key handling capabilities (RFC7250).
   Key material can be set via the --rawpkkeyfile and --rawpkfile flags.

** API and ABI modifications:
No changes since last version.


To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 pkgsrc/security/gnutls/Makefile
cvs rdiff -u -r1.140 -r1.141 pkgsrc/security/gnutls/distinfo
cvs rdiff -u -r1.9 -r0 pkgsrc/security/gnutls/patches/patch-lib_Makefile.in
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/security/gnutls/patches/patch-src_libopts_autoopts_options.h \
    pkgsrc/security/gnutls/patches/patch-src_libopts_compat_compat.h \
    pkgsrc/security/gnutls/patches/patch-src_libopts_makeshell.c \
    pkgsrc/security/gnutls/patches/patch-src_libopts_proto.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/gnutls/patches/patch-src_libopts_libopts.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.203 pkgsrc/security/gnutls/Makefile:1.204
--- pkgsrc/security/gnutls/Makefile:1.203       Fri Oct  4 17:25:53 2019
+++ pkgsrc/security/gnutls/Makefile     Fri Dec  6 14:00:08 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.203 2019/10/04 17:25:53 nia Exp $
+# $NetBSD: Makefile,v 1.204 2019/12/06 14:00:08 nia Exp $
 
-DISTNAME=      gnutls-3.6.10
+DISTNAME=      gnutls-3.6.11.1
 CATEGORIES=    security devel
 MASTER_SITES=  https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/
 EXTRACT_SUFX=  .tar.xz
@@ -16,8 +16,8 @@ PLIST_SRC=    PLIST
 
 USE_LANGUAGES=                 c c++
 USE_LIBTOOL=                   yes
-USE_PKGLOCALEDIR=              yes
 USE_TOOLS+=                    gmake gsed perl pkg-config bash
+USE_TOOLS+=                    msgfmt msgmerge xgettext
 GNU_CONFIGURE=                 yes
 # this library duplicates (and conflicts with) openssl
 CONFIGURE_ARGS+=               --disable-openssl-compatibility

Index: pkgsrc/security/gnutls/distinfo
diff -u pkgsrc/security/gnutls/distinfo:1.140 pkgsrc/security/gnutls/distinfo:1.141
--- pkgsrc/security/gnutls/distinfo:1.140       Fri Oct  4 17:25:53 2019
+++ pkgsrc/security/gnutls/distinfo     Fri Dec  6 14:00:08 2019
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.140 2019/10/04 17:25:53 nia Exp $
+$NetBSD: distinfo,v 1.141 2019/12/06 14:00:08 nia Exp $
 
-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 (gnutls-3.6.11.1.tar.xz) = 2205863fefa0e070cbf2a6961bfa90c854286287
+RMD160 (gnutls-3.6.11.1.tar.xz) = a5182c63cc9e79c929c8cc098f36d55fd70789c8
+SHA512 (gnutls-3.6.11.1.tar.xz) = 55fbbf0ebc824fbc91ccd08d1708452c5b1c12af75e332f29414540eb2f81337fa605a693ce9f34319a927e9d71177e6e7ffea5c6747792d341fb740f68c9489
+Size (gnutls-3.6.11.1.tar.xz) = 5902328 bytes
 SHA1 (patch-lib_system_certs.c) = fba74b2834a36d66bddcd7d3405d0c91c1b14efc
-SHA1 (patch-src_libopts_autoopts_options.h) = 9202c55314fe8764ac82c95bbfabfa1b031e9ba4
-SHA1 (patch-src_libopts_compat_compat.h) = 240fbfc0ba20af35e0634ba873fe9e34bfbcc921
-SHA1 (patch-src_libopts_libopts.c) = ce5e7681def882e95ed5ab770564d1f999b97039
-SHA1 (patch-src_libopts_makeshell.c) = e5b7d66caaec45e12ae5490d515fc9fc75de3d92
-SHA1 (patch-src_libopts_proto.h) = 78f845bdcbac8de74953a3cee0b77fa9c5b05386
+SHA1 (patch-src_libopts_autoopts_options.h) = ebeeafc834bce3b6b3f938e360b089e165ee4f9e
+SHA1 (patch-src_libopts_compat_compat.h) = 6e88b5e73a56c296f356aa5ce7e6048e1bcff450
+SHA1 (patch-src_libopts_libopts.c) = 6e2453a886aa4be0a17dfbdb8a23ef9d7a0f62f8
+SHA1 (patch-src_libopts_makeshell.c) = 1b08ab63e6e382bd471699530e5d8bff075b3f24
+SHA1 (patch-src_libopts_proto.h) = 7601830e5ff45632ae337a387548f9ed5e591c4f

Index: pkgsrc/security/gnutls/patches/patch-src_libopts_autoopts_options.h
diff -u pkgsrc/security/gnutls/patches/patch-src_libopts_autoopts_options.h:1.2 pkgsrc/security/gnutls/patches/patch-src_libopts_autoopts_options.h:1.3
--- pkgsrc/security/gnutls/patches/patch-src_libopts_autoopts_options.h:1.2     Mon Jun  1 21:50:22 2015
+++ pkgsrc/security/gnutls/patches/patch-src_libopts_autoopts_options.h Fri Dec  6 14:00:08 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_libopts_autoopts_options.h,v 1.2 2015/06/01 21:50:22 spz Exp $
+$NetBSD: patch-src_libopts_autoopts_options.h,v 1.3 2019/12/06 14:00:08 nia Exp $
 
 Workaround for older OSX.
 
---- src/libopts/autoopts/options.h.orig        2015-03-23 07:19:23.000000000 +0000
+--- src/libopts/autoopts/options.h.orig        2019-12-01 21:25:38.000000000 +0000
 +++ src/libopts/autoopts/options.h
 @@ -62,7 +62,7 @@
  #    include <sysexits.h>
@@ -11,5 +11,5 @@ Workaround for older OSX.
 -#  if defined(HAVE_STDBOOL_H)
 +#  if defined(HAVE_STDBOOL_H) || defined(__APPLE__)
  #    include <stdbool.h>
- #  else
+ #  elif ! defined(bool)
       typedef enum { false = 0, true = 1 } _Bool;
Index: pkgsrc/security/gnutls/patches/patch-src_libopts_compat_compat.h
diff -u pkgsrc/security/gnutls/patches/patch-src_libopts_compat_compat.h:1.2 pkgsrc/security/gnutls/patches/patch-src_libopts_compat_compat.h:1.3
--- pkgsrc/security/gnutls/patches/patch-src_libopts_compat_compat.h:1.2        Mon Jun  1 21:50:22 2015
+++ pkgsrc/security/gnutls/patches/patch-src_libopts_compat_compat.h    Fri Dec  6 14:00:08 2019
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_libopts_compat_compat.h,v 1.2 2015/06/01 21:50:22 spz Exp $
+$NetBSD: patch-src_libopts_compat_compat.h,v 1.3 2019/12/06 14:00:08 nia Exp $
 
 Workaround for older OSX.
 
---- src/libopts/compat/compat.h.orig   2015-03-23 07:19:23.000000000 +0000
+--- src/libopts/compat/compat.h.orig   2019-12-01 21:25:38.000000000 +0000
 +++ src/libopts/compat/compat.h
 @@ -182,7 +182,7 @@
  #  include <unistd.h>
  #endif
  
--#ifdef HAVE_STDBOOL_H
+-#if defined(HAVE_STDBOOL_H)
 +#if defined(HAVE_STDBOOL_H) || defined(__APPLE__)
  #  include <stdbool.h>
- #else
+ #elif ! defined(bool)
     typedef enum { false = 0, true = 1 } _Bool;
Index: pkgsrc/security/gnutls/patches/patch-src_libopts_makeshell.c
diff -u pkgsrc/security/gnutls/patches/patch-src_libopts_makeshell.c:1.2 pkgsrc/security/gnutls/patches/patch-src_libopts_makeshell.c:1.3
--- pkgsrc/security/gnutls/patches/patch-src_libopts_makeshell.c:1.2    Mon Jun  1 21:50:22 2015
+++ pkgsrc/security/gnutls/patches/patch-src_libopts_makeshell.c        Fri Dec  6 14:00:08 2019
@@ -1,33 +1,33 @@
-$NetBSD: patch-src_libopts_makeshell.c,v 1.2 2015/06/01 21:50:22 spz Exp $
+$NetBSD: patch-src_libopts_makeshell.c,v 1.3 2019/12/06 14:00:08 nia Exp $
 
 Avoid stdnoreturn.h.
 
---- src/libopts/makeshell.c.orig       2015-03-23 07:19:23.000000000 +0000
+--- src/libopts/makeshell.c.orig       2019-12-01 21:25:38.000000000 +0000
 +++ src/libopts/makeshell.c
-@@ -68,7 +68,7 @@ static void
- open_out(char const * fname, char const * pname);
- /* = = = END-STATIC-FORWARD = = = */
+@@ -35,7 +35,7 @@
+ #define UPPER(_c) (toupper(to_uchar(_c)))
+ #define LOWER(_c) (tolower(to_uchar(_c)))
  
--LOCAL noreturn void
-+LOCAL void
+-noreturn static void
++static void
  option_exits(int exit_code)
  {
      if (print_exit)
-@@ -76,7 +76,7 @@ option_exits(int exit_code)
+@@ -43,7 +43,7 @@ option_exits(int exit_code)
      exit(exit_code);
  }
  
--LOCAL noreturn void
-+LOCAL void
+-noreturn static void
++static void
  ao_bug(char const * msg)
  {
      fprintf(stderr, zao_bug_msg, msg);
-@@ -90,7 +90,7 @@ fserr_warn(char const * prog, char const
+@@ -57,7 +57,7 @@ fserr_warn(char const * prog, char const
              op, fname);
  }
  
--LOCAL noreturn void
-+LOCAL void
+-noreturn static void
++static void
  fserr_exit(char const * prog, char const * op, char const * fname)
  {
      fserr_warn(prog, op, fname);
Index: pkgsrc/security/gnutls/patches/patch-src_libopts_proto.h
diff -u pkgsrc/security/gnutls/patches/patch-src_libopts_proto.h:1.2 pkgsrc/security/gnutls/patches/patch-src_libopts_proto.h:1.3
--- pkgsrc/security/gnutls/patches/patch-src_libopts_proto.h:1.2        Mon Jun  1 21:50:22 2015
+++ pkgsrc/security/gnutls/patches/patch-src_libopts_proto.h    Fri Dec  6 14:00:08 2019
@@ -1,26 +1,26 @@
-$NetBSD: patch-src_libopts_proto.h,v 1.2 2015/06/01 21:50:22 spz Exp $
+$NetBSD: patch-src_libopts_proto.h,v 1.3 2019/12/06 14:00:08 nia Exp $
 
 Avoid stdnoreturn.h.
 
---- src/libopts/proto.h.orig   2015-03-23 07:19:23.000000000 +0000
+--- src/libopts/proto.h.orig   2019-12-01 21:25:38.000000000 +0000
 +++ src/libopts/proto.h
-@@ -98,16 +98,16 @@ load_opt_line(tOptions * opts, tOptState
+@@ -247,16 +247,16 @@ load_opt_line(tOptions * opts, tOptState
  /*
-  *  Extracted from makeshell.c
+  * Static declarations from makeshell.c
   */
--static noreturn void
+-noreturn static void
 +static void
  option_exits(int exit_code);
  
--static noreturn void
+-noreturn static void
 +static void
  ao_bug(char const * msg);
  
  static void
  fserr_warn(char const * prog, char const * op, char const * fname);
  
--static noreturn void
+-noreturn static void
 +static void
  fserr_exit(char const * prog, char const * op, char const * fname);
  
- /*
+ static void

Index: pkgsrc/security/gnutls/patches/patch-src_libopts_libopts.c
diff -u pkgsrc/security/gnutls/patches/patch-src_libopts_libopts.c:1.1 pkgsrc/security/gnutls/patches/patch-src_libopts_libopts.c:1.2
--- pkgsrc/security/gnutls/patches/patch-src_libopts_libopts.c:1.1      Mon Jun  8 13:44:57 2015
+++ pkgsrc/security/gnutls/patches/patch-src_libopts_libopts.c  Fri Dec  6 14:00:08 2019
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_libopts_libopts.c,v 1.1 2015/06/08 13:44:57 joerg Exp $
+$NetBSD: patch-src_libopts_libopts.c,v 1.2 2019/12/06 14:00:08 nia Exp $
 
 Workaround broken gettext.h conflicting with native implementation of
 message contexts in NetBSD.
 
---- src/libopts/libopts.c.orig 2015-06-08 13:12:30.000000000 +0000
+--- src/libopts/libopts.c.orig 2019-12-01 21:25:38.000000000 +0000
 +++ src/libopts/libopts.c
 @@ -1,3 +1,7 @@
 +#include <config.h>
@@ -12,4 +12,4 @@ message contexts in NetBSD.
 +#endif
  #define  AUTOOPTS_INTERNAL 1
  #include "autoopts/project.h"
- #define  LOCAL static
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index