From 749d5d5736375482c395c4d59e1c60da6b44fbea0ece66a0feadb98e3b7f75c8 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 16 Jan 2012 14:23:30 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=38 --- file-5.07-exec.dif | 214 ------------------ file-5.08.tar.gz | 3 - ...bility.patch => file-5.10-visibility.patch | 4 +- file-5.08.dif => file-5.10.dif | 158 ++++++++++++- file-5.10.tar.gz | 3 + file.changes | 26 +++ file.spec | 12 +- python-magic.spec | 4 +- 8 files changed, 186 insertions(+), 238 deletions(-) delete mode 100644 file-5.07-exec.dif delete mode 100644 file-5.08.tar.gz rename file-5.07-visibility.patch => file-5.10-visibility.patch (87%) rename file-5.08.dif => file-5.10.dif (70%) create mode 100644 file-5.10.tar.gz diff --git a/file-5.07-exec.dif b/file-5.07-exec.dif deleted file mode 100644 index af5098b..0000000 --- a/file-5.07-exec.dif +++ /dev/null @@ -1,214 +0,0 @@ ---- magic/Magdir/commands -+++ magic/Magdir/commands 2011-06-14 13:50:11.135927768 +0000 -@@ -4,71 +4,71 @@ - # commands: file(1) magic for various shells and interpreters - # - #0 string/w : shell archive or script for antique kernel text --0 string/wt #!\ /bin/sh POSIX shell script text executable -+0 string/wt #!\ /bin/sh POSIX shell script text - !:mime text/x-shellscript --0 string/wt #!\ /bin/csh C shell script text executable -+0 string/wt #!\ /bin/csh C shell script text - !:mime text/x-shellscript - # korn shell magic, sent by George Wu, gwu@clyde.att.com --0 string/wt #!\ /bin/ksh Korn shell script text executable -+0 string/wt #!\ /bin/ksh Korn shell script text - !:mime text/x-shellscript --0 string/wt #!\ /bin/tcsh Tenex C shell script text executable -+0 string/wt #!\ /bin/tcsh Tenex C shell script text - !:mime text/x-shellscript --0 string/wt #!\ /usr/bin/tcsh Tenex C shell script text executable -+0 string/wt #!\ /usr/bin/tcsh Tenex C shell script text - !:mime text/x-shellscript --0 string/wt #!\ /usr/local/tcsh Tenex C shell script text executable -+0 string/wt #!\ /usr/local/tcsh Tenex C shell script text - !:mime text/x-shellscript --0 string/wt #!\ /usr/local/bin/tcsh Tenex C shell script text executable -+0 string/wt #!\ /usr/local/bin/tcsh Tenex C shell script text - !:mime text/x-shellscript - - # - # zsh/ash/ae/nawk/gawk magic from cameron@cs.unsw.oz.au (Cameron Simpson) --0 string/wt #!\ /bin/zsh Paul Falstad's zsh script text executable -+0 string/wt #!\ /bin/zsh Paul Falstad's zsh script text - !:mime text/x-shellscript --0 string/wt #!\ /usr/bin/zsh Paul Falstad's zsh script text executable -+0 string/wt #!\ /usr/bin/zsh Paul Falstad's zsh script text - !:mime text/x-shellscript --0 string/wt #!\ /usr/local/bin/zsh Paul Falstad's zsh script text executable -+0 string/wt #!\ /usr/local/bin/zsh Paul Falstad's zsh script text - !:mime text/x-shellscript --0 string/wt #!\ /usr/local/bin/ash Neil Brown's ash script text executable -+0 string/wt #!\ /usr/local/bin/ash Neil Brown's ash script text - !:mime text/x-shellscript --0 string/wt #!\ /usr/local/bin/ae Neil Brown's ae script text executable -+0 string/wt #!\ /usr/local/bin/ae Neil Brown's ae script text - !:mime text/x-shellscript --0 string/wt #!\ /bin/nawk new awk script text executable -+0 string/wt #!\ /bin/nawk new awk script text - !:mime text/x-nawk --0 string/wt #!\ /usr/bin/nawk new awk script text executable -+0 string/wt #!\ /usr/bin/nawk new awk script text - !:mime text/x-nawk --0 string/wt #!\ /usr/local/bin/nawk new awk script text executable -+0 string/wt #!\ /usr/local/bin/nawk new awk script text - !:mime text/x-nawk --0 string/wt #!\ /bin/gawk GNU awk script text executable -+0 string/wt #!\ /bin/gawk GNU awk script text - !:mime text/x-gawk --0 string/wt #!\ /usr/bin/gawk GNU awk script text executable -+0 string/wt #!\ /usr/bin/gawk GNU awk script text - !:mime text/x-gawk --0 string/wt #!\ /usr/local/bin/gawk GNU awk script text executable -+0 string/wt #!\ /usr/local/bin/gawk GNU awk script text - !:mime text/x-gawk - # --0 string/wt #!\ /bin/awk awk script text executable -+0 string/wt #!\ /bin/awk awk script text - !:mime text/x-awk --0 string/wt #!\ /usr/bin/awk awk script text executable -+0 string/wt #!\ /usr/bin/awk awk script text - !:mime text/x-awk - 0 regex =^\\s*BEGIN\\s*[{] awk script text - - # AT&T Bell Labs' Plan 9 shell --0 string/wt #!\ /bin/rc Plan 9 rc shell script text executable -+0 string/wt #!\ /bin/rc Plan 9 rc shell script text - - # bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de) --0 string/wt #!\ /bin/bash Bourne-Again shell script text executable -+0 string/wt #!\ /bin/bash Bourne-Again shell script text - !:mime text/x-shellscript --0 string/wt #!\ /usr/bin/bash Bourne-Again shell script text executable -+0 string/wt #!\ /usr/bin/bash Bourne-Again shell script text - !:mime text/x-shellscript --0 string/wt #!\ /usr/local/bash Bourne-Again shell script text executable -+0 string/wt #!\ /usr/local/bash Bourne-Again shell script text - !:mime text/x-shellscript --0 string/wt #!\ /usr/local/bin/bash Bourne-Again shell script text executable -+0 string/wt #!\ /usr/local/bin/bash Bourne-Again shell script text - !:mime text/x-shellscript - - # using env - 0 string/t #!/usr/bin/env a -->15 string/t >\0 %s script text executable -+>15 string/t >\0 %s script text - 0 string/t #!\ /usr/bin/env a -->16 string/t >\0 %s script text executable -+>16 string/t >\0 %s script text - - # PHP scripts - # Ulf Harnhammar -@@ -78,9 +78,9 @@ - !:mime text/x-php - 0 search/1 = ---- magic/Magdir/perl -+++ magic/Magdir/perl 2009-05-05 12:01:34.000000000 +0000 -@@ -6,15 +6,15 @@ - # The `eval' lines recognizes an outrageously clever hack. - # Keith Waclena - # Send additions to --0 search/1/w #!\ /bin/perl Perl script text executable -+0 search/1/w #!\ /bin/perl Perl script text - !:mime text/x-perl - 0 search/1 eval\ "exec\ /bin/perl Perl script text - !:mime text/x-perl --0 search/1/w #!\ /usr/bin/perl Perl script text executable -+0 search/1/w #!\ /usr/bin/perl Perl script text - !:mime text/x-perl - 0 search/1 eval\ "exec\ /usr/bin/perl Perl script text - !:mime text/x-perl --0 search/1/w #!\ /usr/local/bin/perl Perl script text executable -+0 search/1/w #!\ /usr/local/bin/perl Perl script text - !:mime text/x-perl - 0 search/1 eval\ "exec\ /usr/local/bin/perl Perl script text - !:mime text/x-perl ---- magic/Magdir/python -+++ magic/Magdir/python 2011-06-14 13:51:01.507926101 +0000 -@@ -5,7 +5,7 @@ - # - # From: David Necas - # often the module starts with a multiline string --0 string/t """ a python script text executable -+0 string/t """ a python script text - # MAGIC as specified in Python/import.c (1.5 to 2.7a0 and 3.1a0, assuming - # that Py_UnicodeFlag is off for Python 2) - # 20121 ( YEAR - 1995 ) + MONTH + DAY (little endian followed by "\r\n" -@@ -22,39 +22,39 @@ - 0 belong 0x4f0c0d0a python 3.1 byte-compiled - 0 belong 0x6c0c0d0a python 3.2 byte-compiled - --0 search/1/w #!\ /usr/bin/python Python script text executable -+0 search/1/w #!\ /usr/bin/python Python script text - !:mime text/x-python --0 search/1/w #!\ /usr/local/bin/python Python script text executable -+0 search/1/w #!\ /usr/local/bin/python Python script text - !:mime text/x-python --0 search/1 #!/usr/bin/env\ python Python script text executable -+0 search/1 #!/usr/bin/env\ python Python script text - !:mime text/x-python --0 search/1 #!\ /usr/bin/env\ python Python script text executable -+0 search/1 #!\ /usr/bin/env\ python Python script text - !:mime text/x-python - - - # from module.submodule import func1, func2 --0 regex \^from\\s+(\\w|\\.)+\\s+import.*$ Python script text executable -+0 regex \^from\\s+(\\w|\\.)+\\s+import.*$ Python script text - !:mime text/x-python - - # def __init__ (self, ...): - 0 search/4096 def\ __init__ -->&0 search/64 self Python script text executable -+>&0 search/64 self Python script text - !:mime text/x-python - - # comments - 0 search/4096 ''' -->&0 regex .*'''$ Python script text executable -+>&0 regex .*'''$ Python script text - !:mime text/x-python - - 0 search/4096 """ -->&0 regex .*"""$ Python script text executable -+>&0 regex .*"""$ Python script text - !:mime text/x-python - - # try: - # except: or finally: - # block - 0 search/4096 try: -->&0 regex \^\\s*except.*: Python script text executable -+>&0 regex \^\\s*except.*: Python script text - !:mime text/x-python -->&0 search/4096 finally: Python script text executable -+>&0 search/4096 finally: Python script text - !:mime text/x-python ---- magic/Magdir/varied.script -+++ magic/Magdir/varied.script 2011-06-14 13:52:38.827926417 +0000 -@@ -4,12 +4,12 @@ - # varied.script: file(1) magic for various interpreter scripts - - 0 string/t #!\ / a -->3 string >\0 %s script text executable -+>3 string >\0 %s script text - 0 string/t #!\t/ a -->3 string >\0 %s script text executable -+>3 string >\0 %s script text - 0 string/t #!/ a -->2 string >\0 %s script text executable --0 string/t #!\ script text executable -+>2 string >\0 %s script text -+0 string/t #!\ script text - >3 string >\0 for %s - - # From: arno diff --git a/file-5.08.tar.gz b/file-5.08.tar.gz deleted file mode 100644 index 695548f..0000000 --- a/file-5.08.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd2f18f5f344fe89938fcaf5959808fb98e4ff20c2e30f24f234e27946e3a555 -size 605337 diff --git a/file-5.07-visibility.patch b/file-5.10-visibility.patch similarity index 87% rename from file-5.07-visibility.patch rename to file-5.10-visibility.patch index a64eca3..2eb98ac 100644 --- a/file-5.07-visibility.patch +++ b/file-5.10-visibility.patch @@ -1,8 +1,8 @@ --- src/Makefile.am -+++ src/Makefile.am 2011-06-14 14:05:18.691926054 +0000 ++++ src/Makefile.am 2012-01-16 13:23:27.235645838 +0000 @@ -11,7 +11,7 @@ libmagic_la_SOURCES = magic.c apprentice encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \ - funcs.c file.h names.h readelf.h tar.h apptype.c \ + funcs.c file.h readelf.h tar.h apptype.c \ file_opts.h elfclass.h mygetopt.h cdf.c cdf_time.c readcdf.c cdf.h -libmagic_la_LDFLAGS = -no-undefined -version-info 1:0:0 +libmagic_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libmagic.map -no-undefined -version-info 1:0:0 diff --git a/file-5.08.dif b/file-5.10.dif similarity index 70% rename from file-5.08.dif rename to file-5.10.dif index 23f549c..8011748 100644 --- a/file-5.08.dif +++ b/file-5.10.dif @@ -9,7 +9,7 @@ >>18 leshort 51 Stanford MIPS-X, >>18 leshort 52 Motorola Coldfire, >>18 leshort 53 Motorola M68HC12, -@@ -247,7 +247,7 @@ +@@ -250,7 +250,7 @@ >>18 beshort 47 Renesas H8/300H, >>18 beshort 48 Renesas H8S, >>18 beshort 49 Renesas H8/500, @@ -102,7 +102,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 2011-08-23 14:50:29.287926799 +0000 ++++ magic/Makefile.am 2012-01-16 13:04:11.827645527 +0000 @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) @@ -119,8 +119,8 @@ -$(MAGIC_FRAGMENT_DIR)/apple \ $(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/archive \ - $(MAGIC_FRAGMENT_DIR)/asterix \ -@@ -69,7 +68,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ + $(MAGIC_FRAGMENT_DIR)/assembler \ +@@ -71,7 +70,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -128,7 +128,7 @@ $(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/fonts \ $(MAGIC_FRAGMENT_DIR)/fortran \ -@@ -102,19 +100,19 @@ $(MAGIC_FRAGMENT_DIR)/ispell \ +@@ -106,20 +104,20 @@ $(MAGIC_FRAGMENT_DIR)/ispell \ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -145,12 +145,13 @@ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/lua \ $(MAGIC_FRAGMENT_DIR)/luks \ + $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ -$(MAGIC_FRAGMENT_DIR)/macintosh \ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ - $(MAGIC_FRAGMENT_DIR)/maple \ -@@ -131,10 +129,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ + $(MAGIC_FRAGMENT_DIR)/make \ +@@ -138,10 +136,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -162,7 +163,7 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msvc \ $(MAGIC_FRAGMENT_DIR)/mup \ -@@ -173,6 +171,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ +@@ -182,6 +180,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -171,7 +172,7 @@ $(MAGIC_FRAGMENT_DIR)/rinex \ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rtf \ -@@ -238,8 +238,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \ +@@ -248,8 +248,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \ $(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zyxel @@ -193,7 +194,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 -@@ -251,19 +263,22 @@ FILE_COMPILE = $(top_builddir)/src/file +@@ -261,19 +273,22 @@ FILE_COMPILE = $(top_builddir)/src/file FILE_COMPILE_DEP = $(FILE_COMPILE) endif @@ -232,6 +233,143 @@ +# fi) +# $(FILE_COMPILE) -C -m magic +# @rm -fr magic +--- magic/Makefile.in ++++ magic/Makefile.in 2012-01-16 13:01:46.795146180 +0000 +@@ -201,7 +201,7 @@ top_srcdir = @top_srcdir@ + MAGIC_FRAGMENT_BASE = Magdir + MAGIC_DIR = $(top_srcdir)/magic + MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) +-pkgdata_DATA = magic.mgc ++pkgdata_DATA = magic.mgc magic + EXTRA_DIST = \ + $(MAGIC_DIR)/Header \ + $(MAGIC_DIR)/Localstuff \ +@@ -214,7 +214,6 @@ $(MAGIC_FRAGMENT_DIR)/amanda \ + $(MAGIC_FRAGMENT_DIR)/amigaos \ + $(MAGIC_FRAGMENT_DIR)/animation \ + $(MAGIC_FRAGMENT_DIR)/apl \ +-$(MAGIC_FRAGMENT_DIR)/apple \ + $(MAGIC_FRAGMENT_DIR)/applix \ + $(MAGIC_FRAGMENT_DIR)/archive \ + $(MAGIC_FRAGMENT_DIR)/assembler \ +@@ -266,7 +265,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ + $(MAGIC_FRAGMENT_DIR)/erlang \ + $(MAGIC_FRAGMENT_DIR)/esri \ + $(MAGIC_FRAGMENT_DIR)/fcs \ +-$(MAGIC_FRAGMENT_DIR)/filesystems \ + $(MAGIC_FRAGMENT_DIR)/flash \ + $(MAGIC_FRAGMENT_DIR)/fonts \ + $(MAGIC_FRAGMENT_DIR)/fortran \ +@@ -301,20 +299,20 @@ $(MAGIC_FRAGMENT_DIR)/ispell \ + $(MAGIC_FRAGMENT_DIR)/isz \ + $(MAGIC_FRAGMENT_DIR)/java \ + $(MAGIC_FRAGMENT_DIR)/jpeg \ ++$(MAGIC_FRAGMENT_DIR)/linux \ ++$(MAGIC_FRAGMENT_DIR)/filesystems \ + $(MAGIC_FRAGMENT_DIR)/karma \ + $(MAGIC_FRAGMENT_DIR)/kde \ + $(MAGIC_FRAGMENT_DIR)/kml \ + $(MAGIC_FRAGMENT_DIR)/lecter \ + $(MAGIC_FRAGMENT_DIR)/lex \ + $(MAGIC_FRAGMENT_DIR)/lif \ +-$(MAGIC_FRAGMENT_DIR)/linux \ + $(MAGIC_FRAGMENT_DIR)/lisp \ + $(MAGIC_FRAGMENT_DIR)/llvm \ + $(MAGIC_FRAGMENT_DIR)/lua \ + $(MAGIC_FRAGMENT_DIR)/luks \ + $(MAGIC_FRAGMENT_DIR)/m4 \ + $(MAGIC_FRAGMENT_DIR)/mach \ +-$(MAGIC_FRAGMENT_DIR)/macintosh \ + $(MAGIC_FRAGMENT_DIR)/magic \ + $(MAGIC_FRAGMENT_DIR)/mail.news \ + $(MAGIC_FRAGMENT_DIR)/make \ +@@ -333,10 +331,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ + $(MAGIC_FRAGMENT_DIR)/mkid \ + $(MAGIC_FRAGMENT_DIR)/mlssa \ + $(MAGIC_FRAGMENT_DIR)/mmdf \ +-$(MAGIC_FRAGMENT_DIR)/modem \ + $(MAGIC_FRAGMENT_DIR)/motorola \ + $(MAGIC_FRAGMENT_DIR)/mozilla \ + $(MAGIC_FRAGMENT_DIR)/msdos \ ++$(MAGIC_FRAGMENT_DIR)/modem \ + $(MAGIC_FRAGMENT_DIR)/msooxml \ + $(MAGIC_FRAGMENT_DIR)/msvc \ + $(MAGIC_FRAGMENT_DIR)/mup \ +@@ -377,6 +375,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 \ +@@ -443,10 +443,22 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \ + $(MAGIC_FRAGMENT_DIR)/zilog \ + $(MAGIC_FRAGMENT_DIR)/zyxel + ++RAW = magic + MAGIC = magic.mgc +-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff ++CLEANFILES = ${MAGIC} $(MAGIC_DIR)/Localstuff ${RAW} + @IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file + ++${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(EXTRA_DIST) ++ cat /dev/null > $@ ++ for frag in $(EXTRA_DIST); do \ ++ if test -f $(srcdir)/$$frag; then \ ++ f=$(srcdir)/$$frag; \ ++ else \ ++ f=$$frag; \ ++ fi; \ ++ cat $$f; \ ++ done >> $@ ++ + # 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 +@@ -661,23 +673,25 @@ uninstall-am: uninstall-pkgdataDATA + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-pkgdataDATA + ++${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW) ++ $(FILE_COMPILE) -C -m $(RAW + +-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) +- @rm -fr magic +- @mkdir magic && cp -p $(EXTRA_DIST) magic +- @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \ +- echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \ +- else \ +- v=$$(file --version | sed -e s/file-// -e q); \ +- if [ "$$v" != "${PACKAGE_VERSION}" ]; then \ +- echo "Cannot use the installed version of file ($$v) to"; \ +- echo "cross-compile file ${PACKAGE_VERSION}"; \ +- echo "Please install file ${PACKAGE_VERSION} locally first"; \ +- exit 1; \ +- fi; \ +- fi) +- $(FILE_COMPILE) -C -m magic +- @rm -fr magic ++#${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) ++# @rm -fr magic ++# @mkdir magic && cp -p $(EXTRA_DIST) magic ++# @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \ ++# echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \ ++# else \ ++# v=$$(file --version | sed -e s/file-// -e q); \ ++# if [ "$$v" != "${PACKAGE_VERSION}" ]; then \ ++# echo "Cannot use the installed version of file ($$v) to"; \ ++# echo "cross-compile file ${PACKAGE_VERSION}"; \ ++# echo "Please install file ${PACKAGE_VERSION} locally first"; \ ++# exit 1; \ ++# fi; \ ++# fi) ++# $(FILE_COMPILE) -C -m magic ++# @rm -fr magic + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. --- src/Makefile.am +++ src/Makefile.am 2008-04-14 15:14:56.000000000 +0000 @@ -1,4 +1,4 @@ diff --git a/file-5.10.tar.gz b/file-5.10.tar.gz new file mode 100644 index 0000000..927d74d --- /dev/null +++ b/file-5.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73ae51889006b1ddb95db729237d411eb8d353884dfb149f0b4427d314aff68a +size 608726 diff --git a/file.changes b/file.changes index 7f13430..0903464 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Mon Jan 16 13:42:35 UTC 2012 - werner@suse.de + +- Update to file version 5.10 + * Add magic for /usr/bin/env Perl scripts + * Weaken generic script magic to avoid clashing with + language-specific magic. + * Remove hardwired token finding (names.h), turning it into soft + magic. Patterns are either anchored regexs or search/8192. English + language detection and PL/1 detection have been removed as they + were too fragile. -e tokens is still accepted for backwards + compatibility. + * Move 3ds patterns (which are commented out anyway) into autodesk + (they were, oddly, in c-lang). + * Tweak strength of generic hash-bang detectors to be less than + specific ones. + * Make an inconsistent description of Python scripts consistent. + * Python3 binding fixes from Kelly Anderson + * If a string type magic entry is marked as text or binary + only match text files against text entries and binary + files against binary entries. + * If the application name is not set in a cdf file, try to see + if it has a directory with the application name on it. + * Fix ELF lseek(2) madness. Inspired by PR/134 by Jan Kaluza + * Don't use variable string formats. + ------------------------------------------------------------------- Sat Nov 5 18:37:25 UTC 2011 - crrodriguez@opensuse.org diff --git a/file.spec b/file.spec index 2d3d4ce..c33daa1 100644 --- a/file.spec +++ b/file.spec @@ -1,7 +1,7 @@ # # spec file for package file # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -29,14 +29,13 @@ Obsoletes: file-64bit %endif # # Set Version also in python-magic.spec -Version: 5.08 -Release: 3 +Version: 5.10 +Release: 1 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz Source2: baselibs.conf Patch: file-%{version}.dif Patch1: file-5.07-misc.dif -Patch3: file-5.07-exec.dif Patch4: file-4.24-autoconf.dif Patch5: file-4.03-tex.dif Patch7: file-4.20-ssd.dif @@ -55,7 +54,7 @@ Patch26: file-4.24-solv.dif Patch27: file-5.07-zip2.0.dif Patch28: file-5.07-iso9660.dif Patch29: file-5.07-llvm.dif -Patch30: file-5.07-visibility.patch +Patch30: file-5.10-visibility.patch Patch31: file-5.07-biorad.dif Patch32: file-5.07-clicfs.dif Patch33: file-ocloexec.patch @@ -83,7 +82,6 @@ to develop applications that require the magic "file" interface. %prep %setup -q -n file-%{version} %patch1 -p0 -b .misc -%patch3 -p0 -b .exec %patch4 -p0 -b .conf %patch5 -p0 -b .tex %patch7 -p0 -b .ssd @@ -107,8 +105,8 @@ to develop applications that require the magic "file" interface. %patch30 -p0 -b .vis %patch31 -p0 -b .biorad %patch32 -p0 -b .clicfs +%patch33 -p0 -b .clexe %patch -b .0 -%patch33 %build export LANG=POSIX diff --git a/python-magic.spec b/python-magic.spec index b85077c..4af222e 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -1,7 +1,7 @@ # # spec file for package python-magic # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -25,7 +25,7 @@ BuildRequires: python-devel Url: http://www.darwinsys.com/file/ License: BSD 3 Clause, BSD 4 Clause Group: Development/Languages/Python -Version: 5.08 +Version: 5.10 Release: 1 Summary: Python module to use libmagic %py_requires