From dc2bffc70d1903ed3cf59c099fc3cbde01901560ef07bcdf5b8d9d64ce7bfbf1 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 31 Jan 2022 15:56:09 +0000 Subject: [PATCH] - Import commit 117bd7f14aa7834d85a4306cd380d292bec04108 1395c74be7 udevadm: cleanup-db: don't delete information for kept db entries (bsc#1194912) bbafc8092a udevadm: cleanup_dir: use dot_or_dot_dot() OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1242 --- systemd-v249.9+suse.79.g885e0b9126.tar.xz | 3 --- systemd-v249.9+suse.82.g117bd7f14a.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 10 +++++----- 4 files changed, 16 insertions(+), 8 deletions(-) delete mode 100644 systemd-v249.9+suse.79.g885e0b9126.tar.xz create mode 100644 systemd-v249.9+suse.82.g117bd7f14a.tar.xz diff --git a/systemd-v249.9+suse.79.g885e0b9126.tar.xz b/systemd-v249.9+suse.79.g885e0b9126.tar.xz deleted file mode 100644 index 6d53a8ef..00000000 --- a/systemd-v249.9+suse.79.g885e0b9126.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51c9904085a4c76526e49baf1e103afc39880d72247c971f91730d9cdebe9d99 -size 7279976 diff --git a/systemd-v249.9+suse.82.g117bd7f14a.tar.xz b/systemd-v249.9+suse.82.g117bd7f14a.tar.xz new file mode 100644 index 00000000..048b7576 --- /dev/null +++ b/systemd-v249.9+suse.82.g117bd7f14a.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:167cad3440fd7babb26317d528842f78fa37573bdaeda29845990dc0986463f0 +size 7280500 diff --git a/systemd.changes b/systemd.changes index 384769f5..2921bd08 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jan 31 15:52:44 UTC 2022 - Franck Bui + +- Import commit 117bd7f14aa7834d85a4306cd380d292bec04108 + + 1395c74be7 udevadm: cleanup-db: don't delete information for kept db entries (bsc#1194912) + bbafc8092a udevadm: cleanup_dir: use dot_or_dot_dot() + ------------------------------------------------------------------- Mon Jan 31 14:54:07 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index f6007a22..106f792a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -32,7 +32,7 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.79.g885e0b9126 +%define suse_version +suse.82.g117bd7f14a %define _testsuitedir /usr/lib/systemd/tests %if 0%{?bootstrap} @@ -193,10 +193,10 @@ Source202: files.container Source203: files.network Source204: files.devel -# Patches listed below are SUSE specific and should be kept at its -# minimum. We try hard to push our changes to upstream but sometimes -# they are only relevant for SUSE distros. Special rewards for those -# who will manage to get rid of one of them ! +# Patches listed below are openSUSE specific and should be kept at its +# minimum. We try hard to push our changes to upstream but sometimes they are +# only relevant for SUSE distros. Special rewards for those who will manage to +# get rid of one of them ! 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