Browse Source

Refresh and update patches

Christoph Biedl 9 years ago
parent
commit
ac9d39ee2c

+ 7 - 5
debian/patches/0001-file-localmagic.patch

@@ -1,9 +1,11 @@
-Authors:
- Michael Piefel <piefel@debian.org>,
- Judit Foglszinger <fgrfgr@freenet.de>
 Description:
 Description:
  No longer includes Localstuff in /usr/share/misc/magic, local definitions
  No longer includes Localstuff in /usr/share/misc/magic, local definitions
  should go to /etc/magic.
  should go to /etc/magic.
+Author:
+ Michael Piefel <piefel@debian.org>,
+ Judit Foglszinger <fgrfgr@freenet.de>
+Forwarded: no
+Last-Update: 2015-08-23
 
 
 --- a/magic/Header
 --- a/magic/Header
 +++ b/magic/Header
 +++ b/magic/Header
@@ -25,7 +27,7 @@ Description:
 +
 +
 --- a/src/apprentice.c
 --- a/src/apprentice.c
 +++ b/src/apprentice.c
 +++ b/src/apprentice.c
-@@ -448,7 +448,7 @@
+@@ -450,7 +450,7 @@
  #ifndef COMPILE_ONLY
  #ifndef COMPILE_ONLY
  	map = apprentice_map(ms, fn);
  	map = apprentice_map(ms, fn);
  	if (map == NULL) {
  	if (map == NULL) {
@@ -47,7 +49,7 @@ Description:
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
 --- a/src/Makefile.in
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -329,7 +329,7 @@
+@@ -341,7 +341,7 @@
  MAGIC = $(pkgdatadir)/magic
  MAGIC = $(pkgdatadir)/magic
  lib_LTLIBRARIES = libmagic.la
  lib_LTLIBRARIES = libmagic.la
  include_HEADERS = magic.h
  include_HEADERS = magic.h

+ 3 - 2
debian/patches/0002-file-make.patch

@@ -1,9 +1,10 @@
-Author: Michael Piefel <piefel@debian.org>
 Description: n/a
 Description: n/a
+Author: Michael Piefel <piefel@debian.org>
+Last-Update: 2015-08-23
 
 
 --- a/src/Makefile.in
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -471,7 +471,7 @@
+@@ -482,7 +482,7 @@
  
  
  file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) $(EXTRA_file_DEPENDENCIES) 
  file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) $(EXTRA_file_DEPENDENCIES) 
  	@rm -f file$(EXEEXT)
  	@rm -f file$(EXEEXT)

+ 4 - 2
debian/patches/0003-file-usage.patch

@@ -1,9 +1,11 @@
+Description: Adding POSIXLY_CORRECT reference in usage message
 Author: Daniel Baumann <mail@daniel-baumann.ch>
 Author: Daniel Baumann <mail@daniel-baumann.ch>
-Description: Adding POSIXLY_CORRECT reference in usage message (Closes: #576679).
+Bug-Debian: https://bugs.debian.org/576679
+Last-Update: 2015-08-23
 
 
 --- a/src/file_opts.h
 --- a/src/file_opts.h
 +++ b/src/file_opts.h
 +++ b/src/file_opts.h
-@@ -34,8 +34,8 @@
+@@ -36,8 +36,8 @@
  OPT('k', "keep-going", 0, "           don't stop at the first match\n")
  OPT('k', "keep-going", 0, "           don't stop at the first match\n")
  OPT('l', "list", 0, "                 list magic strength\n")
  OPT('l', "list", 0, "                 list magic strength\n")
  #ifdef S_IFLNK
  #ifdef S_IFLNK

+ 6 - 4
debian/patches/0004-doc-manpages.patch

@@ -1,9 +1,11 @@
+Description: FIXME
 Author: Michael Piefel <piefel@debian.org>
 Author: Michael Piefel <piefel@debian.org>
-Description: FIXME, and #417511.
+Bug-Debian: https://bugs.debian.org/417511
+Last-Update: 2015-08-23
 
 
 --- a/doc/file.man
 --- a/doc/file.man
 +++ b/doc/file.man
 +++ b/doc/file.man
-@@ -56,7 +56,7 @@
+@@ -57,7 +57,7 @@
  or non-printable).
  or non-printable).
  Exceptions are well-known file formats (core files, tar archives)
  Exceptions are well-known file formats (core files, tar archives)
  that are known to contain binary data.
  that are known to contain binary data.
@@ -12,7 +14,7 @@ Description: FIXME, and #417511.
  .Em "preserve these keywords" .
  .Em "preserve these keywords" .
  Users depend on knowing that all the readable files in a directory
  Users depend on knowing that all the readable files in a directory
  have the word
  have the word
-@@ -100,7 +100,8 @@
+@@ -101,7 +101,8 @@
  has been applied by extension to data files.
  has been applied by extension to data files.
  Any file with some invariant identifier at a small fixed
  Any file with some invariant identifier at a small fixed
  offset into the file can usually be described in this way.
  offset into the file can usually be described in this way.
@@ -22,7 +24,7 @@ Description: FIXME, and #417511.
  magic file
  magic file
  .Pa __MAGIC__.mgc ,
  .Pa __MAGIC__.mgc ,
  or the files in the directory
  or the files in the directory
-@@ -453,12 +454,6 @@
+@@ -459,12 +460,6 @@
  The order of entries in the magic file is significant.
  The order of entries in the magic file is significant.
  Depending on what system you are using, the order that
  Depending on what system you are using, the order that
  they are put together may be incorrect.
  they are put together may be incorrect.

+ 2 - 1
debian/patches/0006-gzip.patch

@@ -1,5 +1,6 @@
-Author: Daniel Baumann <mail@daniel-baumann.ch>
 Description: Updating gzip mime (Closes: #688886).
 Description: Updating gzip mime (Closes: #688886).
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Last-Update: 2015-08-23
 
 
 --- a/magic/Magdir/compress
 --- a/magic/Magdir/compress
 +++ b/magic/Magdir/compress
 +++ b/magic/Magdir/compress

+ 6 - 4
debian/patches/0007-c64-tap.patch

@@ -1,9 +1,11 @@
+Subject: Adding new magics for Commodore raw tape files
 Author: Esa Hyytiä <esa@netlab.tkk.fi>
 Author: Esa Hyytiä <esa@netlab.tkk.fi>
-Description: Adding new magics for Commodore raw tape files (Closes: #699777).
+Bug-Debian: https://bugs.debian.org/699777
+Forwarded: http://mx.gw.com/pipermail/file/2015/001755.html
+Last-Update: 2015-08-23
 
 
-diff -Naurp file.orig/magic/Magdir/c64 file/magic/Magdir/c64
---- file.orig/magic/Magdir/c64
-+++ file/magic/Magdir/c64
+--- a/magic/Magdir/c64
++++ b/magic/Magdir/c64
 @@ -41,3 +41,9 @@
 @@ -41,3 +41,9 @@
  >32	leshort		x		Version:0x%x
  >32	leshort		x		Version:0x%x
  >36	leshort		!0		Entries:%i
  >36	leshort		!0		Entries:%i

+ 6 - 4
debian/patches/0008-aol-art.patch

@@ -1,9 +1,11 @@
+Subject: Adding updated magics for AOL ART images
 Author: Bastien Roucaries <roucaries.bastien@gmail.com>
 Author: Bastien Roucaries <roucaries.bastien@gmail.com>
-Description: Adding updated magics for AOL ART images (Closes: #681304).
+Bug-Debian: https://bugs.debian.org/681304
+Forwarded: http://mx.gw.com/pipermail/file/2015/001755.html
+Last-Update: 2015-08-23
 
 
-diff -Naurp file.orig/magic/Magdir/netscape file/magic/Magdir/netscape
---- file.orig/magic/Magdir/netscape
-+++ file/magic/Magdir/netscape
+--- a/magic/Magdir/netscape
++++ b/magic/Magdir/netscape
 @@ -22,4 +22,5 @@
 @@ -22,4 +22,5 @@
  
  
  #
  #

+ 4 - 1
debian/patches/0009-ms-html-help.patch

@@ -1,5 +1,8 @@
+Subject: Updating MS Windows HtmlHelp Data magics
 Author: Paul Wise <pabs@debian.org>
 Author: Paul Wise <pabs@debian.org>
-Description: Updating MS Windows HtmlHelp Data magics (Closes: #653911).
+Bug-Debian: https://bugs.debian.org/653911
+Forwarded: http://mx.gw.com/pipermail/file/2015/001755.html
+Last-Update: 2015-08-23
 
 
 --- a/magic/Magdir/msdos
 --- a/magic/Magdir/msdos
 +++ b/magic/Magdir/msdos
 +++ b/magic/Magdir/msdos

+ 4 - 1
debian/patches/0010-mdadm.patch

@@ -1,5 +1,8 @@
+Subject: Adding new magics for Linux Software RAID
 Author: Russell Coker <russell@coker.com.au>
 Author: Russell Coker <russell@coker.com.au>
-Description: Adding new magics for Linux Software RAID (Closes: #663454).
+Bug-Debian: https://bugs.debian.org/663454
+Forwarded: http://mx.gw.com/pipermail/file/2015/001755.html
+Last-Update: 2015-08-23
 
 
 --- a/magic/Magdir/linux
 --- a/magic/Magdir/linux
 +++ b/magic/Magdir/linux
 +++ b/magic/Magdir/linux

+ 5 - 2
debian/patches/0011-btrfs.patch

@@ -1,9 +1,12 @@
+Subject: Adding updated magics for BTRFS
 Author: Russell Coker <russell@coker.com.au>
 Author: Russell Coker <russell@coker.com.au>
-Description: Adding updated magics for BTRFS (Closes: #663454).
+Bug-Debian: https://bugs.debian.org/663454
+Forwarded: http://mx.gw.com/pipermail/file/2015/001755.html
+Last-Update: 2015-08-23
 
 
 --- a/magic/Magdir/filesystems
 --- a/magic/Magdir/filesystems
 +++ b/magic/Magdir/filesystems
 +++ b/magic/Magdir/filesystems
-@@ -2202,12 +2202,21 @@
+@@ -2210,12 +2210,21 @@
  >>0x10060        string          >\0             lockproto %s)
  >>0x10060        string          >\0             lockproto %s)
  
  
  # BTRFS
  # BTRFS

+ 4 - 4
debian/patches/0012-lxt.patch

@@ -1,9 +1,9 @@
+Subject: Adding new magics for LXT
 Author: chrysn <chrysn@fsfe.org>
 Author: chrysn <chrysn@fsfe.org>
-Description: Adding new magics for LXT (Closes: #647412).
+Bug-Debian: https://bugs.debian.org/647412
 
 
-diff -Naurp file.orig/magic/Magdir/scientific file/magic/Magdir/scientific
---- file.orig/magic/Magdir/scientific
-+++ file/magic/Magdir/scientific
+--- a/magic/Magdir/scientific
++++ b/magic/Magdir/scientific
 @@ -104,3 +104,8 @@
 @@ -104,3 +104,8 @@
  >>5	byte	x		version %d.0
  >>5	byte	x		version %d.0
  >4	byte	>0x00		version %d
  >4	byte	>0x00		version %d