From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 94C5A139694 for ; Wed, 28 Jun 2017 20:32:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C66C02340A2; Wed, 28 Jun 2017 20:31:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7DB72340A2 for ; Wed, 28 Jun 2017 20:31:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9345E341804 for ; Wed, 28 Jun 2017 20:31:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9AA941F02 for ; Wed, 28 Jun 2017 20:31:43 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1498681868.e9a542b09cb0ee4c3b085881190bed393f4ece03.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/, sys-apps/systemd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/files/233-CVE-2017-9445.patch sys-apps/systemd/systemd-233-r2.ebuild sys-apps/systemd/systemd-233-r3.ebuild X-VCS-Directories: sys-apps/systemd/files/ sys-apps/systemd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: e9a542b09cb0ee4c3b085881190bed393f4ece03 X-VCS-Branch: master Date: Wed, 28 Jun 2017 20:31:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bdf7d226-1aa9-463d-aa8f-419e1d4b2ff6 X-Archives-Hash: 822c32a75268f518e305647b30d89411 commit: e9a542b09cb0ee4c3b085881190bed393f4ece03 Author: Mike Gilbert gentoo org> AuthorDate: Wed Jun 28 20:30:47 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Jun 28 20:31:08 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a542b0 sys-apps/systemd: update CVE-2017-9445 patch after upstream revert Package-Manager: Portage-2.3.6_p9, Repoman-2.3.2_p77 sys-apps/systemd/files/233-CVE-2017-9445.patch | 29 ---------------------- ...systemd-233-r2.ebuild => systemd-233-r3.ebuild} | 0 2 files changed, 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?= -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 similarity index 100% rename from sys-apps/systemd/systemd-233-r2.ebuild rename to sys-apps/systemd/systemd-233-r3.ebuild