Refresh patch queue

Removed, were cherry-picked:
* cherry-pick.FILE5_33-2-g35c46552.fix-cast.patch
* cherry-pick.FILE5_33-3-g4a870863.bump-gif-to-beat-mbr-from-kamil-dudka.patch
* cherry-pick.FILE5_33-31-ga642587a.avoid-reading-past-the-end-of-buffer.patch

Removed, obsolete:
* local.mailing-list-is-down.patch
* upstream.disable-erroneous-dbpf.patch

debian/patches/cherry-pick.FILE5_33-2-g35c46552.fix-cast.patch

@@ -1,16 +0,0 @@
-Subject: Fix cast
-Origin: FILE5_33-2-g35c46552
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Sun Apr 15 19:57:59 2018 +0000
-
---- a/src/apprentice.c
-+++ b/src/apprentice.c
-@@ -3335,7 +3335,7 @@
- bs1(struct magic *m)
- {
- 	m->cont_level = swap2(m->cont_level);
--	m->offset = swap4((int32_t)m->offset);
-+	m->offset = swap4((uint32_t)m->offset);
- 	m->in_offset = swap4((uint32_t)m->in_offset);
- 	m->lineno = swap4((uint32_t)m->lineno);
- 	if (IS_STRING(m->type)) {

debian/patches/cherry-pick.FILE5_33-3-g4a870863.bump-gif-to-beat-mbr-from-kamil-dudka.patch

@@ -1,17 +0,0 @@
-Subject: Bump gif to beat mbr (from Kamil Dudka)
-Origin: FILE5_33-3-g4a870863
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Tue Apr 17 12:09:20 2018 +0000
-
---- a/magic/Magdir/images
-+++ b/magic/Magdir/images
-@@ -464,7 +464,9 @@
- !:mime	image/x-unknown
- 
- # GIF
-+# Strength set up to beat 0x55AA DOS/MBR signature word lookups (+65)
- 0	string		GIF8		GIF image data
-+!:strength +80
- !:mime	image/gif
- !:apple	8BIMGIFf
- >4	string		7a		\b, version 8%s,

debian/patches/cherry-pick.FILE5_33-31-ga642587a.avoid-reading-past-the-end-of-buffer.patch

@@ -1,18 +0,0 @@
-Subject: Avoid reading past the end of buffer (Rui Reis)
-Origin: FILE5_33-31-ga642587a
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Sat Jun 9 16:00:06 2018 +0000
-Bug-Debian: https://bugs.debian.org/901351
-
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -825,7 +825,8 @@
- 
- 				cname = (unsigned char *)
- 				    &nbuf[doff + prpsoffsets(i)];
--				for (cp = cname; *cp && isprint(*cp); cp++)
-+				for (cp = cname; cp < nbuf + size && *cp
-+				    && isprint(*cp); cp++)
- 					continue;
- 				/*
- 				 * Linux apparently appends a space at the end

debian/patches/local.don-t-include-libs-in-build.patch

@@ -6,8 +6,8 @@ Last-Update: 2016-06-27
 
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -439,7 +439,7 @@
- 	rm -f $$list
+@@ -481,7 +481,7 @@
+ 
  file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) $(EXTRA_file_DEPENDENCIES) 
  	@rm -f file$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(file_OBJECTS) $(file_LDADD) $(LIBS)

debian/patches/local.mailing-list-is-down.patch

@@ -1,21 +0,0 @@
-Description: Mark currently offline addresses as such
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Forwarded: no
-Last-Update: 2018-04-22
-
---- a/doc/file.man
-+++ b/doc/file.man
-@@ -624,10 +624,13 @@
- .Sh BUGS
- Please report bugs and send patches to the bug tracker at
- .Pa http://bugs.gw.com/
-+[currently down]
- or the mailing list at
- .Aq file@mx.gw.com
-+[currently down]
- (visit
- .Pa http://mx.gw.com/mailman/listinfo/file
-+[currently down]
- first to subscribe).
- .Sh TODO
- Fix output so that tests for MIME and APPLE flags are not needed all

debian/patches/local.support-local-definitions-in-etc-magic.patch

@@ -47,7 +47,7 @@ Last-Update: 2016-06-27
  libmagic_la_SOURCES = buffer.c magic.c apprentice.c softmagic.c ascmagic.c \
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -299,7 +299,7 @@
+@@ -340,7 +340,7 @@
  MAGIC = $(pkgdatadir)/magic
  lib_LTLIBRARIES = libmagic.la
  nodist_include_HEADERS = magic.h

debian/patches/series

@@ -1,11 +1,7 @@
 # cherry-picked commits. Keep in upstream's chronological order
-cherry-pick.FILE5_33-2-g35c46552.fix-cast.patch
-cherry-pick.FILE5_33-3-g4a870863.bump-gif-to-beat-mbr-from-kamil-dudka.patch
-cherry-pick.FILE5_33-31-ga642587a.avoid-reading-past-the-end-of-buffer.patch
 
 # patches that should go upstream
 upstream.coff-amd64.patch
-upstream.disable-erroneous-dbpf.patch
 
 # local modifications
 local.support-local-definitions-in-etc-magic.patch
@@ -14,4 +10,3 @@ local.mention-posixly-correct-dependent-behaviour-in-usage-message.patch
 local.report-gz-as-application-gzip.patch
 local.disable-detection-of-vax-coff-executables.patch
 local.disable-algol68-detection.patch
-local.mailing-list-is-down.patch

debian/patches/upstream.coff-amd64.patch

@@ -2,7 +2,7 @@ Subject: Recognize ia64 and amd64 COFF files
 Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Date: 2017-10-06
 Bug-Debian: https://bugs.debian.org/697846
-Forwarded: no, how?
+Forwarded: https://bugs.astron.com/view_all_bug_page.php
 
 --- a/magic/Magdir/coff
 +++ b/magic/Magdir/coff

debian/patches/upstream.disable-erroneous-dbpf.patch

@@ -1,20 +0,0 @@
-Subject: Disable erroneous DBPF detection that breaks SQLite and some more
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: 2018-04-29
-Bug-Debian: https://bugs.debian.org/897153
-Forwarded: no, how?
-
---- a/magic/Magdir/dbpf
-+++ b/magic/Magdir/dbpf
-@@ -11,7 +11,7 @@
- >>>36	ulelong	x       \b, files: %u
- !:ext	dbpf/package/dat/sc4
- !:mime	application/x-maxis-dbpf
--4	ulelong	1
-->8	ulelong	!1
-->>24	ledate	!0	\b, created: %s
-->>>28	ledate	!0	\b, modified: %s
-+#4	ulelong	1
-+#>8	ulelong	!1
-+#>>24	ledate	!0	\b, created: %s
-+#>>>28	ledate	!0	\b, modified: %s