debian/changelog

@@ -1,3 +1,16 @@
+file (1:5.46-5) unstable; urgency=high
+
+  * Cherry-pick "Some zip files are misclassified as data".
+    Closes: #1102577
+
+ -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de>  Fri, 11 Apr 2025 07:25:13 +0200
+
+file (1:5.46-4) unstable; urgency=high
+
+  * Cherry-pick "Fix stack overrun". Closes: #1101470
+
+ -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de>  Fri, 28 Mar 2025 18:53:57 +0100
+
 file (1:5.46-3) unstable; urgency=medium
 
   * Cherry-pick some fixes from upstream. Closes: #1100712

debian/patches/1733423740.FILE5_46-7-gb3384a1f.pr-579-net147-fix-stack-overrun.patch

@@ -0,0 +1,17 @@
+Subject: PR/579: net147: Fix stack overrun.
+Origin: upstream, commit FILE5_46-7-gb3384a1f <https://github.com/file/file/commit/FILE5_46-7-gb3384a1f>
+Author: Christos Zoulas <christos@zoulas.com>
+Date: Thu Dec 5 18:35:40 2024 +0000
+Bug-Debian: https://bugs.debian.org/1101470
+
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -1726,7 +1726,7 @@
+ 	Elf64_Phdr ph64;
+ 	const char *linking_style;
+ 	unsigned char nbuf[NBUFSIZE];
+-	char interp[128];
++	char interp[NBUFSIZE];
+ 	ssize_t bufsize;
+ 	size_t offset, align, need = 0;
+ 	int pie = 0, dynamic = 0;

debian/patches/1733427672.FILE5_46-14-g60b2032b.pr-571-jschleus-some-zip-files-are-misclassified-as-data.patch

@@ -0,0 +1,47 @@
+Subject: PR/571: jschleus: Some zip files are misclassified as data
+Origin: upstream, commit FILE5_46-14-g60b2032b <https://github.com/file/file/commit/FILE5_46-14-g60b2032b>
+Author: Christos Zoulas <christos@zoulas.com>
+Date: Thu Dec 5 19:41:12 2024 +0000
+Bug-Debian: https://bugs.debian.org/1102577
+
+--- a/magic/Magdir/archive
++++ b/magic/Magdir/archive
+@@ -1795,6 +1795,17 @@
+ !:ext zip/cbz
+ 
+ 
++# Generic zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
++#   Next line excludes specialized formats:
++0	name	zipgeneric
++>4	beshort		x			Zip archive data, at least
++!:mime	application/zip
++>4	use		zipversion
++>4	beshort		x			to extract
++>8	beshort		x			\b, compression method=
++>8	use		zipcompression
++>0x161	string		WINZIP		\b, WinZIP self-extracting
++
+ 0	string		PK\003\004
+ !:strength +1
+ # IOS/IPadOS IPA file (Zip archive)
+@@ -2132,17 +2143,11 @@
+ >>>>>>(-6.l)	search/9000	kmp.json	Keyman Compiled Package File
+ !:mime	application/vnd.keyman.kmp+zip
+ !:ext kmp
++>>>>>+4	default		x
++>>>>>>0	use		zipgeneric
+ 
+-# Generic zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
+-#   Next line excludes specialized formats:
+ >>>>+4	default		x
+->>>>>4	beshort		x			Zip archive data, at least
+-!:mime	application/zip
+->>>>>4	use		zipversion
+->>>>>4	beshort		x			to extract
+->>>>>8	beshort		x			\b, compression method=
+->>>>>8	use		zipcompression
+->>>>>0x161	string		WINZIP		\b, WinZIP self-extracting
++>>>>>0	use		zipgeneric
+ 
+ # Zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
+ 0	string		PK\005\006	Zip archive data (empty)

debian/patches/series

@@ -1,6 +1,8 @@
 # reverted upstream commits
 
 # cherry-picked commits. Keep in upstream's chronological order
+1733423740.FILE5_46-7-gb3384a1f.pr-579-net147-fix-stack-overrun.patch
+1733427672.FILE5_46-14-g60b2032b.pr-571-jschleus-some-zip-files-are-misclassified-as-data.patch
 1741021322.FILE5_46-55-gff9ba253.use-unsigned-byte-christoph-biedl.patch
 1742485595.FILE5_46-68-g5089651f.fix-openstreetmap-christoph-biedl.patch
 1742492756.FILE5_46-69-g280e121f.remove-superfluous-christoph-biedl.patch