Projects
Mega:23.09
file
_service:tar_scm:0001-file-localmagic.patch
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:tar_scm:0001-file-localmagic.patch of Package file
From bba354e18cfac11cc69a1032cbda23960b7c05d0 Mon Sep 17 00:00:00 2001 From: Jan Kaluza <hanzz.k@gmail.com> Date: Thu, 15 Dec 2011 16:15:41 +0100 Subject: [PATCH] file-localmagic.patch Upstream says it's up to distributions to add a way to support local-magic. Signed-off-by: Kamil Dudka <kdudka@redhat.com> --- magic/magic.local | 3 +++ src/Makefile.am | 2 +- src/apprentice.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 magic/magic.local diff --git a/magic/magic.local b/magic/magic.local new file mode 100644 index 0000000..283a863 --- /dev/null +++ b/magic/magic.local @@ -0,0 +1,3 @@ +# Magic local data for file(1) command. +# Insert here your local magic data. Format is described in magic(5). + diff --git a/src/Makefile.am b/src/Makefile.am index 96749b5..e3eaf36 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -MAGIC = $(pkgdatadir)/magic +MAGIC = /etc/magic:$(pkgdatadir)/magic lib_LTLIBRARIES = libmagic.la nodist_include_HEADERS = magic.h diff --git a/src/apprentice.c b/src/apprentice.c index db21787..5134682 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -496,7 +496,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) -- 1.8.3.1
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2