From 5c988fd02bf168f06cc4da104270260bfa52c04e679855da41872546f61e37f3 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Wed, 5 Apr 2023 07:45:22 +0000
Subject: [PATCH 1/2] - Import commit 66f3a8a47d5bf6aea3f6fb181c01550a1a54406e
 (merge of v253.3)   This merge also includes the following fix, which is not
 part of the stable   release:     d2413cec02 test/test-functions: fix typo in
 install_suse_systemd()   For a complete list of changes, visit:  
 https://github.com/openSUSE/systemd/compare/03cfbe767327d01d5a71131d91bf06fdc0047ca1...66f3a8a47d5bf6aea3f6fb181c01550a1a54406e

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1369
---
 systemd-v253.2+suse.20.g03cfbe7673.tar.xz |  3 ---
 systemd-v253.3+suse.22.g66f3a8a47d.tar.xz |  3 +++
 systemd.changes                           | 14 ++++++++++++++
 systemd.spec                              |  4 ++--
 4 files changed, 19 insertions(+), 5 deletions(-)
 delete mode 100644 systemd-v253.2+suse.20.g03cfbe7673.tar.xz
 create mode 100644 systemd-v253.3+suse.22.g66f3a8a47d.tar.xz

diff --git a/systemd-v253.2+suse.20.g03cfbe7673.tar.xz b/systemd-v253.2+suse.20.g03cfbe7673.tar.xz
deleted file mode 100644
index 2acb1f5..0000000
--- a/systemd-v253.2+suse.20.g03cfbe7673.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c4d378e16528a3ee1b5e13568e57f7edc71686fe10072bac63f2b600228155a
-size 8205740
diff --git a/systemd-v253.3+suse.22.g66f3a8a47d.tar.xz b/systemd-v253.3+suse.22.g66f3a8a47d.tar.xz
new file mode 100644
index 0000000..27f4e3f
--- /dev/null
+++ b/systemd-v253.3+suse.22.g66f3a8a47d.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5e09e6e9eb4c0b383578dad276f56c174eacd2d7752e0f545db6d2480d627d0
+size 8205724
diff --git a/systemd.changes b/systemd.changes
index 0ca37f7..9a37bdd 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Apr  5 07:32:41 UTC 2023 - Franck Bui <fbui@suse.com>
+
+- Import commit 66f3a8a47d5bf6aea3f6fb181c01550a1a54406e (merge of v253.3)
+
+  This merge also includes the following fix, which is not part of the stable
+  release:
+
+    d2413cec02 test/test-functions: fix typo in install_suse_systemd()
+
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/03cfbe767327d01d5a71131d91bf06fdc0047ca1...66f3a8a47d5bf6aea3f6fb181c01550a1a54406e
+
+
 -------------------------------------------------------------------
 Mon Apr  3 09:36:03 UTC 2023 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 3b65f59..4071773 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -19,7 +19,7 @@
 %global flavor @BUILD_FLAVOR@%{nil}
 
 %define min_kernel_version 4.5
-%define archive_version +suse.20.g03cfbe7673
+%define archive_version +suse.22.g66f3a8a47d
 
 %define _testsuitedir /usr/lib/systemd/tests
 %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
@@ -72,7 +72,7 @@
 
 Name:           systemd%{?mini}
 URL:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        253.2
+Version:        253.3
 Release:        0
 Summary:        A System and Session Manager
 License:        LGPL-2.1-or-later

From f6aa2eabef43c4f5ec756e9f381607a2ff8e1769b9eb6fcf25e0ecb1e38e6dd8 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Wed, 5 Apr 2023 08:22:16 +0000
Subject: [PATCH 2/2] - testsuite: TEST-75-RESOLVED needs knot DNS server

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

diff --git a/systemd.changes b/systemd.changes
index 9a37bdd..7fd9db1 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr  5 08:20:53 UTC 2023 - Franck Bui <fbui@suse.com>
+
+- testsuite: TEST-75-RESOLVED needs knot DNS server
+
 -------------------------------------------------------------------
 Wed Apr  5 07:32:41 UTC 2023 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 4071773..e74fb0a 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -508,6 +508,8 @@ Recommends:     tpm2.0-tools
 # are used by test-funtions to find the libs on the host and install them in the
 # image, see install_missing_libraries() for details.
 %if %{with resolved}
+# Optional dep for knot needed by TEST-75-RESOLVED
+Recommends:     knot
 Requires:       libidn2
 Requires:       pkgconfig(libidn2)
 %endif