Browse Source

Refresh patch queue

Christoph Biedl 7 months ago
parent
commit
e37fde341d

+ 0 - 18
debian/patches/cherry-pick.FILE5_38-1-gd955cefc.-td-is-for-ptrdiff-t-not-for-off-t.patch

@@ -1,18 +0,0 @@
-Subject: %td is for ptrdiff_t not for off_t
-Origin: FILE5_38-1-gd955cefc <https://github.com/file/file/commit/FILE5_38-1-gd955cefc>
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Tue Dec 17 15:27:27 2019 +0000
-
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -1349,8 +1349,8 @@
- 	name_off = xsh_offset;
- 
- 	if (fsize != SIZE_UNKNOWN && fsize < name_off) {
--		if (file_printf(ms, ", too large section header offset %td",
--		    name_off) == -1)
-+		if (file_printf(ms, ", too large section header offset %jd",
-+		    (intmax_t)name_off) == -1)
- 			return -1;
- 		return 0;
- 	}

+ 0 - 28
debian/patches/cherry-pick.FILE5_38-98-g028a1561.pr-93-undo-previous-there-are-dynamic-objects-shared-libraries-for-example.patch

@@ -1,28 +0,0 @@
-Subject: PR/93: Undo previous: There are dynamic objects (shared libraries for example) (...)
-Origin: FILE5_38-98-g028a1561 <https://github.com/file/file/commit/FILE5_38-98-g028a1561>
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Sun Apr 26 17:43:13 2020 +0000
-Bug-Debian: https://bugs.debian.org/948269
-
-    PR/93: Undo previous: There are dynamic objects (shared libraries for example)
-    that don't have interpeters and should not be counted as static. We
-    need to figure out what to do with static-pie and gcc-9 separately.
-
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -1639,6 +1639,7 @@
- 		switch (xph_type) {
- 		case PT_DYNAMIC:
- 			doread = 1;
-+			linking_style = "dynamically";
- 			break;
- 		case PT_NOTE:
- 			if (sh_num)	/* Did this through section headers */
-@@ -1653,7 +1654,6 @@
- 			}
- 			/*FALLTHROUGH*/
- 		case PT_INTERP:
--			linking_style = "dynamically";
- 			doread = 1;
- 			break;
- 		default:

+ 0 - 15
debian/patches/cherry-pick.FILE5_38-99-g2f3e66e1.fix-escaping-of-periods.patch

@@ -1,15 +0,0 @@
-Subject: Fix escaping of periods
-Origin: FILE5_38-99-g2f3e66e1 <https://github.com/file/file/commit/FILE5_38-99-g2f3e66e1>
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Mon Apr 27 01:50:36 2020 +0000
-Bug-Debian: https://bugs.debian.org/949878
-
---- a/magic/Magdir/rst
-+++ b/magic/Magdir/rst
-@@ -7,5 +7,5 @@
- >&0	regex/256	\^[\=]+$
- >>&0	search/512	:Author:	ReStructuredText file
- >>&0	default		x
-->>>&0	regex/512	\^\.\.[A-Za-z]	ReStructuredText file
-+>>>&0	regex/512	\^\\.\\.[A-Za-z]	ReStructuredText file
- !:ext	rst

+ 0 - 17
debian/patches/increase.number.use.magic.limit.patch

@@ -1,17 +0,0 @@
-Subject: Change default for name/use to 50
-Origin: Part of FILE5_38-65-gdf476c81 <https://github.com/file/file/commit/FILE5_38-65-gdf476c81>
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Thu Mar 19 20:41:11 2020 +0000
-Bug-Debian: https://bugs.debian.org/928009
-
---- a/src/file.h
-+++ b/src/file.h
-@@ -437,7 +437,7 @@
- 	uint16_t regex_max;
- 	size_t bytes_max;		/* number of bytes to read from file */
- #define	FILE_INDIR_MAX			50
--#define	FILE_NAME_MAX			30
-+#define	FILE_NAME_MAX			50
- #define	FILE_ELF_SHNUM_MAX		32768
- #define	FILE_ELF_PHNUM_MAX		2048
- #define	FILE_ELF_NOTES_MAX		256

+ 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
 +++ b/doc/file.man
-@@ -371,6 +371,10 @@
+@@ -380,6 +380,10 @@
  .Fl z
  flag is specified and the built-in decompressors are not available.
  On systems where sandboxing is not available, this option has no effect.

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

@@ -5,14 +5,15 @@ Last-Update: 2016-06-27
 
 --- a/src/file_opts.h
 +++ b/src/file_opts.h
-@@ -39,8 +39,8 @@
- OPT('k', "keep-going", 0, 0, "           don't stop at the first match\n")
- OPT('l', "list", 0, 0, "                 list magic strength\n")
+@@ -59,9 +59,9 @@
+     "                 list magic strength\n")
  #ifdef S_IFLNK
--OPT('L', "dereference", 0, 1, "          follow symlinks")
--OPT('h', "no-dereference", 0, 2, "       don't follow symlinks")
-+OPT('L', "dereference", 0, 1, "          follow symlinks (default if POSIXLY_CORRECT is set)")
-+OPT('h', "no-dereference", 0, 2, "       don't follow symlinks (default if POSIXLY_CORRECT is not set)")
+ 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")
- OPT('N', "no-pad", 0, 0, "               do not pad output\n")
+ OPT('n', "no-buffer", 0, 0,
+     "            do not buffer output\n")

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

@@ -25,9 +25,9 @@ Last-Update: 2016-06-27
 +
 --- a/src/apprentice.c
 +++ b/src/apprentice.c
-@@ -454,7 +454,7 @@
- 	if (map == RCAST(struct magic_map *, -1))
- 		return -1;
+@@ -460,7 +460,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)
@@ -58,7 +58,7 @@ 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
-@@ -57,7 +57,7 @@
+@@ -58,7 +58,7 @@
  or non-printable).
  Exceptions are well-known file formats (core files, tar archives)
  that are known to contain binary data.
@@ -67,7 +67,7 @@ Last-Update: 2016-06-27
  .Em "preserve these keywords" .
  Users depend on knowing that all the readable files in a directory
  have the word
-@@ -101,7 +101,8 @@
+@@ -102,7 +102,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.
@@ -77,7 +77,7 @@ Last-Update: 2016-06-27
  magic file
  .Pa __MAGIC__.mgc ,
  or the files in the directory
-@@ -556,12 +557,6 @@
+@@ -565,12 +566,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.

+ 0 - 4
debian/patches/series

@@ -1,10 +1,6 @@
 # reverted upstream commits
 
 # cherry-picked commits. Keep in upstream's chronological order
-cherry-pick.FILE5_38-1-gd955cefc.-td-is-for-ptrdiff-t-not-for-off-t.patch
-increase.number.use.magic.limit.patch
-cherry-pick.FILE5_38-98-g028a1561.pr-93-undo-previous-there-are-dynamic-objects-shared-libraries-for-example.patch
-cherry-pick.FILE5_38-99-g2f3e66e1.fix-escaping-of-periods.patch
 
 # patches that should go upstream
 upstream.disable.att3b.patch