libgcrypt: update to 1.9.1.

Comment out some old workarounds for configure script/compiler issues,
and trust the upstream configure script again until proven wrong.

Remove hacks.mk, the grep does not match anything any longer.

Noteworthy changes in version 1.9.1 (2021-01-29)  [C23/A3/R1]
------------------------------------------------

 * Bug fixes:

   - Fix exploitable bug in hash functions introduced with 1.9.0.
     [#5275]

   - Return an error if a negative MPI is used with sexp scan
     functions.  [#4964]

   - Check for operational FIPS in the random and KDF functions.
     [#5243]

   - Fix compile error on ARMv7 with NEON disabled.  [#5251]

   - Fix self-test in KDF module.  [#5254]

   - Improve assembler checks for better LTO support.  [#5255]

   - Fix assember problem on macOS running on M1.  [#5157]

   - Support older macOS without posix_spawn. [#5159]

   - Fix 32-bit cross build on x86.  [#5257]

   - Fix non-NEON ARM assembly implementation for SHA512.  [#5263]

   - Fix build problems with the cipher_bulk_ops_t typedef.  [#5264]

   - Fix Ed25519 private key handling for preceding ZEROs. [#5267]

   - Fix overflow in modular inverse implementation.  [#5269]

   - Fix register access for AVX/AVX2 implementations of Blake2.
     [#5271].

 * Performance:

   - Add optimized cipher and hash functions for s390x/zSeries.

   - Use hardware bit counting functionx when available.

 * Internal changes:

   - The macOS getentropy syscall is used when available.  [#5268]

   - Update DSA functions to match FIPS 186-3.  [30ed9593f6]

   - New self-tests for CMACs and KDFs.  [385a89e35b,7a0da24925]

   - Add bulk cipher functions for OFB and GCM modes.
     [f12b6788f2,f4e63e92dc]

 Release-info: https://dev.gnupg.org/T5259
This commit is contained in:
wiz 2021-01-29 12:10:03 +00:00
parent adaead4b7d
commit 655be9015a
3 changed files with 29 additions and 41 deletions

View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.100 2021/01/25 09:59:50 wiz Exp $
# $NetBSD: Makefile,v 1.101 2021/01/29 12:10:03 wiz Exp $
DISTNAME= libgcrypt-1.9.0
DISTNAME= libgcrypt-1.9.1
CATEGORIES= security
MASTER_SITES= https://gnupg.org/ftp/gcrypt/libgcrypt/
EXTRACT_SUFX= .tar.bz2
@ -21,37 +21,37 @@ INFO_FILES= yes
.include "../../mk/bsd.prefs.mk"
.include "../../mk/compiler.mk"
.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) && \
empty(MACHINE_PLATFORM:MNetBSD-*-alpha) && \
empty(MACHINE_PLATFORM:MNetBSD-*-sparc) && \
empty(MACHINE_PLATFORM:M*-*-hppa)
CONFIGURE_ARGS+= --disable-asm
.endif
CONFIGURE_ARGS+= --disable-aesni-support
#.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) && \
# empty(MACHINE_PLATFORM:MNetBSD-*-alpha) && \
# empty(MACHINE_PLATFORM:MNetBSD-*-sparc) && \
# empty(MACHINE_PLATFORM:M*-*-hppa)
#CONFIGURE_ARGS+= --disable-asm
#.endif
#CONFIGURE_ARGS+= --disable-aesni-support
.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || \
!empty(MACHINE_PLATFORM:MSunOS-*-i386)
CONFIGURE_ARGS+= --disable-pclmul-support
.endif
#.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || \
# !empty(MACHINE_PLATFORM:MSunOS-*-i386)
#CONFIGURE_ARGS+= --disable-pclmul-support
#.endif
# SCO OpenServer 5.0.7/3.2 has no socklen_t, but it is defined in pthread.h
# from builtin GNU pth.
.if ${OS_VARIANT} == "SCOOSR5"
CONFIGURE_ENV+= ac_cv_type_socklen_t=yes
CONFIGURE_ENV+= gl_cv_socklen_t_equiv=int
.endif
#.if ${OS_VARIANT} == "SCOOSR5"
#CONFIGURE_ENV+= ac_cv_type_socklen_t=yes
#CONFIGURE_ENV+= gl_cv_socklen_t_equiv=int
#.endif
.if !empty(PKGSRC_COMPILER:Mclang)
CFLAGS+= -fheinous-gnu-extensions
.endif
.if (${MACHINE_ARCH} == "x86_64")
. if !empty(CC_VERSION:Mgcc-4.[45].*)
CONFIGURE_ARGS+= --disable-avx2-support
CONFIGURE_ARGS+= --disable-avx-support
CONFIGURE_ENV+= gcry_cv_gcc_inline_asm_avx=no
. endif
.endif
#.if (${MACHINE_ARCH} == "x86_64")
#. if !empty(CC_VERSION:Mgcc-4.[45].*)
#CONFIGURE_ARGS+= --disable-avx2-support
#CONFIGURE_ARGS+= --disable-avx-support
#CONFIGURE_ENV+= gcry_cv_gcc_inline_asm_avx=no
#. endif
#.endif
SUBST_CLASSES+= rpath
SUBST_FILES.rpath= src/libgcrypt-config.in

View file

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.85 2021/01/25 09:59:50 wiz Exp $
$NetBSD: distinfo,v 1.86 2021/01/29 12:10:03 wiz Exp $
SHA1 (libgcrypt-1.9.0.tar.bz2) = 459383a8b6200673cfc31f7b265c4961c0850031
RMD160 (libgcrypt-1.9.0.tar.bz2) = f4a12a634e96a656a8ab8ab44a2dce96fd864f34
SHA512 (libgcrypt-1.9.0.tar.bz2) = cdfb812f387e4bac598fe5701eafb284ee326cce6b20fce08b92262e371e0d95a1ab529dfa3232255869e27787c102aa817f7a70bd5fbbf8d490025a01e40429
Size (libgcrypt-1.9.0.tar.bz2) = 3183699 bytes
SHA1 (libgcrypt-1.9.1.tar.bz2) = a15ce7355b028f28a33428eaa0147154861b29d4
RMD160 (libgcrypt-1.9.1.tar.bz2) = f9bbd9ed747f21e5c66e7287102975f2cb04f4e5
SHA512 (libgcrypt-1.9.1.tar.bz2) = e8a028724cf5476fff0ca82c5c279a64b3bc5d1fd1472b784df4084b185266825baffc49e27b90db7453c8faef68cd0b8264f379abacee629bbdf6b11f2a28d6
Size (libgcrypt-1.9.1.tar.bz2) = 3202683 bytes
SHA1 (patch-aa) = 60b3f4453b217ed8879a2ffd8d485c0195ffb5f8
SHA1 (patch-cipher_rijndael-arm.S) = ef3cb7f481022440780eb48ae31cbfad0a3ec115
SHA1 (patch-configure) = edc92453a0843ab0442da7f1b9df2ef4c219bdf5

View file

@ -1,12 +0,0 @@
# $NetBSD: hacks.mk,v 1.4 2008/03/26 20:09:43 tron Exp $
# config.h #defines socklen_t if it is not defined, but libgcrypt does
# not propogate this to the installed gcrypt.h, so packages using it
# subsequently fail.
#
# hack around this by using the same #define (if present) in gcrypt.h.
post-configure:
socklen=`${GREP} '^#define socklen_t' ${WRKSRC}/config.h || ${TRUE}`; \
${MV} ${WRKSRC}/src/gcrypt.h ${WRKSRC}/src/gcrypt.h.old; \
${SED} -e "s,^/\* socklen_t \*/,$$socklen," \
${WRKSRC}/src/gcrypt.h.old > ${WRKSRC}/src/gcrypt.h