dirkmueller/systemd
SHA256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Import commit 14581e01203df7aa63c7c8383a12e6ebe258476f (merge of v246.13)

Browse Source 
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:
  9753d1c175...14581e0120
- 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
This commit is contained in:
Franck Bui 2021-03-30 14:09:02 +00:00 committed by Git OBS Bridge
parent 93c28dbd9c
commit 9d87c420b5
7 changed files with 53 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
0001-Revert-resolved-gracefully-handle-with-packets-with-.patch
View File

@ -1,51 +0,0 @@
From baf6a410b5bee7d45c26e9475796f1e9db201d77 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
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

18
systemd-mini.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue Mar 30 13:35:38 UTC 2021 - Franck Bui <fbui@suse.com>
- 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 <fbui@suse.com>

13
systemd-mini.spec
View File

@ -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

3
systemd-v246.11+suse.102.g9753d1c175.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4ec3e2511b4af7635c5189276f5d5ad3694159fab01603103f7ff12162d52fb
size 6573652

3
systemd-v246.13+suse.105.g14581e0120.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6316b2146335f43df36f200bdad2482858a6f83a56c50f7b1221b6a24e552eb8
size 6574688

18
systemd.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue Mar 30 13:35:38 UTC 2021 - Franck Bui <fbui@suse.com>
- 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 <fbui@suse.com>

13
systemd.spec
View File

@ -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