Refresh patch queue

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

@@ -1,17 +0,0 @@
-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

@@ -1,47 +0,0 @@
-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/1741021322.FILE5_46-55-gff9ba253.use-unsigned-byte-christoph-biedl.patch

@@ -1,19 +0,0 @@
-Subject: Use unsigned byte (Christoph Biedl)
-Origin: upstream, commit FILE5_46-55-gff9ba253 <https://github.com/file/file/commit/FILE5_46-55-gff9ba253>
-Author: Christos Zoulas <christos@zoulas.com>
-Date: Mon Mar 3 17:02:02 2025 +0000
-
---- a/magic/Magdir/msdos
-+++ b/magic/Magdir/msdos
-@@ -2108,9 +2108,9 @@
- #	display shared information of cursor or icon entry
- 0		name		cur-ico-entry
- >0		byte		=0		\b, 256x
-->0		byte		!0		\b, %dx
-+>0		ubyte		!0		\b, %dx
- >1		byte        	=0		\b256
-->1		byte        	!0		\b%d
-+>1		ubyte        	!0		\b%d
- # number of colors in palette
- >2		ubyte		!0		\b, %d colors
- # reserved 0 FFh

debian/patches/1742485595.FILE5_46-68-g5089651f.fix-openstreetmap-christoph-biedl.patch

@@ -1,76 +0,0 @@
-Subject: Fix OpenStreetMap (Christoph Biedl)
-Origin: upstream, commit FILE5_46-68-g5089651f <https://github.com/file/file/commit/FILE5_46-68-g5089651f>
-Author: Christos Zoulas <christos@zoulas.com>
-Date: Thu Mar 20 15:46:35 2025 +0000
-
---- a/magic/Magdir/sgml
-+++ b/magic/Magdir/sgml
-@@ -15,7 +15,10 @@
- !:mime	image/svg+xml
- !:ext   svg
- 
-+0	string/t		\<?xml\ version=
-+!:strength +40
- >14	regex		['"\ \t]*[0-9.]+['"\ \t]*
-+
- # Sitemap file
- >>19	search/4096	\<urlset		XML Sitemap document text
- !:mime	application/xml-sitemap
-@@ -37,9 +40,7 @@
- # xhtml
- >19	search/4096/cWbt	\<!doctype\ html	XHTML document text
- >>15	string		>\0	(version %.3s)
--!:strength + 15
- !:mime	application/xhtml+xml
--
- >19	search/4096/cWbt	\<html\ xmlns=		XHTML document text
- >>15	string		>\0	(version %.3s)
- !:mime	application/xhtml+xml
-@@ -57,14 +58,11 @@
- # avoid misdetection as JavaScript
- 0	string/cWt	\<!doctype\ html	HTML document text
- !:mime	text/html
--!:strength + 30
- 0	string/ct	\<html>	HTML document text
- !:mime	text/html
--!:strength + 30
- 0	string/ct	\<!--
- >&0	search/4096/cWt	\<!doctype\ html	HTML document text
- !:mime	text/html
--!:strength + 30
- >&0	search/4096/ct	\<html>	HTML document text
- !:mime	text/html
- 
-@@ -127,13 +125,21 @@
- 0	search/1/cwt	\<?xml			XML document text
- !:mime	text/xml
- !:strength + 30
-+0	string/t		\<?xml\ version\ "	XML
-+!:mime	text/xml
-+!:strength + 30
- 0	string/t		\<?xml\ version="	XML
- !:mime	text/xml
- !:strength + 30
- >15	string/t	>\0			%.3s document text
- >>23	search/1	\<xsl:stylesheet	(XSL stylesheet)
- >>24	search/1	\<xsl:stylesheet	(XSL stylesheet)
--
-+0	string/t	\<?xml\ version='	XML
-+!:mime	text/xml
-+!:strength + 30
-+>15	string/t	>\0			%.3s document text
-+>>23	search/1	\<xsl:stylesheet	(XSL stylesheet)
-+>>24	search/1	\<xsl:stylesheet	(XSL stylesheet)
- 0	search/1/wt	\<?XML			broken XML document text
- !:mime	text/xml
- !:strength - 10
---- /dev/null
-+++ b/tests/osm.result
-@@ -0,0 +1 @@
-+OpenStreetMap XML data, ASCII text
---- /dev/null
-+++ b/tests/osm.testfile
-@@ -0,0 +1,3 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<osm version="0.6" generator="CGImap 0.0.2">
-+</osm>

debian/patches/1742492756.FILE5_46-69-g280e121f.remove-superfluous-christoph-biedl.patch

@@ -1,15 +0,0 @@
-Subject: Remove superfluous (Christoph Biedl)
-Origin: upstream, commit FILE5_46-69-g280e121f <https://github.com/file/file/commit/FILE5_46-69-g280e121f>
-Author: Christos Zoulas <christos@zoulas.com>
-Date: Thu Mar 20 17:45:56 2025 +0000
-
---- a/magic/Magdir/zip
-+++ b/magic/Magdir/zip
-@@ -17,7 +17,6 @@
- >>6	leshort		x		\b, extract using at least
- >>6	use		zipversion
- # This is DOS date like: ledate 21:00:48 19 Dec 2001 != DOS 00:00 1 Jan 2010 ~ 0000213C
-->>12	ulelong		x		\b, last modified
- >>14	lemsdosdate	x		\b, last modified %s
- >>12	lemsdostime	x		%s
- # uncompressed size of 1st entry; FFffFFff means real value stored in ZIP64 record

debian/patches/1742492810.FILE5_46-70-g4e2c7d3d.fix-msdosdate-endianess.patch

@@ -1,71 +0,0 @@
-Subject: Fix msdosdate endianness
-Origin: upstream, commit FILE5_46-70-g4e2c7d3d <https://github.com/file/file/commit/FILE5_46-70-g4e2c7d3d>
-Author: Christos Zoulas <christos@zoulas.com>
-Date: Thu Mar 20 17:46:50 2025 +0000
-Bug-Debian: https://bugs.debian.org/1100712
-
-    - fix msdosdate endianness
-    - remove day of the week as some platforms miscalculate it.
-    (Christoph Biedl)
-
-FIXME:
-- Adjust subject and patch file name
-
---- a/src/print.c
-+++ b/src/print.c
-@@ -354,7 +354,7 @@
- 	tm.tm_mon = ((v >> 5) & 0xf) - 1;
- 	tm.tm_year = (v >> 9) + 80;
- 
--	if (strftime(buf, bsize, "%a, %b %d %Y", &tm) == 0)
-+	if (strftime(buf, bsize, "%b %d %Y", &tm) == 0)
- 		goto out;
- 
- 	return buf;
---- a/src/softmagic.c
-+++ b/src/softmagic.c
-@@ -1042,6 +1042,14 @@
- 		return FILE_LEDOUBLE;
- 	case FILE_LEDOUBLE:
- 		return FILE_BEDOUBLE;
-+	case FILE_BEMSDOSDATE:
-+		return FILE_LEMSDOSDATE;
-+	case FILE_LEMSDOSDATE:
-+		return FILE_BEMSDOSDATE;
-+	case FILE_BEMSDOSTIME:
-+		return FILE_LEMSDOSTIME;
-+	case FILE_LEMSDOSTIME:
-+		return FILE_BEMSDOSTIME;
- 	default:
- 		return type;
- 	}
-@@ -1159,11 +1167,7 @@
- 		return 1;
- 	case FILE_SHORT:
- 	case FILE_MSDOSDATE:
--	case FILE_LEMSDOSDATE:
--	case FILE_BEMSDOSDATE:
- 	case FILE_MSDOSTIME:
--	case FILE_LEMSDOSTIME:
--	case FILE_BEMSDOSTIME:
- 		if (cvt_16(p, m) == -1)
- 			goto out;
- 		return 1;
-@@ -1217,6 +1221,8 @@
- 		return 1;
- 	}
- 	case FILE_BESHORT:
-+	case FILE_BEMSDOSDATE:
-+	case FILE_BEMSDOSTIME:
- 		p->h = CAST(short, BE16(p->hs));
- 		if (cvt_16(p, m) == -1)
- 			goto out;
-@@ -1237,6 +1243,8 @@
- 			goto out;
- 		return 1;
- 	case FILE_LESHORT:
-+	case FILE_LEMSDOSDATE:
-+	case FILE_LEMSDOSTIME:
- 		p->h = CAST(short, LE16(p->hs));
- 		if (cvt_16(p, m) == -1)
- 			goto out;

debian/patches/local.support-local-definitions-in-etc-magic.patch

@@ -25,7 +25,7 @@ Last-Update: 2016-06-27
 +
 --- a/src/apprentice.c
 +++ b/src/apprentice.c
-@@ -495,7 +495,7 @@
+@@ -499,7 +499,7 @@
  #ifndef COMPILE_ONLY
  	map = apprentice_map(ms, fn);
  	if (map == NULL) {

debian/patches/series

@@ -1,12 +1,6 @@
 # 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
-1742492810.FILE5_46-70-g4e2c7d3d.fix-msdosdate-endianess.patch
 
 # patches that should go upstream
 upstream.disable.att3b.patch