Browse Source

Cherry-pick "Always support the --no-sandbox option"

Christoph Biedl 1 year ago
parent
commit
eb59c769eb

+ 31 - 0
debian/patches/cherry-pick.FILE5_37-50-g2a1bb655.always-support-the-no-sandbox-option.patch

@@ -0,0 +1,31 @@
+Subject: Always support the --no-sandbox option
+Origin: FILE5_37-50-g2a1bb655 <https://github.com/file/file/commit/FILE5_37-50-g2a1bb655>
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Sat Jul 13 16:23:58 2019 +0000
+
+--- a/src/file.c
++++ b/src/file.c
+@@ -297,11 +297,11 @@
+ 		case 's':
+ 			flags |= MAGIC_DEVICES;
+ 			break;
+-#ifdef HAVE_LIBSECCOMP
+ 		case 'S':
++#ifdef HAVE_LIBSECCOMP
+ 			sandbox = 0;
+-			break;
+ #endif
++			break;
+ 		case 'v':
+ 			if (magicfile == NULL)
+ 				magicfile = magic_getpath(magicfile, action);
+@@ -309,6 +309,9 @@
+ 			    VERSION);
+ 			(void)fprintf(stdout, "magic file from %s\n",
+ 			    magicfile);
++#ifdef HAVE_LIBSECCOMP
++			(void)fprintf(stdout, "seccomp support included\n");
++#endif
+ 			return 0;
+ 		case 'z':
+ 			flags |= MAGIC_COMPRESS;

+ 1 - 0
debian/patches/series

@@ -1,6 +1,7 @@
 # cherry-picked commits. Keep in upstream's chronological order
 cherry-pick.FILE5_37-46-g103c6ec2.dont-print-the-string-entry-unless-the-zip-entry-matched-christoph-biedl.patch
 cherry-pick.FILE5_37-47-g62de35af.disable-gem-gdos-fonts-for-now-needs-to-be-stronger.patch
+cherry-pick.FILE5_37-50-g2a1bb655.always-support-the-no-sandbox-option.patch
 cherry-pick.FILE5_37-54-g119cc185.add-lzma-decompression-support.patch
 cherry-pick.FILE5_37-55-gb259a07e.add-lzma-and-bzip-built-in-decompression-support.patch