Merging debian version 252.25-1~deb12u1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 34 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 1903672..143f1a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+systemd (252.25-1~deb12u1) bookworm; urgency=medium
+
+  * New upstream version 252.25
+  * Refresh patches for v252.25
+
+ -- Luca Boccassi <bluca@debian.org>  Thu, 09 May 2024 18:11:06 +0100
+
+systemd (252.24-1~deb12u1) bookworm; urgency=medium
+
+  * New upstream version 252.24
+  * Refresh patches
+
+ -- Luca Boccassi <bluca@debian.org>  Fri, 26 Apr 2024 01:34:18 +0100
+
 systemd (252.23-1~deb12u1~progress6.99u1) fuchur-backports; urgency=medium
 
   * Uploading to fuchur-backports, remaining changes:
diff --git a/debian/patches/debian/Don-t-enable-audit-by-default.patch b/debian/patches/debian/Don-t-enable-audit-by-default.patch
index 67f2b46..5e6804c 100644
--- a/debian/patches/debian/Don-t-enable-audit-by-default.patch
+++ b/debian/patches/debian/Don-t-enable-audit-by-default.patch
@@ -29,7 +29,7 @@ index 160544a..7e6f175 100644
  
        <varlistentry>
 diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index a78e2c0..efeb50c 100644
+index 863575c..1b9b8e1 100644
 --- a/src/journal/journald-server.c
 +++ b/src/journal/journald-server.c
 @@ -2279,7 +2279,7 @@ int server_init(Server *s, const char *namespace) {
diff --git a/debian/patches/debian/Downgrade-a-couple-of-warnings-to-debug.patch b/debian/patches/debian/Downgrade-a-couple-of-warnings-to-debug.patch
index dbbd56f..b16b4d2 100644
--- a/debian/patches/debian/Downgrade-a-couple-of-warnings-to-debug.patch
+++ b/debian/patches/debian/Downgrade-a-couple-of-warnings-to-debug.patch
@@ -16,10 +16,10 @@ Closes: #981407
  3 files changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 5f4d4b0..cf5e55f 100644
+index 11166f9..b049507 100644
 --- a/src/core/load-fragment.c
 +++ b/src/core/load-fragment.c
-@@ -543,6 +543,7 @@ static int patch_var_run(
+@@ -578,6 +578,7 @@ static int patch_var_run(
  
          const char *e;
          char *z;
@@ -27,7 +27,7 @@ index 5f4d4b0..cf5e55f 100644
  
          e = path_startswith(*path, "/var/run/");
          if (!e)
-@@ -552,7 +553,8 @@ static int patch_var_run(
+@@ -587,7 +588,8 @@ static int patch_var_run(
          if (!z)
                  return log_oom();
  
@@ -51,10 +51,10 @@ index 3c5df6c..24eff86 100644
                                      "Please update package to include a native systemd unit file, in order to make it more safe and robust.", fpath);
  
 diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 281284c..8952a26 100644
+index a186246..83f3e5c 100644
 --- a/src/tmpfiles/tmpfiles.c
 +++ b/src/tmpfiles/tmpfiles.c
-@@ -2991,6 +2991,7 @@ static int specifier_expansion_from_arg(const Specifier *specifier_table, Item *
+@@ -2992,6 +2992,7 @@ static int specifier_expansion_from_arg(const Specifier *specifier_table, Item *
  static int patch_var_run(const char *fname, unsigned line, char **path) {
          const char *k;
          char *n;
@@ -62,7 +62,7 @@ index 281284c..8952a26 100644
  
          assert(path);
          assert(*path);
-@@ -3016,7 +3017,8 @@ static int patch_var_run(const char *fname, unsigned line, char **path) {
+@@ -3017,7 +3018,8 @@ static int patch_var_run(const char *fname, unsigned line, char **path) {
          /* Also log about this briefly. We do so at LOG_NOTICE level, as we fixed up the situation automatically, hence
           * there's no immediate need for action by the user. However, in the interest of making things less confusing
           * to the user, let's still inform the user that these snippets should really be updated. */
diff --git a/debian/patches/debian/Re-enable-journal-forwarding-to-syslog.patch b/debian/patches/debian/Re-enable-journal-forwarding-to-syslog.patch
index 838c4e4..7d7d082 100644
--- a/debian/patches/debian/Re-enable-journal-forwarding-to-syslog.patch
+++ b/debian/patches/debian/Re-enable-journal-forwarding-to-syslog.patch
@@ -30,7 +30,7 @@ index 2db6a0f..160544a 100644
          <literal>systemd.journald.forward_to_kmsg</literal>,
          <literal>systemd.journald.forward_to_console</literal>, and
 diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 77aef79..a78e2c0 100644
+index 31358cd..863575c 100644
 --- a/src/journal/journald-server.c
 +++ b/src/journal/journald-server.c
 @@ -2289,6 +2289,7 @@ int server_init(Server *s, const char *namespace) {
diff --git a/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch b/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch
index e570fff..0c8bd57 100644
--- a/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch
+++ b/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch
@@ -19,7 +19,7 @@ Bug-Debian: https://bugs.debian.org/815020
  2 files changed, 1 insertion(+), 21 deletions(-)
 
 diff --git a/src/core/main.c b/src/core/main.c
-index 1c4b464..e84e7dd 100644
+index 7b51099..40a6612 100644
 --- a/src/core/main.c
 +++ b/src/core/main.c
 @@ -1650,24 +1650,6 @@ static void cmdline_take_random_seed(void) {
diff --git a/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch b/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch
index ec8985c..fb73567 100644
--- a/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch
+++ b/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch
@@ -239,10 +239,10 @@ index 0000000..b7ad58d
 +
 +</refentry>
 diff --git a/meson.build b/meson.build
-index e707742..6330645 100644
+index 703ee3a..07963ce 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -3368,6 +3368,15 @@ executable(
+@@ -3369,6 +3369,15 @@ executable(
          install : true,
          install_dir : rootlibexecdir)
  
diff --git a/debian/patches/p11kit-switch-to-dlopen.patch b/debian/patches/p11kit-switch-to-dlopen.patch
index ed9cbf2..60398fc 100644
--- a/debian/patches/p11kit-switch-to-dlopen.patch
+++ b/debian/patches/p11kit-switch-to-dlopen.patch
@@ -13,10 +13,10 @@ Subject: p11kit: switch to dlopen()
  7 files changed, 202 insertions(+), 60 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index afcb4a7..e707742 100644
+index aea27dc..703ee3a 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -1462,8 +1462,10 @@ if want_p11kit != 'false' and not skip_deps
+@@ -1463,8 +1463,10 @@ if want_p11kit != 'false' and not skip_deps
                                 version : '>= 0.23.3',
                                 required : want_p11kit == 'true')
          have = libp11kit.found()
@@ -718,7 +718,7 @@ index 85dbb81..55728c2 100644
  }
  
 diff --git a/test/test-functions b/test/test-functions
-index da17bff..58257d4 100644
+index 097babf..dfb8db3 100644
 --- a/test/test-functions
 +++ b/test/test-functions
 @@ -1391,7 +1391,7 @@ install_missing_libraries() {
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index ffee353..a611faf 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -9,4 +9,10 @@ variables:
   # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1011649
   SALSA_CI_DISABLE_PIUPARTS: 1
   RELEASE: 'bookworm'
+  SALSA_CI_IMAGES_LINTIAN: ${SALSA_CI_IMAGES}/lintian:stable
   SALSA_CI_LINTIAN_SUPPRESS_TAGS: "bad-distribution-in-changes-file"
+  # The following jobs all run on unstable, and cannot work because they expect
+  # overrides, compiler flags, dependencies, etc to work as in unstable, but this
+  # is a stable branch
+  SALSA_CI_DISABLE_BLHC: 1
+  SALSA_CI_DISABLE_REPROTEST: 1