From f69edd5ebfdca5abaa376cf572074719a484b418 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Jul 11 2024 10:13:56 +0000 Subject: Version 256.2 - A bunch of various small fixes --- diff --git a/0001-meson-rename-libbasic-to-libbasic_static.patch b/0001-meson-rename-libbasic-to-libbasic_static.patch index b1fdd9e..8059d87 100644 --- a/0001-meson-rename-libbasic-to-libbasic_static.patch +++ b/0001-meson-rename-libbasic-to-libbasic_static.patch @@ -1,4 +1,4 @@ -From d5534ba7444f7733b55e56284eb27d16dc6a267d Mon Sep 17 00:00:00 2001 +From 8954e7ccc1f2005df221f50882f3253518c63159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 3 Jul 2024 16:51:05 +0200 Subject: [PATCH 1/3] meson: rename libbasic to libbasic_static @@ -22,10 +22,10 @@ for consitency. This makes the build config easier to understand. 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meson.build b/meson.build -index e42151998b..18115cad5e 100644 +index b1a110cbfc..58748a37a3 100644 --- a/meson.build +++ b/meson.build -@@ -2078,7 +2078,7 @@ libsystemd = shared_library( +@@ -2089,7 +2089,7 @@ libsystemd = shared_library( # Make sure our library is never deleted from memory, so that our open logging fds don't leak on dlopen/dlclose cycles. '-z', 'nodelete', '-Wl,--version-script=' + libsystemd_sym_path], @@ -34,7 +34,7 @@ index e42151998b..18115cad5e 100644 link_whole : [libsystemd_static], dependencies : [librt, threads, -@@ -2243,7 +2243,7 @@ nss_template = { +@@ -2254,7 +2254,7 @@ nss_template = { 'link_with' : [ libsystemd_static, libshared_static, diff --git a/0002-meson-build-libsystemd-core-via-an-intermediate-stat.patch b/0002-meson-build-libsystemd-core-via-an-intermediate-stat.patch index 1d27b04..c7423e9 100644 --- a/0002-meson-build-libsystemd-core-via-an-intermediate-stat.patch +++ b/0002-meson-build-libsystemd-core-via-an-intermediate-stat.patch @@ -1,4 +1,4 @@ -From 63178ad7e51dae8730158573318388ea8c3e488e Mon Sep 17 00:00:00 2001 +From 3b101982011d787c05d7708740e6eada560c62cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 3 Jul 2024 17:03:26 +0200 Subject: [PATCH 2/3] meson: build libsystemd-core via an intermediate static diff --git a/0003-meson-add-option-to-build-systemd-executor-staticall.patch b/0003-meson-add-option-to-build-systemd-executor-staticall.patch index f942c59..73a12b2 100644 --- a/0003-meson-add-option-to-build-systemd-executor-staticall.patch +++ b/0003-meson-add-option-to-build-systemd-executor-staticall.patch @@ -1,4 +1,4 @@ -From 66df80d8c37dce4b597dfa26e1050856a610cf7f Mon Sep 17 00:00:00 2001 +From 254338a838354d9d3e43efa14190ca1203ef3afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 3 Jul 2024 17:05:31 +0200 Subject: [PATCH 3/3] meson: add option to build systemd-executor "statically" @@ -49,11 +49,11 @@ our own, are linked dynamically. 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/meson_options.txt b/meson_options.txt -index d52ca4e4b5..3cce818392 100644 +index 667340ca59..909e2d53e8 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -21,6 +21,8 @@ option('rootprefix', type : 'string', deprecated: true, - description : '''This option is deprecated and will be removed in a future release''') + description : 'This option is deprecated and will be removed in a future release') option('link-udev-shared', type : 'boolean', description : 'link systemd-udevd and its helpers to libsystemd-shared.so') +option('link-executor-shared', type : 'boolean', diff --git a/sources b/sources index 9c34036..2e30e2f 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (systemd-hs-255.5.tar.gz) = 563b058950efa0d525ad76256c17a900288ed581d6fe9e2d9cb07adfd72803c75759a872831bb8d3a722786499d5468270ab09a4251d24d67058885e91626c28 -SHA512 (systemd-hs+fb-255.5.tar.gz) = 602e47521f4fb22d30aa96b10d408e11171ac98914d2b081759bb445a570c2988c848ffba8c066605d53c3680e7a6bc8d35350d58de6ea14d2950e0e217e1d3e +SHA512 (systemd-256.2.tar.gz) = 10da82ee58d3608c41cb0204fdf0227af965b13b8f3716e4f5dea994c236c08a5e31f09ba0d3774cea20a365e1d959c8c865fdeacc82400da55e94ad800e75ba diff --git a/systemd.spec b/systemd.spec index 1ea70e7..5145714 100644 --- a/systemd.spec +++ b/systemd.spec @@ -43,8 +43,8 @@ Name: systemd Url: https://systemd.io # Allow users to specify the version and release when building the rpm by # setting the %%version_override and %%release_override macros. -Version: %{?version_override}%{!?version_override:256.1} -Release: %{?release_override}%{!?release_override:8.1}%{?dist} +Version: %{?version_override}%{!?version_override:256.2} +Release: %{?release_override}%{!?release_override:1.1}%{?dist} %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?)