| 1 |
commit: 0c22a4498e277416179ced59a2a7b834fc6ce462 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Oct 1 18:22:15 2020 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 9 13:45:12 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c22a449 |
| 7 |
|
| 8 |
app-arch/pbzip2: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/17737 |
| 11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 12 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/pbzip2-1.1.12-data_truncation_fix.patch | 142 --------------------- |
| 16 |
1 file changed, 142 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch b/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 0ce62e7a77f..00000000000 |
| 21 |
--- a/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,142 +0,0 @@ |
| 24 |
-https://bugs.launchpad.net/pbzip2/+bug/1524909 |
| 25 |
-https://bugs.gentoo.org/567952 |
| 26 |
- |
| 27 |
- |
| 28 |
-=== modified file 'pbzip2.cpp' |
| 29 |
---- pbzip2.cpp 2014-12-21 10:20:27 +0000 |
| 30 |
-+++ pbzip2.cpp 2015-12-11 00:14:31 +0000 |
| 31 |
-@@ -2083,6 +2083,17 @@ |
| 32 |
- return 0; |
| 33 |
- } |
| 34 |
- |
| 35 |
-+void close_streams(FILE *stream, FILE *zStream) |
| 36 |
-+{ |
| 37 |
-+ if (stream != NULL) |
| 38 |
-+ fflush(stream); |
| 39 |
-+ |
| 40 |
-+ if (zStream != NULL && zStream != stdin) |
| 41 |
-+ fclose(zStream); |
| 42 |
-+ if (stream != NULL && stream != stdout) |
| 43 |
-+ fclose(stream); |
| 44 |
-+} |
| 45 |
-+ |
| 46 |
- /* |
| 47 |
- ********************************************************* |
| 48 |
- */ |
| 49 |
-@@ -2125,9 +2136,7 @@ |
| 50 |
- // check file stream for errors |
| 51 |
- if (ferror(zStream)) |
| 52 |
- { |
| 53 |
-- if (zStream != stdin) |
| 54 |
-- fclose(zStream); |
| 55 |
-- |
| 56 |
-+ close_streams(stream, zStream); |
| 57 |
- handle_error(EF_EXIT, -1, |
| 58 |
- "pbzip2: *ERROR: Problem with input stream of file [%s]! Aborting...\n", InFilename); |
| 59 |
- return -1; |
| 60 |
-@@ -2155,9 +2164,7 @@ |
| 61 |
- // check file stream for errors |
| 62 |
- if (ferror(stream)) |
| 63 |
- { |
| 64 |
-- if (stream != stdout) |
| 65 |
-- fclose(stream); |
| 66 |
-- |
| 67 |
-+ close_streams(stream, zStream); |
| 68 |
- handle_error(EF_EXIT, -1, |
| 69 |
- "pbzip2: *ERROR: Problem with output stream of file [%s]! Aborting...\n", InFilename); |
| 70 |
- return -1; |
| 71 |
-@@ -2169,10 +2176,7 @@ |
| 72 |
- if (syncGetTerminateFlag() != 0) |
| 73 |
- { |
| 74 |
- fprintf (stderr, "directdecompress: terminating1 - terminateFlag set\n"); |
| 75 |
-- if (zStream != stdin) |
| 76 |
-- fclose(zStream); |
| 77 |
-- if (stream != stdout) |
| 78 |
-- fclose(stream); |
| 79 |
-+ close_streams(stream, zStream); |
| 80 |
- return -1; |
| 81 |
- } |
| 82 |
- |
| 83 |
-@@ -2180,11 +2184,8 @@ |
| 84 |
- if (bzf == NULL || bzerr != BZ_OK) |
| 85 |
- { |
| 86 |
- ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); |
| 87 |
-- if (zStream != stdin) |
| 88 |
-- fclose(zStream); |
| 89 |
-- if (stream != stdout) |
| 90 |
-- fclose(stream); |
| 91 |
-- |
| 92 |
-+ close_streams(stream, zStream); |
| 93 |
-+ |
| 94 |
- if (ret != 0) |
| 95 |
- { |
| 96 |
- syncSetTerminateFlag(1); |
| 97 |
-@@ -2200,10 +2201,7 @@ |
| 98 |
- if (syncGetTerminateFlag() != 0) |
| 99 |
- { |
| 100 |
- fprintf (stderr, "directdecompress: terminating2 - terminateFlag set\n"); |
| 101 |
-- if (zStream != stdin) |
| 102 |
-- fclose(zStream); |
| 103 |
-- if (stream != stdout) |
| 104 |
-- fclose(stream); |
| 105 |
-+ close_streams(stream, zStream); |
| 106 |
- return -1; |
| 107 |
- } |
| 108 |
- |
| 109 |
-@@ -2225,11 +2223,8 @@ |
| 110 |
- if (ferror(zStream)) |
| 111 |
- { |
| 112 |
- ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); |
| 113 |
-- if (zStream != stdin) |
| 114 |
-- fclose(zStream); |
| 115 |
-- if (stream != stdout) |
| 116 |
-- fclose(stream); |
| 117 |
-- |
| 118 |
-+ close_streams(stream, zStream); |
| 119 |
-+ |
| 120 |
- if (ret != 0) |
| 121 |
- { |
| 122 |
- syncSetTerminateFlag(1); |
| 123 |
-@@ -2242,11 +2237,8 @@ |
| 124 |
- if (ferror(stream)) |
| 125 |
- { |
| 126 |
- ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); |
| 127 |
-- if (zStream != stdin) |
| 128 |
-- fclose(zStream); |
| 129 |
-- if (stream != stdout) |
| 130 |
-- fclose(stream); |
| 131 |
-- |
| 132 |
-+ close_streams(stream, zStream); |
| 133 |
-+ |
| 134 |
- if (ret != 0) |
| 135 |
- { |
| 136 |
- syncSetTerminateFlag(1); |
| 137 |
-@@ -2263,11 +2255,8 @@ |
| 138 |
- if (ferror(stream)) |
| 139 |
- { |
| 140 |
- ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); |
| 141 |
-- if (zStream != stdin) |
| 142 |
-- fclose(zStream); |
| 143 |
-- if (stream != stdout) |
| 144 |
-- fclose(stream); |
| 145 |
-- |
| 146 |
-+ close_streams(stream, zStream); |
| 147 |
-+ |
| 148 |
- if (ret != 0) |
| 149 |
- { |
| 150 |
- syncSetTerminateFlag(1); |
| 151 |
-@@ -2278,11 +2267,8 @@ |
| 152 |
- if (bzerr != BZ_STREAM_END) |
| 153 |
- { |
| 154 |
- ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); |
| 155 |
-- if (zStream != stdin) |
| 156 |
-- fclose(zStream); |
| 157 |
-- if (stream != stdout) |
| 158 |
-- fclose(stream); |
| 159 |
-- |
| 160 |
-+ close_streams(stream, zStream); |
| 161 |
-+ |
| 162 |
- if (ret != 0) |
| 163 |
- { |
| 164 |
- syncSetTerminateFlag(1); |
| 165 |
- |
Archives