From 88d354148afefc827d9d3eed0262e8302330c33c5499d6363e44314227b7c868 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 3 Dec 2015 14:00:23 +0000 Subject: [PATCH 1/2] - updated to 1.17.1: * fixed two errors found by fuzzer * phase_one_correct always returns value; handle P1 return codes in postprocessing - removed upstreamedretval.diff OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=77 --- LibRaw-0.17.0.tar.gz | 3 --- LibRaw-0.17.1.tar.gz | 3 +++ libraw.changes | 9 +++++++++ libraw.spec | 4 +--- retval.diff | 26 -------------------------- 5 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 LibRaw-0.17.0.tar.gz create mode 100644 LibRaw-0.17.1.tar.gz delete mode 100644 retval.diff diff --git a/LibRaw-0.17.0.tar.gz b/LibRaw-0.17.0.tar.gz deleted file mode 100644 index 8a40378..0000000 --- a/LibRaw-0.17.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e643c20945d548aac1eaa1f5573bf74050e0f49ec6a53a6843dc2a2cfb647310 -size 1468635 diff --git a/LibRaw-0.17.1.tar.gz b/LibRaw-0.17.1.tar.gz new file mode 100644 index 0000000..5e4700a --- /dev/null +++ b/LibRaw-0.17.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e599651a4cc37e00cfc2d2b56be87c3a4e4dae2c360b680fe9ab3f93d07cdea1 +size 1472341 diff --git a/libraw.changes b/libraw.changes index ab82ec6..53d77c9 100644 --- a/libraw.changes +++ b/libraw.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Dec 3 13:56:58 UTC 2015 - pgajdos@suse.com + +- updated to 1.17.1: +* fixed two errors found by fuzzer +* phase_one_correct always returns value; handle P1 return codes + in postprocessing +- removed upstreamedretval.diff + ------------------------------------------------------------------- Fri Nov 13 16:27:05 UTC 2015 - jengelh@inai.de diff --git a/libraw.spec b/libraw.spec index c3208fb..15ec570 100644 --- a/libraw.spec +++ b/libraw.spec @@ -20,7 +20,7 @@ Name: libraw %define lname libraw15 -Version: 0.17.0 +Version: 0.17.1 Release: 0 Summary: Library for reading RAW files obtained from digital photo cameras License: CDDL-1.0 or LGPL-2.1 @@ -29,7 +29,6 @@ Url: http://www.libraw.org/ #Git-Clone: git://github.com/LibRaw/LibRaw Source: http://www.libraw.org/data/%tar_name-%version.tar.gz -Patch1: retval.diff BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libjasper-devel @@ -96,7 +95,6 @@ against LibRaw. LibRaw does not provide dynamic libraries. %prep %setup -qn %tar_name-%version -%patch -P 1 -p1 %build export CXXFLAGS="%optflags -fPIC" diff --git a/retval.diff b/retval.diff deleted file mode 100644 index a75fd14..0000000 --- a/retval.diff +++ /dev/null @@ -1,26 +0,0 @@ -From: Jan Engelhardt -Date: 2015-11-13 17:24:03.127632735 +0100 - -rpmlint says: -I: Program returns random data in a function -E: libraw no-return-in-nonvoid-function internal/dcraw_common.cpp:1710 -gcc: -internal/dcraw_common.cpp: In member function 'int LibRaw::phase_one_correct()': -internal/dcraw_common.cpp:1710:1: warning: control reaches end of non-void function [-Wreturn-type] - ---- - internal/dcraw_common.cpp | 1 + - 1 file changed, 1 insertion(+) - -Index: LibRaw-0.17.0/internal/dcraw_common.cpp -=================================================================== ---- LibRaw-0.17.0.orig/internal/dcraw_common.cpp -+++ LibRaw-0.17.0/internal/dcraw_common.cpp -@@ -1707,6 +1707,7 @@ int CLASS phase_one_correct() - return LIBRAW_CANCELLED_BY_CALLBACK; - } - #endif -+ return 0; - } - - void CLASS phase_one_load_raw() From 67c228ae4c2e47c72613c688f5d497738c8ef616a3a43b924d05f6de74e52498 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 3 Dec 2015 14:01:03 +0000 Subject: [PATCH 2/2] * fixed two errors found by fuzzer (CVE-2015-8367) OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=78 --- libraw.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraw.changes b/libraw.changes index 53d77c9..d65acb0 100644 --- a/libraw.changes +++ b/libraw.changes @@ -2,7 +2,7 @@ Thu Dec 3 13:56:58 UTC 2015 - pgajdos@suse.com - updated to 1.17.1: -* fixed two errors found by fuzzer +* fixed two errors found by fuzzer (CVE-2015-8367) * phase_one_correct always returns value; handle P1 return codes in postprocessing - removed upstreamedretval.diff