Update to 2.4:

NEWS for the 2.4 release

	This is a bugfix release only. It turned out ripemd160 in the
	2.3 release was broken on all big-endian systems, due to a
	missing include of config.h. nettle-2.4 fixes this.

	The library is intended to be binary compatible with
	nettle-2.2 and nettle-2.3. The shared library names are
	libnettle.so.4.3 and libhogweed.so.2.1, with sonames still
	libnettle.so.4 and libhogweed.so.2.

NEWS for the 2.3 release

	* Support for the ripemd-160 hash function.

	* Generates and installs nettle.pc and hogweed.pc files, for
          use with pkg-config. Feedback appreciated. For projects
          using autoconf, the traditional non-pkg-config ways of
          detecting libraries, and setting LIBS and LDFLAGS, is still
          recommended.

	* Fixed a bug which made the testsuite fail in the GCM test on
	  certain platforms. Should not affect any documented features
	  of the library.

	* Reorganization of the code for the various Merkle-Damg
	  hash functions. Some fields in the context structs for md4,
	  md5 and sha1 have been renamed, for consistency.
	  Applications should not peek inside these structs, and the
	  ABI is unchanged.

	* In the manual, fixed mis-placed const in certain function
          prototypes.

	The library is intended to be binary compatible with
	nettle-2.2. The shared library names are libnettle.so.4.2 and
	libhogweed.so.2.1, with sonames still libnettle.so.4 and
	libhogweed.so.2.

4 files changed, 12 insertions, 47 deletions

diff --git a/security/nettle/Makefile b/security/nettle/Makefile
index d134d91f001..8bc82674ab8 100644
--- a/security/nettle/Makefile
+++ b/security/nettle/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2011/08/22 15:09:21 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2011/09/08 20:22:13 wiz Exp $
 
-DISTNAME=	nettle-2.2
+DISTNAME=	nettle-2.4
 CATEGORIES=	devel security
 MASTER_SITES=	http://www.lysator.liu.se/~nisse/archive/ \
 		ftp://ftp.lysator.liu.se/pub/security/lsh/
@@ -21,6 +21,8 @@ CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib
 
 INFO_FILES=		yes
 TEST_TARGET=		check
+PKGCONFIG_OVERRIDE=	hogweed.pc.in
+PKGCONFIG_OVERRIDE+=	nettle.pc.in
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/nettle/PLIST b/security/nettle/PLIST
index e18777a8f89..457de991a40 100644
--- a/security/nettle/PLIST
+++ b/security/nettle/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/08/22 15:09:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/09/08 20:22:13 wiz Exp $
 bin/nettle-hash
 bin/nettle-lfib-stream
 bin/pkcs1-conv
@@ -34,6 +34,7 @@ include/nettle/nettle-types.h
 include/nettle/pgp.h
 include/nettle/pkcs1.h
 include/nettle/realloc.h
+include/nettle/ripemd160.h
 include/nettle/rsa-compat.h
 include/nettle/rsa.h
 include/nettle/serpent.h
@@ -44,3 +45,5 @@ include/nettle/yarrow.h
 info/nettle.info
 lib/libhogweed.la
 lib/libnettle.la
+lib/pkgconfig/hogweed.pc
+lib/pkgconfig/nettle.pc
diff --git a/security/nettle/distinfo b/security/nettle/distinfo
index 6d5cd3ae051..6fb3dd378a4 100644
--- a/security/nettle/distinfo
+++ b/security/nettle/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.5 2011/08/25 20:17:25 tron Exp $
+$NetBSD: distinfo,v 1.6 2011/09/08 20:22:13 wiz Exp $
 
-SHA1 (nettle-2.2.tar.gz) = 5e2a914a8104308bd7a63338a8a732b4d3ef0ae4
-RMD160 (nettle-2.2.tar.gz) = fd9616054759ac229c23ad6c64745d66c5ea8d1a
-Size (nettle-2.2.tar.gz) = 1060360 bytes
+SHA1 (nettle-2.4.tar.gz) = 1df0cd013e83f73b78a5521411a67e331de3dfa6
+RMD160 (nettle-2.4.tar.gz) = 8480e10ce718db1a280d57a808a78a4cfa940d1c
+Size (nettle-2.4.tar.gz) = 1075789 bytes
 SHA1 (patch-Makefile.in) = cf1f0fb4e23657f493f381c80b31e7c6294b67e7
 SHA1 (patch-config.make.in) = 0bf3d2729b97883b41374a1ea3d5286fd2554e98
-SHA1 (patch-nettle-internal.h) = 519c7e305619db924e3cf0ae54bbd083bc8859f6
 SHA1 (patch-testsuite_Makefile.in) = f73c6af3fc2ae63174406df4ff89892f7b5634d7
 SHA1 (patch-tools_Makefile.in) = 5eca9e6d806cea894493122f7e1c79d6a26f2c88
 SHA1 (patch-x86_camellia-crypt-internal.asm) = 0dd04f76ccca63f0c3e7260269fa8f74d01ddda3
diff --git a/security/nettle/patches/patch-nettle-internal.h b/security/nettle/patches/patch-nettle-internal.h
deleted file mode 100644
index 8e2dfc13401..00000000000
--- a/security/nettle/patches/patch-nettle-internal.h
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-nettle-internal.h,v 1.1 2011/08/25 20:17:26 tron Exp $
-
-Fix linking problem under Mac OS X.
-
---- nettle-internal.h.orig	2011-07-11 14:59:25.000000000 +0100
-+++ nettle-internal.h	2011-08-25 21:14:05.000000000 +0100
-@@ -108,20 +108,20 @@
-   (nettle_hash_digest_func *) type##_##name##_digest,	\
- }
- 
--const struct nettle_aead nettle_gcm_aes128;
--const struct nettle_aead nettle_gcm_aes192;
--const struct nettle_aead nettle_gcm_aes256;
-+extern const struct nettle_aead nettle_gcm_aes128;
-+extern const struct nettle_aead nettle_gcm_aes192;
-+extern const struct nettle_aead nettle_gcm_aes256;
- 
--const struct nettle_aead nettle_gcm_camellia128;
--const struct nettle_aead nettle_gcm_camellia192;
--const struct nettle_aead nettle_gcm_camellia256;
-+extern const struct nettle_aead nettle_gcm_camellia128;
-+extern const struct nettle_aead nettle_gcm_camellia192;
-+extern const struct nettle_aead nettle_gcm_camellia256;
- 
--const struct nettle_aead nettle_gcm_serpent128;
--const struct nettle_aead nettle_gcm_serpent192;
--const struct nettle_aead nettle_gcm_serpent256;
-+extern const struct nettle_aead nettle_gcm_serpent128;
-+extern const struct nettle_aead nettle_gcm_serpent192;
-+extern const struct nettle_aead nettle_gcm_serpent256;
- 
--const struct nettle_aead nettle_gcm_twofish128;
--const struct nettle_aead nettle_gcm_twofish192;
--const struct nettle_aead nettle_gcm_twofish256;
-+extern const struct nettle_aead nettle_gcm_twofish128;
-+extern const struct nettle_aead nettle_gcm_twofish192;
-+extern const struct nettle_aead nettle_gcm_twofish256;
- 
- #endif /* NETTLE_INTERNAL_H_INCLUDED */