[packages/file.git] / searchpath.patch

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

--- file-5.12/src/Makefile.am.orig	2013-01-05 18:06:28.459521884 +0100
+++ file-5.12/src/Makefile.am	2013-01-05 18:07:08.582854382 +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 = 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 @@
 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;
Commit	Line	Data
7abc2151 ER	1	still search in /etc/magic
	2	still use ~/.magic by default
	3
49d7bd2c JB	4	--- file-5.12/src/Makefile.am.orig 2013-01-05 18:06:28.459521884 +0100
49d7bd2c JB	5	+++ file-5.12/src/Makefile.am 2013-01-05 18:07:08.582854382 +0100
7abc2151 ER	6	@@ -4,7 +4,7 @@
	7
	8	bin_PROGRAMS = file
	9
	10	-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
	11	+AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
49d7bd2c	12	AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
7abc2151 ER	13
7abc2151 ER	14	libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
0fa7f91e ER	15	--- file-5.06/src/magic.c~ 2011-04-07 22:20:30.000000000 +0300
	16	+++ file-5.06/src/magic.c 2011-04-18 11:56:38.611292743 +0300
	17	@@ -107,7 +107,7 @@
7abc2151 ER	18	private const char *
	19	get_default_magic(void)
	20	{
	21	- static const char hmagic[] = "/.magic/magic.mgc";
	22	+ static const char hmagic[] = "/.magic";
0fa7f91e ER	23	static char *default_magic;
	24	char home, hmagicpath;
	25