From 2d446203bcf1a0db08e99abca43513d246dfa73d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Apr 2018 21:52:00 +0100 Subject: gentoo resync : 05.04.2018 --- sys-apps/systemd/files/CVE-2017-15908.patch | 39 ------------------------- sys-apps/systemd/files/gentoo-noclean-tmp.patch | 28 ------------------ 2 files changed, 67 deletions(-) delete mode 100644 sys-apps/systemd/files/CVE-2017-15908.patch delete mode 100644 sys-apps/systemd/files/gentoo-noclean-tmp.patch (limited to 'sys-apps/systemd/files') diff --git a/sys-apps/systemd/files/CVE-2017-15908.patch b/sys-apps/systemd/files/CVE-2017-15908.patch deleted file mode 100644 index 08e5e37514ce..000000000000 --- a/sys-apps/systemd/files/CVE-2017-15908.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9f939335a07085aa9a9663efd1dca06ef6405d62 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 25 Oct 2017 11:19:19 +0200 -Subject: [PATCH] resolved: fix loop on packets with pseudo dns types - -Reported by Karim Hossen & Thomas Imbert from Sogeti ESEC R&D. - -https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1725351 ---- - src/resolve/resolved-dns-packet.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c -index e2f227bfc..35f4d0689 100644 ---- a/src/resolve/resolved-dns-packet.c -+++ b/src/resolve/resolved-dns-packet.c -@@ -1514,7 +1514,7 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta - - found = true; - -- while (bitmask) { -+ for (; bitmask; bit++, bitmask >>= 1) - if (bitmap[i] & bitmask) { - uint16_t n; - -@@ -1528,10 +1528,6 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta - if (r < 0) - return r; - } -- -- bit++; -- bitmask >>= 1; -- } - } - - if (!found) --- -2.15.0.rc2 - diff --git a/sys-apps/systemd/files/gentoo-noclean-tmp.patch b/sys-apps/systemd/files/gentoo-noclean-tmp.patch deleted file mode 100644 index 769aa04ccf6e..000000000000 --- a/sys-apps/systemd/files/gentoo-noclean-tmp.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b23c098d5787e06770872b19f83fffa14d8a7d14 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Fri, 25 Sep 2015 10:26:18 -0400 -Subject: [PATCH] tmpfiles: Disable cleaning of /tmp and /var/tmp - -Bug: https://bugs.gentoo.org/490676 ---- - tmpfiles.d/tmp.conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf -index 6bbd1aa..a361062 100644 ---- a/tmpfiles.d/tmp.conf -+++ b/tmpfiles.d/tmp.conf -@@ -8,8 +8,8 @@ - # See tmpfiles.d(5) for details - - # Clear tmp directories separately, to make them easier to override --q /tmp 1777 root root 10d --q /var/tmp 1777 root root 30d -+q /tmp 1777 root root -+q /var/tmp 1777 root root - - # Exclude namespace mountpoints created with PrivateTmp=yes - x /tmp/systemd-private-%b-* --- -2.4.10 - -- cgit v1.2.3