From 4ba8a98a2f31412dca6bdb8d30eeb38e1f65859e Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Tue, 26 Mar 2024 01:16:31 +0300 Subject: [PATCH] import libbsd-0.12.2-1.el9 --- .gitignore | 4 +- .libbsd.metadata | 4 +- .../libbsd-0.11.7-test-explicit_bzero.patch | 83 ------------------- SPECS/libbsd.spec | 47 ++++++----- 4 files changed, 31 insertions(+), 107 deletions(-) delete mode 100644 SOURCES/libbsd-0.11.7-test-explicit_bzero.patch diff --git a/.gitignore b/.gitignore index 151ac20..3e1684b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/libbsd-0.11.7.tar.xz -SOURCES/libbsd-0.11.7.tar.xz.asc +SOURCES/libbsd-0.12.2.tar.xz +SOURCES/libbsd-0.12.2.tar.xz.asc diff --git a/.libbsd.metadata b/.libbsd.metadata index bcc3680..b5957af 100644 --- a/.libbsd.metadata +++ b/.libbsd.metadata @@ -1,2 +1,2 @@ -e5f5fffcc2094661a105074c1538f1e434990490 SOURCES/libbsd-0.11.7.tar.xz -311622ec83d75cdc814c9d985bb1647b029e4ae1 SOURCES/libbsd-0.11.7.tar.xz.asc +c8f49920dec71e8e72f2b19f6c209b440a367d3a SOURCES/libbsd-0.12.2.tar.xz +e234fc7862bd78065ebf5222f7dcc54ae6b33786 SOURCES/libbsd-0.12.2.tar.xz.asc diff --git a/SOURCES/libbsd-0.11.7-test-explicit_bzero.patch b/SOURCES/libbsd-0.11.7-test-explicit_bzero.patch deleted file mode 100644 index d5017e2..0000000 --- a/SOURCES/libbsd-0.11.7-test-explicit_bzero.patch +++ /dev/null @@ -1,83 +0,0 @@ -From d5865759f8698f1c75339451a26fa3ae00276a51 Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Thu, 25 Aug 2022 00:52:43 +0200 -Subject: [PATCH] test: Fix explicit_bzero() test on the Hurd - -On the Hurd a small read(3) might end up (indirectly) copying the data -on the stack, which we will end up finding even when we have cleared -the buffer. - -To avoid these side effects, we add a new function, that we force not -to be inlined, so that we can reuse the same stack space, that will -blank any possible stack side effects. This should be portable -regardless of stack growing up or down. - -Diagnosis-by: Samuel Thibault ---- - COPYING | 2 +- - test/explicit_bzero.c | 15 +++++++++++++++ - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/COPYING b/COPYING -index 67223d4..cf43edd 100644 ---- a/COPYING -+++ b/COPYING -@@ -369,7 +369,7 @@ Copyright: - Copyright © 2014 Theo de Raadt - Copyright © 2014 Google Inc. - Copyright © 2015 Michael Felt -- Copyright © 2015 Guillem Jover -+ Copyright © 2015, 2022 Guillem Jover - License: ISC - Permission to use, copy, modify, and distribute this software for any - purpose with or without fee is hereby granted, provided that the above -diff --git a/test/explicit_bzero.c b/test/explicit_bzero.c -index 74993c2..bee29de 100644 ---- a/test/explicit_bzero.c -+++ b/test/explicit_bzero.c -@@ -1,6 +1,7 @@ - /* $OpenBSD: explicit_bzero.c,v 1.7 2021/03/27 11:17:58 bcook Exp $ */ - /* - * Copyright (c) 2014 Google Inc. -+ * Copyright (c) 2022 Guillem Jover - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above -@@ -123,6 +124,18 @@ populate_secret(char *buf, ssize_t len) - ASSERT_EQ(0, close(fds[0])); - } - -+static void __attribute__((__noinline__)) -+blank_stack_side_effects(char *buf, size_t len) -+{ -+ char scratch[SECRETBYTES * 4]; -+ -+ /* If the read(3) in populate_secret() wrote into the stack, as it -+ * might happen on the Hurd for small data, then we might incorrectly -+ * detect the wrong secret on the stack. */ -+ memset(scratch, 0xFF, sizeof(scratch)); -+ ASSERT_EQ(NULL, memmem(scratch, sizeof(scratch), buf, len)); -+} -+ - static int - count_secrets(const char *buf) - { -@@ -143,6 +156,7 @@ test_without_bzero(void) - char *res; - assert_on_stack(); - populate_secret(buf, sizeof(buf)); -+ blank_stack_side_effects(buf, sizeof(buf)); - res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf)); - ASSERT_NE(NULL, res); - return (res); -@@ -155,6 +169,7 @@ test_with_bzero(void) - char *res; - assert_on_stack(); - populate_secret(buf, sizeof(buf)); -+ blank_stack_side_effects(buf, sizeof(buf)); - res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf)); - ASSERT_NE(NULL, res); - explicit_bzero(buf, sizeof(buf)); --- -GitLab - diff --git a/SPECS/libbsd.spec b/SPECS/libbsd.spec index e076e28..d2449f0 100644 --- a/SPECS/libbsd.spec +++ b/SPECS/libbsd.spec @@ -1,25 +1,20 @@ Name: libbsd -Version: 0.11.7 -Release: 2%{?dist} +Version: 0.12.2 +Release: 1%{?dist} Summary: Library providing BSD-compatible functions for portability URL: https://libbsd.freedesktop.org/ # Breakdown in COPYING file of libbsd release tarball, see also: # - https://gitlab.com/fedora/legal/fedora-license-data/-/issues/71 # - https://gitlab.com/fedora/legal/fedora-license-data/-/issues/73 -License: Beerware AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND ISC AND libutil-David-Nugent AND MIT AND LicenseRef-Fedora-Public-Domain +License: Beerware AND BSD-2-Clause AND BSD-3-Clause AND ISC AND libutil-David-Nugent AND MIT AND LicenseRef-Fedora-Public-Domain Source0: https://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.xz Source1: https://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.xz.asc Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/4F3E74F436050C10F5696574B972BF3EA4AE57A3 -# https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/14: Revert breaking commit in explicit_bzero test -Patch0: https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/d5865759f8698f1c75339451a26fa3ae00276a51.patch#/libbsd-0.11.7-test-explicit_bzero.patch -BuildRequires: autoconf -BuildRequires: automake BuildRequires: gcc BuildRequires: gnupg2 BuildRequires: libmd-devel -BuildRequires: libtool BuildRequires: make %description @@ -50,33 +45,27 @@ configured using "pkg-config --libs libbsd-ctor". %prep %setup -q %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%patch0 -p1 -R -b .test-explicit_bzero %build -autoreconf -fiv %configure -%make_build V=1 +%make_build %check -%make_build check V=1 +%make_build check %install -%make_install V=1 +%make_install # don't want static library or libtool archive rm %{buildroot}%{_libdir}/%{name}.a rm %{buildroot}%{_libdir}/%{name}.la -# remove manual pages that conflict with man-pages package -rm %{buildroot}%{_mandir}/man3/explicit_bzero.3bsd - - %ldconfig_scriptlets %files %license COPYING -%doc README TODO ChangeLog -%{_libdir}/%{name}.so.* +%doc README ChangeLog +%{_libdir}/%{name}.so.0* %files devel %{_mandir}/man3/*.3bsd.* @@ -91,9 +80,27 @@ rm %{buildroot}%{_mandir}/man3/explicit_bzero.3bsd %{_libdir}/pkgconfig/%{name}-ctor.pc %changelog -* Wed Jan 10 2024 MSVSphere Packaging Team - 0.11.7-2 +* Mon Mar 25 2024 Robert Scheck - 0.12.2-1 +- Update to 0.12.2 (#2257217) + +* Thu Jan 25 2024 Fedora Release Engineering - 0.11.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.11.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 10 2024 MSVSphere Packaging Team - 0.11.7-5 - Rebuilt for MSVSphere 9.3 +* Thu Jul 20 2023 Fedora Release Engineering - 0.11.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 0.11.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Dec 12 2022 Florian Weimer - 0.11.7-3 +- Port configure script to C99 + * Sun Dec 04 2022 Mikel Olasagasti Uranga - 0.11.7-2 - Add runtime requirement on libmd-devel to libbsd-devel (#2148612)