Refresh patch queue

- Drop commits cherry-picked from upstream

debian/patches/cherry-pick.FILE5_34-2-gedb7f0d6.pr-9-christoph-bield-handle-files-without-program-headers-gracefully.patch

@@ -1,44 +0,0 @@
-Subject: PR/9: Christoph Bield: Handle files without program headers gracefully
-Origin: FILE5_34-2-gedb7f0d6 <https://github.com/file/file/commit/FILE5_34-2-gedb7f0d6>
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Wed Jul 25 06:12:09 2018 +0000
-Bug-Debian: https://bugs.debian.org/882310
-
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -352,6 +352,11 @@
- 	off_t ph_off = off;
- 	int ph_num = num;
- 
-+	if (num == 0) {
-+		if (file_printf(ms, ", no program header") == -1)
-+			return -1;
-+		return 0;
-+	}
- 	if (size != xph_sizeof) {
- 		if (file_printf(ms, ", corrupted program header size") == -1)
- 			return -1;
-@@ -1278,6 +1283,11 @@
- 	char name[50];
- 	ssize_t namesize;
- 
-+	if (num == 0) {
-+		if (file_printf(ms, ", no section header") == -1)
-+			return -1;
-+		return 0;
-+	}
- 	if (size != xsh_sizeof) {
- 		if (file_printf(ms, ", corrupted section header size") == -1)
- 			return -1;
-@@ -1549,6 +1559,11 @@
- 	ssize_t bufsize;
- 	size_t offset, align, len;
- 	
-+	if (num == 0) {
-+		if (file_printf(ms, ", no program header") == -1)
-+			return -1;
-+		return 0;
-+	}
- 	if (size != xph_sizeof) {
- 		if (file_printf(ms, ", corrupted program header size") == -1)
- 			return -1;

debian/patches/cherry-pick.FILE5_34-26-gc673ce51.pr-19-recognize-ia64-and-amd64-coff-files.patch

@@ -1,40 +0,0 @@
-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
-
---- a/magic/Magdir/coff
-+++ b/magic/Magdir/coff
-@@ -26,6 +26,10 @@
- >>0	uleshort	0x0550		Hitachi SH little-endian
- # executable (RISC System/6000 V3.1) or obj module (./ibm6000)
- #>>0	uleshort	0x01DF
-+# MS Windows COFF Intel Itanium, AMD64
-+# https://msdn.microsoft.com/en-us/library/windows/desktop/ms680313(v=vs.85).aspx
-+>>0	uleshort	0x0200		Intel ia64
-+>>0	uleshort	0x8664		Intel amd64
- # TODO for other COFFs
- #>>0	uleshort	0xABCD		COFF_TEMPLATE
- >>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
- #>22	leshort		>0		- version %d
-+0	leshort		0x0200
-+>0	use				display-coff
-+0	leshort		0x8664
-+>0	use				display-coff
- 
- # rom: file(1) magic for BIOS ROM Extensions found in intel machines
- #      mapped into memory between 0xC0000 and 0xFFFFF

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

@@ -1,28 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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/local.support-local-definitions-in-etc-magic.patch

@@ -13,10 +13,10 @@ Last-Update: 2016-06-27
 -# files is 5 on V7 and BSD, 4 on SV, and ?? on SVID.
 +# Format is described in in magic(5).
  # Don't edit this file, edit /etc/magic or send your magic improvements
--# to the maintainers, at file@mx.gw.com
-+# to the upstream maintainers, at file@mx.gw.com
+-# to the maintainers, at file@astron.com
++# to the upstream maintainers, at file@astron.com
 +# or send your suggested inclusions
-+# as a wishlist bug against file (using the reportbug utility).
++# as a wishlist bug against the file package (using the reportbug utility).
 --- /dev/null
 +++ b/magic/magic.local
 @@ -0,0 +1,3 @@
@@ -55,7 +55,7 @@ Last-Update: 2016-06-27
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
  AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
  libmagic_la_SOURCES = buffer.c magic.c apprentice.c softmagic.c ascmagic.c \
- 	encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \
+ 	encoding.c compress.c is_json.c is_tar.c readelf.c print.c fsmagic.c \
 --- a/doc/file.man
 +++ b/doc/file.man
 @@ -57,7 +57,7 @@
@@ -77,7 +77,7 @@ Last-Update: 2016-06-27
  magic file
  .Pa __MAGIC__.mgc ,
  or the files in the directory
-@@ -549,12 +550,6 @@
+@@ -551,12 +552,6 @@
  The order of entries in the magic file is significant.
  Depending on what system you are using, the order that
  they are put together may be incorrect.

debian/patches/series

@@ -1,9 +1,4 @@
 # 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