summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2017-06-28 16:30:47 -0400
committerMike Gilbert <floppym@gentoo.org>2017-06-28 16:31:08 -0400
commite9a542b09cb0ee4c3b085881190bed393f4ece03 (patch)
tree22e9b48fb2aa7d9d9240295c4037e709a0ce53d5
parentdev-ada/gnat_util: Add version 2017 (diff)
downloadgentoo-e9a542b09cb0ee4c3b085881190bed393f4ece03.tar.gz
gentoo-e9a542b09cb0ee4c3b085881190bed393f4ece03.tar.bz2
gentoo-e9a542b09cb0ee4c3b085881190bed393f4ece03.zip
sys-apps/systemd: update CVE-2017-9445 patch after upstream revert
Package-Manager: Portage-2.3.6_p9, Repoman-2.3.2_p77
-rw-r--r--sys-apps/systemd/files/233-CVE-2017-9445.patch29
-rw-r--r--sys-apps/systemd/systemd-233-r3.ebuild (renamed from sys-apps/systemd/systemd-233-r2.ebuild)0
2 files changed, 0 insertions, 29 deletions
diff --git a/sys-apps/systemd/files/233-CVE-2017-9445.patch b/sys-apps/systemd/files/233-CVE-2017-9445.patch
index a05c41f47b6..22a366ceba0 100644
--- a/sys-apps/systemd/files/233-CVE-2017-9445.patch
+++ b/sys-apps/systemd/files/233-CVE-2017-9445.patch
@@ -147,32 +147,3 @@ index 3abcaf8cf..5dff272fd 100644
int n_ref;
--
2.13.1
-
-
-From 415871d88e0c44acf8b90dc07245809087a65d2c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 28 Jun 2017 12:24:37 -0400
-Subject: [PATCH 4/4] resolved: drop unnecessary comparison (#6220)
-
-mtu is always greater than UDP_PACKET_HEADER_SIZE at this point.
-Pointed out by Benjamin Robin.
----
- src/resolve/resolved-dns-packet.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
-index e2285b440..738d4cc8f 100644
---- a/src/resolve/resolved-dns-packet.c
-+++ b/src/resolve/resolved-dns-packet.c
-@@ -57,7 +57,7 @@ int dns_packet_new(DnsPacket **ret, DnsProtocol protocol, size_t mtu) {
- if (mtu < UDP_PACKET_HEADER_SIZE)
- a = DNS_PACKET_SIZE_START;
- else
-- a = MAX(mtu, DNS_PACKET_HEADER_SIZE);
-+ a = mtu;
-
- /* round up to next page size */
- a = PAGE_ALIGN(ALIGN(sizeof(DnsPacket)) + a) - ALIGN(sizeof(DnsPacket));
---
-2.13.1
-
diff --git a/sys-apps/systemd/systemd-233-r2.ebuild b/sys-apps/systemd/systemd-233-r3.ebuild
index b529b98afb8..b529b98afb8 100644
--- a/sys-apps/systemd/systemd-233-r2.ebuild
+++ b/sys-apps/systemd/systemd-233-r3.ebuild