diff --git a/.LibRaw.metadata b/.LibRaw.metadata new file mode 100644 index 0000000..f8d5347 --- /dev/null +++ b/.LibRaw.metadata @@ -0,0 +1,3 @@ +85011f88c65e1470f5de39736e5e129431dabd2e SOURCES/LibRaw-0.14.8.tar.gz +9c6d8429a3ad417514f6af7293ff8b38c4e22b3a SOURCES/LibRaw-demosaic-pack-GPL3-0.14.8.tar.gz +66775c1e6c30857bb2e6529056586551b77fc674 SOURCES/LibRaw-demosaic-pack-GPL2-0.14.8.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/LibRaw-0.14.8-errorhandling.patch b/SOURCES/LibRaw-0.14.8-errorhandling.patch new file mode 100644 index 0000000..b71a539 --- /dev/null +++ b/SOURCES/LibRaw-0.14.8-errorhandling.patch @@ -0,0 +1,49 @@ +diff -U3 -r LibRaw-0.14.8.orig/Changelog.rus LibRaw-0.14.8/Changelog.rus +--- LibRaw-0.14.8.orig/Changelog.rus 2013-05-17 14:54:17.000000000 -0500 ++++ LibRaw-0.14.8/Changelog.rus 2013-05-31 05:31:45.970607271 -0500 +@@ -1,4 +1,8 @@ +-2013-05-21 Alex Tutubalin ++2013-05-31 Alex Tutubalin ++ * Исправлена ошибка при обработке поврежденных полноцветных ++ файлов (sRAW, Foveon) ++ ++2013-05-21 Alex Tutubalin + * Исправлена ошибка в коде функции sony_decrypt(), приводившая + к неверному чтению камерного баланса белого на камерах Sony + если LibRaw была собрана gcc 4.8 +diff -U3 -r LibRaw-0.14.8.orig/Changelog.txt LibRaw-0.14.8/Changelog.txt +--- LibRaw-0.14.8.orig/Changelog.txt 2013-05-17 14:54:17.000000000 -0500 ++++ LibRaw-0.14.8/Changelog.txt 2013-05-31 05:31:45.970607271 -0500 +@@ -1,3 +1,7 @@ ++2013-05-31 Alex Tutubalin ++ * Fixed double call to free() on broken legacy-layout images ++ (backport from 0.15.x) ++ + 2013-05-21 Alex Tutubalin + * Fixed undefined behaviour in sony_decrypt() function. + This bug causes incorrect camera WB read for Sony cameras. +diff -U3 -r LibRaw-0.14.8.orig/src/libraw_cxx.cpp LibRaw-0.14.8/src/libraw_cxx.cpp +--- LibRaw-0.14.8.orig/src/libraw_cxx.cpp 2013-05-17 14:54:17.000000000 -0500 ++++ LibRaw-0.14.8/src/libraw_cxx.cpp 2013-05-31 05:31:51.402607149 -0500 +@@ -796,8 +796,8 @@ + S.iheight= S.height; + IO.shrink = 0; + // allocate image as temporary buffer, size +- imgdata.rawdata.raw_alloc = calloc(S.iwidth*S.iheight,sizeof(*imgdata.image)); +- imgdata.image = (ushort (*)[4]) imgdata.rawdata.raw_alloc; ++ imgdata.rawdata.raw_alloc = 0; ++ imgdata.image = (ushort (*)[4]) calloc(S.iwidth*S.iheight,sizeof(*imgdata.image)); + } + + +@@ -807,8 +807,8 @@ + // recover saved + if( decoder_info.decoder_flags & LIBRAW_DECODER_LEGACY) + { +- imgdata.image = 0; +- imgdata.rawdata.color_image = (ushort (*)[4]) imgdata.rawdata.raw_alloc; ++ imgdata.rawdata.raw_alloc = imgdata.rawdata.color_image = imgdata.image; ++ imgdata.image = 0; + } + + // calculate channel maximum diff --git a/SPECS/LibRaw.spec b/SPECS/LibRaw.spec new file mode 100644 index 0000000..c9af366 --- /dev/null +++ b/SPECS/LibRaw.spec @@ -0,0 +1,170 @@ + +Summary: Library for reading RAW files obtained from digital photo cameras +Name: LibRaw +Version: 0.14.8 +Release: 2%{?dist} +License: GPLv3+ +Group: Development/Libraries +URL: http://www.libraw.org + +BuildRequires: lcms2-devel +BuildRequires: jasper-devel + + +Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz +Source1: http://www.libraw.org/data/%{name}-demosaic-pack-GPL2-%{version}.tar.gz +Source2: http://www.libraw.org/data/%{name}-demosaic-pack-GPL3-%{version}.tar.gz +#Patch0: LibRaw-0.14.7-segfault.patch +Patch1: LibRaw-0.14.8-errorhandling.patch + +%description +LibRaw is a library for reading RAW files obtained from digital photo +cameras (CRW/CR2, NEF, RAF, DNG, and others). + +LibRaw is based on the source codes of the dcraw utility, where part of +drawbacks have already been eliminated and part will be fixed in future. + +%package devel +Summary: LibRaw development libraries +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +LibRaw development libraries. + +This package contains libraries that applications can use to build +against LibRaw. + +%package static +Summary: LibRaw static development libraries +Group: Development/Libraries + +%description static +LibRaw static development libraries. + +%prep +%setup -q -a1 -a2 +#%patch0 -p0 +%patch1 -p1 + +%build +%configure --enable-examples=no --enable-jasper --enable-lcms \ + --enable-demosaic-pack-gpl2 --enable-demosaic-pack-gpl3 +make %{?_smp_mflags} + +%install +cp -pr doc manual +chmod 644 LICENSE.CDDL LICENSE.LGPL COPYRIGHT Changelog.txt Changelog.rus +chmod 644 manual/*.html + +# The Libraries +make install DESTDIR=%{buildroot} + +%files +%defattr(-,root,root,-) +%doc LICENSE.CDDL LICENSE.LGPL COPYRIGHT Changelog.txt Changelog.rus +%{_libdir}/*.so.* + +%files static +%defattr(-,root,root,-) +%{_libdir}/*.a + +%files devel +%defattr(-,root,root,-) +%doc manual +%doc samples +%dir %{_includedir}/libraw +%{_includedir}/libraw/*.h +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc +%exclude %{_libdir}/*.la +%exclude %{_docdir}/libraw/* + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%changelog +* Wed May 29 2013 Jon Ciesla - 0.14.8-2 +- Patch for double free, CVE-2013-2126, BZ 968387. + +* Wed May 29 2013 Jon Ciesla - 0.14.8-1 +- Latest upstream, fixes gcc 4.8 issues. + +* Thu Apr 11 2013 Jon Ciesla - 0.14.7-4 +- Revert prior patch. + +* Thu Apr 11 2013 Jon Ciesla - 0.14.7-3 +- Patch for segfault, BZ 948628. + +* Wed Feb 13 2013 Fedora Release Engineering - 0.14.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Nov 26 2012 Jon Ciesla - 0.14.7-1 +- New upstream 0.14.7 + +* Wed Jul 18 2012 Fedora Release Engineering - 0.14.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jun 2 2012 Siddhesh Poyarekar - 0.14.6-2 +- Use lcms2. + +* Sat Jun 2 2012 Siddhesh Poyarekar - 0.14.6-1 +- New upstream 0.14.6 + +* Tue Feb 28 2012 Fedora Release Engineering - 0.14.3-4 +- Rebuilt for c++ ABI breakage + +* Thu Jan 12 2012 Fedora Release Engineering - 0.14.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Dec 9 2011 Siddhesh Poyarekar - 0.14.3-2 +- Add demosaic packs (bz #760638) +- Change license to GPLv3+ due to above change + +* Wed Nov 16 2011 Siddhesh Poyarekar - 0.14.3-1 +- Rebase to upstream 0.14.3 + +* Mon Feb 07 2011 Fedora Release Engineering - 0.11.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Dec 12 2010 Siddhesh Poyarekar 0.11.3-2 +- Of course, you need to upload the new sources. + +* Sun Dec 12 2010 Siddhesh Poyarekar 0.11.3-1 +- upstream 0.11.3 + +* Sat Nov 13 2010 Siddhesh Poyarekar 0.9.1-9 +- Build position independent object code + +* Sun Jul 08 2010 Siddhesh Poyarekar 0.9.1-8 +- Remove LibRaw license since we're not distributing LibRaw under its terms + +* Sun Jul 07 2010 Siddhesh Poyarekar 0.9.1-7 +- Buildroot is unnecessary +- Corrected license to LGPLv2 or CDDL + +* Sun Jul 04 2010 Siddhesh Poyarekar 0.9.1-6 +- Do not impose -O4 and -w in build options +- Change package group to Development/Libraries +- Corrected license to LGPLv2 +- setup macro no longer needs the name and version arguments +- Rename patches to include name and version + +* Wed Jun 30 2010 Siddhesh Poyarekar 0.9.1-5 +- Use optflags for build +- Install the documentation in a cleaner way + +* Tue Jun 29 2010 Siddhesh Poyarekar 0.9.1-4 +- Use upstream package name (libRaw) instead of libraw + +* Tue Jun 29 2010 Siddhesh Poyarekar 0.9.1-3 +- Remove the clean section since it is not needed in F-13 and later +- Correct installation of docs into defaultdocdir instead of docdir + +* Fri Jun 10 2010 Siddhesh Poyarekar 0.9.1-2 +- Disable lcms and openmp support by default so that we're in line with + upstream default + +* Fri Jun 04 2010 Siddhesh Poyarekar 0.9.1-1 +- New package +