From d86f2d4ef1ae8a45f851b7de664949fe400a9d678dff4ea3c6a862df5c135ae7 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Wed, 10 Mar 2021 09:10:55 +0000
Subject: [PATCH 1/5] - fix-machines-btrfs-subvol.sh is only shipped when
 machined is built

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1138
---
 systemd-mini.changes | 5 +++++
 systemd-mini.spec    | 2 ++
 systemd.changes      | 5 +++++
 systemd.spec         | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/systemd-mini.changes b/systemd-mini.changes
index d9c20bad..57800dc1 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 10 09:10:03 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- fix-machines-btrfs-subvol.sh is only shipped when machined is built
+
 -------------------------------------------------------------------
 Mon Feb 22 20:20:43 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 3ced7752..77bd8f50 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -921,6 +921,7 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules
 
 %post container
 %tmpfiles_create systemd-nspawn.conf
+%if %{with machined}
 if [ $1 -gt 1 ]; then
         # Convert /var/lib/machines subvolume to make it suitable for
         # rollbacks, if needed. See bsc#992573. The installer has been fixed
@@ -939,6 +940,7 @@ if [ $1 -gt 1 ]; then
         # shouldn't be any issues.
         %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || :
 fi
+%endif
 
 %if ! 0%{?bootstrap}
 %post logger
diff --git a/systemd.changes b/systemd.changes
index d9c20bad..57800dc1 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 10 09:10:03 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- fix-machines-btrfs-subvol.sh is only shipped when machined is built
+
 -------------------------------------------------------------------
 Mon Feb 22 20:20:43 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 44651538..41bd4223 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -919,6 +919,7 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules
 
 %post container
 %tmpfiles_create systemd-nspawn.conf
+%if %{with machined}
 if [ $1 -gt 1 ]; then
         # Convert /var/lib/machines subvolume to make it suitable for
         # rollbacks, if needed. See bsc#992573. The installer has been fixed
@@ -937,6 +938,7 @@ if [ $1 -gt 1 ]; then
         # shouldn't be any issues.
         %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || :
 fi
+%endif
 
 %if ! 0%{?bootstrap}
 %post logger

From b7c785ac2b64af59554dacb4ced4db3d2479bca08fa53ff8a42d103166d82653 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Thu, 11 Mar 2021 09:53:07 +0000
Subject: [PATCH 2/5] - Make sure the udev socket units are reloaded during
 udev package updates

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1139
---
 systemd-mini.changes |  5 +++++
 systemd-mini.spec    | 17 +++++++++++------
 systemd.changes      |  5 +++++
 systemd.spec         | 17 +++++++++++------
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/systemd-mini.changes b/systemd-mini.changes
index 57800dc1..a1a83bfe 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 11 09:51:53 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Make sure the udev socket units are reloaded during udev package updates
+
 -------------------------------------------------------------------
 Wed Mar 10 09:10:03 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 77bd8f50..f99bb053 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -903,12 +903,17 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules
 
 %postun -n udev%{?mini}
 %regenerate_initrd_post
-# Restarting udevd sockets means also stopping the daemon. But we
-# don't want the sockets and the daemon to be inactive at the same
-# time because we might loose new events sent by the kernel during the
-# package update otherwise. Hence we accept the fact that the socket
-# properties might not be updated. They are unlikely changed anyway.
-%systemd_postun_with_restart systemd-udevd.service
+systemctl daemon-reload || :
+# On package update, restarting the socket units will probably fail as
+# udevd is most likely running. Therefore systemctl will refuse to
+# start them again once stopped. It's not an issue since we are mostly
+# interested to make PID1 use the updated unit files once the socket
+# units wil be started again. And that will happen when systemd-udevd
+# itself will be restarted.
+if [ $1 -ge 1 ]; then
+	systemctl try-restart systemd-udevd-{control,kernel}.socket 2>/dev/null || :
+	systemctl try-restart systemd-udevd.service || :
+fi
 
 %posttrans -n udev%{?mini}
 %regenerate_initrd_posttrans
diff --git a/systemd.changes b/systemd.changes
index 57800dc1..a1a83bfe 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 11 09:51:53 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Make sure the udev socket units are reloaded during udev package updates
+
 -------------------------------------------------------------------
 Wed Mar 10 09:10:03 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 41bd4223..0ce09c2c 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -901,12 +901,17 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules
 
 %postun -n udev%{?mini}
 %regenerate_initrd_post
-# Restarting udevd sockets means also stopping the daemon. But we
-# don't want the sockets and the daemon to be inactive at the same
-# time because we might loose new events sent by the kernel during the
-# package update otherwise. Hence we accept the fact that the socket
-# properties might not be updated. They are unlikely changed anyway.
-%systemd_postun_with_restart systemd-udevd.service
+systemctl daemon-reload || :
+# On package update, restarting the socket units will probably fail as
+# udevd is most likely running. Therefore systemctl will refuse to
+# start them again once stopped. It's not an issue since we are mostly
+# interested to make PID1 use the updated unit files once the socket
+# units wil be started again. And that will happen when systemd-udevd
+# itself will be restarted.
+if [ $1 -ge 1 ]; then
+	systemctl try-restart systemd-udevd-{control,kernel}.socket 2>/dev/null || :
+	systemctl try-restart systemd-udevd.service || :
+fi
 
 %posttrans -n udev%{?mini}
 %regenerate_initrd_posttrans

From 2e74d0198b005d943f5f8a59070e4ea33f86ca9213f15bc7958f567f8da2c635 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Mon, 15 Mar 2021 11:28:03 +0000
Subject: [PATCH 3/5] - Import commit 13bc08870147b35f87cefb074aec22e767b7ac04 
  846d61e0a1 boot: Move console declarations to missing_efi.h   171a37228b
 boot: Add startswith() and endswith() functions with no_case variants  
 0fad9f309a boot: Drop unnecessary braces   c38bbb0874 boot: Fix void pointer
 arithmetic warning   438210924b boot: Replace raw efivar gets with typed
 variants   e46cb3e4a0 boot: Add  efivar_get/set_uint64_le() functions  
 e16bee35c8 boot: Rename efivar_get/set_int() to efivar_get/set_uint_string() 
  2808d0e9a3 boot: Tighten scope of variables used in loops   d3f3d57743 boot:
 Add efivar_get_boolean_u8()   0551ecce71 boot: Make all efivar util functions
 take the guid as an argument   8376ba3b9f boot: Turn all guid constants into
 C99 compound initializers   166fc2dad2 boot: Enable C99   c87d66e261 boot:
 Move Secure Boot logic to new file   da7bba9438 udev: fix memleak  
 e06139117c nspawn: make rootfs relative to oci bundle path (bsc#1182598)  
 8ba587d46c PATCH] Always free deserialized_subscribed on reload (bsc#1180020)

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1140
---
 systemd-mini.changes                        | 22 +++++++++++++++++++++
 systemd-mini.spec                           |  2 +-
 systemd-v246.10+suse.100.g13bc088701.tar.xz |  3 +++
 systemd.changes                             | 22 +++++++++++++++++++++
 systemd.spec                                |  2 +-
 5 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 systemd-v246.10+suse.100.g13bc088701.tar.xz

diff --git a/systemd-mini.changes b/systemd-mini.changes
index a1a83bfe..3672aa5b 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Mon Mar 15 11:06:54 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Import commit 13bc08870147b35f87cefb074aec22e767b7ac04
+
+  846d61e0a1 boot: Move console declarations to missing_efi.h
+  171a37228b boot: Add startswith() and endswith() functions with no_case variants
+  0fad9f309a boot: Drop unnecessary braces
+  c38bbb0874 boot: Fix void pointer arithmetic warning
+  438210924b boot: Replace raw efivar gets with typed variants
+  e46cb3e4a0 boot: Add  efivar_get/set_uint64_le() functions
+  e16bee35c8 boot: Rename efivar_get/set_int() to efivar_get/set_uint_string()
+  2808d0e9a3 boot: Tighten scope of variables used in loops
+  d3f3d57743 boot: Add efivar_get_boolean_u8()
+  0551ecce71 boot: Make all efivar util functions take the guid as an argument
+  8376ba3b9f boot: Turn all guid constants into C99 compound initializers
+  166fc2dad2 boot: Enable C99
+  c87d66e261 boot: Move Secure Boot logic to new file
+  da7bba9438 udev: fix memleak
+  e06139117c nspawn: make rootfs relative to oci bundle path (bsc#1182598)
+  8ba587d46c PATCH] Always free deserialized_subscribed on reload (bsc#1180020)
+
 -------------------------------------------------------------------
 Thu Mar 11 09:51:53 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index f99bb053..491c366a 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -26,7 +26,7 @@
 ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
 %define mini -mini
 %define min_kernel_version 4.5
-%define suse_version +suse.83.g134cf1c8bc
+%define suse_version +suse.100.g13bc088701
 
 %bcond_with     gnuefi
 %if 0%{?bootstrap}
diff --git a/systemd-v246.10+suse.100.g13bc088701.tar.xz b/systemd-v246.10+suse.100.g13bc088701.tar.xz
new file mode 100644
index 00000000..8c25fe80
--- /dev/null
+++ b/systemd-v246.10+suse.100.g13bc088701.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:230db1113693f80432c3c39de06ea4116e2b8dd6924bdbcd5ab0745eb89958cf
+size 6572516
diff --git a/systemd.changes b/systemd.changes
index a1a83bfe..3672aa5b 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Mon Mar 15 11:06:54 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Import commit 13bc08870147b35f87cefb074aec22e767b7ac04
+
+  846d61e0a1 boot: Move console declarations to missing_efi.h
+  171a37228b boot: Add startswith() and endswith() functions with no_case variants
+  0fad9f309a boot: Drop unnecessary braces
+  c38bbb0874 boot: Fix void pointer arithmetic warning
+  438210924b boot: Replace raw efivar gets with typed variants
+  e46cb3e4a0 boot: Add  efivar_get/set_uint64_le() functions
+  e16bee35c8 boot: Rename efivar_get/set_int() to efivar_get/set_uint_string()
+  2808d0e9a3 boot: Tighten scope of variables used in loops
+  d3f3d57743 boot: Add efivar_get_boolean_u8()
+  0551ecce71 boot: Make all efivar util functions take the guid as an argument
+  8376ba3b9f boot: Turn all guid constants into C99 compound initializers
+  166fc2dad2 boot: Enable C99
+  c87d66e261 boot: Move Secure Boot logic to new file
+  da7bba9438 udev: fix memleak
+  e06139117c nspawn: make rootfs relative to oci bundle path (bsc#1182598)
+  8ba587d46c PATCH] Always free deserialized_subscribed on reload (bsc#1180020)
+
 -------------------------------------------------------------------
 Thu Mar 11 09:51:53 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 0ce09c2c..92c07ee8 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -24,7 +24,7 @@
 %define bootstrap 0
 %define mini %nil
 %define min_kernel_version 4.5
-%define suse_version +suse.83.g134cf1c8bc
+%define suse_version +suse.100.g13bc088701
 
 %bcond_with     gnuefi
 %if 0%{?bootstrap}

From 5b382ceab3394242dfe6743ab01479a54ff11ba271b87cb6b175ffc8f970877a Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Mon, 15 Mar 2021 20:02:29 +0000
Subject: [PATCH 4/5] - Import commit ddbd660935d7cff7e5c846a98b312b50a7af4fe7
 (merge of v246.11)   For a complete list of changes, visit:  
 https://github.com/openSUSE/systemd/compare/134cf1c8bc3e361a2641161aa11ac2b5b990480b...ddbd660935d7cff7e5c846a98b312b50a7af4fe7
 - Rebase 0001-conf-parser-introduce-early-drop-ins.patch

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1141
---
 ...conf-parser-introduce-early-drop-ins.patch | 53 +++++++------------
 systemd-mini.changes                          | 10 ++++
 systemd-mini.spec                             |  4 +-
 systemd-v246.10+suse.100.g13bc088701.tar.xz   |  3 --
 systemd-v246.10+suse.83.g134cf1c8bc.tar.xz    |  3 --
 systemd-v246.11+suse.101.gddbd660935.tar.xz   |  3 ++
 systemd.changes                               | 10 ++++
 systemd.spec                                  |  4 +-
 8 files changed, 45 insertions(+), 45 deletions(-)
 delete mode 100644 systemd-v246.10+suse.100.g13bc088701.tar.xz
 delete mode 100644 systemd-v246.10+suse.83.g134cf1c8bc.tar.xz
 create mode 100644 systemd-v246.11+suse.101.gddbd660935.tar.xz

diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch
index 0d20bde5..c05f4769 100644
--- a/0001-conf-parser-introduce-early-drop-ins.patch
+++ b/0001-conf-parser-introduce-early-drop-ins.patch
@@ -1,4 +1,4 @@
-From 3709cf5ba88e1cb9c737e524168b83a0964ef5db Mon Sep 17 00:00:00 2001
+From 569f94a86a608fa7a47fef583f3f504ec8223967 Mon Sep 17 00:00:00 2001
 From: Franck Bui <fbui@suse.com>
 Date: Fri, 22 Jan 2021 14:57:08 +0100
 Subject: [PATCH 1/1] conf-parser: introduce 'early' drop-ins
@@ -61,15 +61,15 @@ drop this feature at any time.
 
 Fixes: #2121
 ---
- src/shared/conf-parser.c    |  57 ++++++++++++--
- src/test/test-conf-parser.c | 149 ++++++++++++++++++++++++++++++++++++
- 2 files changed, 198 insertions(+), 8 deletions(-)
+ src/shared/conf-parser.c    |  47 ++++++++++-
+ src/test/test-conf-parser.c | 151 ++++++++++++++++++++++++++++++++++++
+ 2 files changed, 194 insertions(+), 4 deletions(-)
 
 diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
-index 0fec79f3d7..daf55d2358 100644
+index 7499b3b882..799026626c 100644
 --- a/src/shared/conf-parser.c
 +++ b/src/shared/conf-parser.c
-@@ -423,6 +423,7 @@ int config_parse(const char *unit,
+@@ -426,6 +426,7 @@ int config_parse(const char *unit,
  
  static int config_parse_many_files(
                  const char *conf_file,
@@ -77,39 +77,20 @@ index 0fec79f3d7..daf55d2358 100644
                  char **files,
                  const char *sections,
                  ConfigItemLookup lookup,
-@@ -431,19 +432,27 @@ static int config_parse_many_files(
-                 void *userdata,
-                 usec_t *ret_mtime) {
- 
--        usec_t mtime = 0;
-+        usec_t t, mtime = 0;
+@@ -438,6 +439,12 @@ static int config_parse_many_files(
          char **fn;
          int r;
  
 +        STRV_FOREACH(fn, early_files) {
-+                r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &t);
++                r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime);
 +                if (r < 0)
 +                        return r;
-+                if (t > mtime) /* Find the newest */
-+                        mtime = t;
 +        }
 +
          if (conf_file) {
--                r = config_parse(NULL, conf_file, NULL, sections, lookup, table, flags, userdata, &mtime);
-+                r = config_parse(NULL, conf_file, NULL, sections, lookup, table, flags, userdata, &t);
+                 r = config_parse(NULL, conf_file, NULL, sections, lookup, table, flags, userdata, &mtime);
                  if (r < 0)
-                         return r;
-+                if (t > mtime) /* Find the newest */
-+                        mtime = t;
-         }
- 
-         STRV_FOREACH(fn, files) {
--                usec_t t;
--
-                 r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &t);
-                 if (r < 0)
-                         return r;
-@@ -457,6 +466,28 @@ static int config_parse_many_files(
+@@ -456,6 +463,28 @@ static int config_parse_many_files(
          return 0;
  }
  
@@ -138,7 +119,7 @@ index 0fec79f3d7..daf55d2358 100644
  /* Parse each config file in the directories specified as nulstr. */
  int config_parse_many_nulstr(
                  const char *conf_file,
-@@ -468,14 +499,19 @@ int config_parse_many_nulstr(
+@@ -467,14 +496,19 @@ int config_parse_many_nulstr(
                  void *userdata,
                  usec_t *ret_mtime) {
  
@@ -160,7 +141,7 @@ index 0fec79f3d7..daf55d2358 100644
  }
  
  /* Parse each config file in the directories specified as strv. */
-@@ -490,8 +526,8 @@ int config_parse_many(
+@@ -489,8 +523,8 @@ int config_parse_many(
                  void *userdata,
                  usec_t *ret_mtime) {
  
@@ -170,7 +151,7 @@ index 0fec79f3d7..daf55d2358 100644
          const char *suffix;
          int r;
  
-@@ -504,7 +540,12 @@ int config_parse_many(
+@@ -503,7 +537,12 @@ int config_parse_many(
          if (r < 0)
                  return r;
  
@@ -185,7 +166,7 @@ index 0fec79f3d7..daf55d2358 100644
  
  #define DEFINE_PARSER(type, vartype, conv_func)                         \
 diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
-index 07edc17f92..bb82923319 100644
+index 07edc17f92..2df4b073c5 100644
 --- a/src/test/test-conf-parser.c
 +++ b/src/test/test-conf-parser.c
 @@ -5,6 +5,9 @@
@@ -198,7 +179,7 @@ index 07edc17f92..bb82923319 100644
  #include "string-util.h"
  #include "strv.h"
  #include "tmpfile-util.h"
-@@ -385,6 +388,149 @@ static void test_config_parse(unsigned i, const char *s) {
+@@ -385,6 +388,151 @@ static void test_config_parse(unsigned i, const char *s) {
          }
  }
  
@@ -299,6 +280,8 @@ index 07edc17f92..bb82923319 100644
 +}
 +
 +static void test_config_parse_many(bool nulstr) {
++        log_info("== %s%s ==", __func__, nulstr ? "_nulstr" : "");
++
 +        test_config_parse_many_one(nulstr, NULL, NULL, NULL, NULL, NULL);
 +
 +        test_config_parse_many_one(nulstr,
@@ -348,7 +331,7 @@ index 07edc17f92..bb82923319 100644
  int main(int argc, char **argv) {
          unsigned i;
  
-@@ -407,5 +553,8 @@ int main(int argc, char **argv) {
+@@ -407,5 +555,8 @@ int main(int argc, char **argv) {
          for (i = 0; i < ELEMENTSOF(config_file); i++)
                  test_config_parse(i, config_file[i]);
  
diff --git a/systemd-mini.changes b/systemd-mini.changes
index 3672aa5b..17d5b0fe 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Mar 15 15:56:45 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Import commit ddbd660935d7cff7e5c846a98b312b50a7af4fe7 (merge of v246.11)
+
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/134cf1c8bc3e361a2641161aa11ac2b5b990480b...ddbd660935d7cff7e5c846a98b312b50a7af4fe7
+
+- Rebase 0001-conf-parser-introduce-early-drop-ins.patch
+
 -------------------------------------------------------------------
 Mon Mar 15 11:06:54 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 491c366a..2dc2061f 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -26,7 +26,7 @@
 ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
 %define mini -mini
 %define min_kernel_version 4.5
-%define suse_version +suse.100.g13bc088701
+%define suse_version +suse.101.gddbd660935
 
 %bcond_with     gnuefi
 %if 0%{?bootstrap}
@@ -55,7 +55,7 @@
 
 Name:           systemd-mini
 URL:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        246.10
+Version:        246.11
 Release:        0
 Summary:        A System and Session Manager
 License:        LGPL-2.1-or-later
diff --git a/systemd-v246.10+suse.100.g13bc088701.tar.xz b/systemd-v246.10+suse.100.g13bc088701.tar.xz
deleted file mode 100644
index 8c25fe80..00000000
--- a/systemd-v246.10+suse.100.g13bc088701.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:230db1113693f80432c3c39de06ea4116e2b8dd6924bdbcd5ab0745eb89958cf
-size 6572516
diff --git a/systemd-v246.10+suse.83.g134cf1c8bc.tar.xz b/systemd-v246.10+suse.83.g134cf1c8bc.tar.xz
deleted file mode 100644
index 8346453f..00000000
--- a/systemd-v246.10+suse.83.g134cf1c8bc.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c1fd0a518b62d8f9db6eed77a4ba465e23663e9ac6cc9278b44bca596fd23d6
-size 6572124
diff --git a/systemd-v246.11+suse.101.gddbd660935.tar.xz b/systemd-v246.11+suse.101.gddbd660935.tar.xz
new file mode 100644
index 00000000..1c7d810b
--- /dev/null
+++ b/systemd-v246.11+suse.101.gddbd660935.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6d8c2608064df3afcb07d4fab0a6e50c766621e4e0e4cf8b9bcfd88d4eb6b61
+size 6574712
diff --git a/systemd.changes b/systemd.changes
index 3672aa5b..17d5b0fe 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Mar 15 15:56:45 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Import commit ddbd660935d7cff7e5c846a98b312b50a7af4fe7 (merge of v246.11)
+
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/134cf1c8bc3e361a2641161aa11ac2b5b990480b...ddbd660935d7cff7e5c846a98b312b50a7af4fe7
+
+- Rebase 0001-conf-parser-introduce-early-drop-ins.patch
+
 -------------------------------------------------------------------
 Mon Mar 15 11:06:54 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 92c07ee8..570ca73f 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -24,7 +24,7 @@
 %define bootstrap 0
 %define mini %nil
 %define min_kernel_version 4.5
-%define suse_version +suse.100.g13bc088701
+%define suse_version +suse.101.gddbd660935
 
 %bcond_with     gnuefi
 %if 0%{?bootstrap}
@@ -53,7 +53,7 @@
 
 Name:           systemd
 URL:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        246.10
+Version:        246.11
 Release:        0
 Summary:        A System and Session Manager
 License:        LGPL-2.1-or-later

From 08496b7dbd8ee3236029419c3357d5dc4f965c30af994337b58c4c577a550342 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Mon, 15 Mar 2021 20:54:49 +0000
Subject: [PATCH 5/5] Previous tarball was borked :-/

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1142
---
 systemd-mini.changes                        | 4 ++--
 systemd-mini.spec                           | 2 +-
 systemd-v246.11+suse.101.gddbd660935.tar.xz | 3 ---
 systemd-v246.11+suse.102.g9753d1c175.tar.xz | 3 +++
 systemd.changes                             | 4 ++--
 systemd.spec                                | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 systemd-v246.11+suse.101.gddbd660935.tar.xz
 create mode 100644 systemd-v246.11+suse.102.g9753d1c175.tar.xz

diff --git a/systemd-mini.changes b/systemd-mini.changes
index 17d5b0fe..d0523373 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,10 +1,10 @@
 -------------------------------------------------------------------
 Mon Mar 15 15:56:45 UTC 2021 - Franck Bui <fbui@suse.com>
 
-- Import commit ddbd660935d7cff7e5c846a98b312b50a7af4fe7 (merge of v246.11)
+- Import commit 9753d1c17545a5d46530696cb14254f5f12024f1 (merge of v246.11)
 
   For a complete list of changes, visit:
-  https://github.com/openSUSE/systemd/compare/134cf1c8bc3e361a2641161aa11ac2b5b990480b...ddbd660935d7cff7e5c846a98b312b50a7af4fe7
+  https://github.com/openSUSE/systemd/compare/134cf1c8bc3e361a2641161aa11ac2b5b990480b...9753d1c17545a5d46530696cb14254f5f12024f1
 
 - Rebase 0001-conf-parser-introduce-early-drop-ins.patch
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 2dc2061f..fd4a0914 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -26,7 +26,7 @@
 ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
 %define mini -mini
 %define min_kernel_version 4.5
-%define suse_version +suse.101.gddbd660935
+%define suse_version +suse.102.g9753d1c175
 
 %bcond_with     gnuefi
 %if 0%{?bootstrap}
diff --git a/systemd-v246.11+suse.101.gddbd660935.tar.xz b/systemd-v246.11+suse.101.gddbd660935.tar.xz
deleted file mode 100644
index 1c7d810b..00000000
--- a/systemd-v246.11+suse.101.gddbd660935.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d6d8c2608064df3afcb07d4fab0a6e50c766621e4e0e4cf8b9bcfd88d4eb6b61
-size 6574712
diff --git a/systemd-v246.11+suse.102.g9753d1c175.tar.xz b/systemd-v246.11+suse.102.g9753d1c175.tar.xz
new file mode 100644
index 00000000..0183619d
--- /dev/null
+++ b/systemd-v246.11+suse.102.g9753d1c175.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4ec3e2511b4af7635c5189276f5d5ad3694159fab01603103f7ff12162d52fb
+size 6573652
diff --git a/systemd.changes b/systemd.changes
index 17d5b0fe..d0523373 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,10 +1,10 @@
 -------------------------------------------------------------------
 Mon Mar 15 15:56:45 UTC 2021 - Franck Bui <fbui@suse.com>
 
-- Import commit ddbd660935d7cff7e5c846a98b312b50a7af4fe7 (merge of v246.11)
+- Import commit 9753d1c17545a5d46530696cb14254f5f12024f1 (merge of v246.11)
 
   For a complete list of changes, visit:
-  https://github.com/openSUSE/systemd/compare/134cf1c8bc3e361a2641161aa11ac2b5b990480b...ddbd660935d7cff7e5c846a98b312b50a7af4fe7
+  https://github.com/openSUSE/systemd/compare/134cf1c8bc3e361a2641161aa11ac2b5b990480b...9753d1c17545a5d46530696cb14254f5f12024f1
 
 - Rebase 0001-conf-parser-introduce-early-drop-ins.patch
 
diff --git a/systemd.spec b/systemd.spec
index 570ca73f..dda477e4 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -24,7 +24,7 @@
 %define bootstrap 0
 %define mini %nil
 %define min_kernel_version 4.5
-%define suse_version +suse.101.gddbd660935
+%define suse_version +suse.102.g9753d1c175
 
 %bcond_with     gnuefi
 %if 0%{?bootstrap}