Update to 2.2. Update LICENSE (see below).

NEWS for the 2.2 release

	Licensing change:

	* Relicensed as LGPL v2.1 or later (user's option).

	* Replaced blowfish and serpent implementation. New code is
          based on the LGPLed code in libgcrypt.

	New features:

	* Support for Galois/Counter Mode (GCM).

	* New interface for enumerating (most) available algorithms,
	  contributed by Daniel Kahn Gillmor.

	* New tool nettle-hash. Can generate hash digests using any
	  supported hash function, with output compatible with md5sum
	  and friends from GNU coreutils. Checking (like md5sum -c)
	  not yet implemented.

	Bug fixes:

	* The old serpent code had a byte order bug (introduced by
	  yours truly about ten years ago). New serpent implementation
	  does not interoperate with earlier versions of nettle.

	* Fixed ABI-dependent libdir default for Linux-based systems
	  which do not follow the Linux File Hierarchy Standard, e.g.,
	  Debian GNU/Linux.

	Optimizations:

	* x86_64 implemention of serpent.

	* x86_64 implemention of camellia.

	* Optimized memxor using word rather than byte operations.
          Both generic C and x86_64 assembler.

	* Eliminated a memcpy for in-place CBC decrypt.

	Miscellaneous:

	* In command line tools, no longer support -? for requesting
          help, since using it without shell quoting is a dangerous
          habit. Use long option --help instead.

	The shared library names are libnettle.so.4.1 and
	libhogweed.so.2.1, with sonames libnettle.so.4 and
	libhogweed.so.2.

3 files changed, 29 insertions, 24 deletions

diff --git a/security/nettle/patches/patch-Makefile.in b/security/nettle/patches/patch-Makefile.in
index 5e66bce2b41..98f6febde61 100644
--- a/security/nettle/patches/patch-Makefile.in
+++ b/security/nettle/patches/patch-Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile.in,v 1.2 2011/04/26 09:54:55 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2011/08/22 15:09:21 wiz Exp $
 
 Use LIBTOOL.
 
---- Makefile.in.orig	2010-07-25 19:30:13.000000000 +0000
+--- Makefile.in.orig	2011-07-11 13:59:25.000000000 +0000
 +++ Makefile.in
 @@ -14,13 +14,13 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = $(INSTALL_PROGRAM) -s
@@ -19,25 +19,25 @@ Use LIBTOOL.
 +LIBTARGETS = libnettle.la @IF_HOGWEED@ libhogweed.la
  SHLIBTARGETS = $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
  
- TARGETS = aesdata$(EXEEXT) desdata$(EXEEXT) shadata$(EXEEXT) \
-@@ -138,19 +138,19 @@ hogweed_OBJS = $(hogweed_SOURCES:.c=.$(O
+ TARGETS = aesdata$(EXEEXT) desdata$(EXEEXT) shadata$(EXEEXT) gcmdata$(EXEEXT)\
+@@ -141,18 +141,18 @@ nettle_PURE_OBJS = $(nettle_OBJS:.$(OBJE
+ hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT))
  hogweed_PURE_OBJS = $(hogweed_OBJS:.$(OBJEXT)=.p$(OBJEXT))
  
- # FIXME: Do we really need to delete the archive first?
 -libnettle.a: $(nettle_OBJS)
 -	-rm -f $@
 -	$(AR) $(ARFLAGS) $@ $(nettle_OBJS)
 -	$(RANLIB) $@
-+libnettle.la: $(nettle_OBJS)
-+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o libnettle.la \
-+		${nettle_OBJS:.o=.lo} -rpath ${PREFIX}/lib \
-+		-version-info ${LIBNETTLE_MAJOR}:${LIBNETTLE_MINOR}
- 
- # FIXME: Do we really need to delete the archive first?
+-
 -libhogweed.a: $(hogweed_OBJS)
 -	-rm -f $@
 -	$(AR) $(ARFLAGS) $@ $(hogweed_OBJS)
 -	$(RANLIB) $@
++libnettle.la: $(nettle_OBJS)
++	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o libnettle.la \
++		${nettle_OBJS:.o=.lo} -rpath ${PREFIX}/lib \
++		-version-info ${LIBNETTLE_MAJOR}:${LIBNETTLE_MINOR}
++
 +libhogweed.la: $(hogweed_OBJS)
 +	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o libhogweed.la \
 +		${hogweed_OBJS:.o=.lo} -rpath ${PREFIX}/lib \
@@ -49,7 +49,7 @@ Use LIBTOOL.
  	&& $(DEP_PROCESS)
  
  # Rules building shared libraries
-@@ -200,7 +200,7 @@ des.$(OBJEXT): des.c des.h $(des_headers
+@@ -205,7 +205,7 @@ des.$(OBJEXT): des.c des.h $(des_headers
  .asm.$(OBJEXT):
  	$(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \
  		$< >$*.s
@@ -58,7 +58,7 @@ Use LIBTOOL.
  	echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d 
  
  .asm.p$(OBJEXT):
-@@ -266,7 +266,7 @@ install-here: install-info install-heade
+@@ -271,7 +271,7 @@ install-here: install-info install-heade
  install-static: $(LIBTARGETS)
  	$(MKDIR_P) $(DESTDIR)$(libdir)
  	for f in $(LIBTARGETS); do \
diff --git a/security/nettle/patches/patch-testsuite_Makefile.in b/security/nettle/patches/patch-testsuite_Makefile.in
index 75b4d8126dc..20620e4a52a 100644
--- a/security/nettle/patches/patch-testsuite_Makefile.in
+++ b/security/nettle/patches/patch-testsuite_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-testsuite_Makefile.in,v 1.1.1.1 2011/04/26 08:59:33 adam Exp $
+$NetBSD: patch-testsuite_Makefile.in,v 1.2 2011/08/22 15:09:21 wiz Exp $
 
 Use LIBTOOL.
 
---- testsuite/Makefile.in.orig	2011-04-26 08:29:38.000000000 +0000
+--- testsuite/Makefile.in.orig	2011-07-11 13:59:25.000000000 +0000
 +++ testsuite/Makefile.in
-@@ -62,8 +62,8 @@ all: $(TARGETS) $(EXTRA_TARGETS)
+@@ -64,8 +64,8 @@ all: $(TARGETS) $(EXTRA_TARGETS)
  # to use suffix rules to build the test executables. So we use an
  # explicit rule for each and every executable.
  
@@ -15,12 +15,12 @@ Use LIBTOOL.
  
  .PHONY: test-rules
  test-rules:
-@@ -81,7 +81,7 @@ test-rules:
+@@ -83,7 +83,7 @@ test-rules:
  include $(srcdir)/.test-rules.make
  
  $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) \
 -	../libnettle.a @IF_HOGWEED@ ../libhogweed.a
 +	../libnettle.la @IF_HOGWEED@ ../libhogweed.la
  
+ # The PATH update is for locating dlls on w*ndows.
  check: $(TS_ALL) $(srcdir)/run-tests
- 	LD_LIBRARY_PATH=../.lib srcdir="$(srcdir)" \
diff --git a/security/nettle/patches/patch-tools_Makefile.in b/security/nettle/patches/patch-tools_Makefile.in
index d376f197100..ff308ae78f8 100644
--- a/security/nettle/patches/patch-tools_Makefile.in
+++ b/security/nettle/patches/patch-tools_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_Makefile.in,v 1.1.1.1 2011/04/26 08:59:33 adam Exp $
+$NetBSD: patch-tools_Makefile.in,v 1.2 2011/08/22 15:09:21 wiz Exp $
 
 Use LIBTOOL.
 
---- tools/Makefile.in.orig	2010-07-25 19:30:14.000000000 +0000
+--- tools/Makefile.in.orig	2011-07-11 13:59:25.000000000 +0000
 +++ tools/Makefile.in
-@@ -32,15 +32,15 @@ SOURCES = $(sexp_conv_SOURCES) nettle-lf
+@@ -33,19 +33,19 @@ SOURCES = $(sexp_conv_SOURCES) nettle-ha
  DISTFILES = $(SOURCES) Makefile.in getopt.h input.h misc.h output.h parse.h
  
  sexp_conv_OBJS = $(sexp_conv_SOURCES:.c=.$(OBJEXT))
@@ -24,9 +24,14 @@ Use LIBTOOL.
 +pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.la ../libhogweed.la
 +	$(LINK) $(pkcs1_conv_OBJS) ../libhogweed.la ../libnettle.la $(LIBS) -o $@
  
- .c.$(OBJEXT):
- 	$(COMPILE) -c $< && $(DEP_PROCESS)
-@@ -55,7 +55,7 @@ check:
+ # FIXME: Avoid linking with gmp
+ nettle_hash_OBJS = $(nettle_hash_SOURCES:.c=.$(OBJEXT))
+-nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.a
++nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.la
+ 	$(LINK) $(nettle_hash_OBJS) -lnettle $(LIBS) -o $@
+ 
+ 
+@@ -62,7 +62,7 @@ check:
  install: $(TARGETS)
  	$(MKDIR_P) $(DESTDIR)$(bindir)
  	for f in $(TARGETS) ; do \