pool/file
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update from 5.19 up to 5.20

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=106
This commit is contained in:
Dr. Werner Fink 2014-10-13 11:19:07 +00:00 committed by Git OBS Bridge
parent 72bacea16c
commit 693bf87649
8 changed files with 60 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
file-5.07-iso9660.dif
View File

@ -1,10 +0,0 @@
--- magic/Magdir/filesystems
+++ magic/Magdir/filesystems 2013-09-30 00:00:00.000000000 +0000
@@ -1946,6 +1946,7 @@
32769 string CD001 #
!:mime application/x-iso9660-image
>38913 string !NSR0 ISO 9660 CD-ROM filesystem data
+!:mime application/x-iso9660-image
>38913 string NSR0 UDF filesystem data
>>38917 string 1 (version 1.0)
>>38917 string 2 (version 1.5)

20
file-5.19-gdbm.patch
View File

@ -1,20 +0,0 @@
Index: magic/Magdir/database
===================================================================
--- magic/Magdir/database.orig 2014-06-03 21:17:27.000000000 +0200
+++ magic/Magdir/database 2014-08-18 14:40:57.296931686 +0200
@@ -9,9 +9,13 @@
# GDBM magic numbers
# Will be maintained as part of the GDBM distribution in the future.
# <downsj@teeny.org>
-0 belong 0x13579ace GNU dbm 1.x or ndbm database, big endian
+0 belong 0x13579acd GNU dbm 1.x or ndbm database, big endian, 32-bit
!:mime application/x-gdbm
-0 lelong 0x13579ace GNU dbm 1.x or ndbm database, little endian
+0 lelong 0x13579acd GNU dbm 1.x or ndbm database, little endian, 32-bit
+!:mime application/x-gdbm
+0 belong 0x13579acf GNU dbm 1.x or ndbm database, big endian, 64-bit
+!:mime application/x-gdbm
+0 lelong 0x13579acf GNU dbm 1.x or ndbm database, little endian, 64-bit
!:mime application/x-gdbm
0 string GDBM GNU dbm 2.x database
!:mime application/x-gdbm

3
file-5.19.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9484b3bbda1acc7b13a4f71031a85ce10c77bd0ffec7226741a219ef587e3a7c
size 719158

29
file-5.18-endian.patch → file-5.20-endian.patch
View File

@ -1,5 +1,10 @@
---
src/apprentice.c | 70 ++++---------------------------------------------------
src/cdf.c | 54 +++---------------------------------------
2 files changed, 10 insertions(+), 114 deletions(-)
--- src/apprentice.c
+++ src/apprentice.c 2014-03-28 10:17:46.310235050 +0000
+++ src/apprentice.c 2014-10-13 11:02:16.023878187 +0000
@@ -54,6 +54,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.
#if defined(HAVE_LIMITS_H)
#include <limits.h>
@ -8,7 +13,7 @@
#ifndef SSIZE_MAX
#define MAXMAGIC_SIZE ((ssize_t)0x7fffffff)
@@ -127,9 +128,11 @@ private struct mlist *mlist_alloc(void);
@@ -132,9 +133,11 @@ private struct mlist *mlist_alloc(void);
private void mlist_free(struct mlist *);
private void byteswap(struct magic *, uint32_t);
private void bs1(struct magic *);
@ -16,14 +21,14 @@
-private uint32_t swap4(uint32_t);
-private uint64_t swap8(uint64_t);
+
+#define swap2(x) bswap_16(x)
+#define swap4(x) bswap_32(x)
+#define swap8(x) bswap_64(x)
+#define swap2(x) bswap_16(x)
+#define swap4(x) bswap_32(x)
+#define swap8(x) bswap_64(x)
+
private char *mkdbname(struct magic_set *, const char *, int);
private struct magic_map *apprentice_map(struct magic_set *, const char *);
private void apprentice_unmap(struct magic_map *);
@@ -2882,67 +2885,6 @@ byteswap(struct magic *magic, uint32_t n
private struct magic_map *apprentice_buf(struct magic_set *, struct magic *,
size_t);
@@ -3031,67 +3034,6 @@ byteswap(struct magic *magic, uint32_t n
}
/*
@ -92,8 +97,8 @@
*/
private void
--- src/cdf.c
+++ src/cdf.c 2013-09-30 00:00:00.000000000 +0000
@@ -50,6 +50,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.55 2014
+++ src/cdf.c 2014-10-13 11:00:50.524206235 +0000
@@ -50,6 +50,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.67 2014
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
@ -101,8 +106,8 @@
#ifndef EFTYPE
#define EFTYPE EINVAL
@@ -75,56 +76,9 @@ static union {
#define CDF_TOLE2(x) ((uint16_t)(NEED_SWAP ? _cdf_tole2(x) : (uint16_t)(x)))
@@ -77,56 +78,9 @@ static union {
CDF_TOLE4(x) : CDF_TOLE8(x)))
#define CDF_GETUINT32(x, y) cdf_getuint32(x, y)
-

39
file-5.19.dif → file-5.20.dif
View File

@ -1,3 +1,14 @@
---
magic/Magdir/elf | 2
magic/Magdir/linux | 36 +++++----
magic/Magdir/msad | 5 +
magic/Magdir/msdos | 4 -
magic/Makefile.am | 61 +++++++++------
magic/Makefile.in | 60 +++++++++------
src/Makefile.am | 2
src/dcore.c | 207 +++++++++++++++++++++++++++++++++++++++++++++++++++++
8 files changed, 311 insertions(+), 66 deletions(-)
--- magic/Magdir/elf
+++ magic/Magdir/elf 2013-09-30 00:00:00.000000000 +0000
@@ -128,7 +128,7 @@
@ -11,7 +22,7 @@
>18 leshort 53 Motorola M68HC12,
--- magic/Magdir/linux
+++ magic/Magdir/linux 2013-12-02 11:09:39.000000000 +0000
@@ -100,23 +100,27 @@
@@ -101,23 +101,27 @@
# and Nicolas Lichtmaier <nick@debian.org>
# All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29
# Linux kernel boot images (i386 arch) (Wolfram Kleff)
@ -65,7 +76,7 @@
+4 string Standard\ Jet\ DB Microsoft Access Database
--- magic/Magdir/msdos
+++ magic/Magdir/msdos 2013-09-30 00:00:00.000000000 +0000
@@ -99,9 +99,9 @@
@@ -100,9 +100,9 @@
>>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB)
>>>(0x3c.l+22) leshort&0x1000 >0 system file
>>>(0x3c.l+24) leshort 0x010b
@ -78,7 +89,7 @@
# hooray, there's a DOS extender using the PE format, with a valid PE
# executable inside (which just prints a message and exits if run in win)
--- magic/Makefile.am
+++ magic/Makefile.am 2013-09-30 00:00:00.000000000 +0000
+++ magic/Makefile.am 2014-10-13 11:06:01.852337743 +0000
@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@ -129,7 +140,7 @@
$(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \
$(MAGIC_FRAGMENT_DIR)/make \
@@ -148,10 +146,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
@@ -150,10 +148,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
$(MAGIC_FRAGMENT_DIR)/mkid \
$(MAGIC_FRAGMENT_DIR)/mlssa \
$(MAGIC_FRAGMENT_DIR)/mmdf \
@ -141,16 +152,16 @@
$(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msx \
$(MAGIC_FRAGMENT_DIR)/msvc \
@@ -195,6 +193,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
@@ -199,6 +197,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
$(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \
+$(MAGIC_FRAGMENT_DIR)/apple \
+$(MAGIC_FRAGMENT_DIR)/macintosh \
$(MAGIC_FRAGMENT_DIR)/rinex \
$(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \
@@ -264,8 +264,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
$(MAGIC_FRAGMENT_DIR)/ruby \
@@ -268,8 +268,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
$(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zyxel
@ -172,7 +183,7 @@
# FIXME: Build file natively as well so that it can be used to compile
# the target's magic file; for now we bail if the local version does not match
@@ -277,19 +289,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
@@ -281,19 +293,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
FILE_COMPILE_DEP = $(FILE_COMPILE)
endif
@ -212,7 +223,7 @@
+# $(FILE_COMPILE) -C -m magic
+# @rm -fr magic
--- magic/Makefile.in
+++ magic/Makefile.in 2014-02-18 10:19:46.542235198 +0000
+++ magic/Makefile.in 2014-10-13 11:09:03.820337523 +0000
@@ -267,7 +267,7 @@ top_srcdir = @top_srcdir@
MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic
@ -263,7 +274,7 @@
$(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \
$(MAGIC_FRAGMENT_DIR)/make \
@@ -409,10 +407,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
@@ -411,10 +409,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
$(MAGIC_FRAGMENT_DIR)/mkid \
$(MAGIC_FRAGMENT_DIR)/mlssa \
$(MAGIC_FRAGMENT_DIR)/mmdf \
@ -275,16 +286,16 @@
$(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msx \
$(MAGIC_FRAGMENT_DIR)/msvc \
@@ -456,6 +454,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
@@ -460,6 +458,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
$(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \
+$(MAGIC_FRAGMENT_DIR)/apple \
+$(MAGIC_FRAGMENT_DIR)/macintosh \
$(MAGIC_FRAGMENT_DIR)/rinex \
$(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \
@@ -525,10 +525,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
$(MAGIC_FRAGMENT_DIR)/ruby \
@@ -529,10 +529,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
$(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zyxel
@ -308,7 +319,7 @@
# FIXME: Build file natively as well so that it can be used to compile
# the target's magic file; for now we bail if the local version does not match
@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file${EXEEXT}
@@ -749,23 +761,25 @@ uninstall-am: uninstall-pkgdataDATA
@@ -753,23 +765,25 @@ uninstall-am: uninstall-pkgdataDATA
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags-am uninstall uninstall-am uninstall-pkgdataDATA

3
file-5.20.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5bc36bfbb83a009da25a7174848f1bc5824be03192a8fdce7f83dc897ed2d247
size 725937

12
file.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Oct 13 10:57:42 UTC 2014 - werner@suse.de
- Update to file version 5.20
* recognize encrypted CDF documents
* add magic_load_buffers from Brooks Davis
* add thumbs.db support
- Remove file-5.07-iso9660.dif as now upstream
- Remove file-5.19-gdbm.patch as now upstream
- Adapt and rename file-5.18-endian.patch to file-5.20-endian.patch
- Adapt and rename file-5.19.dif file-5.20.dif
-------------------------------------------------------------------
Tue Aug 19 09:30:38 UTC 2014 - pgajdos@suse.com

10
file.spec
View File

@ -30,7 +30,7 @@ Obsoletes: file-64bit
%endif
#
# Set Version also in python-magic.spec
Version: 5.19
Version: 5.20
Release: 0
Summary: A Tool to Determine File Types
License: BSD-2-Clause
@ -38,7 +38,7 @@ Group: Productivity/File utilities
Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
Source2: baselibs.conf
Source3: file-rpmlintrc
Patch: file-5.19.dif
Patch: file-5.20.dif
Patch1: file-5.19-misc.dif
Patch4: file-4.24-autoconf.dif
Patch5: file-5.14-tex.dif
@ -55,15 +55,13 @@ Patch22: file-5.19-cromfs.dif
Patch25: file-5.18-javacheck.dif
Patch26: file-5.19-solv.dif
Patch27: file-5.19-zip2.0.dif
Patch28: file-5.07-iso9660.dif
Patch31: file-5.19-biorad.dif
Patch32: file-5.19-clicfs.dif
Patch33: file-5.16-ocloexec.patch
Patch34: file-5.18-endian.patch
Patch34: file-5.20-endian.patch
Patch35: file-5.12-nitpick.dif
Patch36: file-5.15-clear-invalid.patch
Patch37: file-secure_getenv.patch
Patch38: file-5.19-gdbm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global _miscdir %{_datadir}/misc
@ -122,7 +120,6 @@ to develop applications that require the magic "file" interface.
%patch25 -p0 -b .javacheck
%patch26 -p0 -b .solv
%patch27 -p0 -b .zip2.0
%patch28 -p0 -b .iso9600
%patch31 -p0 -b .biorad
%patch32 -p0 -b .clicfs
%patch33 -p0 -b .clexe
@ -130,7 +127,6 @@ to develop applications that require the magic "file" interface.
%patch35 -p0 -b .nitpick
%patch36 -p1 -b .clear
%patch37 -p1 -b .getenv
%patch38 -p0 -b .gdbm
%patch -b .0
test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in