diff --git a/1603-udev-add-actions-while-rename-netif-failed.patch b/1603-udev-add-actions-while-rename-netif-failed.patch index 6d82946..3482482 100644 --- a/1603-udev-add-actions-while-rename-netif-failed.patch +++ b/1603-udev-add-actions-while-rename-netif-failed.patch @@ -7,21 +7,21 @@ 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 8cfa2cd..46bbcb1 100644 +index e1c2baf..b64d279 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c -@@ -788,6 +788,7 @@ static int rename_netif(UdevEvent *event) { +@@ -820,6 +820,7 @@ static int rename_netif(UdevEvent *event) { sd_device *dev = event->dev; const char *oldname; int ifindex, r; + char name[IFNAMSIZ]; - + if (!event->name) return 0; /* No new name is requested. */ -@@ -808,10 +809,43 @@ static int rename_netif(UdevEvent *event) { +@@ -860,12 +861,45 @@ static int rename_netif(UdevEvent *event) { if (r < 0) - return log_device_error_errno(dev, r, "Failed to get ifindex: %m"); - + return log_device_debug_errno(event->dev_db_clone, r, "Failed to update database under /run/udev/data/: %m"); + - r = rtnl_set_link_name(&event->rtnl, ifindex, event->name); + strscpy(name, IFNAMSIZ, event->name); + @@ -62,18 +62,12 @@ index 8cfa2cd..46bbcb1 100644 + nanosleep(&duration, NULL); + } + } - - /* Set ID_RENAMING boolean property here, and drop it in the corresponding move uevent later. */ - r = device_add_property(dev, "ID_RENAMING", "1"); -@@ -822,7 +856,7 @@ static int rename_netif(UdevEvent *event) { - if (r < 0) - return log_device_warning_errno(dev, r, "Failed to update properties with new name '%s': %m", event->name); - log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, event->name); + log_device_info(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, event->name); return 1; } --- -2.19.1 +-- +2.23.0 diff --git a/1605-update-rtc-with-system-clock-when-shutdown.patch b/1605-update-rtc-with-system-clock-when-shutdown.patch index 1c60cee..2f90dc6 100644 --- a/1605-update-rtc-with-system-clock-when-shutdown.patch +++ b/1605-update-rtc-with-system-clock-when-shutdown.patch @@ -10,7 +10,7 @@ Subject: [PATCH] Module: modification summary diff --git a/units/hwclock-save.service.in b/units/hwclock-save.service.in new file mode 100644 -index 0000000000..db33418932 +index 0000000..db33418 --- /dev/null +++ b/units/hwclock-save.service.in @@ -0,0 +1,19 @@ @@ -34,7 +34,7 @@ index 0000000000..db33418932 +WantedBy=default.target + diff --git a/units/meson.build b/units/meson.build -index c641900c66..63fc331921 100644 +index aa2ed11..9992389 100644 --- a/units/meson.build +++ b/units/meson.build @@ -220,6 +220,8 @@ in_units = [ diff --git a/journal-fix-buffer-overrun-when-urlifying.patch b/journal-fix-buffer-overrun-when-urlifying.patch deleted file mode 100644 index d46e191..0000000 --- a/journal-fix-buffer-overrun-when-urlifying.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 85fbebe61a1aec2f86e36fb464283b6b55d3d76d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Tue, 23 Jun 2020 20:51:13 +0200 -Subject: [PATCH] journal: fix buffer overrun when urlifying - -Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=21122. - -message is only valid until message_len, and we need to make sure we're not -reading pass that. Bug introduced in 2108b56749ebb8d17f06d08b6ada2f79ae4f0. ---- - src/shared/logs-show.c | 9 ++++++--- - test/fuzz/fuzz-journal-remote/oss-fuzz-21122 | Bin 0 -> 35798 bytes - 2 files changed, 6 insertions(+), 3 deletions(-) - create mode 100644 test/fuzz/fuzz-journal-remote/oss-fuzz-21122 - -diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c -index 570377dc76..fee6ccdf2a 100644 ---- a/src/shared/logs-show.c -+++ b/src/shared/logs-show.c -@@ -573,19 +573,22 @@ static int output_short( - if (config_file && - message_len >= config_file_len && - memcmp(message, config_file, config_file_len) == 0 && -- IN_SET(message[config_file_len], ':', ' ', '\0') && -+ (message_len == config_file_len || IN_SET(message[config_file_len], ':', ' ')) && - (!highlight || highlight_shifted[0] == 0 || highlight_shifted[0] > config_file_len)) { - - _cleanup_free_ char *t = NULL, *urlified = NULL; - - t = strndup(config_file, config_file_len); - if (t && terminal_urlify_path(t, NULL, &urlified) >= 0) { -- size_t shift = strlen(urlified) - config_file_len; -+ size_t urlified_len = strlen(urlified); -+ size_t shift = urlified_len - config_file_len; - char *joined; - -- joined = strjoin(urlified, message + config_file_len); -+ joined = realloc(urlified, message_len + shift); - if (joined) { -+ memcpy(joined + urlified_len, message + config_file_len, message_len - config_file_len); - free_and_replace(message, joined); -+ TAKE_PTR(urlified); - message_len += shift; - if (highlight) { - highlight_shifted[0] += shift; - --- -2.23.0 - diff --git a/rules-add-the-rule-that-adds-elevator-kernel-command.patch b/rules-add-the-rule-that-adds-elevator-kernel-command.patch index 55a84ae..5b60688 100644 --- a/rules-add-the-rule-that-adds-elevator-kernel-command.patch +++ b/rules-add-the-rule-that-adds-elevator-kernel-command.patch @@ -11,7 +11,7 @@ Resolves: #1670126 1 file changed, 1 insertion(+) diff --git a/rules.d/meson.build b/rules.d/meson.build -index b06edf0621..bd65424a0d 100644 +index 120fe7f..8dcadbc 100644 --- a/rules.d/meson.build +++ b/rules.d/meson.build @@ -1,6 +1,7 @@ @@ -19,9 +19,9 @@ index b06edf0621..bd65424a0d 100644 rules = files(''' + 40-elevator.rules + 60-autosuspend.rules 60-block.rules 60-cdrom_id.rules - 60-drm.rules -- 2.23.0 diff --git a/systemd-246.tar.gz b/systemd-246.tar.gz index 4c3983f..cc841be 100644 Binary files a/systemd-246.tar.gz and b/systemd-246.tar.gz differ diff --git a/systemd.spec b/systemd.spec index f38b9cf..b64c6c5 100644 --- a/systemd.spec +++ b/systemd.spec @@ -20,7 +20,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 246 -Release: 2 +Release: 3 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -63,12 +63,6 @@ Patch0012: Avoid-tmp-being-mounted-as-tmpfs-without-the-user-s-.patch Patch0013: sd-bus-properly-initialize-containers.patch Patch0014: Revert-core-one-step-back-again-for-nspawn-we-actual.patch Patch0015: journal-don-t-enable-systemd-journald-audit.socket-b.patch -Patch0016: journal-fix-buffer-overrun-when-urlifying.patch -## The patch of 0026~0029 resolve the pid1 memory leaks -#Patch0034: revert-pid1-drop-unit-caches-only-based-on-mtime.patch -#Patch0035: revert-analyze-add-unit-files-to-dump-the-unit-fragm.patch -#Patch0036: revert-pid1-use-a-cache-for-all-unit-aliases.patch -#Patch0037: revert-shared-unit-file-add-a-function-to-validate-u.patch #openEuler Patch9001: 1509-fix-journal-file-descriptors-leak-problems.patch @@ -884,7 +878,7 @@ fi %dir %{_systemddir}/user-environment-generators %{_systemddir}/systemd-shutdown %{_systemddir}/systemd-portabled -%{_systemddir}/libsystemd-shared-245.so +%{_systemddir}/libsystemd-shared-246.so %{_systemddir}/systemd-reply-password %dir %{_systemddir}/system-generators %dir %{_systemddir}/system @@ -1223,9 +1217,7 @@ fi %{_libdir}/libnss_systemd.so.2 %{_libdir}/libnss_resolve.so.2 %{_libdir}/libnss_myhostname.so.2 -%{_libdir}/libsystemd.so.0 %{_libdir}/libsystemd.so.* -%{_libdir}/libudev.so.1 %{_libdir}/libudev.so.* %files devel @@ -1375,6 +1367,9 @@ fi %{_udevhwdbdir}/60-sensor.hwdb %{_udevhwdbdir}/70-mouse.hwdb %{_udevhwdbdir}/60-input-id.hwdb +%{_udevhwdbdir}/60-autosuspend-chromiumos.hwdb +%{_udevhwdbdir}/60-autosuspend.hwdb +%{_udevrulesdir}/60-autosuspend.rules %{_udevrulesdir}/40-openEuler.rules %{_udevrulesdir}/40-elevator.rules %{_udevrulesdir}/73-idrac.rules @@ -1406,9 +1401,7 @@ fi %{_udevrulesdir}/99-systemd.rules %{_udevrulesdir}/60-persistent-storage-tape.rules %{_udevrulesdir}/50-udev-default.rules -%{_udevrulesdir}/60-autosuspend-chromiumos.rules %{_udevrulesdir}/60-fido-id.rules -%{_udevrulesdir}/61-autosuspend-manual.rules /usr/lib/modprobe.d/systemd.conf %ghost %config(noreplace) /etc/vconsole.conf %dir /etc/udev @@ -1495,6 +1488,12 @@ fi %exclude /usr/share/man/man3/* %changelog +* Mon Aug 01 2020 openEuler Buildteam - 246-3 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:Update to real release 246 + * Tue Jul 7 2020 openEuler Buildteam - 246-2 - Type:enhancement - ID:NA diff --git a/units-add-Install-section-to-tmp.mount.patch b/units-add-Install-section-to-tmp.mount.patch index 78ec31a..1428897 100644 --- a/units-add-Install-section-to-tmp.mount.patch +++ b/units-add-Install-section-to-tmp.mount.patch @@ -9,13 +9,13 @@ Resolves: #1667065 1 file changed, 4 insertions(+) diff --git a/units/tmp.mount b/units/tmp.mount -index 7066e52261..b3966dfd37 100644 +index cf68378..66d9a32 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=10%,nr_inodes=400k + Options=mode=1777,strictatime,nosuid,nodev,size=50%,nr_inodes=400k + +# Make 'systemctl enable tmp.mount' work: +[Install]