diff --git a/SOURCES/file-5.34-ebpf-magic.patch b/SOURCES/file-5.34-ebpf-magic.patch
new file mode 100644
index 0000000..abcadf8
--- /dev/null
+++ b/SOURCES/file-5.34-ebpf-magic.patch
@@ -0,0 +1,26 @@
+From b675e1cf6c5f047a1ab52b7dcea3c83ea6aac69f Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Fri, 9 Nov 2018 17:51:12 +0000
+Subject: [PATCH] Add eBPF magic from Matteo Croce
+
+Upstream-commit: 4cf4e817457ce6ca32452a7c80b27e96be6441dc
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ magic/Magdir/elf | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/magic/Magdir/elf b/magic/Magdir/elf
+index 133bd1f..7c6011c 100644
+--- a/magic/Magdir/elf
++++ b/magic/Magdir/elf
+@@ -263,6 +263,7 @@
+ >18 leshort 217 iCelero CoolEngine,
+ >18 leshort 218 Nanoradio Optimized RISC,
+ >18 leshort 243 UCB RISC-V,
++>18 leshort 247 eBPF,
+ >18 leshort 0x1057 AVR (unofficial),
+ >18 leshort 0x1059 MSP430 (unofficial),
+ >18 leshort 0x1223 Adapteva Epiphany (unofficial),
+--
+2.17.2
+
diff --git a/SOURCES/file-5.35-man-apple.patch b/SOURCES/file-5.35-man-apple.patch
new file mode 100644
index 0000000..7de07cd
--- /dev/null
+++ b/SOURCES/file-5.35-man-apple.patch
@@ -0,0 +1,29 @@
+From 5bccda402a33b4b6fee13cbc910580a85f1ab73a Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Mon, 18 Feb 2019 18:59:25 +0000
+Subject: [PATCH] Mention that the apple filetype/creator is only available for
+ entries that have it (Kamil Dudka)
+
+Upstream-commit: 642f269ef99930b44daa2236908da7d05a68eb08
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ doc/file.man | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/doc/file.man b/doc/file.man
+index 0968321..98061ba 100644
+--- a/doc/file.man
++++ b/doc/file.man
+@@ -171,6 +171,9 @@ Causes the file command to output the file type and creator code as
+ 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
+--
+2.20.1
+
diff --git a/SOURCES/file-5.35-netpbm.patch b/SOURCES/file-5.35-netpbm.patch
new file mode 100644
index 0000000..1ae9637
--- /dev/null
+++ b/SOURCES/file-5.35-netpbm.patch
@@ -0,0 +1,67 @@
+From b3842fb61c829b0b62e7b8a058b8a86cd83aa0e7 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Tue, 22 Jan 2019 16:17:25 +0000
+Subject: [PATCH] Make netpbm beat DOS/MBR magic again (Kamil Dudka)
+
+Upstream-commit: d2f82e2601e551badc03c4ac7a463d8e18f53e32
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ magic/Magdir/images | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/magic/Magdir/images b/magic/Magdir/images
+index fd20261..afe906c 100644
+--- a/magic/Magdir/images
++++ b/magic/Magdir/images
+@@ -175,42 +175,42 @@
+ >0 regex/4 P1[\040\t\f\r\n]
+ >>0 use netpbm
+ >>>0 string x \b, bitmap
+-!:strength + 45
++!:strength + 65
+ !:mime image/x-portable-bitmap
+
+ 0 search/1 P2
+ >0 regex/4 P2[\040\t\f\r\n]
+ >>0 use netpbm
+ >>>0 string x \b, greymap
+-!:strength + 45
++!:strength + 65
+ !:mime image/x-portable-greymap
+
+ 0 search/1 P3
+ >0 regex/4 P3[\040\t\f\r\n]
+ >>0 use netpbm
+ >>>0 string x \b, pixmap
+-!:strength + 45
++!:strength + 65
+ !:mime image/x-portable-pixmap
+
+ 0 string P4
+ >0 regex/4 P4[\040\t\f\r\n]
+ >>0 use netpbm
+ >>>0 string x \b, rawbits, bitmap
+-!:strength + 45
++!:strength + 65
+ !:mime image/x-portable-bitmap
+
+ 0 string P5
+ >0 regex/4 P5[\040\t\f\r\n]
+ >>0 use netpbm
+ >>>0 string x \b, rawbits, greymap
+-!:strength + 45
++!:strength + 65
+ !:mime image/x-portable-greymap
+
+ 0 string P6
+ >0 regex/4 P6[\040\t\f\r\n]
+ >>0 use netpbm
+ >>>0 string x \b, rawbits, pixmap
+-!:strength + 45
++!:strength + 65
+ !:mime image/x-portable-pixmap
+
+ 0 string P7 Netpbm PAM image file
+--
+2.20.1
+
diff --git a/SOURCES/file-5.35-ppc-core.patch b/SOURCES/file-5.35-ppc-core.patch
new file mode 100644
index 0000000..1c8a9e7
--- /dev/null
+++ b/SOURCES/file-5.35-ppc-core.patch
@@ -0,0 +1,62 @@
+From 7a4b49897c3bc63bdf680f8cb1d7a04ac932a4ff Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Mon, 21 May 2018 16:32:34 +0000
+Subject: [PATCH 1/2] Add missing commas.
+
+Upstream-commit: defcf7e39943780dd19ca002c478e52ec9ee5cbc
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ magic/Magdir/elf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/magic/Magdir/elf b/magic/Magdir/elf
+index 7c6ac8f..d5b2d02 100644
+--- a/magic/Magdir/elf
++++ b/magic/Magdir/elf
+@@ -50,7 +50,7 @@
+ !:mime application/x-executable
+ >16 leshort 3 shared object,
+ !:mime application/x-sharedlib
+->16 leshort 4 core file
++>16 leshort 4 core file,
+ !:mime application/x-coredump
+ # Core file detection is not reliable.
+ #>>>(0x38+0xcc) string >\0 of '%s'
+--
+2.20.1
+
+
+From 1c7aa7b88ef9f53e19a64961867427b0c1f04857 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Tue, 22 Jan 2019 16:28:42 +0000
+Subject: [PATCH 2/2] Add Linux PowerPC core offsets for Linux (which are off-by-4
+ of the regular offsets), after the regular Linux offsets so that there is no
+ confusion. The linux offsets are tried first since they are before, so on PPC
+ they should contain binary data and not match. Addition requested by: Ondrej
+ Dubaj/Kamil Dudka
+
+Upstream-commit: 6367a7c9b476767a692f76e78e3b355dc9386e48
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ src/readelf.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/readelf.c b/src/readelf.c
+index d96a538..c101483 100644
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -246,7 +246,10 @@ static const size_t prpsoffsets32[] = {
+ 84, /* SunOS 5.x (short name) */
+
+ 44, /* Linux (command line) */
+- 28, /* Linux 2.0.36 (short name) */
++ 28, /* Linux (short name) */
++
++ 48, /* Linux PowerPC (command line) */
++ 32, /* Linux PowerPC (short name) */
+
+ 8, /* FreeBSD */
+ };
+--
+2.20.1
+
diff --git a/SOURCES/file-5.37-jffs-magic.patch b/SOURCES/file-5.37-jffs-magic.patch
new file mode 100644
index 0000000..1c25151
--- /dev/null
+++ b/SOURCES/file-5.37-jffs-magic.patch
@@ -0,0 +1,40 @@
+From 432267e707aca36bec55704fd404fa572e2c4b45 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Fri, 15 Nov 2019 23:49:38 +0000
+Subject: [PATCH] fix JFFS2 (the old magic was just hex encoded 0x1984 which is
+ wrong (Kamil Dudka)
+
+Upstream-commit: 5ad78c726bb03e0fbdb6d237ef2b13e51968ffea
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ magic/Magdir/filesystems | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
+index 1920e56..da5c580 100644
+--- a/magic/Magdir/filesystems
++++ b/magic/Magdir/filesystems
+@@ -2057,10 +2057,6 @@
+ >0x10040 lelong 2 yura hash
+ >0x10040 lelong 3 r5 hash
+
+-# JFFS - russell@coker.com.au
+-0 lelong 0x34383931 Linux Journalled Flash File system, little endian
+-0 belong 0x34383931 Linux Journalled Flash File system, big endian
+-
+ # EST flat binary format (which isn't, but anyway)
+ # From: Mark Brown <broonie@sirena.org.uk>
+ 0 string ESTFBINR EST flat binary
+@@ -2144,7 +2140,9 @@
+
+ # JFFS2 file system
+ 0 leshort 0x1984 Linux old jffs2 filesystem data little endian
++0 beshort 0x1984 Linux old jffs2 filesystem data big endian
+ 0 leshort 0x1985 Linux jffs2 filesystem data little endian
++0 beshort 0x1985 Linux jffs2 filesystem data big endian
+
+ # Squashfs
+ 0 string sqsh Squashfs filesystem, big endian,
+--
+2.20.1
+
diff --git a/SPECS/file.spec b/SPECS/file.spec
index 3ab5124..d8490db 100644
--- a/SPECS/file.spec
+++ b/SPECS/file.spec
@@ -15,7 +15,7 @@
Summary: A utility for determining file types
Name: file
Version: 5.33
-Release: 8%{?dist}
+Release: 13%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -46,6 +46,21 @@ Patch8: file-5.33-ppc-swap.patch
# fix memory leak on an error path (#1602492)
Patch9: file-5.33-covscan.patch
+# add magic for eBPF objects (#1648667)
+Patch10: file-5.34-ebpf-magic.patch
+
+# make netpbm beat DOS/MBR magic again (#1658158)
+Patch11: file-5.35-netpbm.patch
+
+# improve parsing of ppc core files (#1658171)
+Patch12: file-5.35-ppc-core.patch
+
+# improve documentation of --apple in file(1) man page (#1677442)
+Patch13: file-5.35-man-apple.patch
+
+# remove wrong magic for JFFS file system (#1773477)
+Patch14: file-5.37-jffs-magic.patch
+
URL: http://www.darwinsys.com/file/
Requires: file-libs = %{version}-%{release}
BuildRequires: zlib-devel
@@ -216,6 +231,22 @@ cd %{py3dir}
%endif
%changelog
+* Mon Nov 18 2019 Kamil Dudka <kdudka@redhat.com> - 5.33-13
+- remove wrong magic for JFFS file system (#1773477)
+
+* Tue Oct 15 2019 Kamil Dudka <kdudka@redhat.com> - 5.33-12
+- restore missing comma in the output for core files (#1658171)
+
+* Tue Oct 15 2019 Kamil Dudka <kdudka@redhat.com> - 5.33-11
+- improve documentation of --apple in file(1) man page (#1677442)
+- improve parsing of ppc core files (#1658171)
+
+* Mon Oct 14 2019 Kamil Dudka <kdudka@redhat.com> - 5.33-10
+- make netpbm beat DOS/MBR magic again (#1658158)
+
+* Wed Jul 03 2019 Kamil Dudka <kdudka@redhat.com> - 5.33-9
+- add magic for eBPF objects (#1652993)
+
* Mon Nov 05 2018 Kamil Dudka <kdudka@redhat.com> - 5.33-8
- fix memory leak on an error path (#1602492)