From 48bab5088bd989d6c47609df1c6d44cd3b3784af5a63ebcff688d97444cee9d5 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Thu, 8 Apr 2021 20:12:54 +0000 Subject: [PATCH] Accepting request 882182 from Base:System - 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) - Add 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch Temporary workaround for bsc#1183745 (upstream issue 18917) until an actual fix is found. - 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/882182 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=328 --- systemd-mini.changes | 35 +++++++++++++++++++++ systemd-mini.spec | 14 +++++---- systemd-v246.11+suse.102.g9753d1c175.tar.xz | 3 -- systemd-v246.13+suse.105.g14581e0120.tar.xz | 3 ++ systemd.changes | 35 +++++++++++++++++++++ systemd.spec | 14 +++++---- 6 files changed, 89 insertions(+), 15 deletions(-) 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/systemd-mini.changes b/systemd-mini.changes index d0523373..f2e3c48f 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +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 + +- 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 + +- 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-mini.spec b/systemd-mini.spec index fd4a0914..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 @@ -512,9 +512,10 @@ 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=hybrid \ + -Ddefault-hierarchy=unified \ -Ddefault-kill-user-processes=false \ -Drc-local=/etc/init.d/boot.local \ -Dbump-proc-sys-fs-nr-open=false \ @@ -1205,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 @@ -1214,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 d0523373..f2e3c48f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +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 + +- 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 + +- 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..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 @@ -510,9 +510,10 @@ 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=hybrid \ + -Ddefault-hierarchy=unified \ -Ddefault-kill-user-processes=false \ -Drc-local=/etc/init.d/boot.local \ -Dbump-proc-sys-fs-nr-open=false \ @@ -1203,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 @@ -1212,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