[file/f19] fix #985072 - add support for journald files
Jan Kaluža
jkaluza at fedoraproject.org
Thu Aug 22 07:36:29 UTC 2013
commit 9d26d71f564d456995571f21dbe299df3892b8eb
Author: Jan Kaluza <jkaluza at redhat.com>
Date: Thu Aug 22 09:36:09 2013 +0200
fix #985072 - add support for journald files
file-5.14-journald.patch | 38 ++++++++++++++++++++++++++++++++++++++
file.spec | 7 ++++++-
2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/file-5.14-journald.patch b/file-5.14-journald.patch
new file mode 100644
index 0000000..f19d5bb
--- /dev/null
+++ b/file-5.14-journald.patch
@@ -0,0 +1,38 @@
+commit c4dda942257181bc75113acce8cfefbadba258d7
+Author: Christos Zoulas <christos at zoulas.com>
+Date: Wed Jun 26 14:48:31 2013 +0000
+
+ asciicize.
+
+diff --git a/magic/Magdir/linux b/magic/Magdir/linux
+index 83c816f..634e9b5 100644
+--- a/magic/Magdir/linux
++++ b/magic/Magdir/linux
+@@ -344,3 +344,27 @@
+ #>2 regex \(name\ [^)]*\) %s
+ >20 search/256 (name (name
+ >>&1 string x %s...)
++
++# Systemd journald files
++# See http://www.freedesktop.org/wiki/Software/systemd/journal-files/.
++# From: Zbigniew Jedrzejewski-Szmek <zbyszek at in.waw.pl>
++
++# check magic
++0 string LPKSHHRH
++# check that state is one of known values
++>16 ubyte&252 0
++# check that each half of three unique id128s is non-zero
++>>24 ubequad >0
++>>>32 ubequad >0
++>>>>40 ubequad >0
++>>>>>48 ubequad >0
++>>>>>>56 ubequad >0
++>>>>>>>64 ubequad >0 Journal file
++!:mime application/octet-stream
++# provide more info
++>>>>>>>>184 leqdate 0 empty
++>>>>>>>>16 ubyte 0 \b, offline
++>>>>>>>>16 ubyte 1 \b, online
++>>>>>>>>16 ubyte 2 \b, archived
++>>>>>>>>8 ulelong&1 1 \b, sealed
++>>>>>>>>12 ulelong&1 1 \b, compressed
diff --git a/file.spec b/file.spec
index efd19d2..5969566 100644
--- a/file.spec
+++ b/file.spec
@@ -5,7 +5,7 @@
Summary: A utility for determining file types
Name: file
Version: 5.11
-Release: 10%{?dist}
+Release: 11%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -26,6 +26,7 @@ Patch11: file-5.04-volume_key.patch
Patch12: file-5.04-man-return-code.patch
Patch13: file-5.04-generic-msdos.patch
Patch14: file-5.14-netpbm.patch
+Patch15: file-5.14-journald.patch
URL: http://www.darwinsys.com/file/
Requires: file-libs = %{version}-%{release}
BuildRequires: zlib-devel
@@ -94,6 +95,7 @@ file(1) command.
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
touch -r doc/libmagic.man doc/libmagic.man_
@@ -169,6 +171,9 @@ cd python
%endif
%changelog
+* Thu Aug 22 2013 Jan Kaluza <jkaluza at redhat.com> - 5.11-11
+- fix #985072 - add support for journald files
+
* Mon Jun 17 2013 Jan Kaluza <jkaluza at redhat.com> - 5.11-10
- build python-magic as noarch
- fix netpbm detection
More information about the scm-commits
mailing list