update to new version 5.30
This commit is contained in:
parent
83f985a85b
commit
37181d0d06
@ -12,7 +12,7 @@ diff --git a/doc/file.man b/doc/file.man
|
||||
index fff7730..3a524f5 100644
|
||||
--- a/doc/file.man
|
||||
+++ b/doc/file.man
|
||||
@@ -586,6 +586,11 @@ program, and are not covered by the above license.
|
||||
@@ -585,6 +585,11 @@ program, and are not covered by the above license.
|
||||
.Sh RETURN CODE
|
||||
.Nm
|
||||
returns 0 on success, and non-zero on error.
|
||||
@ -22,8 +22,8 @@ index fff7730..3a524f5 100644
|
||||
+the file operand cannot be determined, this is not be considered an error
|
||||
+that affects the exit status.
|
||||
.Sh BUGS
|
||||
.Pp
|
||||
Please report bugs and send patches to the bug tracker at
|
||||
.Pa http://bugs.gw.com/
|
||||
--
|
||||
2.5.5
|
||||
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From 5d4ec1f1279dc431343def88c95fc5315e30bffc Mon Sep 17 00:00:00 2001
|
||||
From: Christos Zoulas <christos@zoulas.com>
|
||||
Date: Tue, 7 Feb 2017 23:21:29 +0000
|
||||
Subject: [PATCH] If we are reading a sector stream that is shorter than the
|
||||
minimum standard stream size, but there is no short sector chain, adjust the
|
||||
dirlen.
|
||||
|
||||
Upstream-commit: 781a5357d0dc780e57cc36ec93e47ed3a954b74b
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
src/cdf.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/cdf.c b/src/cdf.c
|
||||
index d38e793..b6fe6cd 100644
|
||||
--- a/src/cdf.c
|
||||
+++ b/src/cdf.c
|
||||
@@ -527,7 +527,7 @@ cdf_read_long_sector_chain(const cdf_info_t *info, const cdf_header_t *h,
|
||||
ssize_t nr;
|
||||
scn->sst_tab = NULL;
|
||||
scn->sst_len = cdf_count_chain(sat, sid, ss);
|
||||
- scn->sst_dirlen = len;
|
||||
+ scn->sst_dirlen = MAX(h->h_min_size_standard_stream, len);
|
||||
scn->sst_ss = ss;
|
||||
|
||||
if (scn->sst_len == (size_t)-1)
|
||||
--
|
||||
2.7.4
|
||||
|
||||
7
file-5.30.tar.gz.asc
Normal file
7
file-5.30.tar.gz.asc
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iEYEABECAAYFAlid+B8ACgkQcREqsWyzOzqaygCfbxYMlxymrZ7Wh0P8UtfFdNr/
|
||||
d8wAoIJiovAYOijFWLAcRqVoszPESSxo
|
||||
=ekW2
|
||||
-----END PGP SIGNATURE-----
|
||||
12
file.spec
12
file.spec
@ -4,8 +4,8 @@
|
||||
|
||||
Summary: A utility for determining file types
|
||||
Name: file
|
||||
Version: 5.29
|
||||
Release: 3%{?dist}
|
||||
Version: 5.30
|
||||
Release: 1%{?dist}
|
||||
License: BSD
|
||||
Group: Applications/File
|
||||
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
|
||||
@ -25,9 +25,6 @@ Patch14: file-5.19-cafebabe.patch
|
||||
Patch15: file-5.22-awk-perl.patch
|
||||
Patch17: file-5.24-varied.patch
|
||||
|
||||
# picked from upstream
|
||||
Patch102: file-5.29-short-sector.patch
|
||||
|
||||
URL: http://www.darwinsys.com/file/
|
||||
Requires: file-libs = %{version}-%{release}
|
||||
BuildRequires: zlib-devel
|
||||
@ -100,8 +97,6 @@ file(1) command.
|
||||
%patch15 -p1
|
||||
%patch17 -p1
|
||||
|
||||
%patch102 -p1
|
||||
|
||||
# Patches can generate *.orig files, which can't stay in the magic dir,
|
||||
# otherwise there will be problems with compiling magic file!
|
||||
rm -fv magic/Magdir/*.orig
|
||||
@ -208,6 +203,9 @@ cd %{py3dir}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Feb 13 2017 Kamil Dudka <kdudka@redhat.com> - 5.30-1
|
||||
- update to new version 5.30
|
||||
|
||||
* Wed Feb 08 2017 Kamil Dudka <kdudka@redhat.com> - 5.29-3
|
||||
- build in parallel and in verbose mode
|
||||
- fix assertion failure on certain files (thanks to Christoph Biedl)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user