diff --git a/file-5.13-return.patch b/file-5.13-return.patch new file mode 100644 index 0000000..efcf364 --- /dev/null +++ b/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; + diff --git a/file.changes b/file.changes index 1c6a2bc..b207826 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/file.spec b/file.spec index 27abac3..46a53d1 100644 --- a/file.spec +++ b/file.spec @@ -61,6 +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 +# PATCH-FIX-UPSTREAM: avoid doubled return +Patch36: file-5.13-return.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -126,6 +128,7 @@ 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