- Upgrade to v250.3 (commit dbd8bd2b9fd827ca89ed18034b60703c95798e01)

See https://github.com/openSUSE/systemd/blob/SUSE/v250/NEWS for
  details. 
  * Rebased 0001-conf-parser-introduce-early-drop-ins.patch
            0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch
- Dropped 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch
  The alias makes little sense as soon as multiple network managers are used in
  parallel.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1259

0001-conf-parser-introduce-early-drop-ins.patch

@@ -1,4 +1,4 @@
-From 4ff82a9455d7b6672e79f2938728a3a8299c3158 Mon Sep 17 00:00:00 2001
+From 079a6f89f9e42517cd14b488320b6302746bcf9b Mon Sep 17 00:00:00 2001
 From: Franck Bui <fbui@suse.com>
 Date: Fri, 22 Jan 2021 14:57:08 +0100
 Subject: [PATCH 01/11] conf-parser: introduce 'early' drop-ins
@@ -61,15 +61,15 @@ drop this feature at any time.
 
 Fixes: #2121
 ---
- src/shared/conf-parser.c    |  48 ++++++++++--
+ src/shared/conf-parser.c    |  48 +++++++++--
- src/test/test-conf-parser.c | 152 ++++++++++++++++++++++++++++++++++++
+ src/test/test-conf-parser.c | 154 ++++++++++++++++++++++++++++++++++++
- 2 files changed, 195 insertions(+), 5 deletions(-)
+ 2 files changed, 197 insertions(+), 5 deletions(-)
 
 diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
-index d0ac1b2660..cb453fa50d 100644
+index 1e1967d7ea..eb81732dfa 100644
 --- a/src/shared/conf-parser.c
 +++ b/src/shared/conf-parser.c
-@@ -430,6 +430,7 @@ int config_parse(
+@@ -464,6 +464,7 @@ static int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path,
  
  static int config_parse_many_files(
                  const char* const* conf_files,
@@ -77,20 +77,20 @@ index d0ac1b2660..cb453fa50d 100644
                  char **files,
                  const char *sections,
                  ConfigItemLookup lookup,
-@@ -442,6 +443,12 @@ static int config_parse_many_files(
+@@ -481,6 +482,12 @@ static int config_parse_many_files(
-         char **fn;
+                 stats_by_path = hashmap_new(&path_hash_ops_free_free);
-         int r;
+                 if (!stats_by_path)
- 
+                         return -ENOMEM;
-+        STRV_FOREACH(fn, early_files) {
-+                r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime);
-+                if (r < 0)
-+                        return r;
 +        } 
 +
++        STRV_FOREACH(fn, early_files) {
++                r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &st);
++                if (r < 0)
++                        return r;
+         }
+ 
          /* First read the first found main config file. */
-         STRV_FOREACH(fn, (char**) conf_files) {
+@@ -521,6 +528,28 @@ static int config_parse_many_files(
-                 r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime);
-@@ -464,6 +471,28 @@ static int config_parse_many_files(
          return 0;
  }
  
@@ -119,9 +119,9 @@ index d0ac1b2660..cb453fa50d 100644
  /* Parse each config file in the directories specified as nulstr. */
  int config_parse_many_nulstr(
                  const char *conf_file,
-@@ -475,15 +504,19 @@ int config_parse_many_nulstr(
+@@ -532,15 +561,19 @@ int config_parse_many_nulstr(
                  void *userdata,
-                 usec_t *ret_mtime) {
+                 Hashmap **ret_stats_by_path) {
  
 -        _cleanup_strv_free_ char **files = NULL;
 +        _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL;
@@ -139,12 +139,12 @@ index d0ac1b2660..cb453fa50d 100644
 +
 +        return config_parse_many_files(STRV_MAKE_CONST(conf_file), early_files, late_files,
 +                                       sections, lookup, table, flags, userdata,
-                                        ret_mtime);
+                                        ret_stats_by_path);
  }
  
-@@ -499,8 +532,8 @@ int config_parse_many(
+@@ -556,8 +589,8 @@ int config_parse_many(
                  void *userdata,
-                 usec_t *ret_mtime) {
+                 Hashmap **ret_stats_by_path) {
  
 +        _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL;
          _cleanup_strv_free_ char **dropin_dirs = NULL;
@@ -152,22 +152,22 @@ index d0ac1b2660..cb453fa50d 100644
          const char *suffix;
          int r;
  
-@@ -513,7 +546,12 @@ int config_parse_many(
+@@ -570,7 +603,12 @@ int config_parse_many(
          if (r < 0)
                  return r;
  
--        return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_mtime);
+-        return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_stats_by_path);
 +        r = config_parse_split_conf_files(files, &early_files, &late_files);
 +        if (r < 0)
 +                return r;
 +
 +        return config_parse_many_files(conf_files, early_files, late_files,
-+                                       sections, lookup, table, flags, userdata, ret_mtime);
++                                       sections, lookup, table, flags, userdata, ret_stats_by_path);
  }
  
  #define DEFINE_PARSER(type, vartype, conv_func)                         \
 diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
-index 5da864347e..77d9f28a79 100644
+index e61932ab16..de408272f0 100644
 --- a/src/test/test-conf-parser.c
 +++ b/src/test/test-conf-parser.c
 @@ -5,6 +5,9 @@
@@ -179,9 +179,9 @@ index 5da864347e..77d9f28a79 100644
 +#include "rm-rf.h"
  #include "string-util.h"
  #include "strv.h"
- #include "tmpfile-util.h"
+ #include "tests.h"
-@@ -385,6 +388,152 @@ static void test_config_parse(unsigned i, const char *s) {
+@@ -391,4 +394,155 @@ TEST(config_parse) {
-         }
+                 test_config_parse_one(i, config_file[i]);
  }
  
 +static void setup_conf_files(const char *root, bool is_main, char **conf_files, char ***ret_conf_dirs) {
@@ -228,7 +228,7 @@ index 5da864347e..77d9f28a79 100644
 +        }
 +}
 +
-+static void test_config_parse_many_one(bool nulstr, const char *main, char **conf_files,
++static void test_config_parse_many_nulstr_one(bool nulstr, const char *main, char **conf_files,
 +                                             const char *name, const char *early, const char *late) {
 +
 +        _cleanup_free_ char *parsed_name = NULL, *parsed_early = NULL, *parsed_late = NULL;
@@ -281,67 +281,61 @@ index 5da864347e..77d9f28a79 100644
 +        assert_se(rm_rf(tmp_dir, REMOVE_ROOT|REMOVE_PHYSICAL) == 0);
 +}
 +
-+static void test_config_parse_many(bool nulstr) {
++static void test_config_parse_many_nulstr(bool nulstr) {
 +        log_info("== %s%s ==", __func__, nulstr ? "_nulstr" : "");
 +
-+        test_config_parse_many_one(nulstr, NULL, NULL, NULL, NULL, NULL);
++        test_config_parse_many_nulstr_one(nulstr, NULL, NULL, NULL, NULL, NULL);
 +
-+        test_config_parse_many_one(nulstr,
++        test_config_parse_many_nulstr_one(nulstr,
 +                                          "dir/main.conf", NULL,
 +                                          "dir/main.conf", NULL, NULL);
 +
-+        test_config_parse_many_one(nulstr,
++        test_config_parse_many_nulstr_one(nulstr,
 +                                          NULL, STRV_MAKE("dir1/50-foo.conf"),
 +                                          "dir1/50-foo.conf", NULL, "dir1/50-foo.conf");
 +
-+        test_config_parse_many_one(nulstr,
++        test_config_parse_many_nulstr_one(nulstr,
 +                                          NULL, STRV_MAKE("dir1/__50-foo.conf"),
 +                                          "dir1/__50-foo.conf", "dir1/__50-foo.conf", NULL);
 +
-+        test_config_parse_many_one(nulstr,
++        test_config_parse_many_nulstr_one(nulstr,
 +                                          NULL, STRV_MAKE("dir1/10-foo.conf", "dir1/50-bar.conf"),
 +                                          "dir1/50-bar.conf", NULL, "dir1/50-bar.conf");
 +
-+        test_config_parse_many_one(nulstr,
++        test_config_parse_many_nulstr_one(nulstr,
 +                                          NULL, STRV_MAKE("dir1/50-foo.conf", "dir2/10-bar.conf"),
 +                                          "dir1/50-foo.conf", NULL, "dir1/50-foo.conf");
 +
-+        test_config_parse_many_one(nulstr,
++        test_config_parse_many_nulstr_one(nulstr,
 +                                          NULL, STRV_MAKE("dir1/10-foo.conf", "dir2/10-foo.conf"),
 +                                          "dir1/10-foo.conf", NULL, "dir1/10-foo.conf");
 +
 +        /* Early conf files should never override the main one whatever their
 +         * priority/location. */
-+        test_config_parse_many_one(nulstr,
++        test_config_parse_many_nulstr_one(nulstr,
 +                                          "dir/10-main.conf",
 +                                          STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf"),
 +                                          "dir/10-main.conf", "dir2/__99-foo.conf", NULL);
 +
 +        /* Late conf files always take precendence over the early conf files
 +         * and the main one. */
-+        test_config_parse_many_one(nulstr,
++        test_config_parse_many_nulstr_one(nulstr,
 +                                          "dir/50-main.conf", STRV_MAKE("dir1/10-foo.conf"),
 +                                          "dir1/10-foo.conf", NULL, "dir1/10-foo.conf");
 +
-+        test_config_parse_many_one(nulstr,
++        test_config_parse_many_nulstr_one(nulstr,
 +                                          "dir/10-main.conf",
 +                                          STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf",
 +                                                    "dir2/10-foo.conf"),
 +                                          "dir2/10-foo.conf", "dir2/__99-foo.conf", "dir2/10-foo.conf");
 +}
 +
- int main(int argc, char **argv) {
++TEST(config_parse_many) {
-         unsigned i;
++        test_config_parse_many_nulstr(true);
- 
++        test_config_parse_many_nulstr(false);
-@@ -407,5 +556,8 @@ int main(int argc, char **argv) {
++}
-         for (i = 0; i < ELEMENTSOF(config_file); i++)
-                 test_config_parse(i, config_file[i]);
- 
-+        test_config_parse_many(true);
-+        test_config_parse_many(false);
 +
-         return 0;
+ DEFINE_TEST_MAIN(LOG_INFO);
- }
 -- 
-2.26.2
+2.34.1
 

0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch

@@ -1,4 +1,4 @@
-From e78660b66efc6ab28b655ca584315504b76cb4dc Mon Sep 17 00:00:00 2001
+From 9ab58f2dbcbbafc10a1b4de046a9b0e03bb08595 Mon Sep 17 00:00:00 2001
 From: Frederic Crozat <fcrozat@suse.com>
 Date: Mon, 29 Oct 2012 13:01:20 +0000
 Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they
@@ -13,10 +13,10 @@ Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they
  create mode 100644 units/var-run.mount
 
 diff --git a/units/meson.build b/units/meson.build
-index 17e9ead9c1..7b926f9f91 100644
+index a9bf28f6d9..739fd84d2c 100644
 --- a/units/meson.build
 +++ b/units/meson.build
-@@ -160,6 +160,8 @@ units = [
+@@ -165,6 +165,8 @@ units = [
          ['umount.target',                       ''],
          ['usb-gadget.target',                   ''],
          ['user.slice',                          ''],
@@ -24,7 +24,7 @@ index 17e9ead9c1..7b926f9f91 100644
 +        ['var-lock.mount',                      'HAVE_SYSV_COMPAT',        'local-fs.target.wants/'],
          ['var-lib-machines.mount',              'ENABLE_MACHINED',
           'remote-fs.target.wants/ machines.target.wants/'],
- ]
+         ['systemd-oomd.socket',                 'ENABLE_OOMD'],
 diff --git a/units/var-lock.mount b/units/var-lock.mount
 new file mode 100644
 index 0000000000..07277adac3
@@ -76,5 +76,5 @@ index 0000000000..ab4da424c9
 +Type=bind
 +Options=bind
 -- 
-2.26.2
+2.34.1
 

0007-networkd-make-network.service-an-alias-of-systemd-ne.patch

@@ -1,29 +0,0 @@
-From 533a1b6996c3d99cf27ae05f0cd8131dcd9bbf30 Mon Sep 17 00:00:00 2001
-From: Pawel Wieczorkiewicz <pwieczorkiewicz@suse.de>
-Date: Tue, 2 Jun 2015 13:33:24 +0000
-Subject: [PATCH 07/11] networkd: make network.service an alias of
- systemd-networkd.service
-
-NetworkManager and wicked does this already. This is needed by yast2
-and other parts of the system.
-
-[fixes boo#933092]
----
- units/systemd-networkd.service.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
-index ffa45ba049..6a5d0dea3c 100644
---- a/units/systemd-networkd.service.in
-+++ b/units/systemd-networkd.service.in
-@@ -53,6 +53,7 @@ User=systemd-network
- 
- [Install]
- WantedBy=multi-user.target
-+Alias=network.service
- Also=systemd-networkd.socket
- Alias=dbus-org.freedesktop.network1.service
- 
--- 
-2.26.2
-

files.container

@@ -17,6 +17,9 @@
 %dir %{_unitdir}/machines.target.wants
 %{_bindir}/machinectl
 %{_datadir}/bash-completion/completions/machinectl
+%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Image.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Machine.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Manager.xml
 %{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
@@ -40,6 +43,8 @@
 %endif
 
 %if %{with importd}
+%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.Manager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.Transfer.xml
 %{_datadir}/dbus-1/system-services/org.freedesktop.import1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy

files.devel

@@ -84,6 +84,8 @@
 %{_mandir}/man3/SD_ID128_MAKE_STR.3.gz
 %{_mandir}/man3/SD_ID128_MAKE_UUID_STR.3.gz
 %{_mandir}/man3/SD_ID128_NULL.3.gz
+%{_mandir}/man3/SD_ID128_STRING_MAX.3.gz
+%{_mandir}/man3/SD_ID128_TO_STRING.3.gz
 %{_mandir}/man3/SD_ID128_UUID_FORMAT_STR.3.gz
 %{_mandir}/man3/SD_INFO.3.gz
 %{_mandir}/man3/SD_JOURNAL_ALL_NAMESPACES.3.gz
@@ -426,6 +428,7 @@
 %{_mandir}/man3/sd_event_add_defer.3.gz
 %{_mandir}/man3/sd_event_add_exit.3.gz
 %{_mandir}/man3/sd_event_add_inotify.3.gz
+%{_mandir}/man3/sd_event_add_inotify_fd.3.gz
 %{_mandir}/man3/sd_event_add_io.3.gz
 %{_mandir}/man3/sd_event_add_post.3.gz
 %{_mandir}/man3/sd_event_add_signal.3.gz
@@ -495,6 +498,7 @@
 %{_mandir}/man3/sd_event_source_set_prepare.3.gz
 %{_mandir}/man3/sd_event_source_set_priority.3.gz
 %{_mandir}/man3/sd_event_source_set_ratelimit.3.gz
+%{_mandir}/man3/sd_event_source_set_ratelimit_expire_callback.3.gz
 %{_mandir}/man3/sd_event_source_set_time.3.gz
 %{_mandir}/man3/sd_event_source_set_time_accuracy.3.gz
 %{_mandir}/man3/sd_event_source_set_time_relative.3.gz

files.network

@@ -7,6 +7,10 @@
 %dir %{_systemd_util_dir}/network
 %{_bindir}/networkctl
 %{_datadir}/bash-completion/completions/networkctl
+%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.DHCPServer.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Link.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Manager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Network.xml
 %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.network1.policy
@@ -15,11 +19,13 @@
 %{_mandir}/man1/networkctl.1.gz
 %{_mandir}/man5/networkd.conf.5.gz
 %{_mandir}/man5/networkd.conf.d.5.gz
+%{_mandir}/man5/org.freedesktop.network1.5.gz
 %{_mandir}/man5/systemd.network.5.gz
 %{_mandir}/man8/systemd-networkd-wait-online.8.gz
 %{_mandir}/man8/systemd-networkd-wait-online.service.8.gz
 %{_mandir}/man8/systemd-networkd.8.gz
 %{_mandir}/man8/systemd-networkd.service.8.gz
+%{_systemd_util_dir}/network/80-6rd-tunnel.network
 %{_systemd_util_dir}/network/80-container-host0.network
 %{_systemd_util_dir}/network/80-container-ve.network
 %{_systemd_util_dir}/network/80-container-vz.network
@@ -40,6 +46,9 @@
 %{_bindir}/systemd-resolve
 %{_datadir}/bash-completion/completions/resolvectl
 %{_datadir}/bash-completion/completions/systemd-resolve
+%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.DnssdService.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.Link.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.Manager.xml
 %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy

files.systemd

@@ -13,6 +13,7 @@
 %dir %{_datadir}/bash-completion/completions
 %endif
 %dir %{_datadir}/dbus-1
+%dir %{_datadir}/dbus-1/interfaces
 %dir %{_datadir}/dbus-1/services
 %dir %{_datadir}/dbus-1/system-services
 %dir %{_datadir}/dbus-1/system.d
@@ -24,10 +25,9 @@
 %dir %{_datadir}/zsh
 %dir %{_datadir}/zsh/site-functions
 %endif
-%dir %{xinitconfdir}
-%dir %{xinitconfdir}/xinitrc.d
 %dir %{_environmentdir}
 %dir %{_journalcatalogdir}
+%dir %{_libdir}/cryptsetup
 %dir %{_localstatedir}/lib/systemd
 %dir %{_localstatedir}/lib/systemd/catalog
 %dir %{_modprobedir}
@@ -82,6 +82,8 @@
 %dir %{_unitdir}/sockets.target.wants
 %dir %{_unitdir}/sysinit.target.wants
 %dir %{_unitdir}/timers.target.wants
+%dir %{xinitconfdir}
+%dir %{xinitconfdir}/xinitrc.d
 %doc %{_modprobedir}/README
 %doc %{_sysctldir}/README
 %doc %{_sysusersdir}/README
@@ -113,6 +115,7 @@
 %{_bindir}/systemd-cat
 %{_bindir}/systemd-cgls
 %{_bindir}/systemd-cgtop
+%{_bindir}/systemd-creds
 %if ! 0%{?bootstrap}
 %{_bindir}/systemd-cryptenroll
 %endif
@@ -160,6 +163,29 @@
 %{_datadir}/bash-completion/completions/systemd-run
 %{_datadir}/bash-completion/completions/timedatectl
 %endif
+# dbus introspection data for code generators: https://github.com/systemd/systemd/pull/20294
+%{_datadir}/dbus-1/interfaces/org.freedesktop.LogControl1.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Manager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Seat.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Session.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.User.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Automount.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Device.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Job.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Manager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Mount.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Path.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Scope.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Service.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Slice.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Socket.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Swap.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Target.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Timer.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Unit.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.timedate1.xml
 %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
@@ -205,7 +231,6 @@
 %{_datadir}/zsh/site-functions/_systemd-tmpfiles
 %{_datadir}/zsh/site-functions/_timedatectl
 %endif
-%{xinitconfdir}/xinitrc.d/50-systemd-user.sh
 %{_environmentdir}/99-environment.conf
 %{_journalcatalogdir}/systemd.be.catalog
 %{_journalcatalogdir}/systemd.be@latin.catalog
@@ -220,6 +245,11 @@
 %{_journalcatalogdir}/systemd.zh_CN.catalog
 %{_journalcatalogdir}/systemd.zh_TW.catalog
 %if ! 0%{bootstrap}
+%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so
+%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so
+%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so
+%endif
+%if ! 0%{bootstrap}
 %if %{with sd_boot}
 %{_mandir}/man1/bootctl.1.gz
 %endif
@@ -235,6 +265,7 @@
 %{_mandir}/man1/systemd-cat.1.gz
 %{_mandir}/man1/systemd-cgls.1.gz
 %{_mandir}/man1/systemd-cgtop.1.gz
+%{_mandir}/man1/systemd-creds.1.gz
 %{_mandir}/man1/systemd-cryptenroll.1.gz
 %{_mandir}/man1/systemd-delta.1.gz
 %{_mandir}/man1/systemd-detect-virt.1.gz
@@ -250,6 +281,7 @@
 %{_mandir}/man1/systemd-path.1.gz
 %{_mandir}/man1/systemd-run.1.gz
 %{_mandir}/man1/systemd-socket-activate.1.gz
+%{_mandir}/man1/systemd-stdio-bridge.1.gz
 %{_mandir}/man1/systemd-tty-ask-password-agent.1.gz
 %{_mandir}/man1/systemd-umount.1.gz
 %{_mandir}/man1/systemd.1.gz
@@ -258,8 +290,10 @@
 %{_mandir}/man5/crypttab.5.gz
 %{_mandir}/man5/dnssec-trust-anchors.d.5.gz
 %{_mandir}/man5/environment.d.5.gz
+%{_mandir}/man5/extension-release.5.gz
 %{_mandir}/man5/hostname.5.gz
 %{_mandir}/man5/initrd-release.5.gz
+%{_mandir}/man5/integritytab.5.gz
 %{_mandir}/man5/journald.conf.5.gz
 %{_mandir}/man5/journald.conf.d.5.gz
 %{_mandir}/man5/journald@.conf.5.gz
@@ -323,8 +357,12 @@
 %{_mandir}/man7/file-hierarchy.7.gz
 %{_mandir}/man7/kernel-command-line.7.gz
 %if %{with sd_boot}
+%{_mandir}/man7/linuxaa64.efi.stub.7.gz
+%{_mandir}/man7/linuxia32.efi.stub.7.gz
+%{_mandir}/man7/linuxx64.efi.stub.7.gz
 %{_mandir}/man7/sd-boot.7.gz
 %{_mandir}/man7/systemd-boot.7.gz
+%{_mandir}/man7/systemd-stub.7.gz
 %endif
 %{_mandir}/man7/systemd.directives.7.gz
 %{_mandir}/man7/systemd.environment-generator.7.gz
@@ -383,6 +421,9 @@
 %{_mandir}/man8/systemd-hostnamed.8.gz
 %{_mandir}/man8/systemd-hostnamed.service.8.gz
 %{_mandir}/man8/systemd-hybrid-sleep.service.8.gz
+%{_mandir}/man8/systemd-integritysetup-generator.8.gz
+%{_mandir}/man8/systemd-integritysetup.8.gz
+%{_mandir}/man8/systemd-integritysetup@.service.8.gz
 %{_mandir}/man8/systemd-journald-audit.socket.8.gz
 %{_mandir}/man8/systemd-journald-dev-log.socket.8.gz
 %{_mandir}/man8/systemd-journald-varlink@.socket.8.gz
@@ -455,7 +496,7 @@
 %{_modprobedir}/systemd.conf
 %{_pam_moduledir}/pam_systemd.so
 %{_pam_vendordir}/systemd-user
-%{_prefix}/lib/kernel/install.d/00-entry-directory.install
+%{_prefix}/lib/kernel/install.conf
 %{_prefix}/lib/kernel/install.d/50-depmod.install
 %{_prefix}/lib/kernel/install.d/90-loaderentry.install
 %{_sbindir}/halt
@@ -472,7 +513,7 @@
 %{_systemd_util_dir}/boot/efi/linux*.elf.stub
 %{_systemd_util_dir}/boot/efi/systemd-boot*.efi
 %endif
-%{_systemd_util_dir}/libsystemd-shared-249.so
+%{_systemd_util_dir}/libsystemd-shared-250.so
 %{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list
 %{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh
 %{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh
@@ -493,6 +534,9 @@
 %{_systemd_util_dir}/systemd-growfs
 %{_systemd_util_dir}/systemd-hibernate-resume
 %{_systemd_util_dir}/systemd-hostnamed
+%if ! 0%{?bootstrap}
+%{_systemd_util_dir}/systemd-integritysetup
+%endif
 %{_systemd_util_dir}/systemd-journald
 %{_systemd_util_dir}/systemd-localed
 %{_systemd_util_dir}/systemd-logind
@@ -556,6 +600,9 @@
 %{_systemdgeneratordir}/systemd-getty-generator
 %{_systemdgeneratordir}/systemd-gpt-auto-generator
 %{_systemdgeneratordir}/systemd-hibernate-resume-generator
+%if ! 0%{?bootstrap}
+%{_systemdgeneratordir}/systemd-integritysetup-generator
+%endif
 %{_systemdgeneratordir}/systemd-run-generator
 %{_systemdgeneratordir}/systemd-system-update-generator
 %if ! 0%{?bootstrap}
@@ -602,6 +649,7 @@
 %{_unitdir}/emergency.service
 %{_unitdir}/emergency.target
 %{_unitdir}/exit.target
+%{_unitdir}/factory-reset.target
 %{_unitdir}/final.target
 %{_unitdir}/first-boot-complete.target
 %{_unitdir}/getty-pre.target
@@ -624,6 +672,10 @@
 %{_unitdir}/initrd-switch-root.target
 %{_unitdir}/initrd-usr-fs.target
 %{_unitdir}/initrd.target
+%if ! 0%{?bootstrap}
+%{_unitdir}/integritysetup-pre.target
+%{_unitdir}/integritysetup.target
+%endif
 %{_unitdir}/kexec.target
 %{_unitdir}/local-fs-pre.target
 %{_unitdir}/local-fs.target
@@ -680,6 +732,9 @@
 %endif
 %{_unitdir}/sysinit.target.wants/dev-hugepages.mount
 %{_unitdir}/sysinit.target.wants/dev-mqueue.mount
+%if ! 0%{?bootstrap}
+%{_unitdir}/sysinit.target.wants/integritysetup.target
+%endif
 %{_unitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount
 %{_unitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount
 %{_unitdir}/sysinit.target.wants/sys-kernel-config.mount
@@ -725,6 +780,7 @@
 %{_unitdir}/systemd-boot-check-no-failures.service
 %if %{with sd_boot}
 %{_unitdir}/systemd-boot-system-token.service
+%{_unitdir}/systemd-boot-update.service
 %endif
 %{_unitdir}/systemd-exit.service
 %{_unitdir}/systemd-firstboot.service
@@ -788,6 +844,7 @@
 %{_unitdir}/veritysetup-pre.target
 %{_unitdir}/veritysetup.target
 %endif
+%{xinitconfdir}/xinitrc.d/50-systemd-user.sh
 %if %{with split_usr}
 /bin/systemctl
 /sbin/halt

files.udev

@@ -70,6 +70,8 @@
 %{_udevhwdbdir}/60-keyboard.hwdb
 %{_udevhwdbdir}/60-seat.hwdb
 %{_udevhwdbdir}/60-sensor.hwdb
+%{_udevhwdbdir}/70-analyzers.hwdb
+%{_udevhwdbdir}/70-cameras.hwdb
 %{_udevhwdbdir}/70-joystick.hwdb
 %{_udevhwdbdir}/70-mouse.hwdb
 %{_udevhwdbdir}/70-pointingstick.hwdb
@@ -92,6 +94,7 @@
 %{_udevrulesdir}/60-serial.rules
 %{_udevrulesdir}/61-persistent-storage-compat.rules
 %{_udevrulesdir}/64-btrfs.rules
+%{_udevrulesdir}/70-camera.rules
 %{_udevrulesdir}/70-joystick.rules
 %ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips
 %{_udevrulesdir}/70-memory.rules

systemd-v249.10+suse.86.g0bb1977021.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:325535487567c463664a7e4b54fc31f0a7dff95f49812b89ac7cd1c5c9f82812
-size 7281992

systemd-v250.3+suse.18.gdbd8bd2b9f.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71bed90f579c06f96c9e9e1324d247ab5bf5033f9aa60955019835e128fcb240
+size 7620048

systemd.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Mar  8 09:41:42 UTC 2022 - Franck Bui <fbui@suse.com>
+
+- Upgrade to v250.3 (commit dbd8bd2b9fd827ca89ed18034b60703c95798e01)
+
+  See https://github.com/openSUSE/systemd/blob/SUSE/v250/NEWS for
+  details. 
+
+  * Rebased 0001-conf-parser-introduce-early-drop-ins.patch
+            0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch
+
+- Dropped 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch
+
+  The alias makes little sense as soon as multiple network managers are used in
+  parallel.
+
 -------------------------------------------------------------------
 Tue Mar  8 07:41:41 UTC 2022 - Franck Bui <fbui@suse.com>
 

systemd.spec

@@ -27,7 +27,7 @@
 %endif
 
 %define min_kernel_version 4.5
-%define suse_version +suse.86.g0bb1977021
+%define suse_version +suse.18.gdbd8bd2b9f
 %define _testsuitedir /usr/lib/systemd/tests
 %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
 
@@ -71,7 +71,7 @@
 
 Name:           systemd%{?mini}
 URL:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        249.10
+Version:        250.3
 Release:        0
 Summary:        A System and Session Manager
 License:        LGPL-2.1-or-later
@@ -215,8 +215,9 @@ Patch1:         0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch
 Patch2:         0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch
 Patch3:         0003-strip-the-domain-part-from-etc-hostname-when-setting.patch
 Patch5:         0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch
-Patch7:         0007-networkd-make-network.service-an-alias-of-systemd-ne.patch
+%if %{with sysvcompat}
 Patch8:         0008-sysv-generator-translate-Required-Start-into-a-Wants.patch
+%endif
 Patch10:        0001-conf-parser-introduce-early-drop-ins.patch
 Patch11:        0011-core-disable-session-keyring-per-system-sevice-entir.patch
 Patch12:        0009-pid1-handle-console-specificities-weirdness-for-s390.patch
@@ -690,6 +691,7 @@ Have fun with these services at your own risk.
 	\
         -Defi=%{when sd_boot} \
         -Dgnu-efi=%{when sd_boot} \
+        -Dsbat-distro= \
 	\
         -Dresolve=%{when resolved} \
         -Ddns-servers='' \
@@ -1270,13 +1272,13 @@ fi
 %defattr(-,root,root)
 %license LICENSE.LGPL2.1
 %{_libdir}/libsystemd.so.0
-%{_libdir}/libsystemd.so.0.32.0
+%{_libdir}/libsystemd.so.0.33.0
 
 %files -n libudev%{?mini}1
 %defattr(-,root,root)
 %license LICENSE.LGPL2.1
 %{_libdir}/libudev.so.1
-%{_libdir}/libudev.so.1.7.2
+%{_libdir}/libudev.so.1.7.3
 
 %if %{with coredump}
 %files coredump
@@ -1383,6 +1385,10 @@ fi
 %{_unitdir}/systemd-homed.service
 %{_unitdir}/systemd-homed-activate.service
 %{_pam_moduledir}/pam_systemd_home.so
+%{_datadir}/dbus-1/interfaces/org.freedesktop.home1.Home.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.home1.Manager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Image.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Manager.xml
 %{_datadir}/dbus-1/system-services/org.freedesktop.home1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.home1.policy