From 10efece41cadf12905ba84637f780993dfd78a7d9729fbd0581eed3530562009 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 23 Mar 2021 17:55:26 +0000 Subject: [PATCH 1/3] Accepting request 880601 from home:Pharaoh_Atem:branches:Base:System - Default to the "unified" cgroup hierarchy. At this point, most users of cgroup (such as docker, libvirt, kubernetes) should be ready for this change. It's still possible to switch back to the old "hybrid" hierarchy by passing "systemd.unified_cgroup_hierarchy=0" option to the kernel command line. OBS-URL: https://build.opensuse.org/request/show/880601 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1143 --- systemd-mini.changes | 9 +++++++++ systemd.changes | 9 +++++++++ systemd.spec | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index d0523373..1751888e 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Mar 22 21:12:40 UTC 2021 - Neal Gompa + +- Default to the "unified" cgroup hierarchy. At this point, most + users of cgroup (such as docker, libvirt, kubernetes) should be + ready for this change. It's still possible to switch back to the + old "hybrid" hierarchy by passing "systemd.unified_cgroup_hierarchy=0" + option to the kernel command line. + ------------------------------------------------------------------- Mon Mar 15 15:56:45 UTC 2021 - Franck Bui diff --git a/systemd.changes b/systemd.changes index d0523373..1751888e 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Mar 22 21:12:40 UTC 2021 - Neal Gompa + +- Default to the "unified" cgroup hierarchy. At this point, most + users of cgroup (such as docker, libvirt, kubernetes) should be + ready for this change. It's still possible to switch back to the + old "hybrid" hierarchy by passing "systemd.unified_cgroup_hierarchy=0" + option to the kernel command line. + ------------------------------------------------------------------- Mon Mar 15 15:56:45 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index dda477e4..d20fdc64 100644 --- a/systemd.spec +++ b/systemd.spec @@ -512,7 +512,7 @@ systemd-journal-remote, and systemd-journal-upload. -Dpamlibdir=%{_pamdir} \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ - -Ddefault-hierarchy=hybrid \ + -Ddefault-hierarchy=unified \ -Ddefault-kill-user-processes=false \ -Drc-local=/etc/init.d/boot.local \ -Dbump-proc-sys-fs-nr-open=false \ From 19b66c67b1ad12d2f945022e0931649e9303eb4dd1aab344a255852a900d0b6b Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 24 Mar 2021 07:19:48 +0000 Subject: [PATCH 2/3] - Add 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch Temporary workaround for bsc#1183745 (upstream issue 18917) until an actual fix is found. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1144 --- ...gracefully-handle-with-packets-with-.patch | 51 +++++++++++++++++++ systemd-mini.changes | 8 +++ systemd-mini.spec | 3 +- systemd.changes | 8 +++ systemd.spec | 1 + 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch diff --git a/0001-Revert-resolved-gracefully-handle-with-packets-with-.patch b/0001-Revert-resolved-gracefully-handle-with-packets-with-.patch new file mode 100644 index 00000000..daf75746 --- /dev/null +++ b/0001-Revert-resolved-gracefully-handle-with-packets-with-.patch @@ -0,0 +1,51 @@ +From baf6a410b5bee7d45c26e9475796f1e9db201d77 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Tue, 23 Mar 2021 09:09:01 +0100 +Subject: [PATCH 1/1] Revert "resolved: gracefully handle with packets with too + large RR count" + +This reverts commit c8b7432cba73a4215538726cd98da23a8de9b426. + +[fbui: temporary workaround for bsc#1183745] +--- + src/resolve/resolved-dns-packet.c | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c +index e97d9c6a12..90a40244b1 100644 +--- a/src/resolve/resolved-dns-packet.c ++++ b/src/resolve/resolved-dns-packet.c +@@ -2210,18 +2210,6 @@ static int dns_packet_extract_answer(DnsPacket *p, DnsAnswer **ret_answer) { + if (r < 0) + return r; + +- if (p->rindex == p->size) { +- /* If we reached the end of the packet already, but there are still more RRs +- * declared, then that's a corrupt packet. Let's accept the packet anyway, since it's +- * apparently a common bug in routers. Let's however suppress OPT support in this +- * case, so that we force the rest of the logic into lowest DNS baseline support. Or +- * to say this differently: if the DNS server doesn't even get the RR counts right, +- * it's highly unlikely it gets EDNS right. */ +- log_debug("More resource records declared in packet than included, suppressing OPT."); +- bad_opt = true; +- break; +- } +- + /* Try to reduce memory usage a bit */ + if (previous) + dns_resource_key_reduce(&rr->key, &previous->key); +@@ -2307,10 +2295,8 @@ static int dns_packet_extract_answer(DnsPacket *p, DnsAnswer **ret_answer) { + previous = dns_resource_record_ref(rr); + } + +- if (bad_opt) { ++ if (bad_opt) + p->opt = dns_resource_record_unref(p->opt); +- p->opt_start = p->opt_size = SIZE_MAX; +- } + + *ret_answer = TAKE_PTR(answer); + +-- +2.26.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 1751888e..c486ee45 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Mar 24 07:05:22 UTC 2021 - Franck Bui + +- Add 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch + + Temporary workaround for bsc#1183745 (upstream issue 18917) until an + actual fix is found. + ------------------------------------------------------------------- Mon Mar 22 21:12:40 UTC 2021 - Neal Gompa diff --git a/systemd-mini.spec b/systemd-mini.spec index fd4a0914..b0ef3ca2 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -186,6 +186,7 @@ Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # 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. +Patch100: 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -514,7 +515,7 @@ systemd-journal-remote, and systemd-journal-upload. -Dpamlibdir=%{_pamdir} \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ - -Ddefault-hierarchy=hybrid \ + -Ddefault-hierarchy=unified \ -Ddefault-kill-user-processes=false \ -Drc-local=/etc/init.d/boot.local \ -Dbump-proc-sys-fs-nr-open=false \ diff --git a/systemd.changes b/systemd.changes index 1751888e..c486ee45 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Mar 24 07:05:22 UTC 2021 - Franck Bui + +- Add 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch + + Temporary workaround for bsc#1183745 (upstream issue 18917) until an + actual fix is found. + ------------------------------------------------------------------- Mon Mar 22 21:12:40 UTC 2021 - Neal Gompa diff --git a/systemd.spec b/systemd.spec index d20fdc64..e1fd30d1 100644 --- a/systemd.spec +++ b/systemd.spec @@ -184,6 +184,7 @@ Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # 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. +Patch100: 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch %description Systemd is a system and service manager, compatible with SysV and LSB From d1a386f15ec00a544ec7a5f8e6a51c9ee4771707da31e934e5c0b84e3cc5cc04 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 30 Mar 2021 14:09:02 +0000 Subject: [PATCH 3/3] - Import commit 14581e01203df7aa63c7c8383a12e6ebe258476f (merge of v246.13) 423b1e759c Revert "resolved: gracefully handle with packets with too large RR count" (bsc#1183745) 4723778738 meson.build: make xinitrcdir configurable (bsc#1183408) [...] For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/9753d1c17545a5d46530696cb14254f5f12024f1...14581e01203df7aa63c7c8383a12e6ebe258476f - Drop 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch as it's part of v246.13. - Make use of the new build option to ship xinitrc in /usr/etc/X11/xinit/xinitrc.d (bsc#1183408) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1145 --- ...gracefully-handle-with-packets-with-.patch | 51 ------------------- systemd-mini.changes | 18 +++++++ systemd-mini.spec | 13 ++--- systemd-v246.11+suse.102.g9753d1c175.tar.xz | 3 -- systemd-v246.13+suse.105.g14581e0120.tar.xz | 3 ++ systemd.changes | 18 +++++++ systemd.spec | 13 ++--- 7 files changed, 53 insertions(+), 66 deletions(-) delete mode 100644 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch delete mode 100644 systemd-v246.11+suse.102.g9753d1c175.tar.xz create mode 100644 systemd-v246.13+suse.105.g14581e0120.tar.xz diff --git a/0001-Revert-resolved-gracefully-handle-with-packets-with-.patch b/0001-Revert-resolved-gracefully-handle-with-packets-with-.patch deleted file mode 100644 index daf75746..00000000 --- a/0001-Revert-resolved-gracefully-handle-with-packets-with-.patch +++ /dev/null @@ -1,51 +0,0 @@ -From baf6a410b5bee7d45c26e9475796f1e9db201d77 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Tue, 23 Mar 2021 09:09:01 +0100 -Subject: [PATCH 1/1] Revert "resolved: gracefully handle with packets with too - large RR count" - -This reverts commit c8b7432cba73a4215538726cd98da23a8de9b426. - -[fbui: temporary workaround for bsc#1183745] ---- - src/resolve/resolved-dns-packet.c | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c -index e97d9c6a12..90a40244b1 100644 ---- a/src/resolve/resolved-dns-packet.c -+++ b/src/resolve/resolved-dns-packet.c -@@ -2210,18 +2210,6 @@ static int dns_packet_extract_answer(DnsPacket *p, DnsAnswer **ret_answer) { - if (r < 0) - return r; - -- if (p->rindex == p->size) { -- /* If we reached the end of the packet already, but there are still more RRs -- * declared, then that's a corrupt packet. Let's accept the packet anyway, since it's -- * apparently a common bug in routers. Let's however suppress OPT support in this -- * case, so that we force the rest of the logic into lowest DNS baseline support. Or -- * to say this differently: if the DNS server doesn't even get the RR counts right, -- * it's highly unlikely it gets EDNS right. */ -- log_debug("More resource records declared in packet than included, suppressing OPT."); -- bad_opt = true; -- break; -- } -- - /* Try to reduce memory usage a bit */ - if (previous) - dns_resource_key_reduce(&rr->key, &previous->key); -@@ -2307,10 +2295,8 @@ static int dns_packet_extract_answer(DnsPacket *p, DnsAnswer **ret_answer) { - previous = dns_resource_record_ref(rr); - } - -- if (bad_opt) { -+ if (bad_opt) - p->opt = dns_resource_record_unref(p->opt); -- p->opt_start = p->opt_size = SIZE_MAX; -- } - - *ret_answer = TAKE_PTR(answer); - --- -2.26.2 - diff --git a/systemd-mini.changes b/systemd-mini.changes index c486ee45..f2e3c48f 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Mar 30 13:35:38 UTC 2021 - Franck Bui + +- Import commit 14581e01203df7aa63c7c8383a12e6ebe258476f (merge of v246.13) + + 423b1e759c Revert "resolved: gracefully handle with packets with too large RR count" (bsc#1183745) + 4723778738 meson.build: make xinitrcdir configurable (bsc#1183408) + [...] + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/9753d1c17545a5d46530696cb14254f5f12024f1...14581e01203df7aa63c7c8383a12e6ebe258476f + +- Drop 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch + as it's part of v246.13. + +- Make use of the new build option to ship xinitrc in + /usr/etc/X11/xinit/xinitrc.d (bsc#1183408) + ------------------------------------------------------------------- Wed Mar 24 07:05:22 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index b0ef3ca2..d2b08382 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.102.g9753d1c175 +%define suse_version +suse.105.g14581e0120 %bcond_with gnuefi %if 0%{?bootstrap} @@ -55,7 +55,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.11 +Version: 246.13 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -186,7 +186,6 @@ Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # 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. -Patch100: 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -513,6 +512,7 @@ systemd-journal-remote, and systemd-journal-upload. -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ -Dpamlibdir=%{_pamdir} \ + -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=unified \ @@ -1206,8 +1206,6 @@ fi %dir %{_sysconfdir}/sysctl.d %{_sysctldir}/99-sysctl.conf -%dir %{_sysconfdir}/X11/xinit -%dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xorg.conf.d %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/systemd/network @@ -1215,7 +1213,10 @@ fi %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd %{_sysconfdir}/xdg/systemd/user -%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh + +%dir %{_distconfdir}/X11/xinit +%dir %{_distconfdir}/X11/xinit/xinitrc.d +%{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %config(noreplace) %{_sysconfdir}/pam.d/systemd-user diff --git a/systemd-v246.11+suse.102.g9753d1c175.tar.xz b/systemd-v246.11+suse.102.g9753d1c175.tar.xz deleted file mode 100644 index 0183619d..00000000 --- a/systemd-v246.11+suse.102.g9753d1c175.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4ec3e2511b4af7635c5189276f5d5ad3694159fab01603103f7ff12162d52fb -size 6573652 diff --git a/systemd-v246.13+suse.105.g14581e0120.tar.xz b/systemd-v246.13+suse.105.g14581e0120.tar.xz new file mode 100644 index 00000000..67e2c666 --- /dev/null +++ b/systemd-v246.13+suse.105.g14581e0120.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6316b2146335f43df36f200bdad2482858a6f83a56c50f7b1221b6a24e552eb8 +size 6574688 diff --git a/systemd.changes b/systemd.changes index c486ee45..f2e3c48f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Mar 30 13:35:38 UTC 2021 - Franck Bui + +- Import commit 14581e01203df7aa63c7c8383a12e6ebe258476f (merge of v246.13) + + 423b1e759c Revert "resolved: gracefully handle with packets with too large RR count" (bsc#1183745) + 4723778738 meson.build: make xinitrcdir configurable (bsc#1183408) + [...] + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/9753d1c17545a5d46530696cb14254f5f12024f1...14581e01203df7aa63c7c8383a12e6ebe258476f + +- Drop 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch + as it's part of v246.13. + +- Make use of the new build option to ship xinitrc in + /usr/etc/X11/xinit/xinitrc.d (bsc#1183408) + ------------------------------------------------------------------- Wed Mar 24 07:05:22 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index e1fd30d1..962abb8e 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.102.g9753d1c175 +%define suse_version +suse.105.g14581e0120 %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.11 +Version: 246.13 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -184,7 +184,6 @@ Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # 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. -Patch100: 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -511,6 +510,7 @@ systemd-journal-remote, and systemd-journal-upload. -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ -Dpamlibdir=%{_pamdir} \ + -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=unified \ @@ -1204,8 +1204,6 @@ fi %dir %{_sysconfdir}/sysctl.d %{_sysctldir}/99-sysctl.conf -%dir %{_sysconfdir}/X11/xinit -%dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xorg.conf.d %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/systemd/network @@ -1213,7 +1211,10 @@ fi %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd %{_sysconfdir}/xdg/systemd/user -%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh + +%dir %{_distconfdir}/X11/xinit +%dir %{_distconfdir}/X11/xinit/xinitrc.d +%{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %config(noreplace) %{_sysconfdir}/pam.d/systemd-user