diff --git a/0002-udev-add-actions-while-rename-netif-failed.patch b/0002-udev-add-actions-while-rename-netif-failed.patch index 3482482348e87448e1c404bd04cb28c333abe08e..db6337f30658db3df949675e33d79b7f5e577a25 100644 --- a/0002-udev-add-actions-while-rename-netif-failed.patch +++ b/0002-udev-add-actions-while-rename-netif-failed.patch @@ -7,18 +7,18 @@ Subject: [PATCH] udev-add-actions-while-rename-netif-failed 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c -index e1c2baf..b64d279 100644 +index a60e4f2..b714950 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c -@@ -820,6 +820,7 @@ static int rename_netif(UdevEvent *event) { - sd_device *dev = event->dev; +@@ -829,6 +829,7 @@ static int rename_netif(UdevEvent *event) { const char *oldname; + unsigned flags; int ifindex, r; + char name[IFNAMSIZ]; if (!event->name) return 0; /* No new name is requested. */ -@@ -860,12 +861,45 @@ static int rename_netif(UdevEvent *event) { +@@ -885,12 +886,45 @@ static int rename_netif(UdevEvent *event) { if (r < 0) return log_device_debug_errno(event->dev_db_clone, r, "Failed to update database under /run/udev/data/: %m"); @@ -69,5 +69,5 @@ index e1c2baf..b64d279 100644 return 1; } -- -2.23.0 +2.30.0 diff --git a/0009-units-add-Install-section-to-tmp.mount.patch b/0009-units-add-Install-section-to-tmp.mount.patch index 14288973274ff265dc56c8c4565c2d69f2272640..98ac6c2c36eb06c7291a85c428afd42223d33e7d 100644 --- a/0009-units-add-Install-section-to-tmp.mount.patch +++ b/0009-units-add-Install-section-to-tmp.mount.patch @@ -9,17 +9,17 @@ Resolves: #1667065 1 file changed, 4 insertions(+) diff --git a/units/tmp.mount b/units/tmp.mount -index cf68378..66d9a32 100644 +index 4e1bb8d..4874e8d 100644 --- a/units/tmp.mount +++ b/units/tmp.mount @@ -23,3 +23,7 @@ What=tmpfs Where=/tmp Type=tmpfs - Options=mode=1777,strictatime,nosuid,nodev,size=50%,nr_inodes=400k + Options=mode=1777,strictatime,nosuid,nodev,size=50%,nr_inodes=1m + +# Make 'systemctl enable tmp.mount' work: +[Install] +WantedBy=local-fs.target -- -2.23.0 +2.30.0 diff --git a/0017-resolved-create-etc-resolv.conf-symlink-at-runtime.patch b/0017-resolved-create-etc-resolv.conf-symlink-at-runtime.patch index 21ba7904cc4904cd665b22a552339607e2037f5e..34a1db25f2b4205501d511c0c5775c572cb40f84 100644 --- a/0017-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +++ b/0017-resolved-create-etc-resolv.conf-symlink-at-runtime.patch @@ -10,15 +10,14 @@ If it exists, do nothing. In particular, if it is a broken symlink, we cannot really know if the administator configured it to point to a location used by some service that hasn't started yet, so we don't touch it in that case either. - + https://bugzilla.redhat.com/show_bug.cgi?id=1313085 --- src/resolve/resolved.c | 5 +++++ - tmpfiles.d/etc.conf.in | 3 --- - 2 files changed, 5 insertions(+), 3 deletions(-) + 1 file changed, 5 insertions(+) diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c -index 50989a6b0a..95a51a574a 100644 +index d3bc902..a94d744 100644 --- a/src/resolve/resolved.c +++ b/src/resolve/resolved.c @@ -58,6 +58,11 @@ static int run(int argc, char *argv[]) { @@ -33,20 +32,6 @@ index 50989a6b0a..95a51a574a 100644 /* Drop privileges, but keep three caps. Note that we drop two of those too, later on (see below) */ r = drop_privileges(uid, gid, (UINT64_C(1) << CAP_NET_RAW)| /* needed for SO_BINDTODEVICE */ -diff --git a/tmpfiles.d/etc.conf.in b/tmpfiles.d/etc.conf.in -index f82e0b82ce..66a777bdb2 100644 ---- a/tmpfiles.d/etc.conf.in -+++ b/tmpfiles.d/etc.conf.in -@@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts - {% if HAVE_SMACK_RUN_LABEL %} - t /etc/mtab - - - - security.SMACK64=_ - {% endif %} --{% if ENABLE_RESOLVE %} --L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf --{% endif %} - C! /etc/nsswitch.conf - - - - - {% if HAVE_PAM %} - C! /etc/pam.d - - - - -- -2.23.0 +2.30.0 diff --git a/disable-set-SBAT.patch b/disable-set-SBAT.patch new file mode 100644 index 0000000000000000000000000000000000000000..f95dbf712e27b223394e5bf27ac35b39867753e1 --- /dev/null +++ b/disable-set-SBAT.patch @@ -0,0 +1,63 @@ +From beb49e52eba3e3415fa42536d9335ce5e1d94766 Mon Sep 17 00:00:00 2001 +From: yangmingtai +Date: Fri, 31 Dec 2021 11:48:43 +0800 +Subject: [PATCH] disable set SBAT + +reason: os-release not support BUG_REPORT_URL, SBAT metadata is +inomplete +--- + src/boot/efi/meson.build | 38 -------------------------------------- + 1 file changed, 38 deletions(-) + +diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build +index 97f0e76..60a76a3 100644 +--- a/src/boot/efi/meson.build ++++ b/src/boot/efi/meson.build +@@ -166,44 +166,6 @@ foreach ctype : ['color-normal', 'color-entry', 'color-highlight', 'color-edit'] + 'EFI_' + c[1].strip().underscorify().to_upper())) + endforeach + +-if meson.is_cross_build() and get_option('sbat-distro') == 'auto' +- warning('Auto detection of SBAT information not supported when cross-building, disabling SBAT.') +-elif get_option('sbat-distro') != '' +- efi_conf.set_quoted('SBAT_PROJECT', meson.project_name()) +- efi_conf.set_quoted('PROJECT_VERSION', meson.project_version()) +- efi_conf.set('PROJECT_URL', conf.get('PROJECT_URL')) +- if get_option('sbat-distro-generation') < 1 +- error('SBAT Distro Generation must be a positive integer') +- endif +- efi_conf.set('SBAT_DISTRO_GENERATION', get_option('sbat-distro-generation')) +- foreach sbatvar : [['sbat-distro', 'ID'], +- ['sbat-distro-summary', 'NAME'], +- ['sbat-distro-url', 'BUG_REPORT_URL']] +- value = get_option(sbatvar[0]) +- if (value == '' or value == 'auto') and not meson.is_cross_build() +- cmd = 'if [ -e /etc/os-release ]; then . /etc/os-release; else . /usr/lib/os-release; fi; echo $@0@'.format(sbatvar[1]) +- value = run_command(sh, '-c', cmd).stdout().strip() +- message('@0@ (from @1@): @2@'.format(sbatvar[0], sbatvar[1], value)) +- endif +- if value == '' +- error('Required @0@ option not set and autodetection failed'.format(sbatvar[0])) +- endif +- efi_conf.set_quoted(sbatvar[0].underscorify().to_upper(), value) +- endforeach +- +- pkgname = get_option('sbat-distro-pkgname') +- if pkgname == '' +- pkgname = meson.project_name() +- endif +- efi_conf.set_quoted('SBAT_DISTRO_PKGNAME', pkgname) +- +- pkgver = get_option('sbat-distro-version') +- if pkgver == '' +- efi_conf.set('SBAT_DISTRO_VERSION', 'GIT_VERSION') +- else +- efi_conf.set_quoted('SBAT_DISTRO_VERSION', pkgver) +- endif +-endif + + efi_config_h = configure_file( + output : 'efi_config.h', +-- +2.23.0 + diff --git a/systemd-249.tar.gz b/systemd-250.tar.gz similarity index 55% rename from systemd-249.tar.gz rename to systemd-250.tar.gz index 7d0d938cbff08c53ec81b1068eff3afb5d76da0d..29a42f04e949865f019f70c50ecbe3e9bf57012b 100644 Binary files a/systemd-249.tar.gz and b/systemd-250.tar.gz differ diff --git a/systemd.spec b/systemd.spec index 6e1fa65174e76466b9c72751a77328e2cddb3baa..75a9b7099dc6395a8e9752eb78b122833d991f84 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,8 +19,8 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd -Version: 249 -Release: 2 +Version: 250 +Release: 1 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -64,6 +64,9 @@ Patch0015: 0015-systemd-change-time-log-level.patch Patch0016: 0016-fix-capsh-drop-but-ping-success.patch Patch0017: 0017-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +#openEuler +Patch9000: disable-set-SBAT.patch + BuildRequires: gcc, gcc-c++ BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel BuildRequires: audit-libs-devel, cryptsetup-devel, dbus-devel, libacl-devel @@ -337,6 +340,16 @@ of the Linux persistent storage filesystem, pstore, to other storage, thus preserving the existing information contained in the pstore, and clearing pstore storage for future error events. +%package repart +Summary: Systemd tools for automatically grow and add partitions +License: LGPLv2+ +Requires: %{name} = %{version}-%{release} +%systemd_requires + +%description repart +systemd-repart grows and adds partitions to a partition table, based on +the configuration files described in repart.d(5). + %package_help %prep @@ -854,6 +867,9 @@ fi %preun pstore %systemd_preun systemd-pstore.service +%preun repart +%systemd_preun systemd-repart.service + %files -f %{name}.lang %doc %{_pkgdocdir} %exclude %{_pkgdocdir}/LICENSE.* @@ -877,7 +893,6 @@ fi %ghost %dir /var/log/journal %ghost %attr(0664,root,utmp) /var/log/wtmp -/var/log/README %ghost %attr(0600,root,utmp) /var/log/btmp %ghost %attr(0700,root,root) %dir /var/log/private %ghost %attr(0664,root,utmp) /var/run/utmp @@ -945,6 +960,28 @@ fi /usr/share/dbus-1/system-services/org.freedesktop.locale1.service /usr/share/dbus-1/system-services/org.freedesktop.hostname1.service /usr/share/dbus-1/system-services/org.freedesktop.timedate1.service +/usr/share/dbus-1/interfaces/org.freedesktop.LogControl1.xml +/usr/share/dbus-1/interfaces/org.freedesktop.hostname1.xml +/usr/share/dbus-1/interfaces/org.freedesktop.locale1.xml +/usr/share/dbus-1/interfaces/org.freedesktop.login1.Manager.xml +/usr/share/dbus-1/interfaces/org.freedesktop.login1.Seat.xml +/usr/share/dbus-1/interfaces/org.freedesktop.login1.Session.xml +/usr/share/dbus-1/interfaces/org.freedesktop.login1.User.xml +/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Automount.xml +/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Device.xml +/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Job.xml +/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Manager.xml +/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Mount.xml +/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Path.xml +/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Scope.xml +/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Service.xml +/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Slice.xml +/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Socket.xml +/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Swap.xml +/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Target.xml +/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Timer.xml +/usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Unit.xml +/usr/share/dbus-1/interfaces/org.freedesktop.timedate1.xml /usr/share/dbus-1/system.d/org.freedesktop.timedate1.conf /usr/share/dbus-1/system.d/org.freedesktop.hostname1.conf /usr/share/dbus-1/system.d/org.freedesktop.login1.conf @@ -996,7 +1033,7 @@ fi %dir /usr/lib/systemd %dir /usr/lib/sysusers.d /usr/lib/pam.d/systemd-user -/usr/lib/sysusers.d/systemd.conf +/usr/lib/sysusers.d/systemd-journal.conf /usr/lib/sysusers.d/basic.conf /usr/lib/systemd/system/hwclock-save.service /usr/lib/systemd/system/initrd-usr-fs.target @@ -1237,6 +1274,7 @@ fi %{_systemddir}/system-generators/systemd-run-generator %{_systemddir}/system-generators/systemd-system-update-generator %{_systemddir}/system-generators/systemd-getty-generator +%{_systemddir}/system-generators/systemd-integritysetup-generator %{_systemddir}/user-environment-generators/30-systemd-environment-d-generator %{_systemddir}/system-preset/90-systemd.preset %{_userunitdir}/systemd-tmpfiles-setup.service @@ -1324,6 +1362,7 @@ fi /usr/bin/systemd-cryptenroll /usr/bin/systemd-sysext +/usr/bin/systemd-creds /usr/lib/modprobe.d/README /usr/lib/sysctl.d/README /usr/lib/systemd/system/first-boot-complete.target @@ -1334,6 +1373,13 @@ fi /usr/lib/systemd/system/systemd-sysext.service /usr/lib/systemd/system/veritysetup-pre.target /usr/lib/systemd/system/veritysetup.target +/usr/lib/systemd/system/factory-reset.target +/usr/lib/systemd/system/integritysetup-pre.target +/usr/lib/systemd/system/integritysetup.target +/usr/lib/systemd/system/sysinit.target.wants/integritysetup.target +/usr/lib/systemd/system/systemd-boot-update.service +/usr/lib/systemd/systemd-integritysetup +/usr/lib/systemd/systemd-update-helper /usr/lib/systemd/user/app.slice /usr/lib/systemd/user/background.slice /usr/lib/systemd/user/session.slice @@ -1350,6 +1396,7 @@ fi /usr/lib/udev/rules.d/README /usr/share/bash-completion/completions/systemd-id128 /usr/share/zsh/site-functions/_systemd-path +/usr/lib64/cryptsetup/libcryptsetup-token-systemd-pkcs11.so %files libs %{_libdir}/libnss_systemd.so.2 @@ -1468,9 +1515,9 @@ fi %{_systemddir}/network/99-default.link %dir /usr/lib/kernel/install.d /usr/lib/kernel/install.d/20-grubby.install -/usr/lib/kernel/install.d/00-entry-directory.install /usr/lib/kernel/install.d/90-loaderentry.install /usr/lib/kernel/install.d/50-depmod.install +/usr/lib/kernel/install.conf /usr/lib/udev/v4l_id %dir /usr/lib/udev/rules.d /usr/lib/udev/ata_id @@ -1500,6 +1547,8 @@ fi %{_udevhwdbdir}/60-input-id.hwdb %{_udevhwdbdir}/60-autosuspend-chromiumos.hwdb %{_udevhwdbdir}/60-autosuspend.hwdb +%{_udevhwdbdir}/70-analyzers.hwdb +%{_udevhwdbdir}/70-cameras.hwdb %{_udevrulesdir}/60-autosuspend.rules %{_udevrulesdir}/40-openEuler.rules %{_udevrulesdir}/40-elevator.rules @@ -1533,6 +1582,7 @@ fi %{_udevrulesdir}/60-persistent-storage-tape.rules %{_udevrulesdir}/50-udev-default.rules %{_udevrulesdir}/60-fido-id.rules +%{_udevrulesdir}/70-camera.rules /usr/lib/modprobe.d/systemd.conf %ghost %config(noreplace) /etc/vconsole.conf %dir /etc/udev @@ -1554,6 +1604,11 @@ fi /usr/share/dbus-1/system-services/org.freedesktop.systemd1.service /usr/share/dbus-1/system.d/org.freedesktop.import1.conf /usr/share/dbus-1/system.d/org.freedesktop.machine1.conf +/usr/share/dbus-1/interfaces/org.freedesktop.machine1.Image.xml +/usr/share/dbus-1/interfaces/org.freedesktop.machine1.Machine.xml +/usr/share/dbus-1/interfaces/org.freedesktop.machine1.Manager.xml +/usr/share/dbus-1/interfaces/org.freedesktop.import1.Manager.xml +/usr/share/dbus-1/interfaces/org.freedesktop.import1.Transfer.xml /usr/share/polkit-1/actions/org.freedesktop.import1.policy /usr/share/polkit-1/actions/org.freedesktop.machine1.policy %{_libdir}/libnss_mymachines.so.2 @@ -1610,10 +1665,13 @@ fi /etc/systemd/oomd.conf /usr/bin/oomctl /usr/lib/systemd/system/systemd-oomd.service +/usr/lib/systemd/system/systemd-oomd.socket /usr/lib/systemd/system/dbus-org.freedesktop.oom1.service /usr/lib/systemd/systemd-oomd +/usr/lib/sysusers.d/systemd-oom.conf /usr/share/dbus-1/system-services/org.freedesktop.oom1.service /usr/share/dbus-1/system.d/org.freedesktop.oom1.conf +/usr/share/dbus-1/interfaces/org.freedesktop.oom1.Manager.xml %files help /usr/share/man/*/* @@ -1626,9 +1684,14 @@ fi /usr/share/zsh/site-functions/_resolvectl /usr/share/bash-completion/completions/systemd-resolve /usr/share/dbus-1/system-services/org.freedesktop.resolve1.service +/usr/share/dbus-1/interfaces/org.freedesktop.resolve1.DnssdService.xml +/usr/share/dbus-1/interfaces/org.freedesktop.resolve1.Link.xml +/usr/share/dbus-1/interfaces/org.freedesktop.resolve1.Manager.xml /usr/share/dbus-1/system.d/org.freedesktop.resolve1.conf /usr/share/polkit-1/actions/org.freedesktop.resolve1.policy /usr/bin/systemd-resolve +/usr/lib/sysusers.d/systemd-resolve.conf +/usr/lib/tmpfiles.d/systemd-resolve.conf %{_systemddir}/resolv.conf %{_systemddir}/systemd-resolved %config(noreplace) /etc/systemd/resolved.conf @@ -1646,10 +1709,15 @@ fi /usr/share/bash-completion/completions/networkctl /usr/share/zsh/site-functions/_networkctl /usr/share/dbus-1/system-services/org.freedesktop.network1.service +/usr/share/dbus-1/interfaces/org.freedesktop.network1.DHCPServer.xml +/usr/share/dbus-1/interfaces/org.freedesktop.network1.Link.xml +/usr/share/dbus-1/interfaces/org.freedesktop.network1.Manager.xml +/usr/share/dbus-1/interfaces/org.freedesktop.network1.Network.xml /usr/share/dbus-1/system.d/org.freedesktop.network1.conf /usr/share/polkit-1/actions/org.freedesktop.network1.policy /usr/share/polkit-1/rules.d/systemd-networkd.rules /usr/bin/networkctl +/usr/lib/sysusers.d/systemd-network.conf %{_systemddir}/systemd-networkd-wait-online %{_systemddir}/systemd-networkd %{_unitdir}/systemd-networkd.socket @@ -1660,6 +1728,7 @@ fi %config(noreplace) /etc/systemd/networkd.conf %{_systemddir}/network/80-container-vz.network %{_systemddir}/network/80-container-ve.network +%{_systemddir}/network/80-6rd-tunnel.network %files timesyncd %dir %{_systemddir}/ntp-units.d @@ -1673,6 +1742,7 @@ fi %{_unitdir}/systemd-timesyncd.service %{_systemddir}/ntp-units.d/80-systemd-timesync.list %config(noreplace) /etc/systemd/timesyncd.conf +/usr/lib/sysusers.d/systemd-timesync.conf %files pam %{_libdir}/security/pam_systemd.so @@ -1686,6 +1756,7 @@ fi %{_sysctldir}/50-coredump.conf %config(noreplace) %{_sysconfdir}/systemd/coredump.conf %dir %{_localstatedir}/lib/systemd/coredump +/usr/lib/sysusers.d/systemd-coredump.conf %files portable %defattr(-,root,root) @@ -1695,6 +1766,8 @@ fi %{_unitdir}/systemd-portabled.service %{_unitdir}/dbus-org.freedesktop.portable1.service %{_tmpfilesdir}/portables.conf +/usr/share/dbus-1/interfaces/org.freedesktop.portable1.Image.xml +/usr/share/dbus-1/interfaces/org.freedesktop.portable1.Manager.xml %files pstore %defattr(-,root,root) @@ -1711,9 +1784,18 @@ fi %{_unitdir}/systemd-userdbd.service %{_unitdir}/systemd-userdbd.socket +%files repart +/usr/bin/systemd-repart +/usr/lib/systemd/system/initrd-root-fs.target.wants/systemd-repart.service +/usr/lib/systemd/system/systemd-repart.service +/usr/lib/systemd/system/sysinit.target.wants/systemd-repart.service + %changelog -+* Tue Dec 27 2021 yangmingtai - 249-2 -+- delete useless Provides and Obsoletes +* Thu Dec 30 2021 yangmingtai - 250-1 +- systemd update ro v250 + +* Mon Dec 27 2021 yangmingtai - 249-2 +- delete useless Provides and Obsoletes * Wed Dec 8 2021 yangmingtai - 249-1 - systemd update to v249 @@ -1736,10 +1818,10 @@ fi * Mon Aug 16 2021 yangmingtai - 248-8 - udev: exec daemon-reload after installation -* Thu Jun 03 2021 yangmingtai - 248-7 +* Thu Jul 22 2021 yangmingtai - 248-7 - fix CVE-2021-33910 -* Thu Jul 22 2021 shenyangyang - 248-6 +* Thu Jun 03 2021 shenyangyang - 248-6 - change requires to openssl-libs as post scripts systemctl requires libssl.so.1.1 * Mon May 31 2021 hexiaowen - 248-5