From 6b01ce2eca229131a415f1e03a4b13e0011efeb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Sun, 25 Jul 2010 21:28:53 +0200
Subject: [PATCH] Use camellia-crypt-internal.asm, if available. Bumped soname
 to libnettle.so.4, and reset LIBNETTLE_MINOR to zero.

Rev: nettle/ChangeLog:1.104
Rev: nettle/NEWS:1.8
Rev: nettle/configure.ac:1.21
---
 ChangeLog    |  4 ++++
 NEWS         | 11 ++++++++---
 configure.ac |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8d98feee..7df4d230 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2010-07-25  Niels M�ller  <nisse@lysator.liu.se>
 
+	* Released nettle-2.1.
+
 	* configure.ac: Use camellia-crypt-internal.asm, if available.
+	Bumped soname to libnettle.so.4, and reset LIBNETTLE_MINOR to
+	zero.
 
 	* x86/machine.m4 (LREG, HREG): Moved macros here, from... 
 	* x86/aes.m4: ...here.
diff --git a/NEWS b/NEWS
index b3d72461..e219630e 100644
--- a/NEWS
+++ b/NEWS
@@ -29,9 +29,14 @@ NEWS for the 2.1 release
 	  status attribute in struct des_ctx, struct des3_ctx, and
 	  struct blowfish_ctx.
 
+	The shared library names are libnettle.so.4.0 and
+	libhogweed.so.2.0, with sonames libnettle.so.4 and
+	libhogweed.so.2.
+
 	Other changes:
 
-	* Support for the Camellia block cipher.
+	* Support for the Camellia block cipher, including an
+          assembler implementation for x86_32.
 
 	* New function aes_invert_key, useful for applications that
 	  need both encryption and decryption using the same AES key.
@@ -57,7 +62,7 @@ NEWS for the 2.1 release
 	  distribution (was accidentally left out in nettle-2.0).
 
 	* Configure script now detects if the compiler uses a 32-bit
-          or 64-bit on x86_64 (prevously did this for sparc only).
+          or 64-bit ABI on x86_64 (prevously did this for sparc only).
           Also sets the default location for installing libraries
           (libdir) depending on system type and the ABI used.
 
@@ -72,7 +77,7 @@ NEWS for the 2.1 release
           Contributed by Magnus Holmgren.
 
 	* Slightly improved sha1 performance on x86.
-	
+
 NEWS for the 2.0 release
 
 	This release breaks binary compatibility by splitting the
diff --git a/configure.ac b/configure.ac
index 4497b8c8..0251ffa0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,8 @@ AC_CONFIG_AUX_DIR([.])
 
 AC_CONFIG_HEADER([config.h])
 
-LIBNETTLE_MAJOR=3
-LIBNETTLE_MINOR=1
+LIBNETTLE_MAJOR=4
+LIBNETTLE_MINOR=0
 
 LIBHOGWEED_MAJOR=2
 LIBHOGWEED_MINOR=0
-- 
GitLab