| 1 |
commit: 43a2ba90cdcab456310b81e6a5a85018dd862ffc |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Apr 3 09:18:36 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 3 18:23:14 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43a2ba90 |
| 7 |
|
| 8 |
sys-apps/systemd: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/7787 |
| 11 |
|
| 12 |
sys-apps/systemd/files/CVE-2017-15908.patch | 39 ------------------------- |
| 13 |
sys-apps/systemd/files/gentoo-noclean-tmp.patch | 28 ------------------ |
| 14 |
2 files changed, 67 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/systemd/files/CVE-2017-15908.patch b/sys-apps/systemd/files/CVE-2017-15908.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index 08e5e37514c..00000000000 |
| 19 |
--- a/sys-apps/systemd/files/CVE-2017-15908.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,39 +0,0 @@ |
| 22 |
-From 9f939335a07085aa9a9663efd1dca06ef6405d62 Mon Sep 17 00:00:00 2001 |
| 23 |
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@××××××.pl> |
| 24 |
-Date: Wed, 25 Oct 2017 11:19:19 +0200 |
| 25 |
-Subject: [PATCH] resolved: fix loop on packets with pseudo dns types |
| 26 |
- |
| 27 |
-Reported by Karim Hossen & Thomas Imbert from Sogeti ESEC R&D. |
| 28 |
- |
| 29 |
-https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1725351 |
| 30 |
---- |
| 31 |
- src/resolve/resolved-dns-packet.c | 6 +----- |
| 32 |
- 1 file changed, 1 insertion(+), 5 deletions(-) |
| 33 |
- |
| 34 |
-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c |
| 35 |
-index e2f227bfc..35f4d0689 100644 |
| 36 |
---- a/src/resolve/resolved-dns-packet.c |
| 37 |
-+++ b/src/resolve/resolved-dns-packet.c |
| 38 |
-@@ -1514,7 +1514,7 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta |
| 39 |
- |
| 40 |
- found = true; |
| 41 |
- |
| 42 |
-- while (bitmask) { |
| 43 |
-+ for (; bitmask; bit++, bitmask >>= 1) |
| 44 |
- if (bitmap[i] & bitmask) { |
| 45 |
- uint16_t n; |
| 46 |
- |
| 47 |
-@@ -1528,10 +1528,6 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta |
| 48 |
- if (r < 0) |
| 49 |
- return r; |
| 50 |
- } |
| 51 |
-- |
| 52 |
-- bit++; |
| 53 |
-- bitmask >>= 1; |
| 54 |
-- } |
| 55 |
- } |
| 56 |
- |
| 57 |
- if (!found) |
| 58 |
--- |
| 59 |
-2.15.0.rc2 |
| 60 |
- |
| 61 |
|
| 62 |
diff --git a/sys-apps/systemd/files/gentoo-noclean-tmp.patch b/sys-apps/systemd/files/gentoo-noclean-tmp.patch |
| 63 |
deleted file mode 100644 |
| 64 |
index 769aa04ccf6..00000000000 |
| 65 |
--- a/sys-apps/systemd/files/gentoo-noclean-tmp.patch |
| 66 |
+++ /dev/null |
| 67 |
@@ -1,28 +0,0 @@ |
| 68 |
-From b23c098d5787e06770872b19f83fffa14d8a7d14 Mon Sep 17 00:00:00 2001 |
| 69 |
-From: Mike Gilbert <floppym@g.o> |
| 70 |
-Date: Fri, 25 Sep 2015 10:26:18 -0400 |
| 71 |
-Subject: [PATCH] tmpfiles: Disable cleaning of /tmp and /var/tmp |
| 72 |
- |
| 73 |
-Bug: https://bugs.gentoo.org/490676 |
| 74 |
---- |
| 75 |
- tmpfiles.d/tmp.conf | 4 ++-- |
| 76 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 77 |
- |
| 78 |
-diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf |
| 79 |
-index 6bbd1aa..a361062 100644 |
| 80 |
---- a/tmpfiles.d/tmp.conf |
| 81 |
-+++ b/tmpfiles.d/tmp.conf |
| 82 |
-@@ -8,8 +8,8 @@ |
| 83 |
- # See tmpfiles.d(5) for details |
| 84 |
- |
| 85 |
- # Clear tmp directories separately, to make them easier to override |
| 86 |
--q /tmp 1777 root root 10d |
| 87 |
--q /var/tmp 1777 root root 30d |
| 88 |
-+q /tmp 1777 root root |
| 89 |
-+q /var/tmp 1777 root root |
| 90 |
- |
| 91 |
- # Exclude namespace mountpoints created with PrivateTmp=yes |
| 92 |
- x /tmp/systemd-private-%b-* |
| 93 |
--- |
| 94 |
-2.4.10 |
| 95 |
- |
Archives