Browse Source

Cherry-pick "Don't print the string entry unless the zip entry matched"

This fixes the broken Chrome plugin detection.
Christoph Biedl 1 year ago
parent
commit
7ebc4de31e

+ 13 - 0
debian/patches/cherry-pick.FILE5_37-46-g103c6ec2.dont-print-the-string-entry-unless-the-zip-entry-matched-christoph-biedl.patch

@@ -0,0 +1,13 @@
+Subject: Don't print the string entry unless the zip entry matched (Christoph Biedl)
+Origin: FILE5_37-46-g103c6ec2 <https://github.com/file/file/commit/FILE5_37-46-g103c6ec2>
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Sat Jul 6 19:25:06 2019 +0000
+
+--- a/magic/Magdir/zip
++++ b/magic/Magdir/zip
+@@ -60,4 +60,4 @@
+ #>10	leshort		>1		\b, %d central directories
+ #>12	lelong		x		\b, %d central directory bytes
+ >(16.l)	use		zipcd
+->20	pstring/l	>0		\b, %s
++>>20	pstring/l	>0		\b, %s

+ 1 - 0
debian/patches/series

@@ -1,4 +1,5 @@
 # cherry-picked commits. Keep in upstream's chronological order
+cherry-pick.FILE5_37-46-g103c6ec2.dont-print-the-string-entry-unless-the-zip-entry-matched-christoph-biedl.patch
 
 # patches that should go upstream