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 70E721382C5 for ; Tue, 3 Apr 2018 18:23:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BD9FE0B13; Tue, 3 Apr 2018 18:23:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F91BE0B13 for ; Tue, 3 Apr 2018 18:23:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 88D87335D67 for ; Tue, 3 Apr 2018 18:23:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E950625A for ; Tue, 3 Apr 2018 18:23:37 +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: <1522779794.43a2ba90cdcab456310b81e6a5a85018dd862ffc.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/files/CVE-2017-15908.patch sys-apps/systemd/files/gentoo-noclean-tmp.patch X-VCS-Directories: sys-apps/systemd/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 43a2ba90cdcab456310b81e6a5a85018dd862ffc X-VCS-Branch: master Date: Tue, 3 Apr 2018 18:23:37 +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: ad4e8c71-0056-4bd1-a892-fe083cefe612 X-Archives-Hash: a8154f52800c6194dceb30d3505ff785 commit: 43a2ba90cdcab456310b81e6a5a85018dd862ffc Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Apr 3 09:18:36 2018 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Apr 3 18:23:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43a2ba90 sys-apps/systemd: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/7787 sys-apps/systemd/files/CVE-2017-15908.patch | 39 ------------------------- sys-apps/systemd/files/gentoo-noclean-tmp.patch | 28 ------------------ 2 files changed, 67 deletions(-) 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 08e5e37514c..00000000000 --- 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 769aa04ccf6..00000000000 --- 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 -