Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/, sys-apps/systemd/files/
Date: Wed, 28 Jun 2017 20:32:06
Message-Id: 1498681868.e9a542b09cb0ee4c3b085881190bed393f4ece03.floppym@gentoo
1 commit: e9a542b09cb0ee4c3b085881190bed393f4ece03
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 28 20:30:47 2017 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 28 20:31:08 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a542b0
7
8 sys-apps/systemd: update CVE-2017-9445 patch after upstream revert
9
10 Package-Manager: Portage-2.3.6_p9, Repoman-2.3.2_p77
11
12 sys-apps/systemd/files/233-CVE-2017-9445.patch | 29 ----------------------
13 ...systemd-233-r2.ebuild => systemd-233-r3.ebuild} | 0
14 2 files changed, 29 deletions(-)
15
16 diff --git a/sys-apps/systemd/files/233-CVE-2017-9445.patch b/sys-apps/systemd/files/233-CVE-2017-9445.patch
17 index a05c41f47b6..22a366ceba0 100644
18 --- a/sys-apps/systemd/files/233-CVE-2017-9445.patch
19 +++ b/sys-apps/systemd/files/233-CVE-2017-9445.patch
20 @@ -147,32 +147,3 @@ index 3abcaf8cf..5dff272fd 100644
21 int n_ref;
22 --
23 2.13.1
24 -
25 -
26 -From 415871d88e0c44acf8b90dc07245809087a65d2c Mon Sep 17 00:00:00 2001
27 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@××××××.pl>
28 -Date: Wed, 28 Jun 2017 12:24:37 -0400
29 -Subject: [PATCH 4/4] resolved: drop unnecessary comparison (#6220)
30 -
31 -mtu is always greater than UDP_PACKET_HEADER_SIZE at this point.
32 -Pointed out by Benjamin Robin.
33 ----
34 - src/resolve/resolved-dns-packet.c | 2 +-
35 - 1 file changed, 1 insertion(+), 1 deletion(-)
36 -
37 -diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
38 -index e2285b440..738d4cc8f 100644
39 ---- a/src/resolve/resolved-dns-packet.c
40 -+++ b/src/resolve/resolved-dns-packet.c
41 -@@ -57,7 +57,7 @@ int dns_packet_new(DnsPacket **ret, DnsProtocol protocol, size_t mtu) {
42 - if (mtu < UDP_PACKET_HEADER_SIZE)
43 - a = DNS_PACKET_SIZE_START;
44 - else
45 -- a = MAX(mtu, DNS_PACKET_HEADER_SIZE);
46 -+ a = mtu;
47 -
48 - /* round up to next page size */
49 - a = PAGE_ALIGN(ALIGN(sizeof(DnsPacket)) + a) - ALIGN(sizeof(DnsPacket));
50 ---
51 -2.13.1
52 -
53
54 diff --git a/sys-apps/systemd/systemd-233-r2.ebuild b/sys-apps/systemd/systemd-233-r3.ebuild
55 similarity index 100%
56 rename from sys-apps/systemd/systemd-233-r2.ebuild
57 rename to sys-apps/systemd/systemd-233-r3.ebuild