diff --git a/.gitignore b/.gitignore index a1e2d07..7527596 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/nettle-3.1.1-hobbled.tar.gz +/nettle-3.2-hobbled.tar.xz diff --git a/mingw-nettle.spec b/mingw-nettle.spec index 11c96c8..409c977 100644 --- a/mingw-nettle.spec +++ b/mingw-nettle.spec @@ -1,16 +1,17 @@ %{?mingw_package_header} Name: mingw-nettle -Version: 3.1.1 -Release: 2%{?dist} +Version: 3.2 +Release: 1%{?dist} Summary: MinGW package for nettle cryptographic library License: LGPLv3+ or GPLv2+ Group: Development/Libraries URL: http://www.lysator.liu.se/~nisse/nettle/ # http://www.lysator.liu.se/~nisse/archive/nettle-%{version}.tar.gz -Source: nettle-%{version}-hobbled.tar.gz +Source: nettle-%{version}-hobbled.tar.xz Patch0: nettle-3.1.1-remove-ecc-testsuite.patch +Patch1: nettle-3.2-version-h.patch BuildArch: noarch @@ -67,6 +68,7 @@ or even in kernel space. sed 's/ecc-192.c//g' -i Makefile.in sed 's/ecc-224.c//g' -i Makefile.in %patch0 -p1 -b .ecc +%patch1 -p1 -b .arch %build @@ -95,8 +97,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_infodir}/ %{mingw32_bindir}/nettle-pbkdf2.exe %{mingw32_bindir}/pkcs1-conv.exe %{mingw32_bindir}/sexp-conv.exe -%{mingw32_bindir}/libnettle-6-1.dll -%{mingw32_bindir}/libhogweed-4-1.dll +%{mingw32_bindir}/libnettle-6-2.dll +%{mingw32_bindir}/libhogweed-4-2.dll %{mingw32_libdir}/libnettle.dll.a %{mingw32_libdir}/libhogweed.dll.a %{mingw32_libdir}/pkgconfig/nettle.pc @@ -114,8 +116,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_infodir}/ %{mingw64_bindir}/nettle-pbkdf2.exe %{mingw64_bindir}/pkcs1-conv.exe %{mingw64_bindir}/sexp-conv.exe -%{mingw64_bindir}/libnettle-6-1.dll -%{mingw64_bindir}/libhogweed-4-1.dll +%{mingw64_bindir}/libnettle-6-2.dll +%{mingw64_bindir}/libhogweed-4-2.dll %{mingw64_libdir}/libnettle.dll.a %{mingw64_libdir}/libhogweed.dll.a %{mingw64_libdir}/pkgconfig/nettle.pc @@ -125,6 +127,10 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_infodir}/ %changelog +* Wed Feb 03 2016 Michael Cronenworth - 3.2-1 +- New upstream release +- Fixed CVE-2015-8803 secp256r1 calculation bug (#1304305) + * Wed Jun 17 2015 Fedora Release Engineering - 3.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/nettle-3.2-version-h.patch b/nettle-3.2-version-h.patch new file mode 100644 index 0000000..19c4e35 --- /dev/null +++ b/nettle-3.2-version-h.patch @@ -0,0 +1,17 @@ +diff --git a/version.h.in b/version.h.in +index cf429f2..da0ad15 100644 +--- a/version.h.in ++++ b/version.h.in +@@ -45,12 +45,6 @@ extern "C" { + + #define NETTLE_USE_MINI_GMP @NETTLE_USE_MINI_GMP@ + +-/* We need a preprocessor constant for GMP_NUMB_BITS, simply using +- sizeof(mp_limb_t) * CHAR_BIT is not good enough. */ +-#if NETTLE_USE_MINI_GMP +-# define GMP_NUMB_BITS @GMP_NUMB_BITS@ +-#endif +- + int + nettle_version_major (void); + diff --git a/sources b/sources index ca91de5..f7020f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d1d1e4844bdc196ba34db6b8bb6549a nettle-3.1.1-hobbled.tar.gz +caa868f3b25f36dd197e15d08047d7e6 nettle-3.2-hobbled.tar.xz