add mime type for *.m3u files; rel 4

[packages/file.git] / searchpath.patch

still search in /etc/magic
still use ~/.magic by default

--- file-5.39/src/Makefile.am.orig	2020-11-03 18:58:10.356256020 +0100
+++ file-5.39/src/Makefile.am	2020-11-03 18:58:16.536576455 +0100
@@ -4,7 +4,7 @@
 
 bin_PROGRAMS = file
 
-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
+AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
 AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
 
 libmagic_la_SOURCES = buffer.c magic.c apprentice.c softmagic.c ascmagic.c \
--- file-5.06/src/magic.c~	2011-04-07 22:20:30.000000000 +0300
+++ file-5.06/src/magic.c	2011-04-18 11:56:38.611292743 +0300
@@ -107,7 +107,7 @@
 file_private const char *
 get_default_magic(void)
 {
-	static const char hmagic[] = "/.magic/magic.mgc";
+	static const char hmagic[] = "/.magic";
 	static char *default_magic;
 	char *home, *hmagicpath;
 
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -460,7 +460,7 @@ apprentice_1(struct magic_set *ms, const char *fn, int action)
 #ifndef COMPILE_ONLY
 	map = apprentice_map(ms, fn);
 	if (map == NULL) {
-		if (ms->flags & MAGIC_CHECK)
+		if (ms->flags & MAGIC_CHECK && strcmp("/etc/magic", fn) != 0)
 			file_magwarn(NULL, "using regular magic file `%s'", fn);
 		map = apprentice_load(ms, fn, action);
 		if (map == NULL)