From 7bd4c08065cd3bb4742384c4d5d9e0e97ff547d9ab11a5d28653111f15518e2d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 3 Nov 2019 10:58:18 +0000 Subject: [PATCH] Accepting request 744384 from Base:System OBS-URL: https://build.opensuse.org/request/show/744384 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=300 --- ...escape-when-used-for-shell-expansion.patch | 46 --------------- systemd-mini.changes | 59 +++++++++++++++++++ systemd-mini.spec | 6 +- systemd-v243+suse.126.gb7467b7b55.tar.xz | 3 + systemd-v243+suse.91.g428b937f91.tar.xz | 3 - systemd.changes | 59 +++++++++++++++++++ systemd.spec | 6 +- 7 files changed, 125 insertions(+), 57 deletions(-) delete mode 100644 0001-compat-rules-escape-when-used-for-shell-expansion.patch create mode 100644 systemd-v243+suse.126.gb7467b7b55.tar.xz delete mode 100644 systemd-v243+suse.91.g428b937f91.tar.xz diff --git a/0001-compat-rules-escape-when-used-for-shell-expansion.patch b/0001-compat-rules-escape-when-used-for-shell-expansion.patch deleted file mode 100644 index 207188cb..00000000 --- a/0001-compat-rules-escape-when-used-for-shell-expansion.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b37054aa5aebfed9e7c8ee423067aefef0facd39 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Wed, 9 Oct 2019 16:11:17 +0200 -Subject: [PATCH] compat-rules: escape '$' when used for shell expansion - -Make sure to use '$$' in shell expansions since the behavior of udev -is undefined when it encounters unknown substitions. - -udev used to silently ignore them but since v243 (commit -d7aee41db35f808bca), it throws such warning: - - systemd-udevd[443]: /usr/lib/udev/rules.d/61-persistent-storage-compat.rules:83 Invalid value "/bin/sh -c 'eui="%s{eui}"; echo ${eui// /}" for PROGRAM (char 33: invalid substitution type), ignoring, but please fix it. - -No functional changes. ---- - rules/61-persistent-storage-compat.rules | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/rules/61-persistent-storage-compat.rules b/rules/61-persistent-storage-compat.rules -index 0cdc8c4195..bd229f619b 100644 ---- a/rules/61-persistent-storage-compat.rules -+++ b/rules/61-persistent-storage-compat.rules -@@ -80,17 +80,17 @@ ENV{COMPAT_SYMLINK_GENERATION}!="1", GOTO="generation_2" - # symlink is created. - - KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_EUI_COMPAT}!="?*", ATTRS{eui}=="?*", ATTRS{eui}!="0000000000000000", \ -- PROGRAM=="/bin/sh -c 'eui=\"%s{eui}\"; echo ${eui// /}", ENV{ID_NVME_EUI_COMPAT}="2%c" -+ PROGRAM=="/bin/sh -c 'eui=\"%s{eui}\"; echo $${eui// /}", ENV{ID_NVME_EUI_COMPAT}="2%c" - - KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_NGUID_COMPAT}!="?*", ATTRS{nguid}=="?*", \ -- PROGRAM=="/bin/sh -c 'nguid=\"%s{nguid}\"; echo ${nguid//-/}", ENV{ID_NVME_NGUID_COMPAT}="%c" -+ PROGRAM=="/bin/sh -c 'nguid=\"%s{nguid}\"; echo $${nguid//-/}", ENV{ID_NVME_NGUID_COMPAT}="%c" - - KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_SERIAL_COMPAT}!="?*", ATTRS{model}=="?*", ATTRS{serial}=="?*", \ - PROGRAM=="/bin/sh -c ' \ - cd /sys/%p; \ - while ! [ -f model ]; do \ - cd ..; \ -- [ $(pwd) = %S ] && exit 1; \ -+ [ $$(pwd) = %S ] && exit 1; \ - done; \ - cut -c 1-16 model'", ENV{ID_NVME_SERIAL_COMPAT}="SNVMe_%c%s{serial}" - --- -2.16.4 - diff --git a/systemd-mini.changes b/systemd-mini.changes index 8196fde7..f493f24f 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Thu Oct 31 07:38:55 UTC 2019 - Franck Bui + +- Drop 0001-compat-rules-escape-when-used-for-shell-expansion.patch + + It's part of the previous import. + +------------------------------------------------------------------- +Thu Oct 31 07:32:47 UTC 2019 - Franck Bui + +- Import commit b7467b7b553d6d0d6f92758d966b69f1a88b6b42 + + 441f44f371 fileio: introduce read_full_virtual_file() for reading virtual files in sysfs, procfs (bsc#1133495) + 8a1bb5c66b swap: do not make swap units wanted by its device unit anymore + +------------------------------------------------------------------- +Tue Oct 29 10:35:03 UTC 2019 - Franck Bui + +- Import commit 5df9000899ef7d45ddbcacd0fdf73afa07a40f6b + + f0ed7237e4 udev/cdrom_id: Do not open CD-rom in exclusive mode. (bsc#1154256) + b37054aa5a compat-rules: escape '$' when used for shell expansion + + Changes from the v243-stable: + + ef677436aa test: Pass personality test even when i686 userland runs on x86_64 kernel + 3f6398c450 docs: fix inadvertent change in uid range + 25bb377a73 cgroup: fix typo in BPF firewall support warning message + 6d97aca0d5 fix build with compilers with default stack-protector enabled + fbad077cec nspawn: surrender controlling terminal to PID2 when using the PID1 stub + 0553c3c668 pid1: fix DefaultTasksMax initialization + f406a691a7 src/core/automount: use DirectoryMode when calling mkdir -p + 20438f96c3 udevadm trigger: do not propagate EACCES and ENODEV + 6480630bc3 hwdb: Correct WWWW Pattern In Documentation Comment + 9d8e889810 nspawn: consistenly fail if parsing the environment fails + 40e169b304 nspawn: default to unified hierarchy if --as-pid2 is used + b5df1037a0 cgroup: Mark memory protections as explicitly set in transient units + f14e3e02cc cgroup: Respect DefaultMemoryMin when setting memory.min + ea248e53bf cgroup: Check ancestor memory min for unified memory config + de1d25a506 cgroup: docs: memory.high doc fixups + 2ab45f38d8 cgroup: docs: Mention unbounded protection for memory.{low,min} + 19a43dc38a Consider smb3 as remote filesystem + 5c0224c7bf Handle d_type == DT_UNKNOWN correctly + 8282bc61df util-lib: Don't propagate EACCES from find_binary PATH lookup to caller + 9d0ae987a6 network: drop noisy log message + f67f0e4ec4 Updated log message when the timesync happens for the first time (#13624) + e151bf4674 units: make systemd-binfmt.service easier to work with no autofs + 2b8e574d82 Corect man page reference in systemd-nologin.conf comments + a0577353f1 man: Add a missing space in machinectl(1) + 693e983988 log: Add missing "%" in "%m" log format strings + ea7151b8c4 pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist + b90549290e man: fix typo + +------------------------------------------------------------------- +Tue Oct 22 22:25:34 UTC 2019 - Stefan Brüns + +- Remove intltool BuildRequires, not needed since v237 +- Use python3-base BuildRequires instead of full python3 + ------------------------------------------------------------------- Mon Oct 21 10:33:27 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 45161ddd..d49a96ac 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.91.g428b937f91 +%define suse_version +suse.126.gb7467b7b55 %bcond_with gnuefi %if 0%{?bootstrap} @@ -69,7 +69,7 @@ BuildRequires: libgcrypt-devel BuildRequires: libxslt-tools BuildRequires: polkit # python is only required for generating systemd.directives.xml -BuildRequires: python3 +BuildRequires: python3-base BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libdw) @@ -84,7 +84,6 @@ BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif BuildRequires: fdupes BuildRequires: gperf -BuildRequires: intltool BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 @@ -167,7 +166,6 @@ Source200: scripts-udev-convert-lib-udev-path.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-compat-rules-escape-when-used-for-shell-expansion.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch %description diff --git a/systemd-v243+suse.126.gb7467b7b55.tar.xz b/systemd-v243+suse.126.gb7467b7b55.tar.xz new file mode 100644 index 00000000..b7f0a72a --- /dev/null +++ b/systemd-v243+suse.126.gb7467b7b55.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90e94b87ba38b29d80fa47c14858e6047f32d197847fbac705caabe38a56467d +size 5617640 diff --git a/systemd-v243+suse.91.g428b937f91.tar.xz b/systemd-v243+suse.91.g428b937f91.tar.xz deleted file mode 100644 index 38f5db51..00000000 --- a/systemd-v243+suse.91.g428b937f91.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3bf4fd83f69bfb10a6e461edaeb32b3d259420b641c1d5526165596f7467d35a -size 5617708 diff --git a/systemd.changes b/systemd.changes index 8196fde7..f493f24f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Thu Oct 31 07:38:55 UTC 2019 - Franck Bui + +- Drop 0001-compat-rules-escape-when-used-for-shell-expansion.patch + + It's part of the previous import. + +------------------------------------------------------------------- +Thu Oct 31 07:32:47 UTC 2019 - Franck Bui + +- Import commit b7467b7b553d6d0d6f92758d966b69f1a88b6b42 + + 441f44f371 fileio: introduce read_full_virtual_file() for reading virtual files in sysfs, procfs (bsc#1133495) + 8a1bb5c66b swap: do not make swap units wanted by its device unit anymore + +------------------------------------------------------------------- +Tue Oct 29 10:35:03 UTC 2019 - Franck Bui + +- Import commit 5df9000899ef7d45ddbcacd0fdf73afa07a40f6b + + f0ed7237e4 udev/cdrom_id: Do not open CD-rom in exclusive mode. (bsc#1154256) + b37054aa5a compat-rules: escape '$' when used for shell expansion + + Changes from the v243-stable: + + ef677436aa test: Pass personality test even when i686 userland runs on x86_64 kernel + 3f6398c450 docs: fix inadvertent change in uid range + 25bb377a73 cgroup: fix typo in BPF firewall support warning message + 6d97aca0d5 fix build with compilers with default stack-protector enabled + fbad077cec nspawn: surrender controlling terminal to PID2 when using the PID1 stub + 0553c3c668 pid1: fix DefaultTasksMax initialization + f406a691a7 src/core/automount: use DirectoryMode when calling mkdir -p + 20438f96c3 udevadm trigger: do not propagate EACCES and ENODEV + 6480630bc3 hwdb: Correct WWWW Pattern In Documentation Comment + 9d8e889810 nspawn: consistenly fail if parsing the environment fails + 40e169b304 nspawn: default to unified hierarchy if --as-pid2 is used + b5df1037a0 cgroup: Mark memory protections as explicitly set in transient units + f14e3e02cc cgroup: Respect DefaultMemoryMin when setting memory.min + ea248e53bf cgroup: Check ancestor memory min for unified memory config + de1d25a506 cgroup: docs: memory.high doc fixups + 2ab45f38d8 cgroup: docs: Mention unbounded protection for memory.{low,min} + 19a43dc38a Consider smb3 as remote filesystem + 5c0224c7bf Handle d_type == DT_UNKNOWN correctly + 8282bc61df util-lib: Don't propagate EACCES from find_binary PATH lookup to caller + 9d0ae987a6 network: drop noisy log message + f67f0e4ec4 Updated log message when the timesync happens for the first time (#13624) + e151bf4674 units: make systemd-binfmt.service easier to work with no autofs + 2b8e574d82 Corect man page reference in systemd-nologin.conf comments + a0577353f1 man: Add a missing space in machinectl(1) + 693e983988 log: Add missing "%" in "%m" log format strings + ea7151b8c4 pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist + b90549290e man: fix typo + +------------------------------------------------------------------- +Tue Oct 22 22:25:34 UTC 2019 - Stefan Brüns + +- Remove intltool BuildRequires, not needed since v237 +- Use python3-base BuildRequires instead of full python3 + ------------------------------------------------------------------- Mon Oct 21 10:33:27 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 2a119e33..389ff129 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.91.g428b937f91 +%define suse_version +suse.126.gb7467b7b55 %bcond_with gnuefi %if 0%{?bootstrap} @@ -67,7 +67,7 @@ BuildRequires: libgcrypt-devel BuildRequires: libxslt-tools BuildRequires: polkit # python is only required for generating systemd.directives.xml -BuildRequires: python3 +BuildRequires: python3-base BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libdw) @@ -82,7 +82,6 @@ BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif BuildRequires: fdupes BuildRequires: gperf -BuildRequires: intltool BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 @@ -165,7 +164,6 @@ Source200: scripts-udev-convert-lib-udev-path.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-compat-rules-escape-when-used-for-shell-expansion.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch %description