Accepting request 178542 from home:jengelh:branches:graphics

- Update to new upstream release 0.15.2

OBS-URL: https://build.opensuse.org/request/show/178542
OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=60

0001-build-fix-return-of-random-data.patch

@@ -0,0 +1,30 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Tue, 11 Jun 2013 15:02:28 +0200
+Subject: [PATCH] build: fix return of random data
+X-Upstream: submission has not occurred yet
+
+!@#$
+
+[   11s] internal/./wf_filtering.cpp: In member function 'int LibRaw::wf_remove_banding()':
+[   11s] internal/./wf_filtering.cpp:686:1: warning: control reaches end of non-void function [-Wreturn-type]
+[   39s] I: Program returns random data in a function
+[   39s] E: libraw no-return-in-nonvoid-function internal/./wf_filtering.cpp:686
+---
+ internal/wf_filtering.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/internal/wf_filtering.cpp b/internal/wf_filtering.cpp
+index a54ced4..b383b1e 100644
+--- a/internal/wf_filtering.cpp
++++ b/internal/wf_filtering.cpp
+@@ -683,6 +683,7 @@ int LibRaw::wf_remove_banding()
+ 
+ 	free(dummy_line);
+ 	
++	return WF_DEBANDING_OK;
+ }
+ 
+ double LibRaw::wf_filter_energy(int r1_greenmode, int r1, int r2_greenmode, int r2)
+-- 
+1.8.2
+

LibRaw-0.14.7.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7307a607249043bb544f3ab3b3a999e1923d72fbed12e4e2239d172e522143da
-size 1366794

LibRaw-0.15.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:828eac93910f26f813f91d35f92f33a9e719c2ec8522d575b248063194b068c6
+size 1405341

libraw.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jun 11 12:47:51 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 0.15.2
+* Fixed possible double-free() on error recovery on damaged
+  full-color (Foveon, sRAW) files. (CVE-2013-2126, bnc#822665)
+* fixed wrong data maximum calculation for Panasonic files
+* check for possible buffer overrun in exposure correction code
+  (CVE-2013-2127, bnc#822665)
+- Add 0001-build-fix-return-of-random-data.patch
+
 -------------------------------------------------------------------
 Thu Jan 10 18:42:28 UTC 2013 - jengelh@inai.de
 

libraw.spec

@@ -19,18 +19,20 @@
 %define tar_name LibRaw
 
 Name:           libraw
-%define lname	libraw5
-Version:        0.14.7
+%define lname	libraw9
+Version:        0.15.2
 Release:        0
 Summary:        Library for reading RAW files obtained from digital photo cameras
 License:        CDDL-1.0 or LGPL-2.1
-Group:          System/Libraries
+Group:          Development/Libraries/C and C++
 Url:            http://www.libraw.org/
 
+#Freecode-URL:	http://freecode.com/projects/libraw
 #Git-Clone:	git://github.com/LibRaw/LibRaw
 Source:         http://www.libraw.org/data/%{tar_name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM libraw-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7.
-Patch0:         libraw-gcc47.patch
+Patch1:         libraw-gcc47.patch
+Patch2:         0001-build-fix-return-of-random-data.patch
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libjasper-devel
@@ -70,7 +72,7 @@ drawbacks have already been eliminated and part will be fixed in future.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries/Other
+Group:          Development/Libraries/C and C++
 Requires:       %lname = %version
 
 %description    devel
@@ -82,7 +84,7 @@ drawbacks have already been eliminated and part will be fixed in future.
 
 %package        devel-static
 Summary:        Library for reading RAW files obtained from digital photo cameras
-Group:          Development/Libraries/Other
+Group:          Development/Libraries/C and C++
 Requires:       %{name}-devel = %{version}
 
 %description    devel-static
@@ -97,7 +99,7 @@ against LibRaw. LibRaw does not provide dynamic libraries.
 
 %prep
 %setup -q -n %{tar_name}-%{version}
-%patch0 -p1
+%patch -P 1 -P 2 -p1
 
 %build
 CXXFLAGS="%{optflags} -fPIC" \
@@ -146,8 +148,8 @@ rm -rf %{buildroot}%{_datadir}/doc
 
 %files -n %lname
 %defattr(-,root,root,-)
-%{_libdir}/libraw.so.5*
-%{_libdir}/libraw_r.so.5*
+%{_libdir}/libraw.so.9*
+%{_libdir}/libraw_r.so.9*
 
 %files devel-static
 %defattr(-,root,root,-)