Cherry-pick four commits from upstream, replacing local patches

debian/debian-extra-magic

@@ -1,41 +1,2 @@
 
 # sorted by Debian bug report number
-
-
-# AutoCAD Drawing Exchange Format
-# https://bugs.debian.org/702744
-# https://bugs.astron.com/view.php?id=16
-0 regex \^[\ \t]*0\r?\000$
->1 regex \^[\ \t]*SECTION\r?$
->>2 regex \^[\ \t]*2\r?$
->>>3 regex \^[\ \t]*HEADER\r?$ AutoCAD Drawing Exchange Format
-!:mime application/x-dxf
-!:ext dxf
-
->>>>&1 search/8192 AC1006 \b, R10
->>>>&1 search/8192 AC1009 \b, R11/R12
->>>>&1 search/8192 AC1012 \b, R13
->>>>&1 search/8192 AC1014 \b, R14
->>>>&1 search/8192 AC1015 \b, version 2000
->>>>&1 search/8192 AC1018 \b, version 2004
->>>>&1 search/8192 AC1021 \b, version 2007
->>>>&1 search/8192 AC1024 \b, version 2010
-
-
-# Extended Display Identification Data (EDID)
-# https://bugs.debian.org/896932
-# https://bugs.astron.com/view.php?id=12
-# https://en.wikipedia.org/wiki/Extended_Display_Identification_Data
-0       string  \x00\xFF\xFF\xFF\xFF\xFF\xFF\x00
->19     byte    x
->>18    byte    x   EDID data, version %u.
->>19    byte    x   \b%u
-
-
-# SketchUp files
-# https://bugs.debian.org/903693
-# https://bugs.astron.com/view.php?id=10
-
-0   string  \xff\xfe\xff\x0e\x53\x00\x6b\x00\x65\x00\x74\x00\x63\x00\x68\x00\x55\x00\x70\x00\x20\x00\x4d\x00\x6f\x00\x64\x00\x65\x00\x6c\x00  SketchUp Model
-!:mime      application/vnd.sketchup.skp
-!:ext       skp

debian/patches/upstream.coff-amd64.patch

@@ -1,8 +1,8 @@
-Subject: Recognize ia64 and amd64 COFF files
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: 2017-10-06
+Subject: PR/19: Recognize ia64 and amd64 COFF files
+Origin: FILE5_34-26-gc673ce51 <https://github.com/file/file/commit/FILE5_34-26-gc673ce51>
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Wed Aug 1 10:34:03 2018 +0000
 Bug-Debian: https://bugs.debian.org/697846
-Forwarded: https://bugs.astron.com/view.php?id=19
 
 --- a/magic/Magdir/coff
 +++ b/magic/Magdir/coff
@@ -19,6 +19,14 @@ Forwarded: https://bugs.astron.com/view.php?id=19
  >>0	default		x
 --- a/magic/Magdir/intel
 +++ b/magic/Magdir/intel
+@@ -1,6 +1,6 @@
+ 
+ #------------------------------------------------------------------------------
+-# $File: intel,v 1.16 2017/11/14 15:48:36 christos Exp $
++# $File: intel,v 1.17 2018/08/01 10:34:03 christos Exp $
+ # intel:  file(1) magic for x86 Unix
+ #
+ # Various flavors of x86 UNIX executable/object (other than Xenix, which
 @@ -42,6 +42,10 @@
  #>12	lelong		>0		not stripped
  # no hint found, that at offset 22 is version

debian/patches/cherry-pick.FILE5_34-27-gc2926e0d.pr-16-add-autocad-dxf-magic.patch

@@ -0,0 +1,28 @@
+Subject: PR/16: Add autocad dxf magic
+Origin: FILE5_34-27-gc2926e0d <https://github.com/file/file/commit/FILE5_34-27-gc2926e0d>
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Wed Aug 1 12:05:00 2018 +0000
+Bug-Debian: https://bugs.debian.org/702744
+
+--- a/magic/Magdir/cad
++++ b/magic/Magdir/cad
+@@ -167,3 +167,19 @@
+ 0	string	;;\020HSF\020V		OpenHSF (Hoops Stream Format)
+ >7	regex/9 V[.0-9]{4,5}\020	%s
+ !:ext hsf
++
++# AutoCAD Drawing Exchange Format
++0	regex		\^[\ \t]*0\r?\000$
++>1	regex		\^[\ \t]*SECTION\r?$
++>>2	regex		\^[\ \t]*2\r?$
++>>>3	regex		\^[\ \t]*HEADER\r?$	AutoCAD Drawing Exchange Format
++!:mime	application/x-dxf
++!:ext	dxf
++>>>>&1	search/8192	AC1006			\b, R10
++>>>>&1	search/8192	AC1009			\b, R11/R12
++>>>>&1	search/8192	AC1012			\b, R13
++>>>>&1	search/8192	AC1014			\b, R14
++>>>>&1	search/8192	AC1015			\b, version 2000
++>>>>&1	search/8192	AC1018			\b, version 2004
++>>>>&1	search/8192	AC1021			\b, version 2007
++>>>>&1	search/8192	AC1024			\b, version 2010

debian/patches/cherry-pick.FILE5_34-29-g4efd402b.pr-10-add-sketchup.patch

@@ -0,0 +1,17 @@
+Subject: PR/10: Add sketchup
+Origin: FILE5_34-29-g4efd402b <https://github.com/file/file/commit/FILE5_34-29-g4efd402b>
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Thu Aug 2 06:23:27 2018 +0000
+Bug-Debian: https://bugs.debian.org/903693
+
+--- a/magic/Magdir/cad
++++ b/magic/Magdir/cad
+@@ -183,3 +183,8 @@
+ >>>>&1	search/8192	AC1018			\b, version 2004
+ >>>>&1	search/8192	AC1021			\b, version 2007
+ >>>>&1	search/8192	AC1024			\b, version 2010
++
++# The Sketchup 3D model format https://www.sketchup.com/
++0	string	\xff\xfe\xff\x0e\x53\x00\x6b\x00\x65\x00\x74\x00\x63\x00\x68\x00\x55\x00\x70\x00\x20\x00\x4d\x00\x6f\x00\x64\x00\x65\x00\x6c\x00	SketchUp Model
++!:mime application/vnd.sketchup.skp
++!:ext skp

debian/patches/cherry-pick.FILE5_34-30-g9b8cfc02.new-edid-magic.patch

@@ -0,0 +1,21 @@
+Subject: New EDID magic
+Origin: FILE5_34-30-g9b8cfc02 <https://github.com/file/file/commit/FILE5_34-30-g9b8cfc02>
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Thu Aug 2 06:32:52 2018 +0000
+Bug-Debian: https://bugs.debian.org/896932
+
+--- /dev/null
++++ b/magic/Magdir/hardware
+@@ -0,0 +1,12 @@
++
++#------------------------------------------------------------------------------
++# $File: hardware,v 1.1 2018/08/02 06:32:52 christos Exp $
++# hardware magic
++
++# EDID
++# https://en.wikipedia.org/wiki/Extended_Display_Identification_Data
++0	string		\x00\xFF\xFF\xFF\xFF\xFF\xFF\x00
++>19	byte		x
++>>18	byte		x	EDID data, version %u.
++>>19	byte		x	\b%u
++#>>17	ubyte+1990	<255	\b, manufactured %u

debian/patches/series

@@ -1,8 +1,11 @@
 # cherry-picked commits. Keep in upstream's chronological order
 cherry-pick.FILE5_34-2-gedb7f0d6.pr-9-christoph-bield-handle-files-without-program-headers-gracefully.patch
+cherry-pick.FILE5_34-26-gc673ce51.pr-19-recognize-ia64-and-amd64-coff-files.patch
+cherry-pick.FILE5_34-27-gc2926e0d.pr-16-add-autocad-dxf-magic.patch
+cherry-pick.FILE5_34-29-g4efd402b.pr-10-add-sketchup.patch
+cherry-pick.FILE5_34-30-g9b8cfc02.new-edid-magic.patch
 
 # patches that should go upstream
-upstream.coff-amd64.patch
 
 # local modifications
 local.support-local-definitions-in-etc-magic.patch