From 88572537508344db30784efa35a2adb536f84fc4 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Sun, 18 Feb 2024 15:51:29 +0100
Subject: [PATCH] Update commons-compress to 1.23.0

commons-compress adds 0x000a headers with extended timestamps
since https://issues.apache.org/jira/browse/COMPRESS-613 , remove
those again (consistent with `X5455_ExtendedTimestamp`, and avoiding
problems with timezone processing in particular situations)
---
 pom.xml                                                |  2 +-
 .../java/io/github/zlika/reproducible/ZipStripper.java | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0c296c6..f3724cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
     <wagon-gitsite.version>0.3.1</wagon-gitsite.version>
     
     <!-- Dependency versions -->
-    <commons-compress.version>1.21</commons-compress.version>
+    <commons-compress.version>1.23.0</commons-compress.version>
     <junit.version>4.13.2</junit.version>
     <maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
     <maven-plugin-api.version>3.6.0</maven-plugin-api.version>
diff --git a/src/main/java/io/github/zlika/reproducible/ZipStripper.java b/src/main/java/io/github/zlika/reproducible/ZipStripper.java
index ac4c72c..11555f4 100644
--- a/src/main/java/io/github/zlika/reproducible/ZipStripper.java
+++ b/src/main/java/io/github/zlika/reproducible/ZipStripper.java
@@ -30,11 +30,7 @@
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
-import org.apache.commons.compress.archivers.zip.X5455_ExtendedTimestamp;
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
-import org.apache.commons.compress.archivers.zip.ZipExtraField;
-import org.apache.commons.compress.archivers.zip.ZipFile;
+import org.apache.commons.compress.archivers.zip.*;
 
 /**
  * Strips non-reproducible data from a ZIP file.
@@ -218,6 +214,10 @@ private ZipArchiveEntry filterZipEntry(ZipArchiveEntry entry)
         // Remove extended timestamps
         for (ZipExtraField field : entry.getExtraFields())
         {
+            if (field instanceof X000A_NTFS)
+            {
+                entry.removeExtraField(field.getHeaderId());
+            }
             if (field instanceof X5455_ExtendedTimestamp)
             {
                 entry.removeExtraField(field.getHeaderId());