From 8ed6e37eb47f5ee1ec084227fb1acd9c54a8054e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 13 Jul 2022 16:38:43 +0200 Subject: [PATCH] Version 251.3 --- 0001-sha256-fix-compilation-on-efi-ia32.patch | 38 ------------------- sources | 2 +- systemd.spec | 8 ++-- 3 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 0001-sha256-fix-compilation-on-efi-ia32.patch diff --git a/0001-sha256-fix-compilation-on-efi-ia32.patch b/0001-sha256-fix-compilation-on-efi-ia32.patch deleted file mode 100644 index cc23995..0000000 --- a/0001-sha256-fix-compilation-on-efi-ia32.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3185ae7c812af8ff6cabbd680b694d8a51f0c09f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 3 Jun 2022 09:32:02 +0200 -Subject: [PATCH] sha256: fix compilation on efi-ia32 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -/usr/bin/gcc -c ../src/fundamental/sha256.c -o src/boot/efi/sha256.c.o -Wno-format-signedness -Wno-missing-field-initializers -Wno-unused-parameter -Wdate-time -Wendif-labels -Werror=format=2 -Werror=implicit-function-declaration -Werror=incompatible-pointer-types -Werror=int-conversion -Werror=overflow -Werror=override-init -Werror=return-type -Werror=shift-count-overflow -Werror=shift-overflow=2 -Werror=undef -Wfloat-equal -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op -Wmissing-include-dirs -Wmissing-noreturn -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-aliasing=2 -Wstrict-prototypes -Wsuggest-attribute=noreturn -Wunused-function -Wwrite-strings -Wno-unused-result -fno-stack-protector -fno-strict-aliasing -fpic -fwide-exec-charset=UCS2 -Wall -Wextra -Wsign-compare -nostdlib -std=gnu99 -ffreestanding -fshort-wchar -fvisibility=hidden -isystem /usr/include/efi -isystem /usr/include/efi/ia32 -I /builddir/build/BUILD/systemd-stable-250.7/src/fundamental -DSD_BOOT -DGNU_EFI_USE_MS_ABI -include src/boot/efi/efi_config.h -include version.h -mno-sse -mno-mmx -flto -O2 -flto=auto -../src/fundamental/sha256.c: In function ‘sha256_finish_ctx’: -../src/fundamental/sha256.c:61:25: error: ‘false’ undeclared (first use in this function) - 61 | # define UNALIGNED_P(p) false - | ^~~~~ -../src/fundamental/sha256.c:136:21: note: in expansion of macro ‘UNALIGNED_P’ - 136 | if (UNALIGNED_P(resbuf)) - | ^~~~~~~~~~~ -../src/fundamental/sha256.c:32:1: note: ‘false’ is defined in header ‘’; did you forget to ‘#include ’? - 31 | #include "sha256.h" - +++ |+#include - 32 | -... ---- - src/fundamental/sha256.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/fundamental/sha256.c b/src/fundamental/sha256.c -index 67d83b5f1c..f089594796 100644 ---- a/src/fundamental/sha256.c -+++ b/src/fundamental/sha256.c -@@ -60,7 +60,7 @@ - # define UNALIGNED_P(p) (((size_t) p) % sizeof(uint32_t) != 0) - # endif - #else --# define UNALIGNED_P(p) false -+# define UNALIGNED_P(p) sd_false - #endif - - /* This array contains the bytes used to pad the buffer to the next diff --git a/sources b/sources index 95b4d5d..dbe2adf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-251.2.tar.gz) = 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c +SHA512 (systemd-251.3.tar.gz) = fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f diff --git a/systemd.spec b/systemd.spec index 85233a2..eb4122e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -30,8 +30,8 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd %if %{without inplace} -Version: 251.2 -Release: 2%{?dist} +Version: 251.3 +Release: 1%{?dist} %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') @@ -90,7 +90,6 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[ # Any patches which are "in preparation" upstream should be listed here, rather # than in the next section. Packit CI will drop any patches in this range before # applying upstream pull requests. -Patch0000: 0001-sha256-fix-compilation-on-efi-ia32.patch # Those are downstream-only patches, but we don't want them in packit builds: @@ -1006,7 +1005,8 @@ fi %files standalone-sysusers -f .file-list-standalone-sysusers %changelog -* Wed Jul 13 2022 Zbigniew Jędrzejewski-Szmek - 251.2-2 +* Wed Jul 13 2022 Zbigniew Jędrzejewski-Szmek - 251.3-1 +- Update to latest bugfix release - Drop forgotten "temporary" workaround for #1663040 * Wed Jun 29 2022 Zbigniew Jędrzejewski-Szmek - 251.2-2