summaryrefslogtreecommitdiffstats
path: root/debian/patches/1673725413.FILE5_44-22-g6d565d82.improve-apk-detection-fc-stegerman.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-28 09:52:52 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-28 09:52:52 +0000
commit424f663819ec59abc4edab03a667845835e57ac1 (patch)
tree63b79645aaee07c3de90e4b70dd8d6371faa1747 /debian/patches/1673725413.FILE5_44-22-g6d565d82.improve-apk-detection-fc-stegerman.patch
parentAdding upstream version 1:5.44. (diff)
downloadfile-debian.tar.xz
file-debian.zip
Adding debian version 1:5.44-3.debian/1%5.44-3debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/1673725413.FILE5_44-22-g6d565d82.improve-apk-detection-fc-stegerman.patch')
-rw-r--r--debian/patches/1673725413.FILE5_44-22-g6d565d82.improve-apk-detection-fc-stegerman.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/debian/patches/1673725413.FILE5_44-22-g6d565d82.improve-apk-detection-fc-stegerman.patch b/debian/patches/1673725413.FILE5_44-22-g6d565d82.improve-apk-detection-fc-stegerman.patch
new file mode 100644
index 0000000..256f66f
--- /dev/null
+++ b/debian/patches/1673725413.FILE5_44-22-g6d565d82.improve-apk-detection-fc-stegerman.patch
@@ -0,0 +1,47 @@
+Subject: Improve APK detection (FC Stegerman)
+Origin: FILE5_44-22-g6d565d82 <https://github.com/file/file/commit/FILE5_44-22-g6d565d82>
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Sat Jan 14 19:43:33 2023 +0000
+
+--- a/magic/Magdir/archive
++++ b/magic/Magdir/archive
+@@ -1531,7 +1531,7 @@
+ !:mime application/vnd.android.package-archive
+ !:ext apk
+ # Starts with META-INF/MANIFEST.MF (file name length = 20)
+-# NB: checks for resources.arsc or drawables as well to avoid matching JAR files
++# NB: checks for resources.arsc, classes.dex, etc. as well to avoid matching JAR files
+ >26 uleshort 20
+ >>30 string META-INF/MANIFEST.MF
+ # Contains resources.arsc (near the end, in the central directory)
+@@ -1540,13 +1540,27 @@
+ >>>>>(-6.l-16) string APK\x20Sig\x20Block\x2042 \b, with APK Signing Block
+ !:mime application/vnd.android.package-archive
+ !:ext apk
+->>>-512 default x
+-# Contains drawables (near the end, in the central directory)
+->>>>-512 search res/drawable Android package (APK), with MANIFEST.MF and drawables
++>>>-512 default x
++# Contains classes.dex (near the end, in the central directory)
++>>>>-512 search classes.dex Android package (APK), with MANIFEST.MF and classes.dex
+ >>>>>-22 string PK\005\006
+ >>>>>>(-6.l-16) string APK\x20Sig\x20Block\x2042 \b, with APK Signing Block
+ !:mime application/vnd.android.package-archive
+ !:ext apk
++>>>>-512 default x
++# Contains lib/armeabi (near the end, in the central directory)
++>>>>>-512 search lib/armeabi Android package (APK), with MANIFEST.MF and armeabi lib
++>>>>>>-22 string PK\005\006
++>>>>>>>(-6.l-16) string APK\x20Sig\x20Block\x2042 \b, with APK Signing Block
++!:mime application/vnd.android.package-archive
++!:ext apk
++>>>>>-512 default x
++# Contains drawables (near the end, in the central directory)
++>>>>>>-512 search res/drawable Android package (APK), with MANIFEST.MF and drawables
++>>>>>>>-22 string PK\005\006
++>>>>>>>>(-6.l-16) string APK\x20Sig\x20Block\x2042 \b, with APK Signing Block
++!:mime application/vnd.android.package-archive
++!:ext apk
+ # Starts with zipflinger virtual entry (28 + 104 = 132 bytes)
+ # See https://github.com/obfusk/apksigcopier/blob/666f5b7/apksigcopier/__init__.py#L230
+ >4 string \x00\x00\x00\x00\x00\x00