rpms/file
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: #1342428 - iconv/gconv module cache recognition

Browse Source
This commit is contained in:
Marek Cermak 2017-08-14 08:19:05 +02:00
parent 9580f9ae81
commit 1e8f3a1a8d
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
file-5.31-gconv-cache-recognition.patch Normal file
View File

@ -0,0 +1,49 @@
From 2093d2fde94ae6dd094196a455bf4f70d7e84747 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Thu, 10 Aug 2017 11:01:38 +0000
Subject: [PATCH] Add gconv magic (Marek Cermak)
Recognition of iconv/gconv module configuration cache
https://bugzilla.redhat.com/show_bug.cgi?id=1342428
Upstream commit: https://github.com/file/file/commit/2093d2fde94ae6dd094196a455bf4f70d7e84747
Signed-off-by: Marek Cermak <macermak@redhat.com>
---
magic/Magdir/gconv | 10 ++++++++++
magic/Makefile.am | 3 ++-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 magic/Magdir/gconv
diff --git a/magic/Magdir/gconv b/magic/Magdir/gconv
new file mode 100644
index 00000000..eec5ddcd
--- /dev/null
+++ b/magic/Magdir/gconv
@@ -0,0 +1,10 @@
+
+#------------------------------------------------------------------------------
+# $File: gconv
+# gconv: file(1) magic for iconv/gconv module configuration cache
+#
+# Magic number defined in glibc/iconv/iconvconfig.h as GCONVCACHE_MAGIC
+#
+# From: Marek Cermak <macermak@redhat.com>
+#
+0 lelong 0x20010324 gconv module configuration cache data
diff --git a/magic/Makefile.am b/magic/Makefile.am
index 25b8c3d4..5259a478 100644
--- a/magic/Makefile.am
+++ b/magic/Makefile.am
@@ -99,6 +99,7 @@ $(MAGIC_FRAGMENT_DIR)/fsav \
$(MAGIC_FRAGMENT_DIR)/fusecompress \
$(MAGIC_FRAGMENT_DIR)/games \
$(MAGIC_FRAGMENT_DIR)/gcc \
+$(MAGIC_FRAGMENT_DIR)/gconv \
$(MAGIC_FRAGMENT_DIR)/geo \
$(MAGIC_FRAGMENT_DIR)/geos \
$(MAGIC_FRAGMENT_DIR)/gimp \
--
2.13.3

6
file.spec
View File

@ -3,7 +3,7 @@
Summary: A utility for determining file types
Name: file
Version: 5.31
Release: 7%{?dist}
Release: 8%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@ -19,6 +19,7 @@ Patch5: file-5.04-man-return-code.patch
# picked from upstream
Patch6: file-5.31-mo-file-recognition.patch
Patch7: file-5.31-awk-perl-recognition.patch
Patch8: file-5.31-gconv-cache-recognition.patch
URL: http://www.darwinsys.com/file/
Requires: file-libs = %{version}-%{release}
@ -183,6 +184,9 @@ cd %{py3dir}
%endif
%changelog
* Mon Aug 14 2017 Marek Cermak <macermak@redhat.com> - 5.31-8
- New magic entry for iconv/gconv module configuration cache (#1342428)
* Fri Aug 4 2017 Marek Cermak <macermak@redhat.com> - 5.31-7
- Changes in commands and images magic files
- Fixes awk/perl script recognition