Hello community,
here is the log from the commit of package systemd for openSUSE:Factory checked in at 2019-10-23 15:45:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
and /work/SRC/openSUSE:Factory/.systemd.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd"
Wed Oct 23 15:45:55 2019 rev:299 rq:741487 version:243
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2019-10-04 11:20:31.665241101 +0200
+++ /work/SRC/openSUSE:Factory/.systemd.new.2352/systemd-mini.changes 2019-10-23 15:45:57.318377129 +0200
@@ -1,0 +2,77 @@
+Mon Oct 21 10:33:27 UTC 2019 - Franck Bui
+
+- Add 0001-compat-rules-escape-when-used-for-shell-expansion.patch (bsc#1153648)
+
+ Added to the quaratine area to avoid uploading a new tar ball just
+ for that single change. It will be dropped during the next import.
+
+-------------------------------------------------------------------
+Mon Oct 21 09:06:10 UTC 2019 - Ludwig Nussel
+
+- don't package locales in -mini package
+
+-------------------------------------------------------------------
+Fri Oct 4 14:26:59 UTC 2019 - Franck Bui
+
+- Import commit 428b937f917ae177f2315e8469800941885e441a
+
+ 0026b58744 pid1: fix DefaultTasksMax initialization
+
+-------------------------------------------------------------------
+Mon Sep 30 10:43:28 UTC 2019 - Franck Bui
+
+- Import commit ed81f69153488279957268e247a5c81b678da491 (changes from v243-stable)
+
+ fab6f010ac dhcp6: use unaligned_read_be32()
+ f2d9af4322 dhcp6: add missing option length check
+ ccf797511e ndisc: make first solicit delayed randomly
+ f2275b6e12 dhcp6: read OPTION_INFORMATION_REFRESH_TIME option
+ 6dfbe58ee7 l10n: update Czech Translation
+ d4cd0e9d32 sd-radv: if lifetime < SD_RADV_DEFAULT_MAX_TIMEOUT_USEC, adjust timeout (#13491)
+ dbefe59259 polkit: fix typo
+ a321507476 sd-netlink: fix invalid assertion
+ 45dca7fe86 network: do not enter failed state if device's sysfs entry does not exist yet
+ dd83d58796 network: add missing link->network checks
+ b294305888 path: stop watching path specs once we triggered the target unit
+ 2cd636c437 hwdb: add Medion Akoya E2292 (#13498)
+ d133bdd1fa po: update Brazilian Portuguese translation
+ 530e09b594 po: update Polish translation
+ 0c5c3e34c1 polkit: change "revert settings" to "reset settings"
+ 73e0f372d8 man: fix description of ARPIntervalSec= units
+ 5412cc54a1 hwdb: axis override for Dell 9360 touchpad
+ 9d4e658529 test: drop the missed || exit 1 expression
+ 7ed7ea82f6 udevadm: use usec_add()
+ 477bf86c91 udevadm: missing initialization of descriptor
+ 19ac31c989 networkd: unbreak routing_policy_rule_compare_func()
+ a20a2157a8 core: coldplug possible nop_job
+ eb55241742 tty-ask-pwd-agent: fix message forwarded to wall(1)
+ 1a3c53c06c core: Fix setting StatusUnitFormat from config files
+ 91db81e4dd network DHCP4: Dont mislead the logs.
+ 6af590838b Update m4 for selective utmp support. modified: tmpfiles.d/systemd.conf.m4
+ 6823c907cf core: restore initialization of u->source_mtime
+ 29308bcc13 mount-setup: relabel items mentioned directly in relabel-extra.d
+ 8ca1e56165 Call getgroups() to know size of supplementary groups array to allocate
+ 5d84a7ad1c test: add test cases for empty string match
+ 1536348cc8 udev: fix multi match
+ 3ccafef0ad man: move TimeoutCleanSec= entry from .service to .exec
+ 8c0c30a820 zsh: udpate bootctl completions
+ 0556c247a2 resolved: fix abort when recv() returns 0
+ 9a25d75520 man: remove repeated words
+ be3be29347 hwdb: Also mark lis3lv02d sensors in "HP" laptops as being in the base
+ 4b92ffccaa udev: also logs file permission
+ 75a2845e5a udev: add missing flag for OPTIONS=static_node
+ 19e9fc4262 network: do not abort execution when a config file cannot be loaded
+ 3e1267cf50 fileio: update warning message
+ 1b3156edd2 pstore: fix use after free
+ f500d2fa81 journal: Make the output of --update-catalog deterministic
+ 64d0f7042d travis: protect the systemd organization on Fuzzit from forks
+ 4247938ee1 hwdb: Mark lis3lv02d sensors in HP laptops as being in the base
+ 379158684a po: update Japanese translation
+ 31e1bbd1ca docs: fix push recipe in RELEASE.md
+ f06530d86b man/systemctl.xml: fix missing "not"
+ 22aba2b969 docs: fix typo in boot loader doc
+ 000e08ca70 pstore: fix typo in error message - directoy -> directory
+ f7f9c69ac5 Fix typo in comment: overide -> override
+ ca8ba8f8c0 po: update Polish translation
+
+-------------------------------------------------------------------
@@ -4,0 +82,6 @@
+
+-------------------------------------------------------------------
+Wed Sep 18 14:59:16 UTC 2019 - Ludwig Nussel
+
+- split off networkd and resolved into separate network subpackage
+- use separate lang package for translations
systemd.changes: same change
Old:
----
systemd-v243+suse.36.g9e41d7ec35.tar.xz
New:
----
0001-compat-rules-escape-when-used-for-shell-expansion.patch
systemd-v243+suse.91.g428b937f91.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd-mini.spec ++++++
--- /var/tmp/diff_new_pack.hbAGtQ/_old 2019-10-23 15:46:00.286380338 +0200
+++ /var/tmp/diff_new_pack.hbAGtQ/_new 2019-10-23 15:46:00.294380346 +0200
@@ -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.36.g9e41d7ec35
+%define suse_version +suse.91.g428b937f91
%bcond_with gnuefi
%if 0%{?bootstrap}
@@ -167,6 +167,7 @@
# 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
@@ -331,6 +332,22 @@
This package contains systemd-nspawn, machinectl, systemd-machined,
and systemd-importd.
+%if %{with networkd} || %{with resolved}
+%package network
+Summary: Systemd tools for networkd and resolved
+License: LGPL-2.1-or-later
+Group: System/Base
+Requires: %{name} = %{version}-%{release}
+Provides: systemd:/usr/lib/systemd/systemd-networkd
+Provides: systemd:/usr/lib/systemd/systemd-resolved
+%systemd_requires
+
+%description network
+Systemd tools to manage network settings using networkd and
+resolver tools for resolved
+
+%endif
+
%if %{with portabled}
%package portable
Summary: Systemd tools for portable services
@@ -398,7 +415,7 @@
Summary: Plugin for local hostname resolution via systemd-resolved
License: LGPL-2.1-or-later
Group: System/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-network = %{version}-%{release}
%description -n nss-resolve
This package contains a plug-in module for the Name Service Switch
@@ -447,6 +464,10 @@
systemd-journal-remote, and systemd-journal-upload.
%endif
+%if ! 0%{?bootstrap}
+%lang_package
+%endif
+
%prep
%setup -q -n systemd-v%{version}%{suse_version}
%autopatch -p1
@@ -526,6 +547,7 @@
mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib}
%else
rm %{buildroot}%{_libdir}/libnss_systemd.so*
+rm -r %{buildroot}%{_datadir}/locale
%endif
# Don't ship resolvconf symlink for now as it conflicts with the
@@ -719,7 +741,9 @@
# which may still be used by yast.
cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map
+%if ! 0%{?bootstrap}
%find_lang systemd
+%endif
# Build of installation images uses a hard coded list of packages with
# a %pre that needs to be run during the build. systemd is one of them
@@ -769,13 +793,6 @@
%systemd_post machines.target
%systemd_post remote-fs.target
%systemd_post systemd-timesyncd.service
-%if %{with networkd}
-%systemd_post systemd-networkd.service
-%systemd_post systemd-networkd-wait-online.service
-%endif
-%if %{with resolved}
-%systemd_post systemd-resolved.service
-%endif
# v228 wrongly set world writable suid root permissions on timestamp
# files used by permanent timers. Fix the timestamps that might have
@@ -818,12 +835,6 @@
# Avoid restarting logind until fixed upstream (issue #1163)
%systemd_postun_with_restart systemd-journald.service
%systemd_postun_with_restart systemd-timesyncd.service
-%if %{with networkd}
-%systemd_postun_with_restart systemd-networkd.service
-%endif
-%if %{with resolved}
-%systemd_postun_with_restart systemd-resolved.service
-%endif
%pre -n udev%{?mini}
# New installations uses the last compat symlink generation number
@@ -936,6 +947,45 @@
%service_del_postun systemd-journal-upload.service
%endif
+%if %{with networkd} || %{with resolved}
+%pre network
+%if %{with networkd}
+%service_add_pre systemd-networkd.service
+%service_add_pre systemd-networkd-wait-online.service
+%endif
+%if %{with resolved}
+%service_add_pre systemd-resolved.service
+%endif
+
+%post network
+%tmpfiles_create portables.conf
+%if %{with networkd}
+%service_add_post systemd-networkd.service
+%service_add_post systemd-networkd-wait-online.service
+%endif
+%if %{with resolved}
+%service_add_post systemd-resolved.service
+%endif
+
+%preun network
+%if %{with networkd}
+%service_del_preun systemd-networkd.service
+%service_del_preun systemd-networkd-wait-online.service
+%endif
+%if %{with resolved}
+%service_del_preun systemd-resolved.service
+%endif
+
+%postun network
+%if %{with networkd}
+%service_del_postun systemd-networkd.service
+%service_del_postun systemd-networkd-wait-online.service
+%endif
+%if %{with resolved}
+%service_del_postun systemd-resolved.service
+%endif
+%endif
+
%if %{with portabled}
%pre portable
%service_add_pre systemd-portabled.service
@@ -953,7 +1003,7 @@
%clean
-%files -f systemd.lang
+%files
%defattr(-,root,root)
%license LICENSE*
/bin/systemd
@@ -964,12 +1014,6 @@
%{_bindir}/hostnamectl
%{_bindir}/kernel-install
%{_bindir}/localectl
-%if %{with networkd}
-%{_bindir}/networkctl
-%endif
-%if %{with resolved}
-%{_bindir}/resolvectl
-%endif
%{_bindir}/systemctl
%{_bindir}/systemd-analyze
%{_bindir}/systemd-delta
@@ -989,9 +1033,6 @@
%{_bindir}/systemd-tty-ask-password-agent
%{_bindir}/systemd-tmpfiles
%{_bindir}/systemd-machine-id-setup
-%if %{with resolved}
-%{_bindir}/systemd-resolve
-%endif
%{_bindir}/systemd-socket-activate
%{_bindir}/systemd-stdio-bridge
%{_bindir}/systemd-detect-virt
@@ -1064,9 +1105,6 @@
%{_prefix}/lib/systemd/systemd-*
%{_prefix}/lib/systemd/systemd
%{_prefix}/lib/systemd/libsystemd-shared-*.so
-%if %{with resolved}
-%{_prefix}/lib/systemd/resolv.conf
-%endif
%{_prefix}/lib/systemd/scripts
%exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh
%dir %{_journalcatalogdir}
@@ -1116,11 +1154,6 @@
%dir %{_sysconfdir}/sysctl.d
%{_sysctldir}/99-sysctl.conf
-%if %{with networkd}
-%dir %{_sysconfdir}/systemd/network
-%{_prefix}/lib/systemd/network/80-container-host0.network
-%endif
-
%dir %{_sysconfdir}/X11/xinit
%dir %{_sysconfdir}/X11/xinit/xinitrc.d
%dir %{_sysconfdir}/X11/xorg.conf.d
@@ -1139,12 +1172,6 @@
%config(noreplace) %{_sysconfdir}/systemd/system.conf
%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
%config(noreplace) %{_sysconfdir}/systemd/user.conf
-%if %{with networkd}
-%config(noreplace) %{_sysconfdir}/systemd/networkd.conf
-%endif
-%if %{with resolved}
-%config(noreplace) %{_sysconfdir}/systemd/resolved.conf
-%endif
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/system.d
@@ -1156,12 +1183,6 @@
%{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf
%{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf
%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf
-%if %{with networkd}
-%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
-%endif
-%if %{with resolved}
-%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
-%endif
# FIXME: why do we have to own this dir ?
%dir %{_prefix}/lib/modprobe.d
@@ -1190,12 +1211,6 @@
%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service
-%if %{with networkd}
-%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service
-%endif
-%if %{with resolved}
-%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service
-%endif
%dir %{_datadir}/polkit-1
%dir %{_datadir}/polkit-1/actions
@@ -1204,13 +1219,6 @@
%{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
-%if %{with networkd}
-%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy
-%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules
-%endif
-%if %{with resolved}
-%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy
-%endif
%if ! 0%{?bootstrap}
%{_mandir}/man1/[a-rt-z]*ctl.1*
@@ -1393,10 +1401,6 @@
%dir %{_sysconfdir}/systemd/nspawn
%{_bindir}/systemd-nspawn
%{_unitdir}/systemd-nspawn@.service
-%if %{with networkd}
-%{_prefix}/lib/systemd/network/80-container-ve.network
-%{_prefix}/lib/systemd/network/80-container-vz.network
-%endif
%if %{with machined}
%{_bindir}/machinectl
%{_prefix}/lib/systemd/systemd-machined
@@ -1434,6 +1438,8 @@
%endif
%if ! 0%{?bootstrap}
+%files lang -f systemd.lang
+
%files logger
%defattr(-,root,root)
%dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/
@@ -1486,6 +1492,32 @@
%{_datadir}/systemd/gatewayd
%endif
+%if %{with networkd} || %{with resolved}
+%files network
+%defattr(-,root,root)
+%if %{with networkd}
+%dir %{_sysconfdir}/systemd/network
+%config(noreplace) %{_sysconfdir}/systemd/networkd.conf
+%{_bindir}/networkctl
+%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service
+%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy
+%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules
+%{_prefix}/lib/systemd/network/80-container-host0.network
+%{_prefix}/lib/systemd/network/80-container-ve.network
+%{_prefix}/lib/systemd/network/80-container-vz.network
+%endif
+%if %{with resolved}
+%{_bindir}/resolvectl
+%{_bindir}/systemd-resolve
+%config(noreplace) %{_sysconfdir}/systemd/resolved.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service
+%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy
+%{_prefix}/lib/systemd/resolv.conf
+%endif
+%endif
+
%if %{with portabled}
%files portable
%defattr(-,root,root)
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.hbAGtQ/_old 2019-10-23 15:46:00.358380415 +0200
+++ /var/tmp/diff_new_pack.hbAGtQ/_new 2019-10-23 15:46:00.362380419 +0200
@@ -24,7 +24,7 @@
%define bootstrap 0
%define mini %nil
%define min_kernel_version 4.5
-%define suse_version +suse.36.g9e41d7ec35
+%define suse_version +suse.91.g428b937f91
%bcond_with gnuefi
%if 0%{?bootstrap}
@@ -165,6 +165,7 @@
# 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
@@ -329,6 +330,22 @@
This package contains systemd-nspawn, machinectl, systemd-machined,
and systemd-importd.
+%if %{with networkd} || %{with resolved}
+%package network
+Summary: Systemd tools for networkd and resolved
+License: LGPL-2.1-or-later
+Group: System/Base
+Requires: %{name} = %{version}-%{release}
+Provides: systemd:/usr/lib/systemd/systemd-networkd
+Provides: systemd:/usr/lib/systemd/systemd-resolved
+%systemd_requires
+
+%description network
+Systemd tools to manage network settings using networkd and
+resolver tools for resolved
+
+%endif
+
%if %{with portabled}
%package portable
Summary: Systemd tools for portable services
@@ -396,7 +413,7 @@
Summary: Plugin for local hostname resolution via systemd-resolved
License: LGPL-2.1-or-later
Group: System/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-network = %{version}-%{release}
%description -n nss-resolve
This package contains a plug-in module for the Name Service Switch
@@ -445,6 +462,10 @@
systemd-journal-remote, and systemd-journal-upload.
%endif
+%if ! 0%{?bootstrap}
+%lang_package
+%endif
+
%prep
%setup -q -n systemd-v%{version}%{suse_version}
%autopatch -p1
@@ -524,6 +545,7 @@
mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib}
%else
rm %{buildroot}%{_libdir}/libnss_systemd.so*
+rm -r %{buildroot}%{_datadir}/locale
%endif
# Don't ship resolvconf symlink for now as it conflicts with the
@@ -717,7 +739,9 @@
# which may still be used by yast.
cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map
+%if ! 0%{?bootstrap}
%find_lang systemd
+%endif
# Build of installation images uses a hard coded list of packages with
# a %pre that needs to be run during the build. systemd is one of them
@@ -767,13 +791,6 @@
%systemd_post machines.target
%systemd_post remote-fs.target
%systemd_post systemd-timesyncd.service
-%if %{with networkd}
-%systemd_post systemd-networkd.service
-%systemd_post systemd-networkd-wait-online.service
-%endif
-%if %{with resolved}
-%systemd_post systemd-resolved.service
-%endif
# v228 wrongly set world writable suid root permissions on timestamp
# files used by permanent timers. Fix the timestamps that might have
@@ -816,12 +833,6 @@
# Avoid restarting logind until fixed upstream (issue #1163)
%systemd_postun_with_restart systemd-journald.service
%systemd_postun_with_restart systemd-timesyncd.service
-%if %{with networkd}
-%systemd_postun_with_restart systemd-networkd.service
-%endif
-%if %{with resolved}
-%systemd_postun_with_restart systemd-resolved.service
-%endif
%pre -n udev%{?mini}
# New installations uses the last compat symlink generation number
@@ -934,6 +945,45 @@
%service_del_postun systemd-journal-upload.service
%endif
+%if %{with networkd} || %{with resolved}
+%pre network
+%if %{with networkd}
+%service_add_pre systemd-networkd.service
+%service_add_pre systemd-networkd-wait-online.service
+%endif
+%if %{with resolved}
+%service_add_pre systemd-resolved.service
+%endif
+
+%post network
+%tmpfiles_create portables.conf
+%if %{with networkd}
+%service_add_post systemd-networkd.service
+%service_add_post systemd-networkd-wait-online.service
+%endif
+%if %{with resolved}
+%service_add_post systemd-resolved.service
+%endif
+
+%preun network
+%if %{with networkd}
+%service_del_preun systemd-networkd.service
+%service_del_preun systemd-networkd-wait-online.service
+%endif
+%if %{with resolved}
+%service_del_preun systemd-resolved.service
+%endif
+
+%postun network
+%if %{with networkd}
+%service_del_postun systemd-networkd.service
+%service_del_postun systemd-networkd-wait-online.service
+%endif
+%if %{with resolved}
+%service_del_postun systemd-resolved.service
+%endif
+%endif
+
%if %{with portabled}
%pre portable
%service_add_pre systemd-portabled.service
@@ -951,7 +1001,7 @@
%clean
-%files -f systemd.lang
+%files
%defattr(-,root,root)
%license LICENSE*
/bin/systemd
@@ -962,12 +1012,6 @@
%{_bindir}/hostnamectl
%{_bindir}/kernel-install
%{_bindir}/localectl
-%if %{with networkd}
-%{_bindir}/networkctl
-%endif
-%if %{with resolved}
-%{_bindir}/resolvectl
-%endif
%{_bindir}/systemctl
%{_bindir}/systemd-analyze
%{_bindir}/systemd-delta
@@ -987,9 +1031,6 @@
%{_bindir}/systemd-tty-ask-password-agent
%{_bindir}/systemd-tmpfiles
%{_bindir}/systemd-machine-id-setup
-%if %{with resolved}
-%{_bindir}/systemd-resolve
-%endif
%{_bindir}/systemd-socket-activate
%{_bindir}/systemd-stdio-bridge
%{_bindir}/systemd-detect-virt
@@ -1062,9 +1103,6 @@
%{_prefix}/lib/systemd/systemd-*
%{_prefix}/lib/systemd/systemd
%{_prefix}/lib/systemd/libsystemd-shared-*.so
-%if %{with resolved}
-%{_prefix}/lib/systemd/resolv.conf
-%endif
%{_prefix}/lib/systemd/scripts
%exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh
%dir %{_journalcatalogdir}
@@ -1114,11 +1152,6 @@
%dir %{_sysconfdir}/sysctl.d
%{_sysctldir}/99-sysctl.conf
-%if %{with networkd}
-%dir %{_sysconfdir}/systemd/network
-%{_prefix}/lib/systemd/network/80-container-host0.network
-%endif
-
%dir %{_sysconfdir}/X11/xinit
%dir %{_sysconfdir}/X11/xinit/xinitrc.d
%dir %{_sysconfdir}/X11/xorg.conf.d
@@ -1137,12 +1170,6 @@
%config(noreplace) %{_sysconfdir}/systemd/system.conf
%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
%config(noreplace) %{_sysconfdir}/systemd/user.conf
-%if %{with networkd}
-%config(noreplace) %{_sysconfdir}/systemd/networkd.conf
-%endif
-%if %{with resolved}
-%config(noreplace) %{_sysconfdir}/systemd/resolved.conf
-%endif
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/system.d
@@ -1154,12 +1181,6 @@
%{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf
%{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf
%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf
-%if %{with networkd}
-%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
-%endif
-%if %{with resolved}
-%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
-%endif
# FIXME: why do we have to own this dir ?
%dir %{_prefix}/lib/modprobe.d
@@ -1188,12 +1209,6 @@
%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service
-%if %{with networkd}
-%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service
-%endif
-%if %{with resolved}
-%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service
-%endif
%dir %{_datadir}/polkit-1
%dir %{_datadir}/polkit-1/actions
@@ -1202,13 +1217,6 @@
%{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
-%if %{with networkd}
-%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy
-%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules
-%endif
-%if %{with resolved}
-%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy
-%endif
%if ! 0%{?bootstrap}
%{_mandir}/man1/[a-rt-z]*ctl.1*
@@ -1391,10 +1399,6 @@
%dir %{_sysconfdir}/systemd/nspawn
%{_bindir}/systemd-nspawn
%{_unitdir}/systemd-nspawn@.service
-%if %{with networkd}
-%{_prefix}/lib/systemd/network/80-container-ve.network
-%{_prefix}/lib/systemd/network/80-container-vz.network
-%endif
%if %{with machined}
%{_bindir}/machinectl
%{_prefix}/lib/systemd/systemd-machined
@@ -1432,6 +1436,8 @@
%endif
%if ! 0%{?bootstrap}
+%files lang -f systemd.lang
+
%files logger
%defattr(-,root,root)
%dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/
@@ -1484,6 +1490,32 @@
%{_datadir}/systemd/gatewayd
%endif
+%if %{with networkd} || %{with resolved}
+%files network
+%defattr(-,root,root)
+%if %{with networkd}
+%dir %{_sysconfdir}/systemd/network
+%config(noreplace) %{_sysconfdir}/systemd/networkd.conf
+%{_bindir}/networkctl
+%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service
+%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy
+%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules
+%{_prefix}/lib/systemd/network/80-container-host0.network
+%{_prefix}/lib/systemd/network/80-container-ve.network
+%{_prefix}/lib/systemd/network/80-container-vz.network
+%endif
+%if %{with resolved}
+%{_bindir}/resolvectl
+%{_bindir}/systemd-resolve
+%config(noreplace) %{_sysconfdir}/systemd/resolved.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service
+%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy
+%{_prefix}/lib/systemd/resolv.conf
+%endif
+%endif
+
%if %{with portabled}
%files portable
%defattr(-,root,root)
++++++ 0001-compat-rules-escape-when-used-for-shell-expansion.patch ++++++
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
++++++ systemd-v243+suse.36.g9e41d7ec35.tar.xz -> systemd-v243+suse.91.g428b937f91.tar.xz ++++++
++++ 1943 lines of diff (skipped)