gentoo auto-resync : 16:03:2024 - 06:48:31

4 files changed, 56 insertions, 1 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 12290477ba4d..a659d8ff3f32 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/torrentzip/Manifest b/app-arch/torrentzip/Manifest
index 42dd35f53063..c0d8c0a0375e 100644
--- a/app-arch/torrentzip/Manifest
+++ b/app-arch/torrentzip/Manifest
@@ -1,6 +1,7 @@
 AUX torrentzip-0.9-autoconf-quote.patch 337 BLAKE2B 6d1f630d365eaa9aff9d2c910ad30ad79694906cbb3ec7fccf665a468458d8103a0ebbc4e0d3fed1969e18b92780217fa47ed9a6260c42888f8bc022db15b3a6 SHA512 6ec05d00be36479084005c0938fb3df58b960914496ed149cb7eea9a6b4cb6067f9caa3ae7c835cf3bd79f357e17e18b8fcf80994dc1d550247c32416d71596d
+AUX torrentzip-1.2-checksum-detection.patch 2001 BLAKE2B 1efdfa1105a2446e6deafc65750505c3115889dcb7567898f8ea358cc8c96b9bbec1ebad20d913b2cc1f8c9ac46f3201bbedfb026493ab7571c234995a89ef7f SHA512 4d949191caed0285596df6dd53b7a86e892f112059e51af6efded5bdadce495b00941a71ae23438e0489a7a8e9795d266b3ba94a70f4b08fb3beb61669586a0e
 DIST torrentzip-0.9.tar.gz 59007 BLAKE2B eb5d7d8d9026115367afd88ef0cf33d2eed600e6eaa773f039a713c76a48a39e12cb5a8ac6faf2937d3563c9270029543bdb6361d2f22a39e2341953872f589c SHA512 691cd25f501de3de16b5b15b2afadfc34b833c3e93208c2c3497674936580ad2c3532a02e02531b89974302eee7b36f7579a412718914b1b38044b78a39a4d4d
 DIST trrntzip-1.2.tar.gz 62707 BLAKE2B 289ddfe89b91c63b1a6902ea7a4055fa8e235e712d6ea911da2848cc8db15cbdf712967b9fcc1414513c1a18eef160108f5f7b03aefd8f8f18c4d04907a16c17 SHA512 90c853efde1d077c741206362bc14fe779627f1b20571246e99ed29980840e78c0377110431c59c35596a0d209e612f6fe77b385707eb4bdb1ea47bb797c9272
 EBUILD torrentzip-0.9-r1.ebuild 564 BLAKE2B c3b95f46af8c990519039ad89be0c054a6060184f1911cf8945247589b3095dc5af33513f5488f0119db7fe38cd917f54a8b0a1413bb4f8db819b4767dccf050 SHA512 8e503901307d1e9c3cba278f06ed4f03de7c70bec58ba88a8ddb96d00ba4bfe791ec02e31c53335a7b2d6ad94a2a7b7315b84b3a7c8cb472d0134aa776dca9ac
-EBUILD torrentzip-1.2.ebuild 514 BLAKE2B 069764ad288d6940353e336cce2e665880e95ec11a8e5a9d89a0ebf3cdb956cae932e0edeb9f665f1acb030c900c40bdd10a00d056127cb7ba1b5c0c0253b03c SHA512 58b7f31adbc569de6acc0f87e2a1731a39c3825cbe9efb03f3ce809361e0f22235dd700cb9203af67a74f3fe33ac590dda4541dfec4c02dc01886cf6b078ccba
+EBUILD torrentzip-1.2-r1.ebuild 571 BLAKE2B c5e7353309cb442154c07c1ac7a772a5315245abb39e31bae523f4a6fe10bf09ea8cc9099fcc914e5fb755cca0d0c5ca0635be328cf085d4b9bc35bbbf91a9b0 SHA512 44ccbd88cf8e0fe505bb8b46c85e273a2450f734a227bbd751e486aa6b625a88a256b818889ad68cd110c5a03ccd35557eb04b97ae9108b064688ac35665675e
 MISC metadata.xml 928 BLAKE2B b0a650f0cd81be849f08bd6f078035ae7b56967034b3b9ba534da5d046936f7b27e819dc05ee94b2b8d95ca54ceafb8b521f7121eec0f4d5c4fdd0d8ac141ede SHA512 101e70ac70fdc24294dae2f18057c84e75dd0c776689883ea630f2dcd4ddd2b3da1f7e6643ffc5fd1aed2f5e355aa6700174bca0c16eb1fa84d9f531d7eba064
diff --git a/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch b/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch
new file mode 100644
index 000000000000..ac1ae14cbe03
--- /dev/null
+++ b/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch
@@ -0,0 +1,51 @@
+From 016915e16f32105590a6dc11a4adc988b2f8d9a9 Mon Sep 17 00:00:00 2001
+From: Alexander Miller <alex.miller@gmx.de>
+Date: Mon, 4 Mar 2024 19:26:21 +0100
+Subject: [PATCH] Fix broken detection of missing or wrong TORRENTZIPPED-...
+ comment
+
+The commit listed below introduces a regression where in MigrateZip(),
+variable rc would be clobbered when its value is still needed. That
+completely breaks handling of zips that should be re-zipped because
+of missing or out of date TORRENTZIPPED-... comment.
+
+Rewrite the offending code such that it no longer touches the variable.
+
+Fixes: cf11c900079e ("Check for more errors while reading zip entries")
+---
+ src/trrntzip.c | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/src/trrntzip.c b/src/trrntzip.c
+index e55d217..49f796e 100644
+--- a/src/trrntzip.c
++++ b/src/trrntzip.c
+@@ -379,16 +379,20 @@ int MigrateZip(const char *zip_path, const char *pDir, WORKSPACE *ws,
+ 
+   CHECK_DYNAMIC_STRING_ARRAY(ws->FileNameArray, ws->iElements);
+   // Get the filelist from the zip file in original order in ws->FileNameArray
+-  rc = GetFileList(UnZipHandle, ws);
+-  if (rc != TZ_OK) {
++  switch (GetFileList(UnZipHandle, ws)) {
++  case TZ_OK:
++    break;
++  case TZ_CRITICAL:
+     logprint3(stderr, mig->fProcessLog, ErrorLog(ws),
+-              rc == TZ_CRITICAL
+-                  ? "Error allocating memory!\n"
+-                  : "Could not list contents of \"%s\". File is corrupted or "
+-                    "contains entries with bad names.\n",
+-              szZipFileName);
++              "Error allocating memory!\n");
++    unzClose(UnZipHandle);
++    return TZ_CRITICAL;
++  default:
++    logprint3(stderr, mig->fProcessLog, ErrorLog(ws),
++              "Could not list contents of \"%s\". File is corrupted or "
++              "contains entries with bad names.\n", szZipFileName);
+     unzClose(UnZipHandle);
+-    return rc;
++    return TZ_ERR;
+   }
+   CHECK_DYNAMIC_STRING_ARRAY(ws->FileNameArray, ws->iElements);
+ 
diff --git a/app-arch/torrentzip/torrentzip-1.2.ebuild b/app-arch/torrentzip/torrentzip-1.2-r1.ebuild
index beb03c69a832..7dfb7fbdde2b 100644
--- a/app-arch/torrentzip/torrentzip-1.2.ebuild
+++ b/app-arch/torrentzip/torrentzip-1.2-r1.ebuild
@@ -23,3 +23,6 @@ DEPEND="
 "
 
 DOCS=(AUTHORS NEWS.md README.md)
+PATCHES=(
+	"${FILESDIR}-${P}-checksum-detection.patch"
+)