commit a284f48220336f577117dc690735dc5362b2bc98
Author: Elan Ruusamäe <[email protected]>
Date: Tue Feb 26 15:30:45 2013 +0200
up to 5.13
cdf-pread.patch | 11 +++++++++++
file-sparc.patch | 46 +++++++++++++++++++++++-----------------------
file.spec | 7 +++++--
3 files changed, 39 insertions(+), 25 deletions(-)
---
diff --git a/file.spec b/file.spec
index 4d0ad0e..fae3621 100644
--- a/file.spec
+++ b/file.spec
@@ -28,12 +28,12 @@ Summary(uk.UTF-8): Утиліта для визначення типів фай
Summary(zh_CN.UTF-8): 判定文件类型的工具。
Summary(zh_TW.UTF-8): 用於決定檔案類型的一個工具程式。
Name: file
-Version: 5.12
+Version: 5.13
Release: 1
License: distributable
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5: 1d7d85cb9354f79e5e351deef36be6ba
+# Source0-md5: d60c1364ba956eff7d21f8250808fc6d
Source1:
http://ftp1.pld-linux.org/people/glen/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 6a45bcaefd19b94db36a1b2b7c5b806b
Source2: %{name}-zisofs.magic
@@ -44,6 +44,7 @@ Patch1: %{name}-selinux.patch
Patch2: searchpath.patch
Patch3: automake.patch
Patch4: sticky-bit.patch
+Patch5: cdf-pread.patch
URL: http://www.darwinsys.com/file/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -252,6 +253,7 @@ Wiązania Pythona dla libmagic.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%if "%{cc_version}" < "3.4"
%{__sed} -i -e 's,-Wextra,,' configure.ac
@@ -269,6 +271,7 @@ rm -f magic/Magdir/{*.orig,*~}
%{__autoconf}
%{__automake}
%configure \
+ --disable-silent-rules \
--enable-fsect-man5 \
%{?with_static_libs:--enable-static}
diff --git a/cdf-pread.patch b/cdf-pread.patch
new file mode 100644
index 0000000..059427e
--- /dev/null
+++ b/cdf-pread.patch
@@ -0,0 +1,11 @@
+--- file-5.13/src/cdf.c~ 2013-02-18 20:33:14.000000000 +0200
++++ file-5.13/src/cdf.c 2013-02-26 15:29:26.285712309 +0200
+@@ -296,8 +296,6 @@
+ if (info->i_fd == -1)
+ return -1;
+
+- return -1;
+-
+ if (pread(info->i_fd, buf, len, off) != (ssize_t)len)
+ return -1;
+
diff --git a/file-sparc.patch b/file-sparc.patch
index aeb121e..2c3aec8 100644
--- a/file-sparc.patch
+++ b/file-sparc.patch
@@ -26,17 +26,17 @@ diff -Nru file-4.02.bak/magic/Magdir/bsdi
file-4.02/magic/Magdir/bsdi
>0 byte &0x80 dynamically linked executable
>0 byte ^0x80 executable
>16 belong >0 not stripped
---- file-5.12/magic/Magdir/mach.orig 2013-01-05 18:01:15.529528408 +0100
-+++ file-5.12/magic/Magdir/mach 2013-01-05 18:05:58.686189172 +0100
-@@ -76,7 +76,7 @@
- >>8 belong 0 mc88000
- >>8 belong 1 mc88100
- >>8 belong 2 mc88110
-->4 belong 14 sparc
-+>4 belong 14 SPARC
- >4 belong 15 i860g
- >4 belong 16 alpha
- >4 belong 17 rs6000
+--- file-5.13/magic/Magdir/mach~ 2013-01-05 01:35:53.000000000 +0200
++++ file-5.13/magic/Magdir/mach 2013-02-26 15:21:04.862538450 +0200
+@@ -122,7 +122,7 @@
+ >>>8 belong&0x00ffffff 1 mc88100
+ >>>8 belong&0x00ffffff 2 mc88110
+ >>>8 belong&0x00ffffff >2 mc88000 subarchitecture=%ld
+->>4 belong&0x00ffffff 14 sparc
++>>4 belong&0x00ffffff 14 SPARC
+ >>4 belong&0x00ffffff 15 i860g
+ >>4 belong&0x00ffffff 16 alpha
+ >>4 belong&0x00ffffff 17 rs6000
diff -Nru file-4.02.bak/magic/Magdir/netbsd file-4.02/magic/Magdir/netbsd
--- file-4.02.bak/magic/Magdir/netbsd Tue Apr 1 01:53:37 2003
+++ file-4.02/magic/Magdir/netbsd Thu Apr 3 09:17:09 2003
@@ -70,29 +70,29 @@ diff -Nru file-4.02.bak/magic/Magdir/netbsd
file-4.02/magic/Magdir/netbsd
>12 string >\0 from '%s'
>32 belong !0 (signal %d)
---- file-4.18/magic/Magdir/sun.orig 2006-06-14 00:17:00.000000000 +0200
-+++ file-4.18/magic/Magdir/sun 2006-11-13 16:16:59.029505000 +0100
-@@ -5,7 +5,7 @@
- # Values for big-endian Sun (MC680x0, SPARC) binaries on pre-5.x
- # releases. (5.x uses ELF.)
+--- file-5.13/magic/Magdir/sun~ 2013-01-10 00:37:24.000000000 +0200
++++ file-5.13/magic/Magdir/sun 2013-02-26 15:22:40.763637298 +0200
+@@ -9,7 +9,7 @@
+ # are in aout, as they're indistinguishable from other big-endian
+ # 32-bit a.out files.
#
--0 belong&077777777 0600413 sparc demand paged
-+0 belong&077777777 0600413 SPARC demand paged
+-0 belong&077777777 0600413 a.out SunOS sparc demand paged
++0 belong&077777777 0600413 a.out SunOS SPARC demand paged
>0 byte &0x80
>>20 belong <4096 shared library
>>20 belong =4096 dynamically linked executable
-@@ -13,12 +13,12 @@
+@@ -17,12 +17,12 @@
>0 byte ^0x80 executable
>16 belong >0 not stripped
--0 belong&077777777 0600410 sparc pure
-+0 belong&077777777 0600410 SPARC pure
+-0 belong&077777777 0600410 a.out SunOS sparc pure
++0 belong&077777777 0600410 a.out SunOS SPARC pure
>0 byte &0x80 dynamically linked executable
>0 byte ^0x80 executable
>16 belong >0 not stripped
--0 belong&077777777 0600407 sparc
-+0 belong&077777777 0600407 SPARC
+-0 belong&077777777 0600407 a.out SunOS sparc
++0 belong&077777777 0600407 a.out SunOS SPARC
>0 byte &0x80 dynamically linked executable
>0 byte ^0x80 executable
>16 belong >0 not stripped
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/file.git/commitdiff/a284f48220336f577117dc690735dc5362b2bc98
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
