Update security/nettle to 3.5.1

- Bump PORTREVISION of dependent ports for shlib change
- Fix build of devel/pijul [1]

Changes:	https://git.lysator.liu.se/nettle/nettle/blob/master/NEWS
PR:		238991
Exp-run by:	antoine
Thanks to:	tobik [1]

37 files changed, 95 insertions, 34 deletions

diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index b4c9deaed492..5763b6a855a0 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libarchive
 PORTVERSION=	3.3.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://libarchive.org/downloads/
diff --git a/biology/ncbi-blast+/Makefile b/biology/ncbi-blast+/Makefile
index 5eb3ebd668b1..06bc21a59392 100644
--- a/biology/ncbi-blast+/Makefile
+++ b/biology/ncbi-blast+/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ncbi-blast+
 DISTVERSION=	2.9.0
+PORTREVISION=	1
 CATEGORIES=	biology perl5 python
 MASTER_SITES=	https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ \
 		https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${PORTVERSION}/
diff --git a/biology/ncbi-toolkit/Makefile b/biology/ncbi-toolkit/Makefile
index ae9cc2b1cc9c..e026238b9dcb 100644
--- a/biology/ncbi-toolkit/Makefile
+++ b/biology/ncbi-toolkit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ncbi-toolkit
 DISTVERSION=	2017.01.06	# containing BLAST v2.2.27 (? is this true)
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.ncbi.nlm.nih.gov/toolbox/ncbi_tools/old/${PORTVERSION:S/.//g}/
 DISTNAME=	ncbi
diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile
index d17cd5f73d5a..f635c6126eae 100644
--- a/devel/opendht/Makefile
+++ b/devel/opendht/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	opendht
 DISTVERSION=	1.9.5
+PORTREVISION=	1
 CATEGORIES=	devel net
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/pijul/Makefile b/devel/pijul/Makefile
index 7f8fa47ebf36..33a564068bae 100644
--- a/devel/pijul/Makefile
+++ b/devel/pijul/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pijul
 PORTVERSION=	0.12.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	https://pijul.org/releases/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/devel/pijul/files/patch-cargo-crates_nettle-sys-1.0.1_bindgen-wrapper.h b/devel/pijul/files/patch-cargo-crates_nettle-sys-1.0.1_bindgen-wrapper.h
new file mode 100644
index 000000000000..bbde35c4fc51
--- /dev/null
+++ b/devel/pijul/files/patch-cargo-crates_nettle-sys-1.0.1_bindgen-wrapper.h
@@ -0,0 +1,51 @@
+From af76e728b3f309b6962847f06876e6c4c6a8c065 Mon Sep 17 00:00:00 2001
+From: Justus Winter <justus@sequoia-pgp.org>
+Date: Mon, 1 Jul 2019 12:05:09 +0200
+Subject: [PATCH] Do not bind the openssl-compat interface.
+
+  * In Nettle 3.5, the libdes/openssl compatibility interface is
+    removed, breaking the build of nettle-sys.
+
+  * Fix this by not binding any of the compatibility interfaces
+    present in Nettle.
+
+  * Fixes #4.
+
+From 7ec219212af8c1331a645b5a153bc2271bef19e6 Mon Sep 17 00:00:00 2001
+From: Justus Winter <justus@sequoia-pgp.org>
+Date: Mon, 8 Jul 2019 11:55:37 +0200
+Subject: [PATCH] Fix building against latest Nettle.
+
+  - `nettle/nettle-stdint.h` is no longer distributed with Nettle.
+    Dropping it from `bindgen-wrapper.h` does not change the generated
+    bindings, hence we do not need to bump the major version.
+
+  - Tested against Nettle revision
+    eead7cfa32c341b5193a697273de9fc7336e694a.
+
+  - Fixes #5.
+--- cargo-crates/nettle-sys-1.0.1/bindgen-wrapper.h.orig	2017-11-30 11:38:42 UTC
++++ cargo-crates/nettle-sys-1.0.1/bindgen-wrapper.h
+@@ -16,9 +16,7 @@
+ #include <nettle/chacha.h>
+ #include <nettle/ctr.h>
+ #include <nettle/curve25519.h>
+-#include <nettle/des-compat.h>
+ #include <nettle/des.h>
+-#include <nettle/dsa-compat.h>
+ #include <nettle/dsa.h>
+ #include <nettle/eax.h>
+ #include <nettle/ecc-curve.h>
+@@ -33,12 +31,10 @@
+ #include <nettle/macros.h>
+ #include <nettle/md2.h>
+ #include <nettle/md4.h>
+-#include <nettle/md5-compat.h>
+ #include <nettle/md5.h>
+ #include <nettle/memops.h>
+ #include <nettle/memxor.h>
+ #include <nettle/nettle-meta.h>
+-#include <nettle/nettle-stdint.h>
+ #include <nettle/nettle-types.h>
+ #include <nettle/pbkdf2.h>
+ #include <nettle/pgp.h>
diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile
index dfba36a6f3f1..65d8bda323f8 100644
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dnsmasq
 DISTVERSION=	2.80rc1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/release-candidates/
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index d0021f27d415..dc4194202a52 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dnsmasq
 DISTVERSION=	2.80
-PORTREVISION=	2	# leave this in even if 0 to avoid PORTEPOCH bumps
+PORTREVISION=	3	# leave this in even if 0 to avoid PORTEPOCH bumps
 PORTEPOCH=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/ \
diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
index 9fcd1155f123..8f6f78f3c560 100644
--- a/dns/knot-resolver/Makefile
+++ b/dns/knot-resolver/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	knot-resolver
 DISTVERSION=	3.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
 		https://dns.company/downloads/knot-resolver/
diff --git a/dns/knot2/Makefile b/dns/knot2/Makefile
index ca7f0d0eb2ad..cbb2535db60c 100644
--- a/dns/knot2/Makefile
+++ b/dns/knot2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	knot
 DISTVERSION=	2.8.1
+PORTREVISION=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
 		https://dns.company/downloads/knot-dns/
diff --git a/emulators/qemu-cheri/Makefile b/emulators/qemu-cheri/Makefile
index 16878918e825..2185e4d43e14 100644
--- a/emulators/qemu-cheri/Makefile
+++ b/emulators/qemu-cheri/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	0.d${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES=	emulators devel
 PKGNAMESUFFIX=	-cheri
 
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 23116688ea99..301256eb6c28 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	3.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 PKGNAMESUFFIX=	-devel
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 80fffd10e146..b4a34f306c90 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	3.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 DIST_SUBDIR=	qemu/${PORTVERSION}
diff --git a/emulators/qemu2/Makefile b/emulators/qemu2/Makefile
index 40481f425ead..24b767c716aa 100644
--- a/emulators/qemu2/Makefile
+++ b/emulators/qemu2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	2.12.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 PKGNAMESUFFIX=	2
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 91714b590ede..27873f6db455 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	7.65.1
+PORTREVISION=	1
 CATEGORIES=	ftp net www
 MASTER_SITES=	https://curl.haxx.se/download/ \
 		LOCAL/sunpoet
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 5b8a72891e74..8e8c5f9fa61c 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	filezilla
 PORTVERSION=	3.40.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp
 MASTER_SITES=	https://download.filezilla-project.org/client/
 DISTNAME=	FileZilla_${PORTVERSION}_src
diff --git a/ftp/libfilezilla/Makefile b/ftp/libfilezilla/Makefile
index 53e6ab7cff52..24c1ad5c0fb7 100644
--- a/ftp/libfilezilla/Makefile
+++ b/ftp/libfilezilla/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libfilezilla
 PORTVERSION=	0.15.1
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	https://download.filezilla-project.org/${PORTNAME}/
 
diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index 1589a15fd52d..d8abf04c331d 100644
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	supertuxkart
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/supertuxkart/SuperTuxKart/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/graphics/aseprite/Makefile b/graphics/aseprite/Makefile
index 6bf992805def..7828e4c1efcb 100644
--- a/graphics/aseprite/Makefile
+++ b/graphics/aseprite/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=		aseprite
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.2.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=		graphics
 
 MAINTAINER=		yuri@FreeBSD.org
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 14a5ae0d1479..28a5c3318c95 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	claws-mail
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail news ipv6
 
 COMMENT=	Lightweight and featureful GTK+ based e-mail and news client
diff --git a/multimedia/gstreamer1-plugins-hls/Makefile b/multimedia/gstreamer1-plugins-hls/Makefile
index eba6a1ad0426..fa3d6f26bc4b 100644
--- a/multimedia/gstreamer1-plugins-hls/Makefile
+++ b/multimedia/gstreamer1-plugins-hls/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	GStreamer HTTP Live Streaming (HLS) plugin
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index 556313b045be..65a3353724cd 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kodi
 DISTVERSION=	17.6
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	multimedia java
 
 MAINTAINER=	mickael.maillot@gmail.com
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index 82e651f70551..3d8e32c1dfca 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libav
 PORTVERSION=	12.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
diff --git a/net-p2p/ncdc/Makefile b/net-p2p/ncdc/Makefile
index 65f7481ed324..c5be4acbea5d 100644
--- a/net-p2p/ncdc/Makefile
+++ b/net-p2p/ncdc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ncdc
 PORTVERSION=	1.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://dev.yorhel.nl/download/
 
diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index e9a981098fc3..11a6f5ab7626 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	chrony
 PORTVERSION=	3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://download.tuxfamily.org/chrony/
 
diff --git a/net/libstorj/Makefile b/net/libstorj/Makefile
index 368ce8928e95..83995cd5c1fd 100644
--- a/net/libstorj/Makefile
+++ b/net/libstorj/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libstorj
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile
index df18f92d7bc2..2495ccc0b8c2 100644
--- a/net/ocserv/Makefile
+++ b/net/ocserv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ocserv
 PORTVERSION=	0.12.4
+PORTREVISION=	1
 CATEGORIES=	net security
 MASTER_SITES=	ftp://ftp.infradead.org/pub/ocserv/
 
diff --git a/net/radcli/Makefile b/net/radcli/Makefile
index 3fe36c03eb8e..8606dd22f9fb 100644
--- a/net/radcli/Makefile
+++ b/net/radcli/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	radcli
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	neel@neelc.org
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index da52dd367919..1657f5b2bbb2 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gnutls
 PORTVERSION=	3.6.8
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	GNUPG/gnutls/v${PORTVERSION:R}
 
diff --git a/security/libkpass/Makefile b/security/libkpass/Makefile
index fc3854a02c5b..fe678f4e2efb 100644
--- a/security/libkpass/Makefile
+++ b/security/libkpass/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libkpass
 PORTVERSION=	6
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/security/nettle/Makefile b/security/nettle/Makefile
index 9cbe767a024b..3427c2bb2878 100644
--- a/security/nettle/Makefile
+++ b/security/nettle/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nettle
-PORTVERSION=	3.4.1
-PORTREVISION=	1
+PORTVERSION=	3.5.1
 CATEGORIES=	security
 MASTER_SITES=	GNU \
 		https://www.lysator.liu.se/~nisse/archive/
@@ -27,11 +26,10 @@ USES=		compiler:c11 gmake localbase makeinfo pathfix
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=	M4="/usr/bin/m4 -g"
 GNU_CONFIGURE=	yes
-#USE_CSTD=	c11
 USE_LDCONFIG=	yes
 
 INFO=		nettle
-PORTDOCS=	NEWS README TODO nettle.html nettle.pdf
+PORTDOCS=	NEWS README nettle.html nettle.pdf
 PORTEXAMPLES=	*.c *.h
 
 .include <bsd.port.options.mk>
diff --git a/security/nettle/distinfo b/security/nettle/distinfo
index d7591e34b74b..b78e80c1244a 100644
--- a/security/nettle/distinfo
+++ b/security/nettle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1544007142
-SHA256 (nettle-3.4.1.tar.gz) = f941cf1535cd5d1819be5ccae5babef01f6db611f9b5a777bae9c7604b8a92ad
-SIZE (nettle-3.4.1.tar.gz) = 1947053
+TIMESTAMP = 1561724684
+SHA256 (nettle-3.5.1.tar.gz) = 75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419
+SIZE (nettle-3.5.1.tar.gz) = 1989593
diff --git a/security/nettle/pkg-plist b/security/nettle/pkg-plist
index c76dd159731f..957a59d79963 100644
--- a/security/nettle/pkg-plist
+++ b/security/nettle/pkg-plist
@@ -19,9 +19,9 @@ include/nettle/ccm.h
 include/nettle/cfb.h
 include/nettle/chacha-poly1305.h
 include/nettle/chacha.h
+include/nettle/cmac.h
 include/nettle/ctr.h
 include/nettle/curve25519.h
-include/nettle/des-compat.h
 include/nettle/des.h
 include/nettle/dsa-compat.h
 include/nettle/dsa.h
@@ -43,7 +43,6 @@ include/nettle/md5.h
 include/nettle/memops.h
 include/nettle/memxor.h
 include/nettle/nettle-meta.h
-include/nettle/nettle-stdint.h
 include/nettle/nettle-types.h
 include/nettle/pbkdf2.h
 include/nettle/pgp.h
@@ -64,14 +63,15 @@ include/nettle/sha3.h
 include/nettle/twofish.h
 include/nettle/umac.h
 include/nettle/version.h
+include/nettle/xts.h
 include/nettle/yarrow.h
 lib/libhogweed.a
 lib/libhogweed.so
-lib/libhogweed.so.4
-lib/libhogweed.so.4.5
+lib/libhogweed.so.5
+lib/libhogweed.so.5.0
 lib/libnettle.a
 lib/libnettle.so
-lib/libnettle.so.6
-lib/libnettle.so.6.5
+lib/libnettle.so.7
+lib/libnettle.so.7.0
 libdata/pkgconfig/hogweed.pc
 libdata/pkgconfig/nettle.pc
diff --git a/sysutils/rdup/Makefile b/sysutils/rdup/Makefile
index 2d22a2546626..9121f04c5839 100644
--- a/sysutils/rdup/Makefile
+++ b/sysutils/rdup/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rdup
 PORTVERSION=	1.1.15
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	rm@FreeBSD.org
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index b10610781fad..1f925825d924 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	epiphany
 PORTVERSION=	3.28.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 18e5dc656130..afdee55d4101 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	4.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.squid-cache.org/Versions/v4/ \
 		http://www2.us.squid-cache.org/Versions/v4/ \
diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index 4df2fcb84468..2f777fa982d4 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.5.28
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
 		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \