From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 8 Feb 2025 17:45:36 +0000 (+0000)
Subject: archive writer: Never ever pad the last block
X-Git-Tag: 0.9.30~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb93c22f5175f45bb77c22e992ef6c6cde2e28b8;p=pakfire.git

archive writer: Never ever pad the last block

Even for gzip, this seems to confuse some implementations.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/pakfire/archive_writer.c b/src/pakfire/archive_writer.c
index c2b54dfa..b98a0ce8 100644
--- a/src/pakfire/archive_writer.c
+++ b/src/pakfire/archive_writer.c
@@ -197,9 +197,6 @@ static int pakfire_archive_writer_setup_archive(struct pakfire_archive_writer* s
 				return -ENOTSUP;
 			}
 
-			// Do not pad the last block
-			archive_write_set_bytes_in_last_block(self->archive, 1);
-
 #if ARCHIVE_VERSION_NUMBER >= 3007002
 			// Enable long mode (supported from libarchive >= 3.7.2)
 			r = archive_write_set_filter_option(self->archive, NULL, "long", "31");
@@ -247,6 +244,9 @@ static int pakfire_archive_writer_setup_archive(struct pakfire_archive_writer* s
 		}
 	}
 
+	// Do not pad the last block
+	archive_write_set_bytes_in_last_block(self->archive, 1);
+
 	// Write archive to f
 	r = archive_write_open_FILE(self->archive, self->f);
 	if (r) {