From ae60fd978b0dd8227babf933c8a8a2772abbfd56 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 3 Nov 2021 22:10:49 -0400 Subject: [PATCH] import nettle-3.7.3-2.el9 --- .gitignore | 1 + .nettle.metadata | 1 + SOURCES/nettle-3.4-annocheck.patch | 13 + .../nettle-3.7.2-suppress-maybe-uninit.patch | 40 ++ SPECS/nettle.spec | 366 ++++++++++++++++++ 5 files changed, 421 insertions(+) create mode 100644 .gitignore create mode 100644 .nettle.metadata create mode 100644 SOURCES/nettle-3.4-annocheck.patch create mode 100644 SOURCES/nettle-3.7.2-suppress-maybe-uninit.patch create mode 100644 SPECS/nettle.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b3b09cd --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/nettle-3.7.3-hobbled.tar.xz diff --git a/.nettle.metadata b/.nettle.metadata new file mode 100644 index 0000000..5caa09d --- /dev/null +++ b/.nettle.metadata @@ -0,0 +1 @@ +128dc3ced096462fef4233404b542ed6dfe40b87 SOURCES/nettle-3.7.3-hobbled.tar.xz diff --git a/SOURCES/nettle-3.4-annocheck.patch b/SOURCES/nettle-3.4-annocheck.patch new file mode 100644 index 0000000..b1262a5 --- /dev/null +++ b/SOURCES/nettle-3.4-annocheck.patch @@ -0,0 +1,13 @@ +Index: nettle-3.7/Makefile.in +=================================================================== +--- nettle-3.7.orig/Makefile.in ++++ nettle-3.7/Makefile.in +@@ -291,7 +291,7 @@ libhogweed.a: $(hogweed_OBJS) + + %.$(OBJEXT): %.asm $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 + $(M4) $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 $< >$*.s +- $(COMPILE) -c $*.s ++ $(COMPILE) -c -Wa,--generate-missing-build-notes=yes $*.s + + %.$(OBJEXT): %.c + $(COMPILE) -c $< \ diff --git a/SOURCES/nettle-3.7.2-suppress-maybe-uninit.patch b/SOURCES/nettle-3.7.2-suppress-maybe-uninit.patch new file mode 100644 index 0000000..f7295ea --- /dev/null +++ b/SOURCES/nettle-3.7.2-suppress-maybe-uninit.patch @@ -0,0 +1,40 @@ +From 952c2d890902782ee90b6ed273f1d8b4e95dbff1 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Sun, 21 Mar 2021 11:13:36 +0100 +Subject: [PATCH] nettle-benchmark: suppress -Wmaybe-uninitialized warnings + +--- + examples/nettle-benchmark.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/examples/nettle-benchmark.c b/examples/nettle-benchmark.c +index ca6346e0..518b947d 100644 +--- a/examples/nettle-benchmark.c ++++ b/examples/nettle-benchmark.c +@@ -392,6 +392,7 @@ time_umac(void) + + uint8_t key[16]; + ++ init_key(sizeof(key), key); + umac32_set_key (&ctx32, key); + info.ctx = &ctx32; + info.update = (nettle_hash_update_func *) umac32_update; +@@ -434,6 +435,7 @@ time_cmac(void) + + uint8_t key[16]; + ++ init_key(sizeof(key), key); + cmac_aes128_set_key (&ctx, key); + info.ctx = &ctx; + info.update = (nettle_hash_update_func *) cmac_aes128_update; +@@ -451,6 +453,7 @@ time_poly1305_aes(void) + struct poly1305_aes_ctx ctx; + uint8_t key[32]; + ++ init_key(sizeof(key), key); + poly1305_aes_set_key (&ctx, key); + info.ctx = &ctx; + info.update = (nettle_hash_update_func *) poly1305_aes_update; +-- +2.30.2 + diff --git a/SPECS/nettle.spec b/SPECS/nettle.spec new file mode 100644 index 0000000..506a8cf --- /dev/null +++ b/SPECS/nettle.spec @@ -0,0 +1,366 @@ +# Recent so-version, so we do not bump accidentally. +%global nettle_so_ver 8 +%global hogweed_so_ver 6 + +# Set to 1 when building a bootstrap for a bumped so-name. +%global bootstrap 0 + +%if 0%{?bootstrap} +%global version_old 3.5.1 +%global nettle_so_ver_old 7 +%global hogweed_so_ver_old 5 +%endif + +%bcond_without fips + +Name: nettle +Version: 3.7.3 +Release: 2%{?dist} +Summary: A low-level cryptographic library + +License: LGPLv3+ or GPLv2+ +URL: http://www.lysator.liu.se/~nisse/nettle/ +Source0: %{name}-%{version}-hobbled.tar.xz +#Source0: http://www.lysator.liu.se/~nisse/archive/%{name}-%{version}.tar.gz +%if 0%{?bootstrap} +Source1: %{name}-%{version_old}-hobbled.tar.xz +Source2: nettle-3.5-remove-ecc-testsuite.patch +%endif +Patch0: nettle-3.4-annocheck.patch +Patch1: nettle-3.7.2-suppress-maybe-uninit.patch + +BuildRequires: make +BuildRequires: gcc +BuildRequires: gmp-devel, m4 +BuildRequires: libtool, automake, autoconf, gettext-devel +%if %{with fips} +BuildRequires: fipscheck +%endif + +%package devel +Summary: Development headers for a low-level cryptographic library +Requires: %{name} = %{version}-%{release} +Requires: gmp-devel%{?_isa} + +%description +Nettle is a cryptographic library that is designed to fit easily in more +or less any context: In crypto toolkits for object-oriented languages +(C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in +kernel space. + +%description devel +Nettle is a cryptographic library that is designed to fit easily in more +or less any context: In crypto toolkits for object-oriented languages +(C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in +kernel space. This package contains the files needed for developing +applications with nettle. + + +%prep +%autosetup -Tb 0 -p1 + +%if 0%{?bootstrap} +mkdir -p bootstrap_ver +pushd bootstrap_ver +tar --strip-components=1 -xf %{SOURCE1} +patch -p1 < %{SOURCE2} + +# Disable -ggdb3 which makes debugedit unhappy +sed s/ggdb3/g/ -i configure +sed 's/ecc-192.c//g' -i Makefile.in +sed 's/ecc-224.c//g' -i Makefile.in +popd +%endif + +# Disable -ggdb3 which makes debugedit unhappy +sed s/ggdb3/g/ -i configure +sed 's/ecc-secp192r1.c//g' -i Makefile.in +sed 's/ecc-secp224r1.c//g' -i Makefile.in + +%build +autoreconf -ifv +%configure --enable-shared --enable-fat +%make_build + +%if 0%{?bootstrap} +pushd bootstrap_ver +autoconf +%configure --with-tests +%make_build +popd +%endif + +%if %{with fips} +%define fipshmac() \ + fipshmac -d $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/%1.* \ + file=`basename $RPM_BUILD_ROOT%{_libdir}/%1.*.hmac` && \ + mv $RPM_BUILD_ROOT%{_libdir}/$file $RPM_BUILD_ROOT%{_libdir}/.$file && \ + ln -s .$file $RPM_BUILD_ROOT%{_libdir}/.%1.hmac + +%if 0%{?bootstrap} +%define bootstrap_fips 1 +%endif + +%define __spec_install_post \ + %{?__debug_package:%{__debug_install_post}} \ + %{__arch_install_post} \ + %{__os_install_post} \ + %fipshmac libnettle.so.%{nettle_so_ver} \ + %fipshmac libhogweed.so.%{hogweed_so_ver} \ + %{?bootstrap_fips:%fipshmac libnettle.so.%{nettle_so_ver_old}} \ + %{?bootstrap_fips:%fipshmac libhogweed.so.%{hogweed_so_ver_old}} \ +%{nil} +%endif + + +%install +%if 0%{?bootstrap} +make -C bootstrap_ver install-shared-nettle DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +make -C bootstrap_ver install-shared-hogweed DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + +chmod 0755 $RPM_BUILD_ROOT%{_libdir}/libnettle.so.%{nettle_so_ver_old}.* +chmod 0755 $RPM_BUILD_ROOT%{_libdir}/libhogweed.so.%{hogweed_so_ver_old}.* +%endif + +%make_install +make install-shared DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +mkdir -p $RPM_BUILD_ROOT%{_infodir} +install -p -m 644 nettle.info $RPM_BUILD_ROOT%{_infodir}/ +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +rm -f $RPM_BUILD_ROOT%{_infodir}/dir +rm -f $RPM_BUILD_ROOT%{_bindir}/nettle-lfib-stream +rm -f $RPM_BUILD_ROOT%{_bindir}/pkcs1-conv +rm -f $RPM_BUILD_ROOT%{_bindir}/sexp-conv +rm -f $RPM_BUILD_ROOT%{_bindir}/nettle-hash +rm -f $RPM_BUILD_ROOT%{_bindir}/nettle-pbkdf2 + +chmod 0755 $RPM_BUILD_ROOT%{_libdir}/libnettle.so.%{nettle_so_ver}.* +chmod 0755 $RPM_BUILD_ROOT%{_libdir}/libhogweed.so.%{hogweed_so_ver}.* + +%check +make check + +%files +%doc AUTHORS NEWS README +%license COPYINGv2 COPYING.LESSERv3 +%{_infodir}/nettle.info.* +%{_libdir}/libnettle.so.%{nettle_so_ver} +%{_libdir}/libnettle.so.%{nettle_so_ver}.* +%{_libdir}/libhogweed.so.%{hogweed_so_ver} +%{_libdir}/libhogweed.so.%{hogweed_so_ver}.* +%if 0%{?bootstrap} +%{_libdir}/libnettle.so.%{nettle_so_ver_old} +%{_libdir}/libnettle.so.%{nettle_so_ver_old}.* +%{_libdir}/libhogweed.so.%{hogweed_so_ver_old} +%{_libdir}/libhogweed.so.%{hogweed_so_ver_old}.* +%endif +%if %{with fips} +%{_libdir}/.libhogweed.so.*.hmac +%{_libdir}/.libnettle.so.*.hmac +%endif + +%files devel +%doc descore.README nettle.html nettle.pdf +%{_includedir}/nettle +%{_libdir}/libnettle.so +%{_libdir}/libhogweed.so +%{_libdir}/pkgconfig/hogweed.pc +%{_libdir}/pkgconfig/nettle.pc + +%ldconfig_scriptlets + + +%changelog +* Mon Aug 09 2021 Mohan Boddu - 3.7.3-2 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Wed Jul 28 2021 Daiki Ueno - 3.7.3-1 +- Update to nettle 3.7.3 (#1986712) + +* Fri Apr 16 2021 Mohan Boddu - 3.7.2-2 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Sun Mar 21 2021 Daiki Ueno - 3.7.2-1 +- Update to nettle 3.7.2 +- Merge nettle-3.6-remove-ecc-testsuite.patch to hobble-nettle script + +* Tue Mar 9 2021 Daiki Ueno - 3.7.1-1 +- Update to nettle 3.7.1 + +* Wed Feb 10 2021 Daiki Ueno - 3.7-3 +- Port a fix for chacha counter issue on ppc64le + +* Tue Jan 26 2021 Fedora Release Engineering - 3.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jan 11 2021 Daiki Ueno - 3.7-1 +- Update to nettle 3.7 + +* Tue Jul 28 2020 Fedora Release Engineering - 3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Tom Stellard - 3.6-2 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Mon May 4 2020 Daiki Ueno - 3.6-1 +- Update to nettle 3.6 + +* Wed Jan 29 2020 Fedora Release Engineering - 3.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 31 2019 Nikos Mavrogiannopoulos - 3.5.1-4 +- New upstream release + +* Thu Jul 25 2019 Fedora Release Engineering - 3.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jul 16 2019 Daiki Ueno - 3.5.1-2 +- Rebuild with bootstrap enabled + +* Mon Jul 15 2019 Nikos Mavrogiannopoulos - 3.5.1-1 +- New upstream release + +* Wed Apr 24 2019 Björn Esser - 3.4.1rc1-3 +- Remove hardcoded gzip suffix from GNU info pages + +* Fri Feb 01 2019 Fedora Release Engineering - 3.4.1rc1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Nov 30 2018 Nikos Mavrogiannopoulos - 3.4.1rc1-1 +- New upstream release; provides API for constant memory access RSA operations + +* Tue Oct 16 2018 Tomáš Mráz - 3.4-7 +- Generate the .hmac checksums unless --without fips is used + +* Tue Oct 16 2018 Tomáš Mráz - 3.4-6 +- Cover the gaps in annotation coverage for assembler sources + +* Fri Aug 31 2018 Leigh Scott - 3.4-5 +- update libary versions used for fips + +* Sat Jul 28 2018 Igor Gnatenko - 3.4-4 +- Replace obsolete scriptlets + +* Fri Jul 13 2018 Fedora Release Engineering - 3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Nov 20 2017 Nikos Mavrogiannopoulos - 3.4-1 +- New upstream release + +* Wed Aug 09 2017 Nikos Mavrogiannopoulos - 3.3-5 +- Removed executables from the library to allow parallel installation + of x86-64 and x86 packages. The executables had testing purpose, and + may be re-introduced in a separate package if needed. + +* Thu Aug 03 2017 Fedora Release Engineering - 3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jul 19 2016 Nikos Mavrogiannopoulos - 3.3-1 +- New upstream release +- Allow arm neon instructions (they are enabled via fat builds) + +* Tue Jul 19 2016 Nikos Mavrogiannopoulos - 3.2-3 +- Backported a fix for more cache silence on RSA and DSA. + +* Thu Feb 18 2016 Nikos Mavrogiannopoulos - 3.2-2 +- Enabled fat builds by default + +* Wed Feb 3 2016 Nikos Mavrogiannopoulos - 3.2-1 +- updated to 3.2 (#1301310) +- Fixed CVE-2015-8803 secp256r1 calculation bug (#1304305) + +* Wed Dec 9 2015 Nikos Mavrogiannopoulos - 3.1.1-6 +- Made version.h architecture independent (#1289938) + +* Wed Dec 2 2015 Nikos Mavrogiannopoulos - 3.1.1-5 +- Disabled arm-neon unconditionally (#1287298) + +* Thu Oct 22 2015 Nikos Mavrogiannopoulos - 3.1.1-4 +- Fixed SHA3 implementation to conform to published version (#1252935) + +* Sun Aug 2 2015 Peter Robinson 3.1.1-3 +- No need to ship license in devel too +- Drop ChangeLog as details are in NEWS + +* Wed Jun 17 2015 Fedora Release Engineering - 3.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Apr 30 2015 Nikos Mavrogiannopoulos - 3.1.1-1 +- Updated to nettle 3.1.1 + +* Sat Feb 21 2015 Till Maas - 2.7.1-6 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Sun Aug 17 2014 Fedora Release Engineering - 2.7.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 2.7.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Jan 10 2014 Nikos Mavrogiannopoulos - 2.7.1-3 +- Corrected bug number in previous comment. + +* Fri Dec 13 2013 Nikos Mavrogiannopoulos - 2.7.1-2 +- Added patch nettle-tmpalloc.patch to solve #1051455 + +* Mon Nov 25 2013 Nikos Mavrogiannopoulos - 2.7.1-1 +- Updated to nettle 2.7.1 + +* Sat Aug 03 2013 Fedora Release Engineering - 2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 6 2013 Tomáš Mráz - 2.6-2 +- nettle includes use gmp.h + +* Tue Feb 5 2013 Tomáš Mráz - 2.6-1 +- New upstream release + +* Fri Jul 20 2012 Fedora Release Engineering - 2.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jul 05 2012 David Woodhouse - 2.4-3 +- Remove explicit buildroot handling and defattr. + +* Wed Jul 04 2012 David Woodhouse - 2.4-2 +- Review feedback + +* Mon Jun 18 2012 David Woodhouse - 2.4-1 +- Revive package (GnuTLS needs it), disable static, update to current release 2.4 + +* Sat Jul 25 2009 Fedora Release Engineering - 1.15-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1.15-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Apr 10 2008 Ian Weller 1.15-5 +- Moved static lib to -static + +* Mon Mar 24 2008 Ian Weller 1.15-4 +- Added libraries and ldconfig + +* Mon Feb 18 2008 Ian Weller 1.15-3 +- Added provides -static to -devel + +* Sun Feb 17 2008 Ian Weller 1.15-2 +- Removed redundant requires +- Removed redundant documentation between packages +- Fixed license tag +- Fixed -devel description +- Added the static library back to -devel +- Added make clean + +* Fri Feb 08 2008 Ian Weller 1.15-1 +- First package build.