Accepting request 156456 from Base:System

- Add patch file-5.13-return.patch: avoid doubled return

- Update to file version 5.13 (mainly bug fixes)
  * add elf reading of debug info to determine if file is stripped
  * use pread()
  * change mime description size from 64 to 80 to accommodate OOXML.
  * Warn about inconsistent continuation levels.
  * Change fsmagic to add a space after it prints.
  * Make getline public so that file can link against it.
    Perhaps it is better to rename it, or hide it differently.
    Fixes builds on platforms that do not provide it.
  * Add SuS d{,1,2,4,8}, u{,1,2,4,8} and document
    what long, int, short, etc is (Guy Harris)
  * add magic_version function and constant
  * Redo memory allocation and de-allocation.
    (prevents double frees on non mmap platforms)
  * Fix bug with name/use having to do with passing
    found state from the parent to the child and back.

OBS-URL: https://build.opensuse.org/request/show/156456
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=69

file-5.12-llong.dif

@@ -1,10 +0,0 @@
---- configure.ac
-+++ configure.ac	2013-01-23 12:57:44.605952352 +0000
-@@ -107,6 +107,7 @@ AC_TYPE_UINT32_T
- AC_TYPE_INT32_T
- AC_TYPE_UINT64_T
- AC_TYPE_INT64_T
-+AC_CHECK_SIZEOF(long long)
- AC_FUNC_MMAP
- AC_FUNC_FORK
- AC_FUNC_MBRTOWC

file-5.12.tar.gz

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

file-5.13-return.patch

@@ -0,0 +1,11 @@
+--- src/cdf.c
++++ src/cdf.c	2013-02-26 17:30:21.073444930 +0000
+@@ -250,8 +250,6 @@ cdf_read(const cdf_info_t *info, off_t o
+ 	if (info->i_fd == -1)
+ 		return -1;
+ 
+-		return -1;
+-
+ 	if (pread(info->i_fd, buf, len, off) != (ssize_t)len)
+ 		return -1;
+ 

file-5.13.dif

@@ -1,5 +1,5 @@
 --- magic/Magdir/elf
-+++ magic/Magdir/elf	2013-01-22 15:12:10.957452651 +0000
++++ magic/Magdir/elf	2013-01-22 15:12:11.000000000 +0000
 @@ -127,7 +127,7 @@
  >18	leshort		47		Renesas H8/300H,
  >18	leshort		48		Renesas H8S,
@@ -10,9 +10,9 @@
  >18	leshort		52		Motorola Coldfire,
  >18	leshort		53		Motorola M68HC12,
 --- magic/Magdir/linux
-+++ magic/Magdir/linux	2013-01-22 15:16:40.925952418 +0000
++++ magic/Magdir/linux	2013-01-22 15:16:41.000000000 +0000
 @@ -97,22 +97,44 @@
- # and Nicolás Lichtmaier <nick@debian.org>
+ # 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)
 -514	string		HdrS		Linux kernel
@@ -94,7 +94,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-01-22 15:19:20.873952132 +0000
++++ magic/Makefile.am	2013-01-22 15:19:21.000000000 +0000
 @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
  MAGIC_DIR = $(top_srcdir)/magic
  MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@@ -120,7 +120,7 @@
  $(MAGIC_FRAGMENT_DIR)/flash \
  $(MAGIC_FRAGMENT_DIR)/fonts \
  $(MAGIC_FRAGMENT_DIR)/fortran \
-@@ -110,6 +108,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
+@@ -111,6 +109,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
  $(MAGIC_FRAGMENT_DIR)/java \
  $(MAGIC_FRAGMENT_DIR)/javascript \
  $(MAGIC_FRAGMENT_DIR)/jpeg \
@@ -129,7 +129,7 @@
  $(MAGIC_FRAGMENT_DIR)/karma \
  $(MAGIC_FRAGMENT_DIR)/kde \
  $(MAGIC_FRAGMENT_DIR)/keepass \
-@@ -117,7 +117,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
+@@ -118,7 +118,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
  $(MAGIC_FRAGMENT_DIR)/lecter \
  $(MAGIC_FRAGMENT_DIR)/lex \
  $(MAGIC_FRAGMENT_DIR)/lif \
@@ -137,7 +137,7 @@
  $(MAGIC_FRAGMENT_DIR)/lisp \
  $(MAGIC_FRAGMENT_DIR)/llvm \
  $(MAGIC_FRAGMENT_DIR)/lua \
-@@ -125,7 +124,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
+@@ -126,7 +125,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
  $(MAGIC_FRAGMENT_DIR)/m4 \
  $(MAGIC_FRAGMENT_DIR)/mach \
  $(MAGIC_FRAGMENT_DIR)/macos \
@@ -145,7 +145,7 @@
  $(MAGIC_FRAGMENT_DIR)/magic \
  $(MAGIC_FRAGMENT_DIR)/mail.news \
  $(MAGIC_FRAGMENT_DIR)/make \
-@@ -144,10 +142,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
+@@ -145,10 +143,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
  $(MAGIC_FRAGMENT_DIR)/mkid \
  $(MAGIC_FRAGMENT_DIR)/mlssa \
  $(MAGIC_FRAGMENT_DIR)/mmdf \
@@ -157,7 +157,7 @@
  $(MAGIC_FRAGMENT_DIR)/msooxml \
  $(MAGIC_FRAGMENT_DIR)/msvc \
  $(MAGIC_FRAGMENT_DIR)/mup \
-@@ -189,6 +187,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
+@@ -190,6 +188,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
  $(MAGIC_FRAGMENT_DIR)/python \
  $(MAGIC_FRAGMENT_DIR)/revision \
  $(MAGIC_FRAGMENT_DIR)/riff \
@@ -166,7 +166,7 @@
  $(MAGIC_FRAGMENT_DIR)/rinex \
  $(MAGIC_FRAGMENT_DIR)/rpm \
  $(MAGIC_FRAGMENT_DIR)/rtf \
-@@ -257,8 +257,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
+@@ -258,8 +258,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
  $(MAGIC_FRAGMENT_DIR)/zilog \
  $(MAGIC_FRAGMENT_DIR)/zyxel 
  
@@ -188,7 +188,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
-@@ -270,19 +282,22 @@ FILE_COMPILE = $(top_builddir)/src/file
+@@ -271,19 +283,22 @@ FILE_COMPILE = $(top_builddir)/src/file
  FILE_COMPILE_DEP = $(FILE_COMPILE)
  endif
  
@@ -228,7 +228,7 @@
 +#	$(FILE_COMPILE) -C -m magic
 +#	@rm -fr magic
 --- magic/Makefile.in
-+++ magic/Makefile.in	2013-01-22 15:20:18.609452535 +0000
++++ magic/Makefile.in	2013-01-22 15:20:19.000000000 +0000
 @@ -204,7 +204,7 @@ top_srcdir = @top_srcdir@
  MAGIC_FRAGMENT_BASE = Magdir
  MAGIC_DIR = $(top_srcdir)/magic
@@ -238,15 +238,15 @@
  EXTRA_DIST = \
  $(MAGIC_DIR)/Header \
  $(MAGIC_DIR)/Localstuff \
-@@ -217,7 +217,6 @@ $(MAGIC_FRAGMENT_DIR)/amanda \
+@@ -218,7 +218,6 @@ $(MAGIC_FRAGMENT_DIR)/amigaos \
- $(MAGIC_FRAGMENT_DIR)/amigaos \
  $(MAGIC_FRAGMENT_DIR)/animation \
+ $(MAGIC_FRAGMENT_DIR)/aout \
  $(MAGIC_FRAGMENT_DIR)/apl \
 -$(MAGIC_FRAGMENT_DIR)/apple \
  $(MAGIC_FRAGMENT_DIR)/applix \
  $(MAGIC_FRAGMENT_DIR)/archive \
  $(MAGIC_FRAGMENT_DIR)/assembler \
-@@ -270,7 +269,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
+@@ -271,7 +270,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
  $(MAGIC_FRAGMENT_DIR)/erlang \
  $(MAGIC_FRAGMENT_DIR)/esri \
  $(MAGIC_FRAGMENT_DIR)/fcs \
@@ -254,7 +254,7 @@
  $(MAGIC_FRAGMENT_DIR)/flash \
  $(MAGIC_FRAGMENT_DIR)/fonts \
  $(MAGIC_FRAGMENT_DIR)/fortran \
-@@ -306,6 +304,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
+@@ -309,6 +307,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
  $(MAGIC_FRAGMENT_DIR)/java \
  $(MAGIC_FRAGMENT_DIR)/javascript \
  $(MAGIC_FRAGMENT_DIR)/jpeg \
@@ -263,7 +263,7 @@
  $(MAGIC_FRAGMENT_DIR)/karma \
  $(MAGIC_FRAGMENT_DIR)/kde \
  $(MAGIC_FRAGMENT_DIR)/keepass \
-@@ -313,7 +313,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
+@@ -316,7 +316,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
  $(MAGIC_FRAGMENT_DIR)/lecter \
  $(MAGIC_FRAGMENT_DIR)/lex \
  $(MAGIC_FRAGMENT_DIR)/lif \
@@ -271,7 +271,7 @@
  $(MAGIC_FRAGMENT_DIR)/lisp \
  $(MAGIC_FRAGMENT_DIR)/llvm \
  $(MAGIC_FRAGMENT_DIR)/lua \
-@@ -321,7 +320,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
+@@ -324,7 +323,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
  $(MAGIC_FRAGMENT_DIR)/m4 \
  $(MAGIC_FRAGMENT_DIR)/mach \
  $(MAGIC_FRAGMENT_DIR)/macos \
@@ -279,7 +279,7 @@
  $(MAGIC_FRAGMENT_DIR)/magic \
  $(MAGIC_FRAGMENT_DIR)/mail.news \
  $(MAGIC_FRAGMENT_DIR)/make \
-@@ -340,10 +338,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
+@@ -343,10 +341,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
  $(MAGIC_FRAGMENT_DIR)/mkid \
  $(MAGIC_FRAGMENT_DIR)/mlssa \
  $(MAGIC_FRAGMENT_DIR)/mmdf \
@@ -291,7 +291,7 @@
  $(MAGIC_FRAGMENT_DIR)/msooxml \
  $(MAGIC_FRAGMENT_DIR)/msvc \
  $(MAGIC_FRAGMENT_DIR)/mup \
-@@ -385,6 +383,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
+@@ -388,6 +386,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
  $(MAGIC_FRAGMENT_DIR)/python \
  $(MAGIC_FRAGMENT_DIR)/revision \
  $(MAGIC_FRAGMENT_DIR)/riff \
@@ -300,7 +300,7 @@
  $(MAGIC_FRAGMENT_DIR)/rinex \
  $(MAGIC_FRAGMENT_DIR)/rpm \
  $(MAGIC_FRAGMENT_DIR)/rtf \
-@@ -453,10 +453,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
+@@ -456,10 +456,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
  $(MAGIC_FRAGMENT_DIR)/zilog \
  $(MAGIC_FRAGMENT_DIR)/zyxel 
  
@@ -324,7 +324,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
-@@ -671,23 +683,25 @@ uninstall-am: uninstall-pkgdataDATA
+@@ -674,23 +686,25 @@ uninstall-am: uninstall-pkgdataDATA
  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
  	uninstall uninstall-am uninstall-pkgdataDATA
  

file-5.13.tar.gz

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

file.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Tue Feb 26 17:33:36 UTC 2013 - werner@suse.de
+
+- Add patch file-5.13-return.patch: avoid doubled return
+
+-------------------------------------------------------------------
+Fri Feb 22 10:14:36 UTC 2013 - werner@suse.de
+
+- Update to file version 5.13 (mainly bug fixes)
+  * add elf reading of debug info to determine if file is stripped
+  * use pread()
+  * change mime description size from 64 to 80 to accommodate OOXML.
+  * Warn about inconsistent continuation levels.
+  * Change fsmagic to add a space after it prints.
+  * Make getline public so that file can link against it.
+    Perhaps it is better to rename it, or hide it differently.
+    Fixes builds on platforms that do not provide it.
+  * Add SuS d{,1,2,4,8}, u{,1,2,4,8} and document
+    what long, int, short, etc is (Guy Harris)
+  * add magic_version function and constant
+  * Redo memory allocation and de-allocation.
+    (prevents double frees on non mmap platforms)
+  * Fix bug with name/use having to do with passing
+    found state from the parent to the child and back.
+
 -------------------------------------------------------------------
 Tue Feb 19 09:05:31 UTC 2013 - werner@suse.de
 

file.spec

@@ -30,16 +30,15 @@ Obsoletes:      file-64bit
 %endif
 #
 # Set Version also in python-magic.spec
-Version:        5.12
+Version:        5.13
 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.12.dif
+Patch:          file-5.13.dif
 Patch1:         file-5.12-misc.dif
-Patch2:         file-5.12-llong.dif
 Patch4:         file-4.24-autoconf.dif
 Patch5:         file-4.03-tex.dif
 Patch7:         file-4.20-ssd.dif
@@ -62,7 +61,8 @@ Patch32:        file-5.07-clicfs.dif
 Patch33:        file-5.12-ocloexec.patch
 Patch34:        file-5.12-endian.patch
 Patch35:        file-5.12-nitpick.dif
-Patch42:        file-5.12-upstream.patch
+# PATCH-FIX-UPSTREAM: avoid doubled return
+Patch36:        file-5.13-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir /etc
 %global         _miscdir    %{_datadir}/misc
@@ -103,9 +103,7 @@ to develop applications that require the magic "file" interface.
 
 %prep
 %setup -q -n file-%{version}
-%patch42 -p1
 %patch1  -p0 -b .misc
-%patch2  -p0 -b .llong
 %patch4  -p0 -b .conf
 %patch5  -p0 -b .tex
 %patch7  -p0 -b .ssd
@@ -130,7 +128,10 @@ to develop applications that require the magic "file" interface.
 %patch33 -p0 -b .clexe
 %patch34 -p0 -b .endian
 %patch35 -p0 -b .nitpick
+%patch36 -p0 -b .return
 %patch -b .0
+test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in
+
 %build
 export LANG=POSIX
 export LC_ALL=POSIX