01-file-localmagic.patch 2.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. Authors:
  2. Michael Piefel <piefel@debian.org>,
  3. Judit Foglszinger <fgrfgr@freenet.de>
  4. Description:
  5. No longer includes Localstuff in /usr/share/misc/magic, local definitions
  6. should go to /etc/magic.
  7. diff -Naurp file.orig/magic/Header file/magic/Header
  8. --- file.orig/magic/Header 2011-09-08 17:23:06.845387845 +0200
  9. +++ file/magic/Header 2011-09-08 17:33:03.984889688 +0200
  10. @@ -1,5 +1,6 @@
  11. # Magic data for file(1) command.
  12. -# Format is described in magic(files), where:
  13. -# files is 5 on V7 and BSD, 4 on SV, and ?? on SVID.
  14. +# Format is described in in magic(5).
  15. # Don't edit this file, edit /etc/magic or send your magic improvements
  16. -# to the maintainers, at file@mx.gw.com
  17. +# to the upstream maintainers, at file@mx.gw.com
  18. +# or send your suggested inclusions
  19. +# as a wishlist bug against file (using the reportbug utility).
  20. diff -Naurp file.orig/magic/magic.local file/magic/magic.local
  21. --- file.orig/magic/magic.local 1970-01-01 01:00:00.000000000 +0100
  22. +++ file/magic/magic.local 2011-09-08 17:38:44.420889203 +0200
  23. @@ -0,0 +1,3 @@
  24. +# Magic local data for file(1) command.
  25. +# Insert here your local magic data. Format is described in magic(5).
  26. +
  27. diff -Naurp file.orig/src/Makefile.am file/src/Makefile.am
  28. --- file.orig/src/Makefile.am 2011-09-08 17:23:06.884893668 +0200
  29. +++ file/src/Makefile.am 2011-09-08 17:33:03.988392256 +0200
  30. @@ -4,7 +4,7 @@ include_HEADERS = magic.h
  31. bin_PROGRAMS = file
  32. -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
  33. +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
  34. AM_CFLAGS = @WARNINGS@
  35. libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
  36. diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
  37. --- file.orig/src/Makefile.in 2011-09-08 17:23:06.884893668 +0200
  38. +++ file/src/Makefile.in 2011-09-08 17:33:03.988392256 +0200
  39. @@ -243,7 +243,7 @@ top_srcdir = @top_srcdir@
  40. MAGIC = $(pkgdatadir)/magic
  41. lib_LTLIBRARIES = libmagic.la
  42. include_HEADERS = magic.h
  43. -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
  44. +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
  45. AM_CFLAGS = @WARNINGS@
  46. libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
  47. encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \