Refresh patch queue

debian/patches/cherry-pick.FILE5_39-9-g85b7ab83.include-alternate-format-to-the-list-of-uninteresting-formats.patch

@@ -1,19 +0,0 @@
-Subject: Include # (alternate format) to the list of uninteresting formats (...)
-Origin: FILE5_39-9-g85b7ab83 <https://github.com/file/file/commit/FILE5_39-9-g85b7ab83>
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Thu Jun 25 16:52:48 2020 +0000
-
-    Include # (alternate format) to the list of uninteresting formats
-    Reported by Werner Fink
-
---- a/src/funcs.c
-+++ b/src/funcs.c
-@@ -93,7 +93,7 @@
- 		if (*++p == '%')
- 			continue;
- 		// Skip uninteresting.
--		while (strchr("0.'+- ", *p) != NULL)
-+		while (strchr("#0.'+- ", *p) != NULL)
- 			p++;
- 		if (*p == '*') {
- 			if (msg)

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

@@ -6,7 +6,7 @@ Last-Update: 2016-06-27
 
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -500,7 +500,7 @@
+@@ -501,7 +501,7 @@
  
  file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) $(EXTRA_file_DEPENDENCIES) 
  	@rm -f file$(EXEEXT)

debian/patches/local.extra-magic.patch

@@ -6,7 +6,7 @@ Forwarded: not-yet
 --- a/magic/Makefile.am
 +++ b/magic/Makefile.am
 @@ -10,6 +10,7 @@
- EXTRA_DIST = \
+ MAGIC_FRAGMENTS = \
  $(MAGIC_DIR)/Header \
  $(MAGIC_DIR)/Localstuff \
 +$(MAGIC_FRAGMENT_DIR)/../../debian/debian-extra-magic \

debian/patches/local.manpage-seccomp-is-disabled.patch

@@ -5,9 +5,9 @@ Bug-Debian: https://bugs.debian.org/917930
 
 --- a/doc/file.man
 +++ b/doc/file.man
-@@ -380,6 +380,10 @@
+@@ -387,6 +387,10 @@
  .Fl z
- flag is specified and the built-in decompressors are not available.
+ option is specified and the built-in decompressors are not available.
  On systems where sandboxing is not available, this option has no effect.
 +.Pp
 +.Em Note:

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

@@ -25,7 +25,7 @@ Last-Update: 2016-06-27
 +
 --- a/src/apprentice.c
 +++ b/src/apprentice.c
-@@ -460,7 +460,7 @@
+@@ -462,7 +462,7 @@
  #ifndef COMPILE_ONLY
  	map = apprentice_map(ms, fn);
  	if (map == NULL) {
@@ -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
-@@ -359,7 +359,7 @@
+@@ -360,7 +360,7 @@
  MAGIC = $(pkgdatadir)/magic
  lib_LTLIBRARIES = libmagic.la
  nodist_include_HEADERS = magic.h
@@ -58,15 +58,15 @@ Last-Update: 2016-06-27
  	encoding.c compress.c is_csv.c is_json.c is_tar.c readelf.c print.c \
 --- a/doc/file.man
 +++ b/doc/file.man
-@@ -58,7 +58,7 @@
- or non-printable).
+@@ -59,7 +59,7 @@
  Exceptions are well-known file formats (core files, tar archives)
  that are known to contain binary data.
--When modifying magic files or the program itself, make sure to
-+When adding local definitions to /etc/magic, make sure to
- .Em "preserve these keywords" .
+ When modifying magic files or the program itself, make sure to
+-.Em preserve these keywords .
++.Em "preserve these keywords" .
  Users depend on knowing that all the readable files in a directory
  have the word
+ .Dq text
 @@ -102,7 +102,8 @@
  has been applied by extension to data files.
  Any file with some invariant identifier at a small fixed
@@ -77,7 +77,7 @@ Last-Update: 2016-06-27
  magic file
  .Pa __MAGIC__.mgc ,
  or the files in the directory
-@@ -565,12 +566,6 @@
+@@ -572,12 +573,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,7 +1,6 @@
 # reverted upstream commits
 
 # cherry-picked commits. Keep in upstream's chronological order
-cherry-pick.FILE5_39-9-g85b7ab83.include-alternate-format-to-the-list-of-uninteresting-formats.patch
 
 # patches that should go upstream
 upstream.disable.att3b.patch