From 54820153df58c1f7d1fb512009b43d4a39d15eec Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 18 Jan 2013 10:41:00 +0000
Subject: [PATCH] Update to libnettle-2.6.

---
 security/libnettle/Makefile                  |  8 ++++----
 security/libnettle/distinfo                  |  4 ++--
 security/libnettle/patches/patch-Makefile_in | 10 +++++-----
 security/libnettle/pkg/PLIST                 |  7 ++++++-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/security/libnettle/Makefile b/security/libnettle/Makefile
index f788e091bc5..bf6489e3801 100644
--- a/security/libnettle/Makefile
+++ b/security/libnettle/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.5 2012/09/05 07:14:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2013/01/18 10:41:00 ajacoutot Exp $
 
 COMMENT=	cryptographic library
 
-DISTNAME=	nettle-2.5
+DISTNAME=	nettle-2.6
 PKGNAME=	lib${DISTNAME}
 
-SHARED_LIBS +=  hogweed                   1.0 # 2.4
-SHARED_LIBS +=  nettle                    1.0 # 4.3
+SHARED_LIBS +=  hogweed                   1.1 # 2.3
+SHARED_LIBS +=  nettle                    1.1 # 4.5
 
 CATEGORIES=	security devel
 
diff --git a/security/libnettle/distinfo b/security/libnettle/distinfo
index 59fc52c71c2..f33da19828d 100644
--- a/security/libnettle/distinfo
+++ b/security/libnettle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nettle-2.5.tar.gz) = SqFC6QiwBTCC13KfwBVdyQ2+ccjvX1DzADSAXtXJLHI=
-SIZE (nettle-2.5.tar.gz) = 1113274
+SHA256 (nettle-2.6.tar.gz) = YN9iT2O5l8gyyuKfSKua2pnfgVvNYNIxUmuD54a0sVY=
+SIZE (nettle-2.6.tar.gz) = 1385695
diff --git a/security/libnettle/patches/patch-Makefile_in b/security/libnettle/patches/patch-Makefile_in
index 41c83660753..dac2ba27f69 100644
--- a/security/libnettle/patches/patch-Makefile_in
+++ b/security/libnettle/patches/patch-Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2012/09/05 07:14:47 ajacoutot Exp $
---- Makefile.in.orig	Sat Jul  7 15:27:54 2012
-+++ Makefile.in	Mon Sep  3 13:56:47 2012
-@@ -318,11 +318,6 @@ install-dll-nettle:
+$OpenBSD: patch-Makefile_in,v 1.4 2013/01/18 10:41:00 ajacoutot Exp $
+--- Makefile.in.orig	Mon Jan 14 22:44:12 2013
++++ Makefile.in	Fri Jan 18 11:28:10 2013
+@@ -327,11 +327,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 +13,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2012/09/05 07:14:47 ajacoutot Exp $
  
  install-dll-hogweed:
  	$(MKDIR_P) $(DESTDIR)$(bindir)
-@@ -331,11 +326,6 @@ install-dll-hogweed:
+@@ -340,11 +335,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/pkg/PLIST b/security/libnettle/pkg/PLIST
index f2d99d58cbf..b6cb0bc44d1 100644
--- a/security/libnettle/pkg/PLIST
+++ b/security/libnettle/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2012/09/05 07:14:47 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.5 2013/01/18 10:41:00 ajacoutot Exp $
 %%SHARED%%
 @bin bin/nettle-hash
 @bin bin/nettle-lfib-stream
@@ -22,6 +22,7 @@ include/nettle/des-compat.h
 include/nettle/des.h
 include/nettle/dsa.h
 include/nettle/gcm.h
+include/nettle/gosthash94.h
 include/nettle/hmac.h
 include/nettle/knuth-lfib.h
 include/nettle/macros.h
@@ -33,6 +34,7 @@ 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
 include/nettle/pkcs1.h
 include/nettle/realloc.h
@@ -43,6 +45,9 @@ include/nettle/salsa20.h
 include/nettle/serpent.h
 include/nettle/sexp.h
 include/nettle/sha.h
+include/nettle/sha1.h
+include/nettle/sha2.h
+include/nettle/sha3.h
 include/nettle/twofish.h
 include/nettle/yarrow.h
 @info info/nettle.info