From a32a29be0c1c98106f22ae54cedda4e2c3b7170f Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 25 Aug 2010 07:14:47 +0000 Subject: [PATCH] - removed obsolete lzma patch - added python patch (recognize python 2.7) - added dbase patch (workaround too weak DBase 3 entries, which covered python 2.7) - release 0.2 Changed files: file-dbase.patch -> 1.1 file-lzma.patch -> 1.2 file-python.patch -> 1.1 file.spec -> 1.172 --- file-dbase.patch | 25 +++++++++++++++++++++++++ file-lzma.patch | 15 --------------- file-python.patch | 10 ++++++++++ file.spec | 6 ++++-- 4 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 file-dbase.patch delete mode 100644 file-lzma.patch create mode 100644 file-python.patch diff --git a/file-dbase.patch b/file-dbase.patch new file mode 100644 index 0000000..fee8669 --- /dev/null +++ b/file-dbase.patch @@ -0,0 +1,25 @@ +Single 0x03/0x83 is too weak (the first conflicts with Python 2.7); +rely on the fact, that third byte is the last modification month in BCD, i.e. <= 0x12 +--- file-5.04/magic/Magdir/msdos.orig 2010-08-25 08:34:47.942823295 +0200 ++++ file-5.04/magic/Magdir/msdos 2010-08-25 09:04:06.554822457 +0200 +@@ -549,12 +549,14 @@ + 0 lelong 0x08084b50 TurboC Font file + + # WARNING: below line conflicts with Infocom game data Z-machine 3 +-0 byte 0x03 DBase 3 data file +->0x04 lelong 0 (no records) +->0x04 lelong >0 (%ld records) +-0 byte 0x83 DBase 3 data file with memo(s) +->0x04 lelong 0 (no records) +->0x04 lelong >0 (%ld records) ++0 byte 0x03 ++>0x02 byte <0x13 DBase 3 data file ++>>0x04 lelong 0 (no records) ++>>0x04 lelong >0 (%ld records) ++0 byte 0x83 ++>0x02 byte <0x13 DBase 3 data file with memo(s) ++>>0x04 lelong 0 (no records) ++>>0x04 lelong >0 (%ld records) + 0 leshort 0x0006 DBase 3 index file + 0 string PMCC Windows 3.x .GRP file + 1 string RDC-meg MegaDots diff --git a/file-lzma.patch b/file-lzma.patch deleted file mode 100644 index b6945ef..0000000 --- a/file-lzma.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur file-4.17.old/magic/Magdir/compress file-4.17/magic/Magdir/compress ---- file-4.17.old/magic/Magdir/compress 2006-04-22 11:56:54.000000000 +0200 -+++ file-4.17/magic/Magdir/compress 2006-04-22 12:01:39.000000000 +0200 -@@ -174,6 +174,11 @@ - >6 byte x version %d - >7 byte x \b.%d - -+# LZMA (7-zip sister format) -+# http://www.7-zip.org/sdk.html -+# -+0 string ]\000\000\200\000\377\377\377\377\377\377\377\377 LZMA compressed data -+ - # AFX compressed files (Wolfram Kleff) - 2 string -afx- AFX compressed file data - diff --git a/file-python.patch b/file-python.patch new file mode 100644 index 0000000..45b35bf --- /dev/null +++ b/file-python.patch @@ -0,0 +1,10 @@ +--- file-5.04/magic/Magdir/python.orig 2009-10-27 15:49:57.000000000 +0100 ++++ file-5.04/magic/Magdir/python 2010-08-25 08:48:48.722825810 +0200 +@@ -17,6 +17,7 @@ + 0 belong 0x6df20d0a python 2.4 byte-compiled + 0 belong 0xb3f20d0a python 2.5 byte-compiled + 0 belong 0xd1f20d0a python 2.6 byte-compiled ++0 belong 0x03f30d0a python 2.7 byte-compiled + 0 belong 0x3b0c0d0a python 3.0 byte-compiled + 0 belong 0x4f0c0d0a python 3.1 byte-compiled + diff --git a/file.spec b/file.spec index 19353d5..8aa2b4e 100644 --- a/file.spec +++ b/file.spec @@ -29,7 +29,7 @@ Summary(zh_CN.UTF-8): 判定文件类型的工具。 Summary(zh_TW.UTF-8): 用於決定檔案類型的一個工具程式。 Name: file Version: 5.04 -Release: 0.1 +Release: 0.2 License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz @@ -46,7 +46,8 @@ Patch3: %{name}-greedy-dump.patch Patch4: %{name}-selinux.patch Patch5: %{name}-msdos.patch Patch6: %{name}-fusecompress.patch -Patch7: %{name}-lzma.patch +Patch7: %{name}-python.patch +Patch8: %{name}-dbase.patch URL: http://www.darwinsys.com/file/ BuildRequires: autoconf BuildRequires: automake @@ -255,6 +256,7 @@ Wiązania Pythona dla libmagic. %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 rm -f magic/Magdir/{*.orig,*~} -- 2.44.0