diff --git a/file-5.12-zip.dif b/file-5.12-zip.dif
index 259ac5b..f89544a 100644
--- a/file-5.12-zip.dif
+++ b/file-5.12-zip.dif
@@ -3,10 +3,10 @@
  1 file changed, 19 insertions(+)
 
 --- magic/Magdir/archive
-+++ magic/Magdir/archive	2018-06-12 14:15:56.676369965 +0000
-@@ -1021,6 +1021,25 @@
- !:mime application/zip
++++ magic/Magdir/archive	2019-02-21 06:46:47.000750101 +0000
+@@ -1044,6 +1044,25 @@
  !:ext zip/cbz
+ !:strength +1
  0	string		PK\003\004
 +>30	ubelong		!0x6d696d65
 +>>4	byte		0x00		Zip archive data
diff --git a/file-5.15-clear-invalid.patch b/file-5.15-clear-invalid.patch
index d48cfb6..70325cd 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
-@@ -61,7 +61,6 @@
+@@ -63,7 +63,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 efd6fea..b3eb7d6 100644
--- a/file-5.16-ocloexec.patch
+++ b/file-5.16-ocloexec.patch
@@ -6,7 +6,7 @@
  4 files changed, 6 insertions(+), 6 deletions(-)
 
 --- src/apprentice.c
-+++ src/apprentice.c	2018-10-22 07:46:50.986423768 +0000
++++ src/apprentice.c	2019-02-21 06:49:57.677147690 +0000
 @@ -1154,7 +1154,7 @@ load_1(struct magic_set *ms, int action,
  	ssize_t len;
  	struct magic_entry me;
@@ -16,7 +16,7 @@
  	if (f == NULL) {
  		if (errno != ENOENT)
  			file_error(ms, errno, "cannot read magic file `%s'",
-@@ -3061,7 +3061,7 @@ apprentice_map(struct magic_set *ms, con
+@@ -3062,7 +3062,7 @@ apprentice_map(struct magic_set *ms, con
  	if (dbname == NULL)
  		goto error;
  
@@ -25,7 +25,7 @@
  		goto error;
  
  	if (fstat(fd, &st) == -1) {
-@@ -3198,7 +3198,7 @@ apprentice_compile(struct magic_set *ms,
+@@ -3199,7 +3199,7 @@ apprentice_compile(struct magic_set *ms,
  	if (dbname == NULL)
  		goto out;
  
@@ -35,19 +35,19 @@
  		file_error(ms, errno, "cannot open `%s'", dbname);
  		goto out;
 --- src/compress.c
-+++ src/compress.c	2018-10-22 07:47:40.645502604 +0000
++++ src/compress.c	2019-02-21 06:51:15.447677279 +0000
 @@ -423,7 +423,7 @@ file_pipe2file(struct magic_set *ms, int
  	{
  		int te;
- 		int ou = umask(0);
+ 		mode_t ou = umask(0);
 -		tfd = mkstemp(buf);
 +		tfd = mkostemp(buf, O_CLOEXEC);
  		(void)umask(ou);
  		te = errno;
  		(void)unlink(buf);
 --- src/file.c
-+++ src/file.c	2018-10-22 07:45:35.907816294 +0000
-@@ -499,7 +499,7 @@ unwrap(struct magic_set *ms, const char
++++ src/file.c	2019-02-21 06:49:57.681147615 +0000
+@@ -500,7 +500,7 @@ unwrap(struct magic_set *ms, const char
  		f = stdin;
  		wid = 1;
  	} else {
@@ -57,8 +57,8 @@
  			return 1;
  		}
 --- src/magic.c
-+++ src/magic.c	2018-10-22 07:49:39.471290675 +0000
-@@ -434,7 +434,7 @@ file_or_fd(struct magic_set *ms, const c
++++ src/magic.c	2019-02-21 06:49:57.681147615 +0000
+@@ -435,7 +435,7 @@ file_or_fd(struct magic_set *ms, const c
  		_setmode(STDIN_FILENO, O_BINARY);
  #endif
  	if (inname != NULL) {
diff --git a/file-5.19-printf.dif b/file-5.19-printf.dif
index 96dd1b4..41debe7 100644
--- a/file-5.19-printf.dif
+++ b/file-5.19-printf.dif
@@ -3,8 +3,8 @@
  1 file changed, 6 insertions(+)
 
 --- src/apprentice.c
-+++ src/apprentice.c	2018-06-12 14:15:19.109042630 +0000
-@@ -2427,6 +2427,12 @@ check_format_type(const char *ptr, int t
++++ src/apprentice.c	2019-02-21 06:39:25.249091320 +0000
+@@ -2428,6 +2428,12 @@ check_format_type(const char *ptr, int t
  			ptr++;
  		if (*ptr == '#')
  			ptr++;
@@ -15,5 +15,5 @@
 +		if (*ptr == '\'')
 +			ptr++;
  #define CHECKLEN() do { \
- 	for (len = cnt = 0; isdigit((unsigned char)*ptr); ptr++, cnt++) \
+ 	for (len = cnt = 0; isdigit(CAST(unsigned char, *ptr)); ptr++, cnt++) \
  		len = len * 10 + (*ptr - '0'); \
diff --git a/file-5.19-zip2.0.dif b/file-5.19-zip2.0.dif
index c7683ff..ec41065 100644
--- a/file-5.19-zip2.0.dif
+++ b/file-5.19-zip2.0.dif
@@ -3,8 +3,8 @@
  1 file changed, 5 insertions(+)
 
 --- magic/Magdir/archive
-+++ magic/Magdir/archive	2018-06-12 14:17:31.598670365 +0000
-@@ -1015,6 +1015,11 @@
++++ magic/Magdir/archive	2019-02-21 06:49:05.298138025 +0000
+@@ -1037,6 +1037,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 7d15c0c..a820cc3 100644
--- a/file-5.22-elf.dif
+++ b/file-5.22-elf.dif
@@ -3,8 +3,8 @@
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 --- src/readelf.c
-+++ src/readelf.c	2018-06-12 14:14:14.054207494 +0000
-@@ -796,7 +796,7 @@ do_core_note(struct magic_set *ms, unsig
++++ src/readelf.c	2019-02-21 06:41:38.598573505 +0000
+@@ -805,7 +805,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
-@@ -808,7 +808,9 @@ do_core_note(struct magic_set *ms, unsig
+@@ -817,7 +817,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 1ee34ff..b3561e2 100644
--- a/file-5.23-endian.patch
+++ b/file-5.23-endian.patch
@@ -4,7 +4,7 @@
  2 files changed, 10 insertions(+), 114 deletions(-)
 
 --- src/apprentice.c
-+++ src/apprentice.c	2018-10-22 07:53:29.562977637 +0000
++++ src/apprentice.c	2019-02-21 07:03:30.961751563 +0000
 @@ -50,7 +50,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.
  #endif
  #include <dirent.h>
@@ -12,8 +12,8 @@
 -
 +#include <byteswap.h>
  
- #define	EATAB {while (isascii((unsigned char) *l) && \
- 		      isspace((unsigned char) *l))  ++l;}
+ #define	EATAB {while (isascii(CAST(unsigned char, *l)) && \
+ 		      isspace(CAST(unsigned char, *l)))  ++l;}
 @@ -123,9 +123,11 @@ private struct mlist *mlist_alloc(void);
  private void mlist_free(struct mlist *);
  private void byteswap(struct magic *, uint32_t);
@@ -29,7 +29,7 @@
  private char *mkdbname(struct magic_set *, const char *, int);
  private struct magic_map *apprentice_buf(struct magic_set *, struct magic *,
      size_t);
-@@ -3290,67 +3292,6 @@ byteswap(struct magic *magic, uint32_t n
+@@ -3292,67 +3294,6 @@ byteswap(struct magic *magic, uint32_t n
  }
  
  /*
@@ -39,8 +39,8 @@
 -swap2(uint16_t sv)
 -{
 -	uint16_t rv;
--	uint8_t *s = (uint8_t *)(void *)&sv;
--	uint8_t *d = (uint8_t *)(void *)&rv;
+-	uint8_t *s = RCAST(uint8_t *, RCAST(void *, &sv));
+-	uint8_t *d = RCAST(uint8_t *, RCAST(void *, &rv));
 -	d[0] = s[1];
 -	d[1] = s[0];
 -	return rv;
@@ -53,8 +53,8 @@
 -swap4(uint32_t sv)
 -{
 -	uint32_t rv;
--	uint8_t *s = (uint8_t *)(void *)&sv;
--	uint8_t *d = (uint8_t *)(void *)&rv;
+-	uint8_t *s = RCAST(uint8_t *, RCAST(void *, &sv));
+-	uint8_t *d = RCAST(uint8_t *, RCAST(void *, &rv));
 -	d[0] = s[3];
 -	d[1] = s[2];
 -	d[2] = s[1];
@@ -69,8 +69,8 @@
 -swap8(uint64_t sv)
 -{
 -	uint64_t rv;
--	uint8_t *s = (uint8_t *)(void *)&sv;
--	uint8_t *d = (uint8_t *)(void *)&rv;
+-	uint8_t *s = RCAST(uint8_t *, RCAST(void *, &sv));
+-	uint8_t *d = RCAST(uint8_t *, RCAST(void *, &rv));
 -#if 0
 -	d[0] = s[3];
 -	d[1] = s[2];
@@ -98,8 +98,8 @@
   */
  private void
 --- src/cdf.c
-+++ src/cdf.c	2018-10-22 07:54:09.366231573 +0000
-@@ -48,6 +48,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.113 201
++++ src/cdf.c	2019-02-21 07:05:15.503772161 +0000
+@@ -48,6 +48,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.114 201
  #include <time.h>
  #include <ctype.h>
  #include <limits.h>
@@ -107,7 +107,7 @@
  
  #ifndef EFTYPE
  #define EFTYPE EINVAL
-@@ -113,55 +114,9 @@ cdf_calloc(const char *file __attribute_
+@@ -116,55 +117,9 @@ cdf_calloc(const char *file __attribute_
  	return calloc(n, u);
  }
  
@@ -118,8 +118,8 @@
 -_cdf_tole2(uint16_t sv)
 -{
 -	uint16_t rv;
--	uint8_t *s = (uint8_t *)(void *)&sv;
--	uint8_t *d = (uint8_t *)(void *)&rv;
+-	uint8_t *s = RCAST(uint8_t *, RCAST(void *, &sv));
+-	uint8_t *d = RCAST(uint8_t *, RCAST(void *, &rv));
 -	d[0] = s[1];
 -	d[1] = s[0];
 -	return rv;
@@ -132,8 +132,8 @@
 -_cdf_tole4(uint32_t sv)
 -{
 -	uint32_t rv;
--	uint8_t *s = (uint8_t *)(void *)&sv;
--	uint8_t *d = (uint8_t *)(void *)&rv;
+-	uint8_t *s = RCAST(uint8_t *, RCAST(void *, &sv));
+-	uint8_t *d = RCAST(uint8_t *, RCAST(void *, &rv));
 -	d[0] = s[3];
 -	d[1] = s[2];
 -	d[2] = s[1];
@@ -148,8 +148,8 @@
 -_cdf_tole8(uint64_t sv)
 -{
 -	uint64_t rv;
--	uint8_t *s = (uint8_t *)(void *)&sv;
--	uint8_t *d = (uint8_t *)(void *)&rv;
+-	uint8_t *s = RCAST(uint8_t *, RCAST(void *, &sv));
+-	uint8_t *d = RCAST(uint8_t *, RCAST(void *, &rv));
 -	d[0] = s[7];
 -	d[1] = s[6];
 -	d[2] = s[5];
@@ -160,9 +160,9 @@
 -	d[7] = s[0];
 -	return rv;
 -}
-+#define _cdf_tole2(x)  bswap_16(x)
-+#define _cdf_tole4(x)  bswap_32(x)
-+#define _cdf_tole8(x)  bswap_64(x)
++#define _cdf_tole2(x)	bswap_16(x)
++#define _cdf_tole4(x)	bswap_32(x)
++#define _cdf_tole8(x)	bswap_64(x)
  
  /*
   * grab a uint32_t from a possibly unaligned address, and return it in
diff --git a/file-5.28-btrfs-image.dif b/file-5.28-btrfs-image.dif
index 31341c4..876bb1c 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
-@@ -2267,20 +2267,29 @@
+@@ -2270,20 +2270,29 @@
  >>0x10060        string          >\0             lockproto %s)
  
  # Russell Coker <russell@coker.com.au>
diff --git a/file-5.35.tar.gz b/file-5.35.tar.gz
deleted file mode 100644
index 2194b98..0000000
--- a/file-5.35.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30c45e817440779be7aac523a905b123cba2a6ed0bf4f5439e1e99ba940b5546
-size 865425
diff --git a/file-5.35.tar.gz.asc b/file-5.35.tar.gz.asc
deleted file mode 100644
index 672bc24..0000000
--- a/file-5.35.tar.gz.asc
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iEYEABECAAYFAlvJGcMACgkQcREqsWyzOzpYYQCgsAWYc53UEoPl3kkJpFPn7wzX
-IAQAnjfEPZBlmALT0+8OOy1jvP1Xgswb
-=wYfS
------END PGP SIGNATURE-----
diff --git a/file-5.35.dif b/file-5.36.dif
similarity index 92%
rename from file-5.35.dif
rename to file-5.36.dif
index b59d380..421f3d7 100644
--- a/file-5.35.dif
+++ b/file-5.36.dif
@@ -10,8 +10,8 @@
  8 files changed, 312 insertions(+), 67 deletions(-)
 
 --- magic/Magdir/elf
-+++ magic/Magdir/elf	2018-10-22 07:59:13.300535081 +0000
-@@ -133,7 +133,7 @@
++++ magic/Magdir/elf	2019-02-21 07:07:41.093015260 +0000
+@@ -135,7 +135,7 @@
  >18	leshort		47		Renesas H8/300H,
  >18	leshort		48		Renesas H8S,
  >18	leshort		49		Renesas H8/500,
@@ -21,7 +21,7 @@
  >18	leshort		52		Motorola Coldfire,
  >18	leshort		53		Motorola M68HC12,
 --- magic/Magdir/linux
-+++ magic/Magdir/linux	2018-10-22 07:59:13.300535081 +0000
++++ magic/Magdir/linux	2019-02-21 07:07:41.093015260 +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
@@ -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-10-22 07:59:13.300535081 +0000
++++ magic/Magdir/msad	2019-02-21 07:07:41.093015260 +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-10-22 07:59:13.300535081 +0000
++++ magic/Magdir/msdos	2019-02-21 07:07:41.097015184 +0000
 @@ -135,9 +135,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-10-22 08:03:21.007892910 +0000
++++ magic/Makefile.am	2019-02-21 07:08:08.552495225 +0000
 @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
  MAGIC_DIR = $(top_srcdir)/magic
  MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@@ -116,15 +116,15 @@
  $(MAGIC_FRAGMENT_DIR)/application \
  $(MAGIC_FRAGMENT_DIR)/applix \
  $(MAGIC_FRAGMENT_DIR)/apt \
-@@ -91,7 +90,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
- $(MAGIC_FRAGMENT_DIR)/erlang \
+@@ -93,7 +92,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \
+ $(MAGIC_FRAGMENT_DIR)/espressif \
  $(MAGIC_FRAGMENT_DIR)/esri \
  $(MAGIC_FRAGMENT_DIR)/fcs \
 -$(MAGIC_FRAGMENT_DIR)/filesystems \
  $(MAGIC_FRAGMENT_DIR)/finger \
  $(MAGIC_FRAGMENT_DIR)/flash \
  $(MAGIC_FRAGMENT_DIR)/flif \
-@@ -135,6 +133,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
+@@ -137,6 +135,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 \
-@@ -144,7 +144,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
+@@ -146,7 +146,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 \
-@@ -152,7 +151,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
+@@ -154,7 +153,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 \
-@@ -175,10 +173,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
+@@ -177,10 +175,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 \
-@@ -230,6 +228,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
+@@ -232,6 +230,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 \
-@@ -306,8 +306,20 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
+@@ -308,8 +308,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
-@@ -319,19 +331,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
+@@ -321,19 +333,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
  FILE_COMPILE_DEP = $(FILE_COMPILE)
  endif
  
@@ -232,7 +232,7 @@
 +#	$(FILE_COMPILE) -C -m magic
 +#	@rm -fr magic
 --- magic/Makefile.in
-+++ magic/Makefile.in	2018-10-22 08:05:13.073792870 +0000
++++ magic/Makefile.in	2019-02-21 07:07:58.924677558 +0000
 @@ -278,7 +278,7 @@ top_srcdir = @top_srcdir@
  MAGIC_FRAGMENT_BASE = Magdir
  MAGIC_DIR = $(top_srcdir)/magic
@@ -250,15 +250,15 @@
  $(MAGIC_FRAGMENT_DIR)/application \
  $(MAGIC_FRAGMENT_DIR)/applix \
  $(MAGIC_FRAGMENT_DIR)/apt \
-@@ -363,7 +362,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
- $(MAGIC_FRAGMENT_DIR)/erlang \
+@@ -365,7 +364,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \
+ $(MAGIC_FRAGMENT_DIR)/espressif \
  $(MAGIC_FRAGMENT_DIR)/esri \
  $(MAGIC_FRAGMENT_DIR)/fcs \
 -$(MAGIC_FRAGMENT_DIR)/filesystems \
  $(MAGIC_FRAGMENT_DIR)/finger \
  $(MAGIC_FRAGMENT_DIR)/flash \
  $(MAGIC_FRAGMENT_DIR)/flif \
-@@ -407,6 +405,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
+@@ -409,6 +407,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 \
-@@ -416,7 +416,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
+@@ -418,7 +418,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 \
-@@ -424,7 +423,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
+@@ -426,7 +425,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 \
-@@ -447,10 +445,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
+@@ -449,10 +447,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 \
-@@ -502,6 +500,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
+@@ -504,6 +502,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 \
-@@ -578,10 +578,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
+@@ -580,10 +580,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
  $(MAGIC_FRAGMENT_DIR)/zip \
  $(MAGIC_FRAGMENT_DIR)/zyxel
  
@@ -328,7 +328,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
  @IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file${EXEEXT}
-@@ -803,23 +815,25 @@ uninstall-am: uninstall-pkgdataDATA
+@@ -805,23 +817,25 @@ uninstall-am: uninstall-pkgdataDATA
  
  .PRECIOUS: Makefile
  
@@ -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-10-22 07:59:13.328534557 +0000
++++ src/Makefile.am	2019-02-21 07:07:41.129014579 +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-10-22 07:59:13.344534255 +0000
++++ src/dcore.c	2019-02-21 07:07:41.133014502 +0000
 @@ -0,0 +1,207 @@
 +/*
 + * Show goo about ELF core files
diff --git a/file-5.36.tar.gz b/file-5.36.tar.gz
new file mode 100644
index 0000000..ccc7939
--- /dev/null
+++ b/file-5.36.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb608290c0fd2405a8f63e5717abf6d03e22e183fb21884413d1edd918184379
+size 875792
diff --git a/file-5.36.tar.gz.asc b/file-5.36.tar.gz.asc
new file mode 100644
index 0000000..7de7797
--- /dev/null
+++ b/file-5.36.tar.gz.asc
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iEYEABECAAYFAlxtcFoACgkQcREqsWyzOzp+cQCg1EKjv0nl2ecPjbh4wHffQ+Gz
+Y2kAn2eyPWcbVtM1rER2qBS7NSaRzhrW
+=J7wy
+-----END PGP SIGNATURE-----
diff --git a/file.changes b/file.changes
index 5683349..46fab6a 100644
--- a/file.changes
+++ b/file.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Thu Feb 21 07:12:21 UTC 2019 - Dr. Werner Fink <werner@suse.de>
+
+- Update to file version 5.36 (bsc#1126117, bsc#1126118, bsc#1126119,
+  and bsc#1126121 which is CVE-2019-8904, CVE-2019-8905, CVE-2019-8906,
+  and CVE-2019-8907)
+  * Fix cast to use cast macros
+  * Add UCS-32 builtin detection (PR/61) reported by tmc
+  * Fix stack read (PR/62) and write (PR/64) stack overflows
+    reported by spinpx
+- Modify the patches
+  * file-5.12-zip.dif
+  * file-5.15-clear-invalid.patch
+  * file-5.16-ocloexec.patch
+  * file-5.19-printf.dif
+  * file-5.19-zip2.0.dif
+  * file-5.22-elf.dif
+  * file-5.23-endian.patch
+  * file-5.28-btrfs-image.dif
+- Modify and rename patch file-5.35.dif which becomes file-5.36.dif
+
 -------------------------------------------------------------------
 Mon Oct 22 08:07:33 UTC 2018 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/file.spec b/file.spec
index 8119e6d..40798ec 100644
--- a/file.spec
+++ b/file.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package file
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -30,7 +30,7 @@ Obsoletes:      file-64bit
 %endif
 #
 # Set Version also in python-magic.spec
-Version:        5.35
+Version:        5.36
 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.35.dif
+Patch:          file-5.36.dif
 Patch1:         file-5.19-misc.dif
 Patch4:         file-4.24-autoconf.dif
 Patch5:         file-5.14-tex.dif
diff --git a/python-magic.changes b/python-magic.changes
index 04d1e36..e37d0d0 100644
--- a/python-magic.changes
+++ b/python-magic.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb 21 07:18:57 UTC 2019 - Dr. Werner Fink <werner@suse.de>
+
+- Correct version of file which is now 5.36 
+
 -------------------------------------------------------------------
 Thu Oct 25 06:09:52 UTC 2018 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/python-magic.spec b/python-magic.spec
index b9912f1..0cdb278 100644
--- a/python-magic.spec
+++ b/python-magic.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-magic
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -28,7 +28,7 @@ BuildRequires:  libtool
 BuildRequires:  python-rpm-macros
 BuildRequires:  zlib-devel
 Url:            http://www.darwinsys.com/file/
-Version:        5.35
+Version:        5.36
 Release:        0
 Summary:        Python module to use libmagic
 License:        BSD-3-Clause AND BSD-4-Clause