Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/
Date: Wed, 14 Jul 2021 20:05:44
Message-Id: 1626293028.f6fbe74a87c4108a4fe5567e60cd8fed06003746.conikost@gentoo
1 commit: f6fbe74a87c4108a4fe5567e60cd8fed06003746
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Wed Jul 14 19:25:18 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 14 20:03:48 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6fbe74a
7
8 net-vpn/i2p: remove unused patch
9
10 Bug: https://github.com/gentoo/gentoo/pull/21641
11 Package-Manager: Portage-3.0.20, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 ...47-DataHelper-decompress-fix-length-check.patch | 25 ----------------------
16 1 file changed, 25 deletions(-)
17
18 diff --git a/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch b/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
19 deleted file mode 100644
20 index b728cc28cb1..00000000000
21 --- a/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
22 +++ /dev/null
23 @@ -1,25 +0,0 @@
24 -# from https://trac.i2p2.de/ticket/2770
25 -From ceb0749e0d5c3c496b4a91bc3a9d3b5e296fc456 Mon Sep 17 00:00:00 2001
26 -From: zzz <zzz@mail.i2p>
27 -Date: Wed, 2 Sep 2020 15:57:04 +0000
28 -Subject: [PATCH] Util: Fix decompression of compressed zero bytes (ticket
29 - #2770)
30 -
31 ----
32 - core/java/src/net/i2p/data/DataHelper.java | 3 ++-
33 - 1 file changed, 2 insertions(+), 1 deletion(-)
34 -
35 -diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
36 -index aaa47797c3..39f766e6fa 100644
37 ---- a/core/java/src/net/i2p/data/DataHelper.java
38 -+++ b/core/java/src/net/i2p/data/DataHelper.java
39 -@@ -1902,7 +1902,8 @@ public static String unescapeHTML(String escaped) {
40 - */
41 - public static byte[] decompress(byte orig[], int offset, int length) throws IOException {
42 - if (orig == null) return orig;
43 -- if (length < 23)
44 -+ // normal overhead is 23 bytes, but a compress of zero bytes is 20 bytes
45 -+ if (length < 20)
46 - throw new IOException("length");
47 - if (length < 65559 && orig[offset + 10] == 0x01)
48 - return zeroDecompress(orig, offset, length);