rpm/file
SHA256
1
0
Fork 0
forked from pool/file
Code Pull Requests Activity

Accepting request 223729 from Base:System

Browse Source 
fix python-magic, 5.17. links to file which was changed without branching (forwarded request 223584 from AndreasStieger)

OBS-URL: https://build.opensuse.org/request/show/223729
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=78
This commit is contained in:
Tomáš Chvátal 2014-02-28 15:22:03 +00:00 committed by Git OBS Bridge
commit 2086a708f0
8 changed files with 71 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
file-5.16.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48bcac7726c37a8a0bc7ffa16b58993575657dd7b382039380fb3b74ab389261
size 658789

12
file-5.07-option.dif → file-5.17-option.dif
View File

@ -1,7 +1,7 @@
--- src/file.c
+++ src/file.c 2013-09-30 00:00:00.000000000 +0000
@@ -195,6 +195,8 @@ main(int argc, char *argv[])
flags |= MAGIC_DEBUG|MAGIC_CHECK;
+++ src/file.c 2014-02-18 08:50:59.990452075 +0000
@@ -198,6 +198,8 @@ main(int argc, char *argv[])
flags |= MAGIC_ERROR;
break;
case 'e':
+ if (!optarg)
@ -9,7 +9,7 @@
for (i = 0; i < sizeof(nv) / sizeof(nv[0]); i++)
if (strcmp(nv[i].name, optarg) == 0)
break;
@@ -206,7 +208,7 @@ main(int argc, char *argv[])
@@ -209,7 +211,7 @@ main(int argc, char *argv[])
break;
case 'f':
@ -18,7 +18,7 @@
usage();
if (magic == NULL)
if ((magic = load(magicfile, flags)) == NULL)
@@ -215,6 +217,8 @@ main(int argc, char *argv[])
@@ -218,6 +220,8 @@ main(int argc, char *argv[])
++didsomefiles;
break;
case 'F':
@ -27,7 +27,7 @@
separator = optarg;
break;
case 'i':
@@ -227,6 +231,8 @@ main(int argc, char *argv[])
@@ -230,6 +234,8 @@ main(int argc, char *argv[])
action = FILE_LIST;
break;
case 'm':

48
file-5.16.dif → file-5.17.dif
View File

@ -10,8 +10,8 @@
>18 leshort 52 Motorola Coldfire,
>18 leshort 53 Motorola M68HC12,
--- magic/Magdir/linux
+++ magic/Magdir/linux 2013-12-02 11:09:39.454735400 +0000
@@ -97,23 +97,27 @@
+++ magic/Magdir/linux 2013-12-02 11:09:39.000000000 +0000
@@ -100,23 +100,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)
@ -96,7 +96,7 @@
$(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/archive \
$(MAGIC_FRAGMENT_DIR)/assembler \
@@ -75,7 +74,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
@@ -76,7 +75,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
$(MAGIC_FRAGMENT_DIR)/erlang \
$(MAGIC_FRAGMENT_DIR)/esri \
$(MAGIC_FRAGMENT_DIR)/fcs \
@ -104,7 +104,7 @@
$(MAGIC_FRAGMENT_DIR)/flash \
$(MAGIC_FRAGMENT_DIR)/fonts \
$(MAGIC_FRAGMENT_DIR)/fortran \
@@ -113,6 +111,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
@@ -114,6 +112,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
$(MAGIC_FRAGMENT_DIR)/java \
$(MAGIC_FRAGMENT_DIR)/javascript \
$(MAGIC_FRAGMENT_DIR)/jpeg \
@ -113,7 +113,7 @@
$(MAGIC_FRAGMENT_DIR)/karma \
$(MAGIC_FRAGMENT_DIR)/kde \
$(MAGIC_FRAGMENT_DIR)/keepass \
@@ -120,7 +120,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
@@ -121,7 +121,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
$(MAGIC_FRAGMENT_DIR)/lecter \
$(MAGIC_FRAGMENT_DIR)/lex \
$(MAGIC_FRAGMENT_DIR)/lif \
@ -121,7 +121,7 @@
$(MAGIC_FRAGMENT_DIR)/lisp \
$(MAGIC_FRAGMENT_DIR)/llvm \
$(MAGIC_FRAGMENT_DIR)/lua \
@@ -128,7 +127,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
@@ -129,7 +128,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
$(MAGIC_FRAGMENT_DIR)/m4 \
$(MAGIC_FRAGMENT_DIR)/mach \
$(MAGIC_FRAGMENT_DIR)/macos \
@ -129,7 +129,7 @@
$(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \
$(MAGIC_FRAGMENT_DIR)/make \
@@ -147,10 +145,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
@@ -148,10 +146,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
$(MAGIC_FRAGMENT_DIR)/mkid \
$(MAGIC_FRAGMENT_DIR)/mlssa \
$(MAGIC_FRAGMENT_DIR)/mmdf \
@ -141,7 +141,7 @@
$(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msx \
$(MAGIC_FRAGMENT_DIR)/msvc \
@@ -193,6 +191,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
@@ -195,6 +193,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
$(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \
@ -150,7 +150,7 @@
$(MAGIC_FRAGMENT_DIR)/rinex \
$(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \
@@ -262,8 +262,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
@@ -264,8 +264,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
$(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zyxel
@ -172,7 +172,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
@@ -275,19 +287,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
@@ -277,19 +289,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
FILE_COMPILE_DEP = $(FILE_COMPILE)
endif
@ -212,8 +212,8 @@
+# $(FILE_COMPILE) -C -m magic
+# @rm -fr magic
--- magic/Makefile.in
+++ magic/Makefile.in 2013-09-30 14:05:30.000000000 +0000
@@ -203,7 +203,7 @@ top_srcdir = @top_srcdir@
+++ magic/Makefile.in 2014-02-18 10:19:46.542235198 +0000
@@ -267,7 +267,7 @@ top_srcdir = @top_srcdir@
MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@ -222,7 +222,7 @@
EXTRA_DIST = \
$(MAGIC_DIR)/Header \
$(MAGIC_DIR)/Localstuff \
@@ -218,7 +218,6 @@ $(MAGIC_FRAGMENT_DIR)/android \
@@ -282,7 +282,6 @@ $(MAGIC_FRAGMENT_DIR)/android \
$(MAGIC_FRAGMENT_DIR)/animation \
$(MAGIC_FRAGMENT_DIR)/aout \
$(MAGIC_FRAGMENT_DIR)/apl \
@ -230,7 +230,7 @@
$(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/archive \
$(MAGIC_FRAGMENT_DIR)/assembler \
@@ -272,7 +271,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
@@ -337,7 +336,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
$(MAGIC_FRAGMENT_DIR)/erlang \
$(MAGIC_FRAGMENT_DIR)/esri \
$(MAGIC_FRAGMENT_DIR)/fcs \
@ -238,7 +238,7 @@
$(MAGIC_FRAGMENT_DIR)/flash \
$(MAGIC_FRAGMENT_DIR)/fonts \
$(MAGIC_FRAGMENT_DIR)/fortran \
@@ -310,6 +308,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
@@ -375,6 +373,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
$(MAGIC_FRAGMENT_DIR)/java \
$(MAGIC_FRAGMENT_DIR)/javascript \
$(MAGIC_FRAGMENT_DIR)/jpeg \
@ -247,7 +247,7 @@
$(MAGIC_FRAGMENT_DIR)/karma \
$(MAGIC_FRAGMENT_DIR)/kde \
$(MAGIC_FRAGMENT_DIR)/keepass \
@@ -317,7 +317,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
@@ -382,7 +382,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
$(MAGIC_FRAGMENT_DIR)/lecter \
$(MAGIC_FRAGMENT_DIR)/lex \
$(MAGIC_FRAGMENT_DIR)/lif \
@ -255,7 +255,7 @@
$(MAGIC_FRAGMENT_DIR)/lisp \
$(MAGIC_FRAGMENT_DIR)/llvm \
$(MAGIC_FRAGMENT_DIR)/lua \
@@ -325,7 +324,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
@@ -390,7 +389,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
$(MAGIC_FRAGMENT_DIR)/m4 \
$(MAGIC_FRAGMENT_DIR)/mach \
$(MAGIC_FRAGMENT_DIR)/macos \
@ -263,7 +263,7 @@
$(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \
$(MAGIC_FRAGMENT_DIR)/make \
@@ -344,10 +342,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
@@ -409,10 +407,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
$(MAGIC_FRAGMENT_DIR)/mkid \
$(MAGIC_FRAGMENT_DIR)/mlssa \
$(MAGIC_FRAGMENT_DIR)/mmdf \
@ -275,7 +275,7 @@
$(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msx \
$(MAGIC_FRAGMENT_DIR)/msvc \
@@ -390,6 +388,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
@@ -456,6 +454,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
$(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \
@ -284,7 +284,7 @@
$(MAGIC_FRAGMENT_DIR)/rinex \
$(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \
@@ -459,10 +459,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
@@ -525,10 +525,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
$(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zyxel
@ -308,12 +308,12 @@
# 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}
@@ -677,23 +689,25 @@ uninstall-am: uninstall-pkgdataDATA
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-pkgdataDATA
@@ -749,23 +761,25 @@ uninstall-am: uninstall-pkgdataDATA
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags-am uninstall uninstall-am uninstall-pkgdataDATA
+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
+ $(FILE_COMPILE) -C -m $(RAW
+ $(FILE_COMPILE) -C -m $(RAW)
-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
- @rm -fr magic

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

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

16
file.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Feb 18 10:21:11 UTC 2014 - werner@suse.de
- Update to file version 5.17 (bug fix release)
* Count recursion levels through indirect magic
* Prevent infinite recursion on files with indirect offsets of 0
* Add -E flag that makes file print filesystem errors to stderr
and exit.
* mime printing could print results from multiple magic entries
if there were multiple matches.
* in some cases overflow was not detected when computing offsets
in softmagic.
* use strcasestr() to for cdf strings
* reset to the "C" locale while doing regex operations, or case
insensitive comparisons; this is provisional
-------------------------------------------------------------------
Mon Dec 2 11:29:44 UTC 2013 - werner@suse.de

8
file.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package file
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 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.16
Version: 5.17
Release: 0
Summary: A Tool to Determine File Types
License: BSD-2-Clause
Group: Productivity/File utilities
Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
Source2: baselibs.conf
Patch: file-5.16.dif
Patch: file-5.17.dif
Patch1: file-5.14-misc.dif
Patch4: file-4.24-autoconf.dif
Patch5: file-5.14-tex.dif
@ -46,7 +46,7 @@ Patch8: file-4.20-xen.dif
Patch9: file-5.07-elf.dif
Patch10: file-5.14-printf.dif
Patch11: file-5.12-zip.dif
Patch12: file-5.07-option.dif
Patch12: file-5.17-option.dif
Patch13: file-4.21-scribus.dif
Patch15: file-4.21-xcursor.dif
Patch20: file-4.24-mips.dif

16
python-magic.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Sun Feb 23 20:34:25 UTC 2014 - andreas.stieger@gmx.de
- Update python-magic to file version 5.17 (bug fix release)
* Count recursion levels through indirect magic
* Prevent infinite recursion on files with indirect offsets of 0
* Add -E flag that makes file print filesystem errors to stderr
and exit.
* mime printing could print results from multiple magic entries
if there were multiple matches.
* in some cases overflow was not detected when computing offsets
in softmagic.
* use strcasestr() to for cdf strings
* reset to the "C" locale while doing regex operations, or case
insensitive comparisons; this is provisional
-------------------------------------------------------------------
Mon Dec 2 11:31:12 UTC 2013 - werner@suse.de

4
python-magic.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package python-magic
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 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
@ -23,7 +23,7 @@ BuildRequires: libtool
BuildRequires: python-devel
BuildRequires: zlib-devel
Url: http://www.darwinsys.com/file/
Version: 5.16
Version: 5.17
Release: 0
Summary: Python module to use libmagic
License: BSD-3-Clause and BSD-4-Clause