rpms/file/devel file-4.16-magic.patch, NONE, 1.1 file.spec, 1.36, 1.37 file-4.10-rh.patch, 1.1, NONE file-4.14-magic.patch, 1.3, NONE file-4.15-style.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Oct 18 07:35:13 UTC 2005
Author: rvokal
Update of /cvs/dist/rpms/file/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13627
Modified Files:
file.spec
Added Files:
file-4.16-magic.patch
Removed Files:
file-4.10-rh.patch file-4.14-magic.patch file-4.15-style.patch
Log Message:
- upgrade to upstream, patch clean-up
file-4.16-magic.patch:
magic/Magdir/apple | 17 +++++++++++++++++
magic/Magdir/images | 6 ++++++
magic/Magdir/revision | 6 ++++++
magic/magic.mime | 29 +++++++++++++++--------------
src/fsmagic.c | 3 ++-
5 files changed, 46 insertions(+), 15 deletions(-)
--- NEW FILE file-4.16-magic.patch ---
--- file-4.14/src/fsmagic.c.magic 2005-06-25 17:52:14.000000000 +0200
+++ file-4.14/src/fsmagic.c 2005-07-14 09:47:08.000000000 +0200
@@ -92,7 +92,8 @@
if (file_printf(ms, "cannot open `%s' (%s)",
fn, strerror(errno)) == -1)
return -1;
- return 1;
+ ms->haderr++;
+ return -1;
}
if ((ms->flags & MAGIC_MIME) != 0) {
--- file-4.14/magic/Magdir/apple.magic 2005-06-25 17:33:02.000000000 +0200
+++ file-4.14/magic/Magdir/apple 2005-07-14 09:47:08.000000000 +0200
@@ -10,6 +10,23 @@
0 belong 0x00051600 AppleSingle encoded Macintosh file
0 belong 0x00051607 AppleDouble encoded Macintosh file
+# Apple Emulator 2IMG format
+#
+0 string 2IMG Apple ][ 2IMG Disk Image
+>4 string XGS! \b, XGS
+>4 string CTKG \b, Catakig
+>4 string ShIm \b, Sheppy's ImageMaker
+>4 string WOOF \b, Sweet 16
+>4 string B2TR \b, Bernie ][ the Rescue
+>4 string !nfc \b, ASIMOV2
+>4 string x \b, Unknown Format
+>0xc byte 00 \b, DOS 3.3 sector order
+>>0x10 byte 00 \b, Volume 254
+>>0x10 byte&0x7f x \b, Volume %u
+>0xc byte 01 \b, ProDOS sector order
+>>0x14 short x \b, %u Blocks
+>0xc byte 02 \b, NIB data
+
# magic for Newton PDA package formats
# from Ruda Moura <ruda at helllabs.org>
0 string package0 Newton package, NOS 1.x,
--- file-4.14/magic/Magdir/images.magic 2005-03-06 06:11:56.000000000 +0100
+++ file-4.14/magic/Magdir/images 2005-07-14 09:47:08.000000000 +0200
@@ -526,3 +526,9 @@
# specifications at http://hdf.ncsa.uiuc.edu/
0 belong 0x0e031301 Hierarchical Data Format (version 4) data
0 string \211HDF\r\n\032 Hierarchical Data Format (version 5) data
+
+# The boot loaders syslinux and isolinux use a RLE based image format
+# called SLL16 to store splash screens.
+0 lelong 0x1413f33d Syslinux SLL16 image data,
+>4 leshort >0 %hd x
+>6 leshort >0 %hd
--- file-4.14/magic/Magdir/revision.magic 2003-05-26 01:04:55.000000000 +0200
+++ file-4.14/magic/Magdir/revision 2005-07-14 09:47:08.000000000 +0200
@@ -3,3 +3,9 @@
# file(1) magic for revision control files
# From Hendrik Scholz <hendrik at scholz.net>
0 string /1\ :pserver: cvs password text file
+
+
+# Subversion (SVN) dumps
+# Uwe Zeisberger <zeisberg at informatik.uni-freiburg.de>
+0 string SVN-fs-dump-format-version: Subversion dumpfile
+>28 string >\0 (version: %s)
--- file-4.14/magic/magic.mime.magic 2005-06-25 17:39:18.000000000 +0200
+++ file-4.14/magic/magic.mime 2005-07-14 09:49:16.000000000 +0200
@@ -195,7 +195,7 @@
0 beshort 0x4DE1 audio/MP4A-LATM
# MPEG Layer 3 sound files
-0 beshort &0xffe0 audio/mpeg
+0 beshort&0xfffe =0xfffa audio/mpeg
#MP3 with ID3 tag
0 string ID3 audio/mpeg
# Ogg/Vorbis
@@ -398,19 +398,14 @@
#
# from Daniel Quinlan <quinlan at yggdrasil.com>
#
-0 string \<HEAD text/html
-0 string \<head text/html
-0 string \<TITLE text/html
-0 string \<title text/html
-0 string \<html text/html
-0 string \<HTML text/html
+0 string/cB \<!DOCTYPE\ html text/html
+0 string/cb \<head text/html
+0 string/cb \<title text/html
+0 string/bc \<html text/html
0 string \<!-- text/html
-0 string \<h1 text/html
-0 string \<H1 text/html
-0 string \<!doctype\ HTML text/html
-0 string \<!DOCTYPE\ HTML text/html
-0 string \<!doctype\ html text/html
-0 string \<!doctype\ HTML text/html
+0 string/c \<h1 text/html
+
+0 string \<?xml text/xml
#------------------------------------------------------------------------------
# images: file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
@@ -473,7 +468,7 @@
0 beshort 0xffd8 image/jpeg
# PC bitmaps (OS/2, Windoze BMP files) (Greg Roelofs, newt at uchicago.edu)
-0 string BM image/bmp
+0 string BM image/x-ms-bmp
#>14 byte 12 (OS/2 1.x format)
#>14 byte 64 (OS/2 2.x format)
#>14 byte 40 (Windows 3.x format)
@@ -919,3 +914,9 @@
# EET archive
# From: Tilman Sauerbeck <tilman at code-monkey.de>
0 belong 0x1ee7ff00 application/x-eet
+
+# Gnumeric spreadsheet
+# This entry is only semi-helpful, as Gnumeric compresses its files, so
+# they will ordinarily reported as "compressed", but at least -z helps
+39 string =<gmr:Workbook application/x-gnumeric
+
Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- file.spec 3 Oct 2005 10:32:29 -0000 1.36
+++ file.spec 18 Oct 2005 07:35:07 -0000 1.37
@@ -2,18 +2,16 @@
Summary: A utility for determining file types.
Name: file
-Version: 4.15
-Release: 4
+Version: 4.16
+Release: 1
License: distributable
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
-#Patch0: file-4.10-rh.patch
Patch1: file-4.10-debian.patch
Patch2: file-selinux.patch
-Patch3: file-4.14-magic.patch
+Patch3: file-4.16-magic.patch
Patch5: file-4.13-fsdump.patch
Patch6: file-4.13-quick.patch
-Patch7: file-4.15-style.patch
Patch8: file-4.15-berkeley.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: zlib-devel
@@ -29,13 +27,11 @@
%prep
%setup -q
-#%patch0 -p1 -b .rh
%patch1 -p1 -b .debian
%patch2 -p1 -b .selinux
%patch3 -p1 -b .magic
%patch5 -p1 -b .fsdump
%patch6 -p1 -b .quick
-%patch7 -p1 -b .style
%patch8 -p1 -b .berkeley
iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
@@ -81,6 +77,9 @@
%{_libdir}/libmagic.*
%changelog
+* Tue Oct 18 2005 Radek Vokal <rvokal at redhat.com> - 4.16-1
+- upgrade to upstream
+
* Mon Oct 03 2005 Radek Vokal <rvokal at redhat.com> - 4.15-4
- file output for Berkeley DB gains Cracklib (#168917)
--- file-4.10-rh.patch DELETED ---
--- file-4.14-magic.patch DELETED ---
--- file-4.15-style.patch DELETED ---
More information about the fedora-cvs-commits
mailing list