From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- app-arch/pbzip2/Manifest | 1 - .../files/pbzip2-1.1.12-data_truncation_fix.patch | 142 --------------------- 2 files changed, 143 deletions(-) delete mode 100644 app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch (limited to 'app-arch/pbzip2') diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest index 58b4c2a44411..01d5334b0191 100644 --- a/app-arch/pbzip2/Manifest +++ b/app-arch/pbzip2/Manifest @@ -1,5 +1,4 @@ AUX pbzip2-1.1.10-makefile.patch 263 BLAKE2B 32043c1a47504a2e901d9c4cb4360f295d39ae70fa7733d687fda7f620c0f5a0d5a4fbfbf65b82c841f21c31d761ff8840f77fa3a624e7c9456dd45299a9b7bb SHA512 f20db966b7da75ccb29578d54dac6d7445165bb5e6d6d29756ca43e0e32ed6abd67384330b652c61f7fdf904393e93d807ad0af5e2657ebb54d625d1fa5659df -AUX pbzip2-1.1.12-data_truncation_fix.patch 3348 BLAKE2B 848afb0cb6311a28ba958346fdda210aa7bb325c8e3a174c7359e574322f8eb41a04d8e785aa70332de953db170706e9c1fefef6d7274ebfbc211769f4dc88dd SHA512 c6bac8fe33f9d123358c1a01cdb94a8dd6be4c63553f62568311f06b25cf371ab7d881797ebb0d66d9f772c5644fe1f38a70fdbd64b99adaaed82f1e96dcc966 DIST pbzip2-1.1.12.tar.gz 47826 BLAKE2B 62b1e47b7b67f2a27f31032654506552c33e68121dd50d3496dc746a405cf783807c4966058feb1aebda2080ae1d1d22e944d057ea3a0dba2f9247ea46b23eb0 SHA512 bb68e87867295b89ee6fb76a8b72834daebf0ca6c16b2f10bce67fe7386716a728acd28bf46a9732087202ca0cc774f02c741b0b58801184bb7550f6fd119cd6 DIST pbzip2-1.1.13.tar.gz 48015 BLAKE2B 1bb410acadc728963c3a04d2665fb1b1f0c206a893ed90352a9c16512e9bd5f82c3f5f3b383b382134bbe904735a1c8a81615a8bc54de8c6bc91633d9ce72c57 SHA512 a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8 EBUILD pbzip2-1.1.12.ebuild 1063 BLAKE2B c3c26ee7b9a2793bed7b3f1beafbabe30a73b61bd5fcddf604668c4a88cf46fca08774fed7b0e3c592b4f72f9d9fc20b7b25d00614cb725cab7aea51a3ed3c79 SHA512 455ea431161a116e62f3ebb1cdd6547e418cd43d60588c47f0dfca520fd6ea0bb884103a3f5d314a2556d8a7d92d2e659cde734fac478a545c7aeace83e21c32 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 deleted file mode 100644 index 0ce62e7a77fe..000000000000 --- a/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch +++ /dev/null @@ -1,142 +0,0 @@ -https://bugs.launchpad.net/pbzip2/+bug/1524909 -https://bugs.gentoo.org/567952 - - -=== modified file 'pbzip2.cpp' ---- pbzip2.cpp 2014-12-21 10:20:27 +0000 -+++ pbzip2.cpp 2015-12-11 00:14:31 +0000 -@@ -2083,6 +2083,17 @@ - return 0; - } - -+void close_streams(FILE *stream, FILE *zStream) -+{ -+ if (stream != NULL) -+ fflush(stream); -+ -+ if (zStream != NULL && zStream != stdin) -+ fclose(zStream); -+ if (stream != NULL && stream != stdout) -+ fclose(stream); -+} -+ - /* - ********************************************************* - */ -@@ -2125,9 +2136,7 @@ - // check file stream for errors - if (ferror(zStream)) - { -- if (zStream != stdin) -- fclose(zStream); -- -+ close_streams(stream, zStream); - handle_error(EF_EXIT, -1, - "pbzip2: *ERROR: Problem with input stream of file [%s]! Aborting...\n", InFilename); - return -1; -@@ -2155,9 +2164,7 @@ - // check file stream for errors - if (ferror(stream)) - { -- if (stream != stdout) -- fclose(stream); -- -+ close_streams(stream, zStream); - handle_error(EF_EXIT, -1, - "pbzip2: *ERROR: Problem with output stream of file [%s]! Aborting...\n", InFilename); - return -1; -@@ -2169,10 +2176,7 @@ - if (syncGetTerminateFlag() != 0) - { - fprintf (stderr, "directdecompress: terminating1 - terminateFlag set\n"); -- if (zStream != stdin) -- fclose(zStream); -- if (stream != stdout) -- fclose(stream); -+ close_streams(stream, zStream); - return -1; - } - -@@ -2180,11 +2184,8 @@ - if (bzf == NULL || bzerr != BZ_OK) - { - ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); -- if (zStream != stdin) -- fclose(zStream); -- if (stream != stdout) -- fclose(stream); -- -+ close_streams(stream, zStream); -+ - if (ret != 0) - { - syncSetTerminateFlag(1); -@@ -2200,10 +2201,7 @@ - if (syncGetTerminateFlag() != 0) - { - fprintf (stderr, "directdecompress: terminating2 - terminateFlag set\n"); -- if (zStream != stdin) -- fclose(zStream); -- if (stream != stdout) -- fclose(stream); -+ close_streams(stream, zStream); - return -1; - } - -@@ -2225,11 +2223,8 @@ - if (ferror(zStream)) - { - ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); -- if (zStream != stdin) -- fclose(zStream); -- if (stream != stdout) -- fclose(stream); -- -+ close_streams(stream, zStream); -+ - if (ret != 0) - { - syncSetTerminateFlag(1); -@@ -2242,11 +2237,8 @@ - if (ferror(stream)) - { - ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); -- if (zStream != stdin) -- fclose(zStream); -- if (stream != stdout) -- fclose(stream); -- -+ close_streams(stream, zStream); -+ - if (ret != 0) - { - syncSetTerminateFlag(1); -@@ -2263,11 +2255,8 @@ - if (ferror(stream)) - { - ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); -- if (zStream != stdin) -- fclose(zStream); -- if (stream != stdout) -- fclose(stream); -- -+ close_streams(stream, zStream); -+ - if (ret != 0) - { - syncSetTerminateFlag(1); -@@ -2278,11 +2267,8 @@ - if (bzerr != BZ_STREAM_END) - { - ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); -- if (zStream != stdin) -- fclose(zStream); -- if (stream != stdout) -- fclose(stream); -- -+ close_streams(stream, zStream); -+ - if (ret != 0) - { - syncSetTerminateFlag(1); - -- cgit v1.2.3