[arch-commits] Commit in gimp-ufraw/repos (12 files)
Christian Hesse
eworm at archlinux.org
Fri Jul 14 19:32:02 UTC 2017
Date: Friday, July 14, 2017 @ 19:32:01
Author: eworm
Revision: 245114
archrelease: copy trunk to community-staging-x86_64, community-staging-i686
Added:
gimp-ufraw/repos/community-staging-i686/
gimp-ufraw/repos/community-staging-i686/001-no-gimp-remote.patch
(from rev 245113, gimp-ufraw/trunk/001-no-gimp-remote.patch)
gimp-ufraw/repos/community-staging-i686/002-CVE-2015-8366.patch
(from rev 245113, gimp-ufraw/trunk/002-CVE-2015-8366.patch)
gimp-ufraw/repos/community-staging-i686/003-fix-unsigned-char.patch
(from rev 245113, gimp-ufraw/trunk/003-fix-unsigned-char.patch)
gimp-ufraw/repos/community-staging-i686/004-gcc-7.patch
(from rev 245113, gimp-ufraw/trunk/004-gcc-7.patch)
gimp-ufraw/repos/community-staging-i686/PKGBUILD
(from rev 245113, gimp-ufraw/trunk/PKGBUILD)
gimp-ufraw/repos/community-staging-x86_64/
gimp-ufraw/repos/community-staging-x86_64/001-no-gimp-remote.patch
(from rev 245113, gimp-ufraw/trunk/001-no-gimp-remote.patch)
gimp-ufraw/repos/community-staging-x86_64/002-CVE-2015-8366.patch
(from rev 245113, gimp-ufraw/trunk/002-CVE-2015-8366.patch)
gimp-ufraw/repos/community-staging-x86_64/003-fix-unsigned-char.patch
(from rev 245113, gimp-ufraw/trunk/003-fix-unsigned-char.patch)
gimp-ufraw/repos/community-staging-x86_64/004-gcc-7.patch
(from rev 245113, gimp-ufraw/trunk/004-gcc-7.patch)
gimp-ufraw/repos/community-staging-x86_64/PKGBUILD
(from rev 245113, gimp-ufraw/trunk/PKGBUILD)
------------------------------------------------------+
community-staging-i686/001-no-gimp-remote.patch | 12 +++
community-staging-i686/002-CVE-2015-8366.patch | 17 ++++
community-staging-i686/003-fix-unsigned-char.patch | 15 ++++
community-staging-i686/004-gcc-7.patch | 15 ++++
community-staging-i686/PKGBUILD | 62 +++++++++++++++++
community-staging-x86_64/001-no-gimp-remote.patch | 12 +++
community-staging-x86_64/002-CVE-2015-8366.patch | 17 ++++
community-staging-x86_64/003-fix-unsigned-char.patch | 15 ++++
community-staging-x86_64/004-gcc-7.patch | 15 ++++
community-staging-x86_64/PKGBUILD | 62 +++++++++++++++++
10 files changed, 242 insertions(+)
Copied: gimp-ufraw/repos/community-staging-i686/001-no-gimp-remote.patch (from rev 245113, gimp-ufraw/trunk/001-no-gimp-remote.patch)
===================================================================
--- community-staging-i686/001-no-gimp-remote.patch (rev 0)
+++ community-staging-i686/001-no-gimp-remote.patch 2017-07-14 19:32:01 UTC (rev 245114)
@@ -0,0 +1,12 @@
+Don't use gimp-remote since gimp 2.4 already includes gimp-remote functionality
+--- a/ufraw_conf.c
++++ b/ufraw_conf.c
+@@ -137,7 +137,7 @@
+ #elif HAVE_GIMP_2_4
+ "gimp", /* remoteGimpCommand */
+ #else
+- "gimp-remote", /* remoteGimpCommand */
++ "gimp", /* remoteGimpCommand */
+ #endif
+
+ /* EXIF data */
Copied: gimp-ufraw/repos/community-staging-i686/002-CVE-2015-8366.patch (from rev 245113, gimp-ufraw/trunk/002-CVE-2015-8366.patch)
===================================================================
--- community-staging-i686/002-CVE-2015-8366.patch (rev 0)
+++ community-staging-i686/002-CVE-2015-8366.patch 2017-07-14 19:32:01 UTC (rev 245114)
@@ -0,0 +1,17 @@
+Fix a buffer overflow bug. See
+https://github.com/LibRaw/LibRaw/commit/89d065424f09b788f443734d44857289489ca9e2
+
+--- a/dcraw.cc
++++ b/dcraw.cc
+@@ -3013,7 +3013,10 @@
+ diff = diff ? -diff : 0x80;
+ if (ftell(ifp) + 12 >= (int) seg[1][1])
+ diff = 0;
+- raw_image[pix] = pred[pix & 1] += diff;
++ if(pix>=raw_width*raw_height)
++ derror();
++ else
++ raw_image[pix] = pred[pix & 1] += diff;
+ if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2;
+ }
+ maximum = 0xff;
Copied: gimp-ufraw/repos/community-staging-i686/003-fix-unsigned-char.patch (from rev 245113, gimp-ufraw/trunk/003-fix-unsigned-char.patch)
===================================================================
--- community-staging-i686/003-fix-unsigned-char.patch (rev 0)
+++ community-staging-i686/003-fix-unsigned-char.patch 2017-07-14 19:32:01 UTC (rev 245114)
@@ -0,0 +1,15 @@
+Description: Fix unsigned char declaration of src[]
+Author: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
+Last-Update: 2017-02-27
+
+--- ufraw-0.22.orig/dcraw.cc
++++ ufraw-0.22/dcraw.cc
+@@ -2285,7 +2285,7 @@ void CLASS quicktake_100_load_raw()
+
+ void CLASS kodak_radc_load_raw()
+ {
+- static const char src[] = {
++ static const signed char src[] = {
+ 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8,
+ 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8,
+ 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,
Copied: gimp-ufraw/repos/community-staging-i686/004-gcc-7.patch (from rev 245113, gimp-ufraw/trunk/004-gcc-7.patch)
===================================================================
--- community-staging-i686/004-gcc-7.patch (rev 0)
+++ community-staging-i686/004-gcc-7.patch 2017-07-14 19:32:01 UTC (rev 245114)
@@ -0,0 +1,15 @@
+diff --git a/dcraw.cc b/dcraw.cc
+index 88c8068..d78c66b 100644
+--- a/dcraw.cc
++++ b/dcraw.cc
+@@ -8766,8 +8766,8 @@ void CLASS identify()
+ "Nikon", "Nokia", "Olympus", "Pentax", "Phase One", "Ricoh",
+ "Samsung", "Sigma", "Sinar", "Sony" };
+ char head[32], *cp;
+- unsigned fsize, i, c;
+- int hlen, flen, zero_fsize=1;
++ unsigned fsize;
++ int hlen, flen, zero_fsize=1, i, c;
+ struct jhead jh;
+
+ tiff_flip = flip = filters = UINT_MAX; /* unknown */
Copied: gimp-ufraw/repos/community-staging-i686/PKGBUILD (from rev 245113, gimp-ufraw/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-07-14 19:32:01 UTC (rev 245114)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Tobias Kieslich <tobias at archlinux.org>
+# Contributor: Martin Sugioarto <nakal at web.de>
+
+pkgname=gimp-ufraw
+pkgver=0.22
+pkgrel=10
+pkgdesc='Converter for raw files; utility and GIMP plugin'
+url='http://ufraw.sourceforge.net/'
+arch=('x86_64' 'i686')
+license=('GPL')
+depends=('gtkimageview' 'exiv2' 'lcms' 'desktop-file-utils' 'cfitsio' 'lensfun')
+makedepends=('gimp' 'cinepaint')
+optdepends=('gimp: to use the gimp import plugin for raw images'
+ 'cinepaint: to use the cinepaint import plugin for raw images')
+source=("http://downloads.sourceforge.net/ufraw/ufraw-$pkgver.tar.gz"
+ '001-no-gimp-remote.patch'
+ '002-CVE-2015-8366.patch'
+ '003-fix-unsigned-char.patch'
+ '004-gcc-7.patch')
+sha256sums=('f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e'
+ '5a3d33edc738228ea5442cef95d2914cd20fbbae911b1005a5cb0d7931fdeda1'
+ '3fc1cb962d1023e6c81e2c93353faae8ee395ba31ea121265686918ad51cb219'
+ 'dbb0dc200867cb67f2ba7688b164e28393ce409092fb759e79b0912dceb3424a'
+ '5a4be00a7548eb78d7d325646b80ceae2d54fd8bfd46f977586b5e1272af3e4c')
+
+prepare() {
+ # One of the include files that comes with cinepaint requires
+ # ../lib/wire/ to exist...
+ mkdir -p lib
+ ln -s /usr/include/cinepaint/wire lib/wire
+
+ cd "ufraw-$pkgver"
+
+ patch -Np1 < "${srcdir}"/001-no-gimp-remote.patch
+ patch -Np1 < "${srcdir}"/002-CVE-2015-8366.patch
+ patch -Np1 < "${srcdir}"/003-fix-unsigned-char.patch
+ patch -Np1 < "${srcdir}"/004-gcc-7.patch
+}
+
+build() {
+ cd "ufraw-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --enable-extras \
+ --enable-mime \
+ --enable-openmp \
+ --with-gimp \
+ --with-cinepaint \
+ --enable-contrast
+ sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile
+ make
+}
+
+package() {
+ make -C "ufraw-$pkgver" DESTDIR="$pkgdir" install
+ rm -f "$pkgdir/usr/bin/dcraw"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: gimp-ufraw/repos/community-staging-x86_64/001-no-gimp-remote.patch (from rev 245113, gimp-ufraw/trunk/001-no-gimp-remote.patch)
===================================================================
--- community-staging-x86_64/001-no-gimp-remote.patch (rev 0)
+++ community-staging-x86_64/001-no-gimp-remote.patch 2017-07-14 19:32:01 UTC (rev 245114)
@@ -0,0 +1,12 @@
+Don't use gimp-remote since gimp 2.4 already includes gimp-remote functionality
+--- a/ufraw_conf.c
++++ b/ufraw_conf.c
+@@ -137,7 +137,7 @@
+ #elif HAVE_GIMP_2_4
+ "gimp", /* remoteGimpCommand */
+ #else
+- "gimp-remote", /* remoteGimpCommand */
++ "gimp", /* remoteGimpCommand */
+ #endif
+
+ /* EXIF data */
Copied: gimp-ufraw/repos/community-staging-x86_64/002-CVE-2015-8366.patch (from rev 245113, gimp-ufraw/trunk/002-CVE-2015-8366.patch)
===================================================================
--- community-staging-x86_64/002-CVE-2015-8366.patch (rev 0)
+++ community-staging-x86_64/002-CVE-2015-8366.patch 2017-07-14 19:32:01 UTC (rev 245114)
@@ -0,0 +1,17 @@
+Fix a buffer overflow bug. See
+https://github.com/LibRaw/LibRaw/commit/89d065424f09b788f443734d44857289489ca9e2
+
+--- a/dcraw.cc
++++ b/dcraw.cc
+@@ -3013,7 +3013,10 @@
+ diff = diff ? -diff : 0x80;
+ if (ftell(ifp) + 12 >= (int) seg[1][1])
+ diff = 0;
+- raw_image[pix] = pred[pix & 1] += diff;
++ if(pix>=raw_width*raw_height)
++ derror();
++ else
++ raw_image[pix] = pred[pix & 1] += diff;
+ if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2;
+ }
+ maximum = 0xff;
Copied: gimp-ufraw/repos/community-staging-x86_64/003-fix-unsigned-char.patch (from rev 245113, gimp-ufraw/trunk/003-fix-unsigned-char.patch)
===================================================================
--- community-staging-x86_64/003-fix-unsigned-char.patch (rev 0)
+++ community-staging-x86_64/003-fix-unsigned-char.patch 2017-07-14 19:32:01 UTC (rev 245114)
@@ -0,0 +1,15 @@
+Description: Fix unsigned char declaration of src[]
+Author: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
+Last-Update: 2017-02-27
+
+--- ufraw-0.22.orig/dcraw.cc
++++ ufraw-0.22/dcraw.cc
+@@ -2285,7 +2285,7 @@ void CLASS quicktake_100_load_raw()
+
+ void CLASS kodak_radc_load_raw()
+ {
+- static const char src[] = {
++ static const signed char src[] = {
+ 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8,
+ 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8,
+ 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,
Copied: gimp-ufraw/repos/community-staging-x86_64/004-gcc-7.patch (from rev 245113, gimp-ufraw/trunk/004-gcc-7.patch)
===================================================================
--- community-staging-x86_64/004-gcc-7.patch (rev 0)
+++ community-staging-x86_64/004-gcc-7.patch 2017-07-14 19:32:01 UTC (rev 245114)
@@ -0,0 +1,15 @@
+diff --git a/dcraw.cc b/dcraw.cc
+index 88c8068..d78c66b 100644
+--- a/dcraw.cc
++++ b/dcraw.cc
+@@ -8766,8 +8766,8 @@ void CLASS identify()
+ "Nikon", "Nokia", "Olympus", "Pentax", "Phase One", "Ricoh",
+ "Samsung", "Sigma", "Sinar", "Sony" };
+ char head[32], *cp;
+- unsigned fsize, i, c;
+- int hlen, flen, zero_fsize=1;
++ unsigned fsize;
++ int hlen, flen, zero_fsize=1, i, c;
+ struct jhead jh;
+
+ tiff_flip = flip = filters = UINT_MAX; /* unknown */
Copied: gimp-ufraw/repos/community-staging-x86_64/PKGBUILD (from rev 245113, gimp-ufraw/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-07-14 19:32:01 UTC (rev 245114)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Tobias Kieslich <tobias at archlinux.org>
+# Contributor: Martin Sugioarto <nakal at web.de>
+
+pkgname=gimp-ufraw
+pkgver=0.22
+pkgrel=10
+pkgdesc='Converter for raw files; utility and GIMP plugin'
+url='http://ufraw.sourceforge.net/'
+arch=('x86_64' 'i686')
+license=('GPL')
+depends=('gtkimageview' 'exiv2' 'lcms' 'desktop-file-utils' 'cfitsio' 'lensfun')
+makedepends=('gimp' 'cinepaint')
+optdepends=('gimp: to use the gimp import plugin for raw images'
+ 'cinepaint: to use the cinepaint import plugin for raw images')
+source=("http://downloads.sourceforge.net/ufraw/ufraw-$pkgver.tar.gz"
+ '001-no-gimp-remote.patch'
+ '002-CVE-2015-8366.patch'
+ '003-fix-unsigned-char.patch'
+ '004-gcc-7.patch')
+sha256sums=('f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e'
+ '5a3d33edc738228ea5442cef95d2914cd20fbbae911b1005a5cb0d7931fdeda1'
+ '3fc1cb962d1023e6c81e2c93353faae8ee395ba31ea121265686918ad51cb219'
+ 'dbb0dc200867cb67f2ba7688b164e28393ce409092fb759e79b0912dceb3424a'
+ '5a4be00a7548eb78d7d325646b80ceae2d54fd8bfd46f977586b5e1272af3e4c')
+
+prepare() {
+ # One of the include files that comes with cinepaint requires
+ # ../lib/wire/ to exist...
+ mkdir -p lib
+ ln -s /usr/include/cinepaint/wire lib/wire
+
+ cd "ufraw-$pkgver"
+
+ patch -Np1 < "${srcdir}"/001-no-gimp-remote.patch
+ patch -Np1 < "${srcdir}"/002-CVE-2015-8366.patch
+ patch -Np1 < "${srcdir}"/003-fix-unsigned-char.patch
+ patch -Np1 < "${srcdir}"/004-gcc-7.patch
+}
+
+build() {
+ cd "ufraw-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --enable-extras \
+ --enable-mime \
+ --enable-openmp \
+ --with-gimp \
+ --with-cinepaint \
+ --enable-contrast
+ sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile
+ make
+}
+
+package() {
+ make -C "ufraw-$pkgver" DESTDIR="$pkgdir" install
+ rm -f "$pkgdir/usr/bin/dcraw"
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list