SHA256
1
0
forked from pool/file
Dr. Werner Fink 2010-02-05 16:16:27 +00:00 committed by Git OBS Bridge
parent 207c922c0c
commit f3cea8b37b
5 changed files with 51 additions and 29 deletions

View File

@ -1,7 +1,5 @@
Index: magic/Localstuff
===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
--- magic/Localstuff
+++ magic/Localstuff 2003-07-01 16:58:32.000000000 +0000
@@ -5,3 +5,12 @@
# $File: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $
# Add any locally observed files here. Remember:

View File

@ -1,7 +1,5 @@
Index: doc/Makefile.am
===================================================================
--- doc/Makefile.am.orig
+++ doc/Makefile.am
--- doc/Makefile.am
+++ doc/Makefile.am 2003-12-15 12:04:19.000000000 +0000
@@ -5,7 +5,8 @@ else
man_MAGIC = magic.4
endif
@ -22,10 +20,8 @@ Index: doc/Makefile.am
@rm -f $@
sed -e s@__CSECTION__@1@g \
-e s@__FSECTION__@${fsect}@g \
Index: src/readelf.h
===================================================================
--- src/readelf.h.orig
+++ src/readelf.h
--- src/readelf.h
+++ src/readelf.h 2003-07-01 14:53:55.000000000 +0000
@@ -34,7 +34,10 @@
#ifndef __fake_elf_h__
#define __fake_elf_h__

View File

@ -49,25 +49,25 @@
+++ magic/Magdir/commands 2009-05-05 13:57:30.778196178 +0200
@@ -12,6 +12,8 @@
!:mime text/x-shellscript
0 string/b #!\ /bin/tcsh Tenex C shell script text executable
0 string/w #!\ /bin/tcsh Tenex C shell script text executable
!:mime text/x-shellscript
+0 string/b #!\ /usr/bin/tcsh Tenex C shell script text executable
+0 string/w #!\ /usr/bin/tcsh Tenex C shell script text executable
+!:mime text/x-shellscript
0 string/b #!\ /usr/local/tcsh Tenex C shell script text executable
0 string/w #!\ /usr/local/tcsh Tenex C shell script text executable
!:mime text/x-shellscript
0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text executable
0 string/w #!\ /usr/local/bin/tcsh Tenex C shell script text executable
@@ -54,7 +56,11 @@
0 string/b #!\ /bin/rc Plan 9 rc shell script text executable
0 string/w #!\ /bin/rc Plan 9 rc shell script text executable
# bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de)
-0 string/b #!\ /bin/bash Bourne-Again shell script text executable
+0 string/b #!\ /bin/bash Bourne-Again shell script text executable
-0 string/w #!\ /bin/bash Bourne-Again shell script text executable
+0 string/w #!\ /bin/bash Bourne-Again shell script text executable
+!:mime text/x-shellscript
+0 string/b #!\ /usr/bin/bash Bourne-Again shell script text executable
+0 string/w #!\ /usr/bin/bash Bourne-Again shell script text executable
+!:mime text/x-shellscript
+0 string/b #!\ /usr/local/bash Bourne-Again shell script text executable
+0 string/w #!\ /usr/local/bash Bourne-Again shell script text executable
!:mime text/x-shellscript
0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text executable
0 string/w #!\ /usr/local/bin/bash Bourne-Again shell script text executable
!:mime text/x-shellscript
--- magic/Magdir/mach
+++ magic/Magdir/mach 2003-12-08 17:50:03.000000000 +0100

View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Fri Feb 5 17:15:51 CET 2010 - werner@suse.de
- Update to file version 5.04
* print proper mime for crystal reports file
* print the last summary information of a cdf document, not the
first so that nested documents print the right info
* ctime/asctime can return NULL on some OS's although
they should not (Toshit Antani)
* Centralize magic path handling routines and remove the
special-casing from file.c so that the python module for
example comes up with the same magic path (Fixes ~/.magic
handling) (from Gab)
* When magic argument is a directory, read the files in
strcmp-sorted order (fixes Debian bug #488562 and our own FIXME).
* Combine overlapping epoc and psion magic files into one (epoc).
* Add some more EPOC MIME types.
* Fix 3 bugs (From Ian Darwin):
- file_showstr could move one past the end of the array
- parse_apple did not nul terminate the string in the overflow case
- parse_mime truncated the wrong string in the overflow case
* Add the necessary field handling for crystal reports files to work
* Stop "(if" identifying Lisp files, that's plain dumb!
* Add a couple of missing MP3 MIME types.
* Add full range of hash-bang tests for Python and Ruby.
* Add MIME types for Python and Ruby scripts.
* off by one in parsing hw capabilities in elf (Cheng Renquan)
-------------------------------------------------------------------
Sat Dec 12 22:08:00 CET 2009 - jengelh@medozas.de

View File

@ -1,7 +1,7 @@
#
# spec file for package file (Version 5.03)
# spec file for package file (Version 5.04)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -30,14 +30,14 @@ Obsoletes: file-64bit
%endif
#
# Set Version also in python-magic.spec
Version: 5.03
Release: 4
Version: 5.04
Release: 1
Summary: A Tool to Determine File Types
Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2
Source2: baselibs.conf
Patch: file-%{version}.dif
Patch1: file-5.02-misc.dif
Patch3: file-5.02-exec.dif
Patch3: file-5.04-exec.dif
Patch4: file-4.24-autoconf.dif
Patch5: file-4.03-tex.dif
Patch7: file-4.20-ssd.dif
@ -47,7 +47,7 @@ Patch10: file-4.18-printf.dif
Patch11: file-4.24-reg_dos.dif
Patch12: file-5.02-option.dif
Patch13: file-4.21-scribus.dif
Patch14: file-4.24-awk.dif
Patch14: file-5.04-awk.dif
Patch15: file-4.21-xcursor.dif
Patch16: file-4.21-reiserfs.dif
Patch20: file-4.24-mips.dif
@ -56,7 +56,7 @@ Patch22: file-4.24-cromfs.dif
Patch24: file-4.24-warn.dif
Patch25: file-5.02-javacheck.dif
Patch26: file-4.24-solv.dif
Patch27: file-5.02-zip2.0.dif
Patch27: file-5.04-zip2.0.dif
Patch28: file-5.03-iso9660.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc