Browse Source

Cherry-pick two documentation fix commits

Christoph Biedl 5 years ago
parent
commit
9c606bf155

+ 23 - 0
debian/patches/cherry-pick.FILE5_35-42-ge6bf546d.fix-documentation-to-match-the-source.patch

@@ -0,0 +1,23 @@
+Subject: Fix documentation to match the source
+Origin: FILE5_35-42-ge6bf546d <https://github.com/file/file/commit/FILE5_35-42-ge6bf546d>
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Mon Jan 21 14:56:53 2019 +0000
+
+--- a/doc/magic.man
++++ b/doc/magic.man
+@@ -116,13 +116,13 @@
+ .It B
+ A byte length (default).
+ .It H
+-A 4 byte big endian length.
++A 2 byte big endian length.
+ .It h
+ A 2 byte little endian length.
+ .It L
+ A 4 byte big endian length.
+ .It l
+-A 2 byte little endian length.
++A 4 byte little endian length.
+ .It J
+ The length includes itself in its count.
+ .El

+ 20 - 0
debian/patches/cherry-pick.FILE5_35-55-g642f269e.mention-that-the-apple-filetype-creator-is-only-available-for-entries-that.patch

@@ -0,0 +1,20 @@
+Subject: Mention that the apple filetype/creator is only available for entries that (...)
+Origin: FILE5_35-55-g642f269e <https://github.com/file/file/commit/FILE5_35-55-g642f269e>
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Mon Feb 18 18:59:25 2019 +0000
+
+    Mention that the apple filetype/creator is only available for entries that
+    have it (Kamil Dudka)
+
+--- a/doc/file.man
++++ b/doc/file.man
+@@ -171,6 +171,9 @@
+ used by older MacOS versions.
+ The code consists of eight letters,
+ the first describing the file type, the latter the creator.
++the first describing the file type, the latter the creator.
++This option works properly only for file formats that have the
++apple-style output defined.
+ .It Fl b , Fl Fl brief
+ Do not prepend filenames to output lines (brief mode).
+ .It Fl C , Fl Fl compile

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

@@ -5,7 +5,7 @@ Bug-Debian: https://bugs.debian.org/917930
 
 
 --- a/doc/file.man
 --- a/doc/file.man
 +++ b/doc/file.man
 +++ b/doc/file.man
-@@ -366,6 +366,10 @@
+@@ -369,6 +369,10 @@
  i.e. when the
  i.e. when the
  .Fl z
  .Fl z
  flag is specified and the built-in decompressors are not available.
  flag is specified and the built-in decompressors are not available.

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

@@ -77,7 +77,7 @@ Last-Update: 2016-06-27
  magic file
  magic file
  .Pa __MAGIC__.mgc ,
  .Pa __MAGIC__.mgc ,
  or the files in the directory
  or the files in the directory
-@@ -551,12 +552,6 @@
+@@ -554,12 +555,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 - 0
debian/patches/series

@@ -8,9 +8,11 @@ cherry-pick.FILE5_35-16-g6d90cbff.avoid-over-trimming-ucs16-text-and-ending-up-l
 cherry-pick.FILE5_35-25-g48052fcf.fix-cut-n-pasto-for-regex-max-vsevolod-stakhov.patch
 cherry-pick.FILE5_35-25-g48052fcf.fix-cut-n-pasto-for-regex-max-vsevolod-stakhov.patch
 cherry-pick.FILE5_35-26-g98f29456.fix-name.patch
 cherry-pick.FILE5_35-26-g98f29456.fix-name.patch
 cherry-pick.FILE5_35-31-g2858eaf9.avoid-oob-read-found-by-asan-reported-by-f.patch
 cherry-pick.FILE5_35-31-g2858eaf9.avoid-oob-read-found-by-asan-reported-by-f.patch
+cherry-pick.FILE5_35-42-ge6bf546d.fix-documentation-to-match-the-source.patch
 cherry-pick.FILE5_35-49-g3a6f62e2.fix-indirect-offset-overflow-calculation-b.patch
 cherry-pick.FILE5_35-49-g3a6f62e2.fix-indirect-offset-overflow-calculation-b.patch
 cherry-pick.FILE5_35-52-g94b7501f.pr-62-spinpx-avoid-non-nul-terminated-string-read.patch
 cherry-pick.FILE5_35-52-g94b7501f.pr-62-spinpx-avoid-non-nul-terminated-string-read.patch
 cherry-pick.FILE5_35-53-gd6578152.pr-62-spinpx-limit-size-of-file-printable.patch
 cherry-pick.FILE5_35-53-gd6578152.pr-62-spinpx-limit-size-of-file-printable.patch
+cherry-pick.FILE5_35-55-g642f269e.mention-that-the-apple-filetype-creator-is-only-available-for-entries-that.patch
 cherry-pick.FILE5_35-56-gf0a26da7.pr-61-tmc-add-ucs-32-built-in-detection.patch
 cherry-pick.FILE5_35-56-gf0a26da7.pr-61-tmc-add-ucs-32-built-in-detection.patch
 cherry-pick.FILE5_35-59-g8305d1cc.use-c-casts-everywhere.patch
 cherry-pick.FILE5_35-59-g8305d1cc.use-c-casts-everywhere.patch
 cherry-pick.FILE5_36-1-gecca6e54.fix-casts-and-bounds-check-found-by-oss-fuzz.patch
 cherry-pick.FILE5_36-1-gecca6e54.fix-casts-and-bounds-check-found-by-oss-fuzz.patch