From c4a1d3027212e91061b3d5b3abf59ebc0b221d33 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 20 Nov 2017 09:09:45 +0000
Subject: [PATCH] Update to libnettle-3.4.

---
 security/libnettle/Makefile                  |  7 +++----
 security/libnettle/distinfo                  |  4 ++--
 security/libnettle/patches/patch-Makefile_in | 11 ++++++-----
 security/libnettle/patches/patch-configure   | 11 ++++++-----
 security/libnettle/pkg/PLIST                 |  6 +++++-
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/security/libnettle/Makefile b/security/libnettle/Makefile
index b7140c0aff7..4eefffce7d1 100644
--- a/security/libnettle/Makefile
+++ b/security/libnettle/Makefile
@@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.19 2016/12/29 15:51:29 jca Exp $
+# $OpenBSD: Makefile,v 1.20 2017/11/20 09:09:45 ajacoutot Exp $
 
 COMMENT=		cryptographic library
 
-DISTNAME=		nettle-3.3
-REVISION=		0
+DISTNAME=		nettle-3.4
 PKGNAME=		lib${DISTNAME}
 
 SHARED_LIBS +=  hogweed                   2.0 # 6.2
-SHARED_LIBS +=  nettle                    2.2 # 4.2
+SHARED_LIBS +=  nettle                    3.0 # 4.2
 
 CATEGORIES=		security devel
 
diff --git a/security/libnettle/distinfo b/security/libnettle/distinfo
index bbb123821b7..8213138de8a 100644
--- a/security/libnettle/distinfo
+++ b/security/libnettle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nettle-3.3.tar.gz) = RpQmJ9XQyhFyD+wY2B/Dj374N+pBl8H2MOcc4NRwsR4=
-SIZE (nettle-3.3.tar.gz) = 1887927
+SHA256 (nettle-3.4.tar.gz) = rnpC3wJlULhdrKg4m2pgumMTsFZ/N0OS5UkYWIpBHpQ=
+SIZE (nettle-3.4.tar.gz) = 1935069
diff --git a/security/libnettle/patches/patch-Makefile_in b/security/libnettle/patches/patch-Makefile_in
index 43e30795c15..259abb18bd2 100644
--- a/security/libnettle/patches/patch-Makefile_in
+++ b/security/libnettle/patches/patch-Makefile_in
@@ -1,7 +1,8 @@
-$OpenBSD: patch-Makefile_in,v 1.7 2016/01/30 09:16:41 ajacoutot Exp $
---- Makefile.in.orig	Thu Jan 28 21:02:21 2016
-+++ Makefile.in	Sat Jan 30 10:11:42 2016
-@@ -453,11 +453,6 @@ install-dll-nettle:
+$OpenBSD: patch-Makefile_in,v 1.8 2017/11/20 09:09:45 ajacoutot Exp $
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -457,11 +457,6 @@ install-dll-nettle:
  install-shared-nettle: $(LIBNETTLE_FORLINK) @IF_DLL@ install-dll-nettle
  	$(MKDIR_P) $(DESTDIR)$(libdir)
  	$(INSTALL_DATA) $(LIBNETTLE_FILE_SRC) $(DESTDIR)$(libdir)/$(LIBNETTLE_FILE)
@@ -13,7 +14,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2016/01/30 09:16:41 ajacoutot Exp $
  
  install-dll-hogweed:
  	$(MKDIR_P) $(DESTDIR)$(bindir)
-@@ -466,11 +461,6 @@ install-dll-hogweed:
+@@ -470,11 +465,6 @@ install-dll-hogweed:
  install-shared-hogweed: $(LIBHOGWEED_FORLINK) @IF_DLL@ install-dll-hogweed
  	$(MKDIR_P) $(DESTDIR)$(libdir)
  	$(INSTALL_DATA) $(LIBHOGWEED_FILE_SRC) $(DESTDIR)$(libdir)/$(LIBHOGWEED_FILE)
diff --git a/security/libnettle/patches/patch-configure b/security/libnettle/patches/patch-configure
index 5fe1151ca65..30a0cd687e0 100644
--- a/security/libnettle/patches/patch-configure
+++ b/security/libnettle/patches/patch-configure
@@ -1,12 +1,13 @@
-$OpenBSD: patch-configure,v 1.6 2016/01/30 09:16:41 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.7 2017/11/20 09:09:45 ajacoutot Exp $
 
 Fix relocation errors on (at least) sparc64.
 
 We don't want extra debug flags in regular builds.
 
---- configure.orig	Thu Jan 28 21:02:21 2016
-+++ configure	Sat Jan 30 10:11:42 2016
-@@ -7068,6 +7068,7 @@ else
+Index: configure
+--- configure.orig
++++ configure
+@@ -7090,6 +7090,7 @@ else
  	bsdi4.*)	CCPIC="-fPIC" ;;
  	bsdi*)		CCPIC="" ;;
  	darwin*)	CCPIC="-fPIC" ;;
@@ -14,7 +15,7 @@ We don't want extra debug flags in regular builds.
  	# Could also use -fpic, depending on the number of symbol references
  	solaris*)	CCPIC="-fPIC" ;;
  	cygwin*)	CCPIC="" ;;
-@@ -7754,7 +7755,7 @@ if test x$GCC = xyes ; then
+@@ -7776,7 +7777,7 @@ if test x$GCC = xyes ; then
    if $CC --version | grep '^2\.96$' 1>/dev/null 2>&1; then
      true
    else
diff --git a/security/libnettle/pkg/PLIST b/security/libnettle/pkg/PLIST
index 4ef3c8db7be..dac51d7ee2c 100644
--- a/security/libnettle/pkg/PLIST
+++ b/security/libnettle/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2016/10/03 08:00:46 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.10 2017/11/20 09:09:45 ajacoutot Exp $
 @bin bin/nettle-hash
 @bin bin/nettle-lfib-stream
 @bin bin/nettle-pbkdf2
@@ -18,6 +18,7 @@ include/nettle/camellia.h
 include/nettle/cast128.h
 include/nettle/cbc.h
 include/nettle/ccm.h
+include/nettle/cfb.h
 include/nettle/chacha-poly1305.h
 include/nettle/chacha.h
 include/nettle/ctr.h
@@ -33,6 +34,7 @@ include/nettle/ecdsa.h
 include/nettle/eddsa.h
 include/nettle/gcm.h
 include/nettle/gosthash94.h
+include/nettle/hkdf.h
 include/nettle/hmac.h
 include/nettle/knuth-lfib.h
 include/nettle/macros.h
@@ -49,6 +51,8 @@ include/nettle/pbkdf2.h
 include/nettle/pgp.h
 include/nettle/pkcs1.h
 include/nettle/poly1305.h
+include/nettle/pss-mgf1.h
+include/nettle/pss.h
 include/nettle/realloc.h
 include/nettle/ripemd160.h
 include/nettle/rsa.h