diff --git a/security/nettle/Makefile b/security/nettle/Makefile index cb48432d34ad..c0af3cb85ce8 100644 --- a/security/nettle/Makefile +++ b/security/nettle/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.24 2020/05/22 08:01:51 adam Exp $ +# $NetBSD: Makefile,v 1.25 2021/02/18 10:59:09 adam Exp $ -DISTNAME= nettle-3.6 +DISTNAME= nettle-3.7.1 CATEGORIES= devel security MASTER_SITES= http://www.lysator.liu.se/~nisse/archive/ MASTER_SITES+= ftp://ftp.lysator.liu.se/pub/security/lsh/ diff --git a/security/nettle/PLIST b/security/nettle/PLIST index ab44df9c01ed..1c35b3678174 100644 --- a/security/nettle/PLIST +++ b/security/nettle/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2020/05/22 08:01:51 adam Exp $ +@comment $NetBSD: PLIST,v 1.11 2021/02/18 10:59:09 adam Exp $ bin/nettle-hash bin/nettle-lfib-stream bin/nettle-pbkdf2 @@ -64,6 +64,7 @@ include/nettle/sha1.h include/nettle/sha2.h include/nettle/sha3.h include/nettle/siv-cmac.h +include/nettle/streebog.h include/nettle/twofish.h include/nettle/umac.h include/nettle/version.h diff --git a/security/nettle/distinfo b/security/nettle/distinfo index c4f94931f3b3..9f7c036d41d4 100644 --- a/security/nettle/distinfo +++ b/security/nettle/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.19 2020/05/22 08:01:51 adam Exp $ +$NetBSD: distinfo,v 1.20 2021/02/18 10:59:09 adam Exp $ -SHA1 (nettle-3.6.tar.gz) = 22e48a4d232ccd26ba8303709f2222b422a8827d -RMD160 (nettle-3.6.tar.gz) = 26dd0cda467edff59ba98f0b9ce377a879f0a3dd -SHA512 (nettle-3.6.tar.gz) = 2471af875e51327af61af8bda53cd9c3adc27b6e32592a4b5b10b3ec60999ebf771ab9c54c747b0bade4b3b5a717e77fdbdb53699dd9e8a9ed4eee07f46aed51 -Size (nettle-3.6.tar.gz) = 2288173 bytes -SHA1 (patch-Makefile.in) = 737dda72892ee1732adef5b71d52f1ffc5fee20b +SHA1 (nettle-3.7.1.tar.gz) = 2113e52ef6755a68097732080b738fcacfac8797 +RMD160 (nettle-3.7.1.tar.gz) = fcb350221e21d7bb2c22f90a3b020df669ff34a7 +SHA512 (nettle-3.7.1.tar.gz) = 25567c0546b68851a03741ea69a2959b07cab660a723b193a9043faf1fd9eb4cd7aea72de150bb0717fd2db28e417f03ad31b14e98aec40ad316f1bcf0caf50b +Size (nettle-3.7.1.tar.gz) = 2380974 bytes +SHA1 (patch-Makefile.in) = ddc92dc4343df2723fbbfd1ef1afc01f1d576b09 SHA1 (patch-aa) = 2332668b077a6e3a1add603c87f60167755554ec SHA1 (patch-config.make.in) = 708fb3cac9c44825e0d231541cbecade2239c850 SHA1 (patch-testsuite_Makefile.in) = 6e530041b753336b3eff745e0b05b3b382baec0c diff --git a/security/nettle/patches/patch-Makefile.in b/security/nettle/patches/patch-Makefile.in index 7d3aa0cc496b..7d04ba111831 100644 --- a/security/nettle/patches/patch-Makefile.in +++ b/security/nettle/patches/patch-Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-Makefile.in,v 1.8 2020/05/22 08:01:51 adam Exp $ +$NetBSD: patch-Makefile.in,v 1.9 2021/02/18 10:59:09 adam Exp $ Use LIBTOOL. ---- Makefile.in.orig 2020-04-29 18:11:44.000000000 +0000 +--- Makefile.in.orig 2021-02-17 18:02:32.000000000 +0000 +++ Makefile.in -@@ -25,7 +25,7 @@ PRE_CPPFLAGS = -I. +@@ -27,7 +27,7 @@ PRE_CPPFLAGS = -I. EXTRA_CFLAGS = $(CCPIC) # FIXME: Add configuration of LIBEXT? @@ -13,7 +13,7 @@ Use LIBTOOL. SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK) getopt_SOURCES = getopt.c getopt1.c -@@ -264,24 +264,24 @@ nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJ +@@ -277,24 +277,24 @@ nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJ hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) \ $(OPT_HOGWEED_OBJS) @IF_MINI_GMP@ mini-gmp.$(OBJEXT) @@ -37,8 +37,8 @@ Use LIBTOOL. + -version-info ${LIBHOGWEED_MAJOR}:${LIBHOGWEED_MINOR} echo hogweed > libhogweed.stamp - %.$(OBJEXT): %.asm $(srcdir)/asm.m4 machine.m4 config.m4 - $(M4) $(srcdir)/asm.m4 machine.m4 config.m4 $< >$*.s + %.$(OBJEXT): %.asm $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 + $(M4) $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 $< >$*.s - $(COMPILE) -c $*.s + ${LIBTOOL} --mode=compile $(COMPILE) -c $*.s @@ -48,7 +48,7 @@ Use LIBTOOL. && $(DEP_PROCESS) # Rules building shared libraries. -@@ -481,7 +481,7 @@ install-here: install-doc install-header +@@ -494,7 +494,7 @@ install-here: install-doc install-header install-static: $(LIBTARGETS) $(MKDIR_P) $(DESTDIR)$(libdir) for f in $(LIBTARGETS); do \