sys-apps/systemd: remove unused patches
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>
Tue, 3 Apr 2018 09:18:36 +0000 (11:18 +0200)
committerMike Gilbert <floppym@gentoo.org>
Tue, 3 Apr 2018 18:23:14 +0000 (14:23 -0400)
Closes: https://github.com/gentoo/gentoo/pull/7787

sys-apps/systemd/files/CVE-2017-15908.patch [deleted file]
sys-apps/systemd/files/gentoo-noclean-tmp.patch [deleted file]

diff --git a/sys-apps/systemd/files/CVE-2017-15908.patch b/sys-apps/systemd/files/CVE-2017-15908.patch
deleted file mode 100644 (file)
index 08e5e37..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9f939335a07085aa9a9663efd1dca06ef6405d62 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-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 (file)
index 769aa04..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From b23c098d5787e06770872b19f83fffa14d8a7d14 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-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
-