Cherry-pick two commits from upstream

* FILE5_33-2-g35c46552: Fix cast
* FILE5_33-3-g4a870863: Bump gif to beat mbr

debian/patches/cherry-pick.FILE5_33-2-g35c46552.fix-cast.patch

@@ -0,0 +1,16 @@
+Subject: Fix cast
+Origin: FILE5_33-2-g35c46552
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Sun Apr 15 19:57:59 2018 +0000
+
+--- a/src/apprentice.c
++++ b/src/apprentice.c
+@@ -3335,7 +3335,7 @@
+ bs1(struct magic *m)
+ {
+ 	m->cont_level = swap2(m->cont_level);
+-	m->offset = swap4((int32_t)m->offset);
++	m->offset = swap4((uint32_t)m->offset);
+ 	m->in_offset = swap4((uint32_t)m->in_offset);
+ 	m->lineno = swap4((uint32_t)m->lineno);
+ 	if (IS_STRING(m->type)) {

debian/patches/cherry-pick.FILE5_33-3-g4a870863.bump-gif-to-beat-mbr-from-kamil-dudka.patch

@@ -0,0 +1,17 @@
+Subject: Bump gif to beat mbr (from Kamil Dudka)
+Origin: FILE5_33-3-g4a870863
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Tue Apr 17 12:09:20 2018 +0000
+
+--- a/magic/Magdir/images
++++ b/magic/Magdir/images
+@@ -464,7 +464,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,

debian/patches/series

@@ -1,4 +1,6 @@
 # cherry-picked commits. Keep in upstream's chronological order
+cherry-pick.FILE5_33-2-g35c46552.fix-cast.patch
+cherry-pick.FILE5_33-3-g4a870863.bump-gif-to-beat-mbr-from-kamil-dudka.patch
 
 # local modifications
 local.support-local-definitions-in-etc-magic.patch