Refresh patch queue

debian/patches/local.mention-posixly-correct-dependent-behaviour-in-usage-message.patch

@@ -1,19 +0,0 @@
-Description: Mention POSIXLY_CORRECT dependent behaviour in usage message
-Author: Daniel Baumann <mail@daniel-baumann.ch>
-Bug-Debian: https://bugs.debian.org/576679
-Last-Update: 2016-06-27
-
---- a/src/file_opts.h
-+++ b/src/file_opts.h
-@@ -59,9 +59,9 @@
-     "                 list magic strength\n")
- #ifdef S_IFLNK
- OPT('L', "dereference", 0, 1,
--    "          follow symlinks")
-+    "          follow symlinks (default if POSIXLY_CORRECT is set)")
- OPT('h', "no-dereference", 0, 2,
--    "       don't follow symlinks")
-+    "       don't follow symlinks (default if POSIXLY_CORRECT is not set)")
- #endif
- OPT('n', "no-buffer", 0, 0,
-     "            do not buffer output\n")

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

@@ -25,13 +25,13 @@ Last-Update: 2016-06-27
 +
 --- a/src/apprentice.c
 +++ b/src/apprentice.c
-@@ -497,7 +497,7 @@
+@@ -496,7 +496,7 @@
  #ifndef COMPILE_ONLY
  	map = apprentice_map(ms, fn);
  	if (map == NULL) {
 -		if (ms->flags & MAGIC_CHECK)
 +		if (ms->flags & MAGIC_CHECK && strcmp("/etc/magic", fn) != 0)
- 			file_magwarn(ms, "using regular magic file `%s'", fn);
+ 			file_magwarn(NULL, "using regular magic file `%s'", fn);
  		map = apprentice_load(ms, fn, action);
  		if (map == NULL)
 --- a/src/Makefile.am

debian/patches/series

@@ -9,6 +9,5 @@ upstream.disable.att3b.patch
 # local modifications
 local.support-local-definitions-in-etc-magic.patch
 local.don-t-include-libs-in-build.patch
-local.mention-posixly-correct-dependent-behaviour-in-usage-message.patch
 local.extra-magic.patch
 local.manpage-seccomp-is-disabled.patch