Refresh patch queue, remove patch for CVE-2014-3710, now upstream

debian/patches/0001-file-localmagic.patch

@@ -5,10 +5,8 @@ Description:
  No longer includes Localstuff in /usr/share/misc/magic, local definitions
  should go to /etc/magic.
 
-Index: file-5.14/magic/Header
-===================================================================
---- file-5.14.orig/magic/Header	2010-12-15 03:06:49.000000000 +0000
-+++ file-5.14/magic/Header	2013-05-06 17:41:20.000000000 +0000
+--- a/magic/Header
++++ b/magic/Header
 @@ -1,5 +1,6 @@
  # Magic data for file(1) command.
 -# Format is described in magic(files), where:
@@ -19,19 +17,15 @@ Index: file-5.14/magic/Header
 +# to the upstream maintainers, at file@mx.gw.com
 +# or send your suggested inclusions
 +# as a wishlist bug against file (using the reportbug utility).
-Index: file-5.14/magic/magic.local
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ file-5.14/magic/magic.local	2013-05-06 17:41:20.000000000 +0000
+--- /dev/null
++++ b/magic/magic.local
 @@ -0,0 +1,3 @@
 +# Magic local data for file(1) command.
 +# Insert here your local magic data. Format is described in magic(5).
 +
-Index: file-5.14/src/apprentice.c
-===================================================================
---- file-5.14.orig/src/apprentice.c	2013-03-21 17:45:14.000000000 +0000
-+++ file-5.14/src/apprentice.c	2013-05-06 17:41:20.000000000 +0000
-@@ -419,7 +419,7 @@
+--- a/src/apprentice.c
++++ b/src/apprentice.c
+@@ -448,7 +448,7 @@
  #ifndef COMPILE_ONLY
  	map = apprentice_map(ms, fn);
  	if (map == NULL) {
@@ -40,10 +34,8 @@ Index: file-5.14/src/apprentice.c
  			file_magwarn(ms, "using regular magic file `%s'", fn);
  		map = apprentice_load(ms, fn, action);
  		if (map == NULL)
-Index: file-5.14/src/Makefile.am
-===================================================================
---- file-5.14.orig/src/Makefile.am	2013-03-21 17:45:14.000000000 +0000
-+++ file-5.14/src/Makefile.am	2013-05-06 17:41:20.000000000 +0000
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -4,7 +4,7 @@
  
  bin_PROGRAMS = file
@@ -53,11 +45,9 @@ Index: file-5.14/src/Makefile.am
  AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
  
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
-Index: file-5.14/src/Makefile.in
-===================================================================
---- file-5.14.orig/src/Makefile.in	2013-03-21 17:51:39.000000000 +0000
-+++ file-5.14/src/Makefile.in	2013-05-06 17:41:20.000000000 +0000
-@@ -282,7 +282,7 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -329,7 +329,7 @@
  MAGIC = $(pkgdatadir)/magic
  lib_LTLIBRARIES = libmagic.la
  include_HEADERS = magic.h

debian/patches/0004-doc-manpages.patch

@@ -1,10 +1,9 @@
 Author: Michael Piefel <piefel@debian.org>
 Description: FIXME, and #417511.
 
-diff -Naurp file.orig/doc/file.man file/doc/file.man
---- file.orig/doc/file.man
-+++ file/doc/file.man
-@@ -55,7 +55,7 @@ meaning anything else (data is usually
+--- a/doc/file.man
++++ b/doc/file.man
+@@ -56,7 +56,7 @@
  or non-printable).
  Exceptions are well-known file formats (core files, tar archives)
  that are known to contain binary data.
@@ -13,7 +12,7 @@ diff -Naurp file.orig/doc/file.man file/doc/file.man
  .Em "preserve these keywords" .
  Users depend on knowing that all the readable files in a directory
  have the word
-@@ -99,7 +99,8 @@ The concept of a
+@@ -100,7 +100,8 @@
  has been applied by extension to data files.
  Any file with some invariant identifier at a small fixed
  offset into the file can usually be described in this way.
@@ -23,7 +22,7 @@ diff -Naurp file.orig/doc/file.man file/doc/file.man
  magic file
  .Pa __MAGIC__.mgc ,
  or the files in the directory
-@@ -434,12 +435,6 @@ will be distributed periodically.
+@@ -453,12 +454,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/0009-ms-html-help.patch

@@ -1,10 +1,9 @@
 Author: Paul Wise <pabs@debian.org>
 Description: Updating MS Windows HtmlHelp Data magics (Closes: #653911).
 
-diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
---- file.orig/magic/Magdir/msdos
-+++ file/magic/Magdir/msdos
-@@ -712,7 +712,7 @@
+--- a/magic/Magdir/msdos
++++ b/magic/Magdir/msdos
+@@ -772,7 +772,7 @@
  0	ulequad	0x3a000000024e4c	MS Advisor help file
  
  # HtmlHelp files (.chm)

debian/patches/0010-mdadm.patch

@@ -3,11 +3,10 @@ Description: Adding new magics for Linux Software RAID (Closes: #663454).
 
 --- a/magic/Magdir/linux
 +++ b/magic/Magdir/linux
-@@ -416,3 +416,25 @@
- # glibc locale archive as defined in glibc locale/locarchive.h
+@@ -417,6 +417,28 @@
  0		lelong		0xde020109	locale archive
  >24		lelong		x		%d strings
-+
+ 
 +# Linux Software RAID (mdadm)
 +# Russell Coker <russell@coker.com.au>
 +4096	lelong	0xa92b4efc	Linux Software RAID
@@ -29,3 +28,7 @@ Description: Adding new magics for Linux Software RAID (Closes: #663454).
 +>32	string	x		name=%s
 +>72	lelong	x		level=%d
 +>92	lelong	x		disks=%d
++
+ # Summary:     Database file for mlocate
+ # Description: A database file as used by mlocate, a fast implementation
+ #              of locate/updatedb. It uses merging to reuse the existing

debian/patches/0011-btrfs.patch

@@ -1,10 +1,9 @@
 Author: Russell Coker <russell@coker.com.au>
 Description: Adding updated magics for BTRFS (Closes: #663454).
 
-diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
---- file.orig/magic/Magdir/filesystems	2013-03-13 16:54:43.588452886 +0100
-+++ file/magic/Magdir/filesystems	2013-03-13 17:15:59.659044842 +0100
-@@ -1894,12 +1894,21 @@
+--- a/magic/Magdir/filesystems
++++ b/magic/Magdir/filesystems
+@@ -2202,12 +2202,21 @@
  >>0x10060        string          >\0             lockproto %s)
  
  # BTRFS

debian/patches/CVE-2014-3710.patch

@@ -1,24 +0,0 @@
-Subject: Fix note bounds reading, Francisco Alonso / Red Hat
-ID: CVE-2014-3710
-Author: Christos Zoulas <christos@zoulas.com>
-Date: Fri Oct 17 15:49:00 2014 +0000
-Origin:
-    commit 39c7ac1106be844a5296d3eb5971946cc09ffda0
-Last-Update: 2014-11-09
-
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -477,6 +477,13 @@
- 	uint32_t namesz, descsz;
- 	unsigned char *nbuf = CAST(unsigned char *, vbuf);
- 
-+	if (xnh_sizeof + offset > size) {
-+		/*
-+		 * We're out of note headers.
-+		 */
-+		return xnh_sizeof + offset;
-+	}
-+
- 	(void)memcpy(xnh_addr, &nbuf[offset], xnh_sizeof);
- 	offset += xnh_sizeof;
- 

debian/patches/series

@@ -9,4 +9,3 @@
 0010-mdadm.patch
 0011-btrfs.patch
 0012-lxt.patch
-CVE-2014-3710.patch