Browse Source

Revert "Allow whitespace in netpbm sizes"

Introduced a major regression.
Christoph Biedl 1 year ago
parent
commit
0dd0ffb61d

+ 16 - 0
debian/patches/1639752170.revert.FILE5_41-51-g30c4d1fc.revert-pr-304-zachs18-allow-whitespace-in-netpbm-sizes.patch

@@ -0,0 +1,16 @@
+Subject: Revert "PR/304: zachs18: Allow whitespace in netpbm sizes."
+Origin: FILE5_41-51-g30c4d1fc <https://github.com/file/file/commit/FILE5_41-51-g30c4d1fc>
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Fri Dec 17 14:42:50 2021 +0000
+
+--- b/magic/Magdir/images
++++ a/magic/Magdir/images
+@@ -179,7 +179,7 @@
+ # adding 65 to strength so that Netpbm images comes before "x86 boot sector" or
+ # "DOS/MBR boot sector" identified by ./filesystems
+ 0	name		netpbm
+->3	regex/s		=[0-9]{1,50}[\040\t\f\r\n]+[0-9]{1,50}	Netpbm image data
++>3	regex/s		=[0-9]{1,50}\ [0-9]{1,50}	Netpbm image data
+ >>&0	regex		=[0-9]{1,50} 			\b, size = %s x
+ >>>&0	regex		=[0-9]{1,50}			\b %s
+ 

+ 1 - 0
debian/patches/series

@@ -1,4 +1,5 @@
 # reverted upstream commits
+1639752170.revert.FILE5_41-51-g30c4d1fc.revert-pr-304-zachs18-allow-whitespace-in-netpbm-sizes.patch
 
 # cherry-picked commits. Keep in upstream's chronological order
 1663939282.FILE5_43-31-g409d43bb.adjust-degas-to-co-exist-with-adobe-photoshop-color-joerg-jenderek.patch