nisse@lysator.liu.se (Niels Möller) writes:
Nikos Mavrogiannopoulos nmav@redhat.com writes:
The x86_64/sha_ni directory is not included in the distribution, and thus compilation fails when --enable-fat is provided. I update my previous patch to add `make distcheck` to include enable-fat, so that missing files from distribution are caught earlier.
Ouch. I'll have to make an updated release later today or tomorrow.
Below is the patch I'm considering, as well as the diff to the file list of the resulting tar file (I've also moved away two unfinished and uncommitted files from the x86_64 directory, which were unintentionally picked up by make dist).
I'm not changing the library versions, since any configuration of 3.5 that can be built succesfully will be completely compatible with 3.5.1, with the only difference being that x86_64 builds with --enable-x86-sha-ni will be a lot faster with 3.5.1.
Any last minute comments appreciated. I intend to do the updated release in a few hours, since I'm about to leave for summer vacation.
Regards, /Niels
diff --git a/ChangeLog b/ChangeLog index c3d298c7..32a3e3ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2019-06-26 Niels Möller nisse@lysator.liu.se
+ * configure.ac: Update version number to 3.5.1. + + * Makefile.in (distdir): Add x86_64/sha_ni to list of distributed + directories. + * Released nettle-3.5.
2019-06-25 Niels Möller nisse@lysator.liu.se diff --git a/Makefile.in b/Makefile.in index a6b8ffd6..537e97d1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -586,7 +586,7 @@ distdir: $(DISTFILES) fi ; \ done set -e; for d in sparc32 sparc64 x86 \ - x86_64 x86_64/aesni x86_64/fat \ + x86_64 x86_64/aesni x86_64/sha_ni x86_64/fat \ arm arm/neon arm/v6 arm/fat ; do \ mkdir "$(distdir)/$$d" ; \ find "$(srcdir)/$$d" -maxdepth 1 '(' -name '*.asm' -o -name '*.m4' ')' \ diff --git a/NEWS b/NEWS index 622377f3..5e94c893 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,16 @@ +NEWS for the Nettle 3.5.1 release + + The Nettle-3.5.1 corrects a packaging mistake in Nettle-3.5. + The new directory x86_64/sha_ni were missing in the tar file, + breaking x86_64 builds with --enable-fat, and producing worse + performance than promised for builds with --enable-x86-sha-ni. + Also a few unused in-progress assembly files were accidentally + included in the tar file. + + These problems are corrected in Nettle-3.5.1. There are no + other changes, and also the library version numbers are + unchanged. + NEWS for the Nettle 3.5 release
This release adds a couple of new features and optimizations, diff --git a/configure.ac b/configure.ac index 00d2bf5d..3547cae4 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl -*- mode: shell-script; sh-indentation: 2; -*-
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([nettle], [3.5], [nettle-bugs@lists.lysator.liu.se]) +AC_INIT([nettle], [3.5.1], [nettle-bugs@lists.lysator.liu.se]) AC_PREREQ(2.61) AC_CONFIG_SRCDIR([arcfour.c]) # Needed to stop autoconf from looking for files in parent directories.
--- /dev/fd/63 2019-06-26 19:24:14.688527655 +0200 +++ /dev/fd/62 2019-06-26 19:24:14.692527654 +0200 @@ -123,7 +123,6 @@ x86_64/aes-decrypt-internal.asm x86_64/ecc-256-redc.asm x86_64/salsa20-crypt.asm -x86_64/ecc-25519-modp-mul.asm x86_64/md5-compress.asm x86_64/gcm-hash8.asm x86_64/sha256-compress.asm @@ -157,13 +156,15 @@ x86_64/sha512-compress.asm x86_64/chacha-core-internal.asm x86_64/ecc-224-modp.asm +x86_64/sha_ni/ +x86_64/sha_ni/sha256-compress.asm +x86_64/sha_ni/sha1-compress.asm x86_64/salsa20.m4 x86_64/poly1305-internal.asm x86_64/serpent-decrypt.asm x86_64/umac-nh.asm x86_64/memxor.asm x86_64/ecc-25519-modp.asm -x86_64/sha1-compress-sse.asm x86_64/serpent-encrypt.asm x86_64/ecc-521-modp.asm camellia-absorb.c