diff --git a/file-4.24-autoconf.dif b/file-4.24-autoconf.dif
index 28161b6..98fdbbb 100644
--- a/file-4.24-autoconf.dif
+++ b/file-4.24-autoconf.dif
@@ -4,7 +4,7 @@
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 --- doc/Makefile.am
-+++ doc/Makefile.am	2017-05-24 10:58:47.226494450 +0000
++++ doc/Makefile.am	2018-07-26 10:42:25.474794639 +0000
 @@ -5,7 +5,8 @@ else
  man_MAGIC = magic.4
  endif
@@ -26,7 +26,7 @@
  	sed -e s@__CSECTION__@1@g \
  	    -e s@__FSECTION__@${fsect}@g \
 --- src/readelf.h
-+++ src/readelf.h	2017-05-24 10:58:47.226494450 +0000
++++ src/readelf.h	2018-07-26 10:44:03.744990438 +0000
 @@ -34,7 +34,10 @@
  #ifndef __fake_elf_h__
  #define	__fake_elf_h__
@@ -38,9 +38,9 @@
  #include <stdint.h>
  #endif
  
-@@ -430,4 +433,5 @@ typedef struct {
- #define	AV_386_SSE4_1		0x00800000
- #define	AV_386_SSE4_2		0x01000000
+@@ -542,4 +545,5 @@ typedef struct {
+ #define	DF_1_STUB	0x04000000	/* Stub */
+ #define	DF_1_PIE	0x08000000	/* Position Independent Executable */
  
 +__END_DECLS
  #endif
diff --git a/file-5.12-zip.dif b/file-5.12-zip.dif
index 3a5ca0c..259ac5b 100644
--- a/file-5.12-zip.dif
+++ b/file-5.12-zip.dif
@@ -4,7 +4,7 @@
 
 --- magic/Magdir/archive
 +++ magic/Magdir/archive	2018-06-12 14:15:56.676369965 +0000
-@@ -1020,6 +1020,25 @@
+@@ -1021,6 +1021,25 @@
  !:mime application/zip
  !:ext zip/cbz
  0	string		PK\003\004
diff --git a/file-5.15-clear-invalid.patch b/file-5.15-clear-invalid.patch
index 9879743..d48cfb6 100644
--- a/file-5.15-clear-invalid.patch
+++ b/file-5.15-clear-invalid.patch
@@ -13,7 +13,7 @@ fixed build warning:
 
 --- file-5.28/magic/Magdir/elf
 +++ file-5.28/magic/Magdir/elf	2016-08-16 11:50:06.748513191 +0000
-@@ -56,7 +56,6 @@
+@@ -61,7 +61,6 @@
  #>>>(0x38+0xcc) string	>\0		of '%s'
  #>>>(0x38+0x10) lelong	>0		(signal %d),
  >16	leshort		&0xff00		processor-specific,
diff --git a/file-5.16-ocloexec.patch b/file-5.16-ocloexec.patch
index 7a9fc99..be88b4d 100644
--- a/file-5.16-ocloexec.patch
+++ b/file-5.16-ocloexec.patch
@@ -16,7 +16,7 @@
  	if (f == NULL) {
  		if (errno != ENOENT)
  			file_error(ms, errno, "cannot read magic file `%s'",
-@@ -3045,7 +3045,7 @@ apprentice_map(struct magic_set *ms, con
+@@ -3051,7 +3051,7 @@ apprentice_map(struct magic_set *ms, con
  	if (dbname == NULL)
  		goto error;
  
@@ -25,7 +25,7 @@
  		goto error;
  
  	if (fstat(fd, &st) == -1) {
-@@ -3182,7 +3182,7 @@ apprentice_compile(struct magic_set *ms,
+@@ -3188,7 +3188,7 @@ apprentice_compile(struct magic_set *ms,
  	if (dbname == NULL) 
  		goto out;
  
@@ -36,7 +36,7 @@
  		goto out;
 --- src/compress.c
 +++ src/compress.c	2018-06-12 14:21:21.286557983 +0000
-@@ -396,7 +396,7 @@ file_pipe2file(struct magic_set *ms, int
+@@ -411,7 +411,7 @@ file_pipe2file(struct magic_set *ms, int
  #else
  	{
  		int te;
diff --git a/file-5.19-biorad.dif b/file-5.19-biorad.dif
index ff586b6..fd5a1dc 100644
--- a/file-5.19-biorad.dif
+++ b/file-5.19-biorad.dif
@@ -4,7 +4,7 @@
 
 --- magic/Magdir/images
 +++ magic/Magdir/images	2018-06-12 14:20:39.967297749 +0000
-@@ -1017,6 +1017,8 @@
+@@ -1023,6 +1023,8 @@
  # http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt
  # Samples: http://www.loci.wisc.edu/software/sample-data
  14	leshort <2
diff --git a/file-5.19-printf.dif b/file-5.19-printf.dif
index fd656f6..667baec 100644
--- a/file-5.19-printf.dif
+++ b/file-5.19-printf.dif
@@ -4,7 +4,7 @@
 
 --- src/apprentice.c
 +++ src/apprentice.c	2018-06-12 14:15:19.109042630 +0000
-@@ -2411,6 +2411,12 @@ check_format_type(const char *ptr, int t
+@@ -2417,6 +2417,12 @@ check_format_type(const char *ptr, int t
  			ptr++;
  		if (*ptr == '#')
  			ptr++;
diff --git a/file-5.19-zip2.0.dif b/file-5.19-zip2.0.dif
index 0e3674e..c7683ff 100644
--- a/file-5.19-zip2.0.dif
+++ b/file-5.19-zip2.0.dif
@@ -4,7 +4,7 @@
 
 --- magic/Magdir/archive
 +++ magic/Magdir/archive	2018-06-12 14:17:31.598670365 +0000
-@@ -1014,6 +1014,11 @@
+@@ -1015,6 +1015,11 @@
  0	string		PK\x07\x08PK\x03\x04	Zip multi-volume archive data, at least PKZIP v2.50 to extract
  !:mime	application/zip
  !:ext zip/cbz
diff --git a/file-5.22-elf.dif b/file-5.22-elf.dif
index 4764317..62bf3bd 100644
--- a/file-5.22-elf.dif
+++ b/file-5.22-elf.dif
@@ -4,7 +4,7 @@
 
 --- src/readelf.c
 +++ src/readelf.c	2018-06-12 14:14:14.054207494 +0000
-@@ -743,7 +743,7 @@ do_core_note(struct magic_set *ms, unsig
+@@ -767,7 +767,7 @@ do_core_note(struct magic_set *ms, unsig
  
  	default:
  		if (type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) {
@@ -13,7 +13,7 @@
  			unsigned char c;
  			/*
  			 * Extract the program name.  We assume
-@@ -755,7 +755,9 @@ do_core_note(struct magic_set *ms, unsig
+@@ -779,7 +779,9 @@ do_core_note(struct magic_set *ms, unsig
  			 * If the characters aren't all printable,
  			 * reject it.
  			 */
diff --git a/file-5.23-endian.patch b/file-5.23-endian.patch
index 04b4207..312d094 100644
--- a/file-5.23-endian.patch
+++ b/file-5.23-endian.patch
@@ -28,7 +28,7 @@
  private char *mkdbname(struct magic_set *, const char *, int);
  private struct magic_map *apprentice_buf(struct magic_set *, struct magic *,
      size_t);
-@@ -3260,67 +3263,6 @@ byteswap(struct magic *magic, uint32_t n
+@@ -3280,67 +3280,6 @@ byteswap(struct magic *magic, uint32_t n
  }
  
  /*
@@ -106,7 +106,7 @@
  
  #ifndef EFTYPE
  #define EFTYPE EINVAL
-@@ -109,55 +110,9 @@ cdf_calloc(const char *file __attribute_
+@@ -112,55 +112,9 @@ cdf_calloc(const char *file __attribute_
  	return calloc(n, u);
  }
  
diff --git a/file-5.28-btrfs-image.dif b/file-5.28-btrfs-image.dif
index 73b0df9..31341c4 100644
--- a/file-5.28-btrfs-image.dif
+++ b/file-5.28-btrfs-image.dif
@@ -16,7 +16,7 @@ contained within the image.
 diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
 --- a/magic/Magdir/filesystems
 +++ b/magic/Magdir/filesystems
-@@ -2245,20 +2245,29 @@
+@@ -2267,20 +2267,29 @@
  >>0x10060        string          >\0             lockproto %s)
  
  # Russell Coker <russell@coker.com.au>
diff --git a/file-5.33.tar.gz b/file-5.33.tar.gz
deleted file mode 100644
index 9d417c2..0000000
--- a/file-5.33.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c52c8c3d271cd898d5511c36a68059cda94036111ab293f01f83c3525b737c6
-size 817060
diff --git a/file-5.33.tar.gz.asc b/file-5.33.tar.gz.asc
deleted file mode 100644
index 87e1d09..0000000
--- a/file-5.33.tar.gz.asc
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iEYEABECAAYFAlrToaMACgkQcREqsWyzOzrTHwCdG6Qlc1qsB9YcfZXYwRfXQivE
-9SkAn0/ecDZhfJzgHtQM59gCgNXG4S9h
-=nWes
------END PGP SIGNATURE-----
diff --git a/file-5.33.dif b/file-5.34.dif
similarity index 91%
rename from file-5.33.dif
rename to file-5.34.dif
index 76c4b70..d4fe122 100644
--- a/file-5.33.dif
+++ b/file-5.34.dif
@@ -10,8 +10,8 @@
  8 files changed, 312 insertions(+), 67 deletions(-)
 
 --- magic/Magdir/elf
-+++ magic/Magdir/elf	2018-06-12 14:34:49.439837299 +0000
-@@ -129,7 +129,7 @@
++++ magic/Magdir/elf	2018-10-15 10:57:39.702000661 +0000
+@@ -133,7 +133,7 @@
  >18	leshort		47		Renesas H8/300H,
  >18	leshort		48		Renesas H8S,
  >18	leshort		49		Renesas H8/500,
@@ -21,8 +21,8 @@
  >18	leshort		52		Motorola Coldfire,
  >18	leshort		53		Motorola M68HC12,
 --- magic/Magdir/linux
-+++ magic/Magdir/linux	2018-06-12 14:34:49.439837299 +0000
-@@ -101,23 +101,27 @@
++++ magic/Magdir/linux	2018-10-15 10:57:39.702000661 +0000
+@@ -111,23 +111,27 @@
  # and Nicolas Lichtmaier <nick@debian.org>
  # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29
  # Linux kernel boot images (i386 arch) (Wolfram Kleff)
@@ -67,7 +67,7 @@
  0		belong	0xb8c0078e	Linux kernel
  >0x1e3		string	Loading		version 1.3.79 or older
 --- magic/Magdir/msad
-+++ magic/Magdir/msad	2018-06-12 14:34:49.439837299 +0000
++++ magic/Magdir/msad	2018-10-15 10:57:39.706000588 +0000
 @@ -0,0 +1,5 @@
 +#------------------------------------------------------------------------------
 +# msad:  file(1) magic for msad
@@ -75,7 +75,7 @@
 +# This must precede the heuristic for raw G3 data
 +4	string	Standard\ Jet\ DB	Microsoft Access Database
 --- magic/Magdir/msdos
-+++ magic/Magdir/msdos	2018-06-12 14:34:49.439837299 +0000
++++ magic/Magdir/msdos	2018-10-15 10:57:39.706000588 +0000
 @@ -104,9 +104,9 @@
  >>>(0x3c.l+22)	leshort&0x0200	>0	(stripped to external PDB)
  >>>(0x3c.l+22)	leshort&0x1000	>0	system file
@@ -98,7 +98,7 @@
  
  # updated by Joerg Jenderek at Oct 2008,2015
 --- magic/Makefile.am
-+++ magic/Makefile.am	2018-06-12 15:09:37.077835298 +0000
++++ magic/Makefile.am	2018-10-15 10:57:39.706000588 +0000
 @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
  MAGIC_DIR = $(top_srcdir)/magic
  MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@@ -116,7 +116,7 @@
  $(MAGIC_FRAGMENT_DIR)/application \
  $(MAGIC_FRAGMENT_DIR)/applix \
  $(MAGIC_FRAGMENT_DIR)/apt \
-@@ -89,7 +88,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
+@@ -90,7 +89,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
  $(MAGIC_FRAGMENT_DIR)/erlang \
  $(MAGIC_FRAGMENT_DIR)/esri \
  $(MAGIC_FRAGMENT_DIR)/fcs \
@@ -124,7 +124,7 @@
  $(MAGIC_FRAGMENT_DIR)/finger \
  $(MAGIC_FRAGMENT_DIR)/flash \
  $(MAGIC_FRAGMENT_DIR)/flif \
-@@ -131,6 +129,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
+@@ -132,6 +130,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
  $(MAGIC_FRAGMENT_DIR)/java \
  $(MAGIC_FRAGMENT_DIR)/javascript \
  $(MAGIC_FRAGMENT_DIR)/jpeg \
@@ -133,7 +133,7 @@
  $(MAGIC_FRAGMENT_DIR)/karma \
  $(MAGIC_FRAGMENT_DIR)/kde \
  $(MAGIC_FRAGMENT_DIR)/keepass \
-@@ -139,7 +139,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
+@@ -140,7 +140,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
  $(MAGIC_FRAGMENT_DIR)/lecter \
  $(MAGIC_FRAGMENT_DIR)/lex \
  $(MAGIC_FRAGMENT_DIR)/lif \
@@ -141,7 +141,7 @@
  $(MAGIC_FRAGMENT_DIR)/lisp \
  $(MAGIC_FRAGMENT_DIR)/llvm \
  $(MAGIC_FRAGMENT_DIR)/lua \
-@@ -147,7 +146,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
+@@ -148,7 +147,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
  $(MAGIC_FRAGMENT_DIR)/m4 \
  $(MAGIC_FRAGMENT_DIR)/mach \
  $(MAGIC_FRAGMENT_DIR)/macos \
@@ -149,7 +149,7 @@
  $(MAGIC_FRAGMENT_DIR)/magic \
  $(MAGIC_FRAGMENT_DIR)/mail.news \
  $(MAGIC_FRAGMENT_DIR)/make \
-@@ -170,10 +168,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
+@@ -171,10 +169,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
  $(MAGIC_FRAGMENT_DIR)/mkid \
  $(MAGIC_FRAGMENT_DIR)/mlssa \
  $(MAGIC_FRAGMENT_DIR)/mmdf \
@@ -161,7 +161,7 @@
  $(MAGIC_FRAGMENT_DIR)/msooxml \
  $(MAGIC_FRAGMENT_DIR)/msx \
  $(MAGIC_FRAGMENT_DIR)/msvc \
-@@ -225,6 +223,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
+@@ -226,6 +224,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
  $(MAGIC_FRAGMENT_DIR)/qt \
  $(MAGIC_FRAGMENT_DIR)/revision \
  $(MAGIC_FRAGMENT_DIR)/riff \
@@ -170,7 +170,7 @@
  $(MAGIC_FRAGMENT_DIR)/rpi \
  $(MAGIC_FRAGMENT_DIR)/rpm \
  $(MAGIC_FRAGMENT_DIR)/rtf \
-@@ -301,8 +301,20 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
+@@ -302,8 +302,20 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
  $(MAGIC_FRAGMENT_DIR)/zip \
  $(MAGIC_FRAGMENT_DIR)/zyxel 
  
@@ -192,7 +192,7 @@
  
  # FIXME: Build file natively as well so that it can be used to compile
  # the target's magic file; for now we bail if the local version does not match
-@@ -314,19 +326,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
+@@ -315,19 +327,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
  FILE_COMPILE_DEP = $(FILE_COMPILE)
  endif
  
@@ -232,8 +232,8 @@
 +#	$(FILE_COMPILE) -C -m magic
 +#	@rm -fr magic
 --- magic/Makefile.in
-+++ magic/Makefile.in	2018-06-12 15:13:56.753087818 +0000
-@@ -237,7 +237,7 @@ top_srcdir = @top_srcdir@
++++ magic/Makefile.in	2018-10-15 10:59:39.151808275 +0000
+@@ -278,7 +278,7 @@ top_srcdir = @top_srcdir@
  MAGIC_FRAGMENT_BASE = Magdir
  MAGIC_DIR = $(top_srcdir)/magic
  MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@@ -242,7 +242,7 @@
  EXTRA_DIST = \
  $(MAGIC_DIR)/Header \
  $(MAGIC_DIR)/Localstuff \
-@@ -254,7 +254,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \
+@@ -295,7 +295,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \
  $(MAGIC_FRAGMENT_DIR)/aout \
  $(MAGIC_FRAGMENT_DIR)/apache \
  $(MAGIC_FRAGMENT_DIR)/apl \
@@ -250,7 +250,7 @@
  $(MAGIC_FRAGMENT_DIR)/application \
  $(MAGIC_FRAGMENT_DIR)/applix \
  $(MAGIC_FRAGMENT_DIR)/apt \
-@@ -320,7 +319,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
+@@ -362,7 +361,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
  $(MAGIC_FRAGMENT_DIR)/erlang \
  $(MAGIC_FRAGMENT_DIR)/esri \
  $(MAGIC_FRAGMENT_DIR)/fcs \
@@ -258,7 +258,7 @@
  $(MAGIC_FRAGMENT_DIR)/finger \
  $(MAGIC_FRAGMENT_DIR)/flash \
  $(MAGIC_FRAGMENT_DIR)/flif \
-@@ -362,6 +360,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
+@@ -404,6 +402,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
  $(MAGIC_FRAGMENT_DIR)/java \
  $(MAGIC_FRAGMENT_DIR)/javascript \
  $(MAGIC_FRAGMENT_DIR)/jpeg \
@@ -267,7 +267,7 @@
  $(MAGIC_FRAGMENT_DIR)/karma \
  $(MAGIC_FRAGMENT_DIR)/kde \
  $(MAGIC_FRAGMENT_DIR)/keepass \
-@@ -370,7 +370,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
+@@ -412,7 +412,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
  $(MAGIC_FRAGMENT_DIR)/lecter \
  $(MAGIC_FRAGMENT_DIR)/lex \
  $(MAGIC_FRAGMENT_DIR)/lif \
@@ -275,7 +275,7 @@
  $(MAGIC_FRAGMENT_DIR)/lisp \
  $(MAGIC_FRAGMENT_DIR)/llvm \
  $(MAGIC_FRAGMENT_DIR)/lua \
-@@ -378,7 +377,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
+@@ -420,7 +419,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
  $(MAGIC_FRAGMENT_DIR)/m4 \
  $(MAGIC_FRAGMENT_DIR)/mach \
  $(MAGIC_FRAGMENT_DIR)/macos \
@@ -283,7 +283,7 @@
  $(MAGIC_FRAGMENT_DIR)/magic \
  $(MAGIC_FRAGMENT_DIR)/mail.news \
  $(MAGIC_FRAGMENT_DIR)/make \
-@@ -401,10 +399,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
+@@ -443,10 +441,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
  $(MAGIC_FRAGMENT_DIR)/mkid \
  $(MAGIC_FRAGMENT_DIR)/mlssa \
  $(MAGIC_FRAGMENT_DIR)/mmdf \
@@ -295,7 +295,7 @@
  $(MAGIC_FRAGMENT_DIR)/msooxml \
  $(MAGIC_FRAGMENT_DIR)/msx \
  $(MAGIC_FRAGMENT_DIR)/msvc \
-@@ -456,6 +454,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
+@@ -498,6 +496,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
  $(MAGIC_FRAGMENT_DIR)/qt \
  $(MAGIC_FRAGMENT_DIR)/revision \
  $(MAGIC_FRAGMENT_DIR)/riff \
@@ -304,7 +304,7 @@
  $(MAGIC_FRAGMENT_DIR)/rpi \
  $(MAGIC_FRAGMENT_DIR)/rpm \
  $(MAGIC_FRAGMENT_DIR)/rtf \
-@@ -532,10 +532,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
+@@ -574,10 +574,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
  $(MAGIC_FRAGMENT_DIR)/zip \
  $(MAGIC_FRAGMENT_DIR)/zyxel 
  
@@ -328,9 +328,9 @@
  # FIXME: Build file natively as well so that it can be used to compile
  # the target's magic file; for now we bail if the local version does not match
  @IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file${EXEEXT}
-@@ -756,23 +768,25 @@ uninstall-am: uninstall-pkgdataDATA
- 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- 	ps ps-am tags-am uninstall uninstall-am uninstall-pkgdataDATA
+@@ -799,23 +811,25 @@ uninstall-am: uninstall-pkgdataDATA
+ 
+ .PRECIOUS: Makefile
  
 +${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
 +	$(FILE_COMPILE) -C -m $(RAW)
@@ -371,7 +371,7 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
 --- src/Makefile.am
-+++ src/Makefile.am	2018-06-12 14:34:49.487836425 +0000
++++ src/Makefile.am	2018-10-15 10:57:39.706000588 +0000
 @@ -1,4 +1,4 @@
 -MAGIC = $(pkgdatadir)/magic
 +MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic
@@ -379,7 +379,7 @@
  nodist_include_HEADERS = magic.h
  
 --- src/dcore.c
-+++ src/dcore.c	2018-06-12 14:34:49.487836425 +0000
++++ src/dcore.c	2018-10-15 10:57:39.706000588 +0000
 @@ -0,0 +1,207 @@
 +/*
 + * Show goo about ELF core files
diff --git a/file-5.34.tar.gz b/file-5.34.tar.gz
new file mode 100644
index 0000000..332293d
--- /dev/null
+++ b/file-5.34.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f15a50dbbfa83fec0bd1161e8e191b092ec832720e30cd14536e044ac623b20a
+size 840219
diff --git a/file-5.34.tar.gz.asc b/file-5.34.tar.gz.asc
new file mode 100644
index 0000000..0b078a0
--- /dev/null
+++ b/file-5.34.tar.gz.asc
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iEYEABECAAYFAltYEXYACgkQcREqsWyzOzpnxwCfXZkGLqYAncdftwkXdBzWNGeM
+bEkAoLHe7Q7/a0vgs1QI4ChwOnJbMkJA
+=F+1u
+-----END PGP SIGNATURE-----
diff --git a/file-a642587a9c.patch b/file-a642587a9c.patch
deleted file mode 100644
index 258d154..0000000
--- a/file-a642587a9c.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit a642587a9c9e2dd7feacdf513c3643ce26ad3c22
-Author: Christos Zoulas <christos@zoulas.com>
-Date:   Sat Jun 9 16:00:06 2018 +0000
-
-    Avoid reading past the end of buffer (Rui Reis)
-
-diff --git src/readelf.c src/readelf.c
-index 79c83f9f..1f41b461 100644
---- src/readelf.c
-+++ src/readelf.c
-@@ -842,7 +842,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
diff --git a/file-secure_getenv.patch b/file-secure_getenv.patch
index 3eeacd2..3ee871d 100644
--- a/file-secure_getenv.patch
+++ b/file-secure_getenv.patch
@@ -7,7 +7,7 @@
 
 --- file-5.29/configure.ac
 +++ file-5.29/configure.ac	2016-11-24 09:13:33.451612426 +0000
-@@ -97,6 +97,8 @@ AC_CHECK_TYPE([sig_t],[AC_DEFINE([HAVE_S
+@@ -102,6 +102,8 @@ AC_CHECK_TYPE([sig_t],[AC_DEFINE([HAVE_S
  #include <signal.h>
  #endif])
  
@@ -18,7 +18,7 @@
  AC_TYPE_OFF_T
 --- file-5.29/src/file.c
 +++ file-5.29/src/file.c	2016-11-24 09:13:33.451612426 +0000
-@@ -623,7 +623,7 @@ docprint(const char *opts, int def)
+@@ -648,7 +648,7 @@ docprint(const char *opts, int def)
  private void
  help(void)
  {
@@ -29,7 +29,7 @@
  "Determine type of FILEs.\n"
 --- file-5.29/src/file.h
 +++ file-5.29/src/file.h	2016-11-24 09:13:33.451612426 +0000
-@@ -615,4 +615,12 @@ static const char *rcsid(const char *p)
+@@ -652,4 +652,12 @@ static const char *rcsid(const char *p)
  #define __RCSID(a)
  #endif
  
diff --git a/file.changes b/file.changes
index 12ec77b..f7e6bb5 100644
--- a/file.changes
+++ b/file.changes
@@ -1,8 +1,22 @@
+-------------------------------------------------------------------
+Mon Oct 15 11:08:06 UTC 2018 - Dr. Werner Fink <werner@suse.de>
+
+- Update new signing key file as well
+
 -------------------------------------------------------------------
 Fri Aug 10 11:58:41 UTC 2018 - astieger@suse.com
 
 - add upstream signing key and verify source signature
 
+-------------------------------------------------------------------
+Thu Jul 26 11:47:32 UTC 2018 - werner@suse.de
+
+- Update to file version 5.33
+  * Add Quad indirect offsets
+  * Enable parsing of ELF dynamic sections to handle PIE better
+- Remove upstream patch file-a642587a9c.patch
+- Rename patch file-5.33.dif which now becomes file-5.34.dif
+
 -------------------------------------------------------------------
 Tue Jun 12 15:16:15 UTC 2018 - werner@suse.de
 
diff --git a/file.spec b/file.spec
index 1ed2bec..f96ffcd 100644
--- a/file.spec
+++ b/file.spec
@@ -30,7 +30,7 @@ Obsoletes:      file-64bit
 %endif
 #
 # Set Version also in python-magic.spec
-Version:        5.33
+Version:        5.34
 Release:        0
 Summary:        A Tool to Determine File Types
 License:        BSD-2-Clause
@@ -40,7 +40,7 @@ Source2:        baselibs.conf
 Source3:        file-rpmlintrc
 Source4:        ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz.asc
 Source5:        file.keyring
-Patch:          file-5.33.dif
+Patch:          file-5.34.dif
 Patch1:         file-5.19-misc.dif
 Patch4:         file-4.24-autoconf.dif
 Patch5:         file-5.14-tex.dif
@@ -64,8 +64,6 @@ Patch35:        file-5.24-nitpick.dif
 Patch36:        file-5.15-clear-invalid.patch
 Patch37:        file-secure_getenv.patch
 Patch39:        file-5.28-btrfs-image.dif
-# PATCH-FIX-USTREAM or bsc#1096974, bsc#1096984, and CVE-2018-10360 -- Avoid reading past the end of buffer
-Patch54:        file-a642587a9c.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir /etc
 %global         _miscdir    %{_datadir}/misc
@@ -134,7 +132,6 @@ to develop applications that require the magic "file" interface.
 %patch36 -p1 -b .clear
 %patch37 -p1 -b .getenv
 %patch39 -p1 -b .btrfs
-%patch54
 %patch -b .0
 test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in
 rm -fv src/magic.h
diff --git a/python-magic.spec b/python-magic.spec
index 2afc551..5b29b40 100644
--- a/python-magic.spec
+++ b/python-magic.spec
@@ -28,7 +28,7 @@ BuildRequires:  libtool
 BuildRequires:  python-rpm-macros
 BuildRequires:  zlib-devel
 Url:            http://www.darwinsys.com/file/
-Version:        5.33
+Version:        5.34
 Release:        0
 Summary:        Python module to use libmagic
 License:        BSD-3-Clause AND BSD-4-Clause