import file-5.33-8.el8

.file.metadata

@@ -0,0 +1 @@
+31a67e4dc0a3d7a8d1b850429c3f625314700240 SOURCES/file-5.33.tar.gz

.gitignore

@@ -0,0 +1 @@
+SOURCES/file-5.33.tar.gz

SOURCES/file-4.17-rpm-name.patch

@@ -0,0 +1,12 @@
+diff --git a/magic/Magdir/rpm b/magic/Magdir/rpm
+index 9a795f8..31db083 100644
+--- a/magic/Magdir/rpm
++++ b/magic/Magdir/rpm
+@@ -29,6 +29,7 @@
+ >>8	beshort		17		SuperH
+ >>8	beshort		18		Xtensa
+ >>8	beshort		255		noarch
++>>10	string		x		%s
+ 
+ #delta RPM    Daniel Novotny (dnovotny@redhat.com)
+ 0	string		drpm		Delta RPM

SOURCES/file-5.04-volume_key.patch

@@ -0,0 +1,10 @@
+diff --git a/magic/Magdir/securitycerts b/magic/Magdir/securitycerts
+index 8785dd8..1c340be 100644
+--- a/magic/Magdir/securitycerts
++++ b/magic/Magdir/securitycerts
+@@ -4,3 +4,5 @@
+ 0	search/1		-----BEGIN\ CERTIFICATE------	RFC1421 Security Certificate text
+ 0	search/1		-----BEGIN\ NEW\ CERTIFICATE	RFC1421 Security Certificate Signing Request text
+ 0	belong	0xedfeedfe	Sun 'jks' Java Keystore File data
++
++0	string \0volume_key	volume_key escrow packet

SOURCES/file-5.33-CVE-2018-10360.patch

@@ -0,0 +1,28 @@
+From 8616080aecf07436e80a27f68c336382c1d1c22d Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Sat, 9 Jun 2018 16:00:06 +0000
+Subject: [PATCH] Avoid reading past the end of buffer (Rui Reis)
+
+Upstream-commit: a642587a9c9e2dd7feacdf513c3643ce26ad3c22
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ src/readelf.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/readelf.c b/src/readelf.c
+index 3df0836..d96a538 100644
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -825,7 +825,8 @@ do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
+ 
+ 				cname = (unsigned char *)
+ 				    &nbuf[doff + prpsoffsets(i)];
+-				for (cp = cname; *cp && isprint(*cp); cp++)
++				for (cp = cname; cp < nbuf + size && *cp
++				    && isprint(*cp); cp++)
+ 					continue;
+ 				/*
+ 				 * Linux apparently appends a space at the end
+-- 
+2.14.4
+

SOURCES/file-5.33-clamav.patch

@@ -0,0 +1,37 @@
+From fb1604080767501fde17eb601382e84f1c1ddca3 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Mon, 16 Jul 2018 12:30:41 +0000
+Subject: [PATCH] remember to put a space between the version and the number,
+ plus more version parsing (Kamil Dudka)
+
+Upstream-commit: 1a7f58c9f253e3b902bfb7a77afd8375b0b428b7
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ magic/Magdir/fsav | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/magic/Magdir/fsav b/magic/Magdir/fsav
+index 5714798..5d72ab9 100644
+--- a/magic/Magdir/fsav
++++ b/magic/Magdir/fsav
+@@ -48,13 +48,15 @@
+ >11	string		>\0		Clam AntiVirus database %-.23s
+ >>34	string		:
+ >>>35		string		!:	\b, version
+->>>>35		string		x 	\b%-.1s
+->>>>>36		string 		!:
++>>>>35		string		x 	\b %-.1s
++>>>>>36		string		!:
+ >>>>>>36	string		x 	\b%-.1s
+ >>>>>>>37	string		!:
+ >>>>>>>>37	string		x 	\b%-.1s
+ >>>>>>>>>38	string		!:
+ >>>>>>>>>>38	string		x 	\b%-.1s
++>>>>>>>>>>>39	string		!:
++>>>>>>>>>>>>39	string		x 	\b%-.1s
+ >512	string		\037\213	\b, gzipped
+ >769	string		ustar\0		\b, tarred
+ 
+-- 
+2.14.4
+

SOURCES/file-5.33-covscan.patch

@@ -0,0 +1,31 @@
+From 7bd1d499157caa391082f594d197f49f5327bd56 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Wed, 1 Aug 2018 09:59:45 +0000
+Subject: [PATCH] fix leak on error, found by coverity.
+
+Upstream-commit: e0805be4909e47dac47bab9d0caf3725da43e645
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ src/compress.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/compress.c b/src/compress.c
+index 184011b..cb11303 100644
+--- a/src/compress.c
++++ b/src/compress.c
+@@ -249,8 +249,11 @@ file_zmagic(struct magic_set *ms, const struct buffer *b, const char *name)
+ 			 * XXX: If file_buffer fails here, we overwrite
+ 			 * the compressed text. FIXME.
+ 			 */
+-			if (file_buffer(ms, -1, NULL, buf, nbytes) == -1)
++			if (file_buffer(ms, -1, NULL, buf, nbytes) == -1) {
++				if (file_pop_buffer(ms, pb) != NULL)
++					abort();
+ 				goto error;
++			}
+ 			if ((rbuf = file_pop_buffer(ms, pb)) != NULL) {
+ 				if (file_printf(ms, "%s", rbuf) == -1) {
+ 					free(rbuf);
+-- 
+2.17.2
+

SOURCES/file-5.33-gif.patch

@@ -0,0 +1,30 @@
+From f0e846528e1c839ab44895a1f13d167a4ad8def3 Mon Sep 17 00:00:00 2001
+From: Marek Cermak <macermak@redhat.com>
+Date: Wed, 20 Dec 2017 16:18:46 +0100
+Subject: [PATCH] Resolves: #1515180 - image/gif classifed as
+ application/octet-stream
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1515180
+
+Signed-off-by: Marek Cermak <macermak@redhat.com>
+---
+ magic/Magdir/images | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/magic/Magdir/images b/magic/Magdir/images
+index 69e8e90f..76f7e7da 100644
+--- a/magic/Magdir/images
++++ b/magic/Magdir/images
+@@ -468,7 +468,9 @@
+ !:mime	image/x-unknown
+ 
+ # GIF
++# Strength set up to beat 0x55AA DOS/MBR signature word lookups (+65)
+ 0	string		GIF8		GIF image data
++!:strength +80
+ !:mime	image/gif
+ !:apple	8BIMGIFf
+ >4	string		7a		\b, version 8%s,
+-- 
+2.13.6
+

SOURCES/file-5.33-pie-executable-revert.patch

@@ -0,0 +1,34 @@
+From 719116b196fd873f5a463dfdb0fd6258cee51591 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Tue, 22 May 2018 18:18:06 +0200
+Subject: [PATCH] Revert "add a conditional in description"
+
+Upstream-commit: 6876ebadcdf27224b3ffa9dfa4343127aa97c9b2
+
+... and partially revert upstream commit
+7dbecfe406a6bb2de1fe7ec2fe413dcd8871ac74
+
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ magic/Magdir/elf | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/magic/Magdir/elf b/magic/Magdir/elf
+index 7fd5de1..dba5a73 100644
+--- a/magic/Magdir/elf
++++ b/magic/Magdir/elf
+@@ -48,9 +48,8 @@
+ !:mime	application/x-object
+ >16	leshort		2		executable,
+ !:mime	application/x-executable
+->16	leshort		3		${x?pie executable:shared object}
+-
+-!:mime	application/x-${x?pie-executable:sharedlib}
++>16	leshort		3		shared object,
++!:mime	application/x-sharedlib
+ >16	leshort		4		core file
+ !:mime	application/x-coredump
+ # Core file detection is not reliable.
+-- 
+2.14.3
+

SOURCES/file-5.33-ppc-swap.patch

@@ -0,0 +1,35 @@
+From ed6062995ae60d6772f2dabc39e03cbf28ee7343 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Mon, 16 Jul 2018 12:32:08 +0000
+Subject: [PATCH] more info for ppc swapspace (Kamil Dudka)
+
+Upstream-commit: 65f9c7053548df8945df600c07123c9151531ee6
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ magic/Magdir/linux | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/magic/Magdir/linux b/magic/Magdir/linux
+index 0630a8a..11e9237 100644
+--- a/magic/Magdir/linux
++++ b/magic/Magdir/linux
+@@ -94,6 +94,16 @@
+ # From Daniel Novotny <dnovotny@redhat.com>
+ # swap file for PowerPC
+ 65526	string		SWAPSPACE2	Linux/ppc swap file
++>0x400	long		x		version %d,
++>0x404	long		x		size %d pages,
++>1052	string		\0		no label,
++>1052	string		>\0		LABEL=%s,
++>0x40c	belong		x		UUID=%08x
++>0x410	beshort		x		\b-%04x
++>0x412	beshort		x		\b-%04x
++>0x414	beshort		x		\b-%04x
++>0x416	belong		x		\b-%08x
++>0x41a	beshort		x		\b%04x
+ 16374	string		SWAPSPACE2	Linux/ia64 swap file
+ #
+ # Linux kernel boot images, from Albert Cahalan <acahalan@cs.uml.edu>
+-- 
+2.14.4
+

SOURCES/file-5.33-seccomp.patch

@@ -0,0 +1,53 @@
+From 4ae8a24b5ccbee904875a10b7b2301369080a88d Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Sun, 6 May 2018 16:36:41 +0000
+Subject: [PATCH] add more syscalls; newfstatat is used for stat'ing the magic
+ file, getdents64 is used for getting the magic entries during compilation.
+
+Upstream-commit: aeddbff330fad0edff2ab4b02dbf0863cd593c3c
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ src/seccomp.c | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index 7c8a3144..481a5624 100644
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -59,12 +59,7 @@ enable_sandbox_basic(void)
+ 	if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) == -1)
+ 		return -1;
+ 
+-#if 0
+-	// prevent escape via ptrace
+-	prctl(PR_SET_DUMPABLE, 0);
+-#endif
+-
+-	if (prctl (PR_SET_DUMPABLE, 0, 0, 0, 0) == -1)
++	if (prctl(PR_SET_DUMPABLE, 0, 0, 0, 0) == -1)
+ 		return -1;
+ 
+ 	// initialize the filter
+@@ -171,6 +166,9 @@ enable_sandbox_full(void)
+ 	ALLOW_RULE(fcntl);  
+ 	ALLOW_RULE(fstat);
+ 	ALLOW_RULE(getdents);
++#ifdef __NR_getdents64
++	ALLOW_RULE(getdents64);
++#endif
+ 	ALLOW_RULE(ioctl);
+ 	ALLOW_RULE(lseek);
+ 	ALLOW_RULE(lstat);
+@@ -178,6 +176,9 @@ enable_sandbox_full(void)
+ 	ALLOW_RULE(mprotect);
+ 	ALLOW_RULE(mremap);
+ 	ALLOW_RULE(munmap);
++#ifdef __NR_newfstatat
++	ALLOW_RULE(newfstatat);
++#endif
+ 	ALLOW_RULE(open);
+ 	ALLOW_RULE(openat);
+ 	ALLOW_RULE(pread64);
+-- 
+2.17.0
+

SOURCES/file-localmagic.patch

@@ -0,0 +1,64 @@
+From f25107f625e88726e8ae9d4963573b5a0dda8f4c Mon Sep 17 00:00:00 2001
+From: Jan Kaluza <hanzz.k@gmail.com>
+Date: Thu, 15 Dec 2011 16:15:41 +0100
+Subject: [PATCH] file-localmagic.patch
+
+Upstream says it's up to distributions to add a way to support local-magic.
+
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ magic/magic.local | 3 +++
+ src/Makefile.am   | 2 +-
+ src/Makefile.in   | 2 +-
+ src/apprentice.c  | 2 +-
+ 4 files changed, 6 insertions(+), 3 deletions(-)
+ create mode 100644 magic/magic.local
+
+diff --git a/magic/magic.local b/magic/magic.local
+new file mode 100644
+index 0000000..283a863
+--- /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).
++
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 155aec4..0f22539 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,4 @@
+-MAGIC = $(pkgdatadir)/magic
++MAGIC = /etc/magic:$(pkgdatadir)/magic
+ lib_LTLIBRARIES = libmagic.la
+ nodist_include_HEADERS = magic.h
+ 
+diff --git a/src/Makefile.in b/src/Makefile.in
+index b6eeb20..78dce55 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -337,7 +337,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-MAGIC = $(pkgdatadir)/magic
++MAGIC = /etc/magic:$(pkgdatadir)/magic
+ lib_LTLIBRARIES = libmagic.la
+ nodist_include_HEADERS = magic.h
+ AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
+diff --git a/src/apprentice.c b/src/apprentice.c
+index e395854..ecc1214 100644
+--- a/src/apprentice.c
++++ b/src/apprentice.c
+@@ -454,7 +454,7 @@ apprentice_1(struct magic_set *ms, const char *fn, int action)
+ 	if (map == (struct magic_map *)-1)
+ 		return -1;
+ 	if (map == NULL) {
+-		if (ms->flags & MAGIC_CHECK)
++		if (ms->flags & MAGIC_CHECK && strcmp("/etc/magic", fn) != 0)
+ 			file_magwarn(ms, "using regular magic file `%s'", fn);
+ 		map = apprentice_load(ms, fn, action);
+ 		if (map == NULL)
+-- 
+2.5.5
+