[gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/, x11-libs/gdk-pixbuf/files/

2018-04-17 Thread Mart Raudsepp 
commit: 5b68f857234da2dd5651b05ac65bd6fed78c8f55
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Apr 17 12:58:26 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Apr 17 12:58:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b68f857

x11-libs/gdk-pixbuf: security cleanup

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 x11-libs/gdk-pixbuf/Manifest   |   1 -
 .../gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch |  66 ---
 x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild   | 124 -
 3 files changed, 191 deletions(-)

diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 6372cac87fb..8c610bda12c 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,4 +1,3 @@
-DIST gdk-pixbuf-2.36.10.tar.xz 5772196 BLAKE2B 
542df9a5b9d3e790cb592b714a402633eaf37ecd4a21d597f307bdc3f5a0a35e3c3d9e3f6c822e163d0d64b9de62d7b120cb2b174f3109bdffc5e08225506f0c
 SHA512 
d080d20baa20efe58cc5e5d043532f57e7950c0f7a3661998f924ae2a819f6bf1113e1da7785ac2063dfa582576d418eea5b3c80ea3db16057de43cc3f911d35
 DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 
1b111c2866b06ff5da5d5e043481956d6ffbc69fa66236d91b29a6e923c01b91054eb491d2ba15a2e5d2d694f143eb0cc472bbed9bfce0bc015d6602449920fa
 SHA512 
231e13ef2339fc6953788e8597a0c455143273338793ed835dac6ccf42e26e0292dec4121a4976b859ba8ffaa81b3ca5b250b54bd4897dbd3146a1874a59d4e3
 DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 
17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271
 SHA512 
d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9
 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B 
da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33
 SHA512 
5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b

diff --git a/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch 
b/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch
deleted file mode 100644
index 80ed32f83f3..000
--- a/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 66537d1ecf7e857a0a443c1ebf72baf6f19dd3e4 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera 
-Date: Mon, 11 Sep 2017 19:11:50 +0200
-Subject: build: Fix TIFF loader compilation with autotools
-
-https://bugzilla.gnome.org/show_bug.cgi?id=786342

- configure.ac   | 7 +++
- gdk-pixbuf/Makefile.am | 2 +-
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0abe5ce..c07bd6f 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -564,7 +564,6 @@ dnl Test for libjasper
- *** --without-libjasper to configure])
-   fi
- 
--AC_SUBST(LIBTIFF)
- AC_SUBST(LIBJPEG)
- AC_SUBST(LIBPNG)
- AC_SUBST(LIBJASPER)
-@@ -676,7 +675,7 @@ if test x$gio_can_sniff = x; then
-   AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])
- fi
- 
--AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x)
-+AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != xno)
- AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
- AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
- AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
-@@ -684,7 +683,7 @@ AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
- if $dynworks ; then
-   STATIC_LIB_DEPS=
-   if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then
--STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF"
-+STATIC_LIB_DEPS="$STATIC_LIB_DEPS $TIFF_LIBS"
-   fi
-   if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then
- STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
-@@ -698,7 +697,7 @@ if $dynworks ; then
- STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
-   fi
- else
--  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
-+  STATIC_LIB_DEPS="$TIFF_LIBS $LIBJPEG $LIBPNG $LIBJASPER"
- fi
- 
- # Checks to see whether we should include mediaLib
-diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
-index 01b693c..720a058 100644
 a/gdk-pixbuf/Makefile.am
-+++ b/gdk-pixbuf/Makefile.am
-@@ -88,7 +88,7 @@ libpixbufloader_pnm_la_LIBADD = $(module_libs)
- libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c
- libpixbufloader_tiff_la_SOURCES = io-tiff.c
- libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs)
-+libpixbufloader_tiff_la_LIBADD = $(TIFF_LIBS) $(module_libs)
- 
- #
- # The XPM loader
--- 
-cgit v0.12
-

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild 
b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
deleted file mode 100644
index 645819ace7a..000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
+++ /dev/null
@@ -1,124 +0,0

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/, x11-libs/gdk-pixbuf/files/

2017-09-21 Thread Gilles Dartiguelongue 
commit: 26a1f15bb0a5261c1c6506aa0305aea13acd314c
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Thu Sep 21 21:10:52 2017 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Thu Sep 21 21:20:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a1f15b

fix detection of libtiff in upstream patch, bug #631088

Closes: https://bugs.gentoo.org/show_bug.cgi?id=631088

 x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch | 2 +-
 .../{gdk-pixbuf-2.36.10-r1.ebuild => gdk-pixbuf-2.36.10-r2.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch 
b/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch
index 47e62ef9118..80ed32f83f3 100644
--- a/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch
+++ b/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch
@@ -26,7 +26,7 @@ index 0abe5ce..c07bd6f 100644
  fi
  
 -AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x)
-+AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != x)
++AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != xno)
  AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
  AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
  AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r1.ebuild 
b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
similarity index 100%
rename from x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r1.ebuild
rename to x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/, x11-libs/gdk-pixbuf/files/

2017-09-15 Thread Gilles Dartiguelongue 
commit: 17cd70a3a834bbaca8d7618eeb901f0c6f870578
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Fri Sep 15 06:40:41 2017 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Fri Sep 15 06:42:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17cd70a3

x11-libs/gdk-pixbuf: fix TIFF loading support, bug #629716

Closes: https://bugs.gentoo.org/show_bug.cgi?id=629716
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch |  66 +++
 x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r1.ebuild   | 124 +
 2 files changed, 190 insertions(+)

diff --git a/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch 
b/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch
new file mode 100644
index 000..47e62ef9118
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch
@@ -0,0 +1,66 @@
+From 66537d1ecf7e857a0a443c1ebf72baf6f19dd3e4 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera 
+Date: Mon, 11 Sep 2017 19:11:50 +0200
+Subject: build: Fix TIFF loader compilation with autotools
+
+https://bugzilla.gnome.org/show_bug.cgi?id=786342
+---
+ configure.ac   | 7 +++
+ gdk-pixbuf/Makefile.am | 2 +-
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0abe5ce..c07bd6f 100644
+--- a/configure.ac
 b/configure.ac
+@@ -564,7 +564,6 @@ dnl Test for libjasper
+ *** --without-libjasper to configure])
+   fi
+ 
+-AC_SUBST(LIBTIFF)
+ AC_SUBST(LIBJPEG)
+ AC_SUBST(LIBPNG)
+ AC_SUBST(LIBJASPER)
+@@ -676,7 +675,7 @@ if test x$gio_can_sniff = x; then
+   AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])
+ fi
+ 
+-AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x)
++AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != x)
+ AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
+ AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
+ AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
+@@ -684,7 +683,7 @@ AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
+ if $dynworks ; then
+   STATIC_LIB_DEPS=
+   if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then
+-STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF"
++STATIC_LIB_DEPS="$STATIC_LIB_DEPS $TIFF_LIBS"
+   fi
+   if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then
+ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
+@@ -698,7 +697,7 @@ if $dynworks ; then
+ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
+   fi
+ else
+-  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
++  STATIC_LIB_DEPS="$TIFF_LIBS $LIBJPEG $LIBPNG $LIBJASPER"
+ fi
+ 
+ # Checks to see whether we should include mediaLib
+diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
+index 01b693c..720a058 100644
+--- a/gdk-pixbuf/Makefile.am
 b/gdk-pixbuf/Makefile.am
+@@ -88,7 +88,7 @@ libpixbufloader_pnm_la_LIBADD = $(module_libs)
+ libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c
+ libpixbufloader_tiff_la_SOURCES = io-tiff.c
+ libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined)
+-libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs)
++libpixbufloader_tiff_la_LIBADD = $(TIFF_LIBS) $(module_libs)
+ 
+ #
+ # The XPM loader
+-- 
+cgit v0.12
+

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r1.ebuild 
b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r1.ebuild
new file mode 100644
index 000..b56eb7ce266
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit flag-o-matic gnome2 multilib multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf;
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+   >=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
+   >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+   introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+   jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+   jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+   tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+   X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+   >=dev-util/gtk-doc-am-1.20
+   >=sys-devel/gettext-0.19
+   virtual/pkgconfig
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+   !https://bugzilla.gnome.org/show_bug.cgi?id=756590
+   "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+   # Fix TIFF loader

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/, x11-libs/gdk-pixbuf/files/

2016-02-26 Thread Anthony G. Basile 
commit: 0cde5cef33c8cae17a2c4f96ffecc8d47422cea1
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Feb 26 12:36:18 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Feb 26 12:36:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cde5cef

x11-libs/gdk-pixbuf: fix build on uClibc, bug #563052

Upstream doesn't understand the proper use of __GLIBC__ and __UCLIBC__,
which I am trying to convince them of.

See: https://bugzilla.gnome.org/show_bug.cgi?id=756590

Package-Manager: portage-2.2.26

 .../gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch  | 34 ++
 x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild|  3 ++
 x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild   |  3 ++
 3 files changed, 40 insertions(+)

diff --git 
a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 
b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch
new file mode 100644
index 000..77ea7e7
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch
@@ -0,0 +1,34 @@
+From 21b8eb73d9272e06707ad6d0357f3034b8d9a46f Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" 
+Date: Wed, 14 Oct 2015 16:18:19 -0400
+Subject: [PATCH] tests/pixbuf-lowmem.c: Do not run pixbuf-lowmem test on
+ uClibc
+
+pixbuf-lowmem.c depends on GNU libc internals and does not build
+on musl or uClibc.  Commit e1fd25a fixes this issue for musl by
+testing if __GLIBC__ is set.  However, uClibc sets __GLIBC__ and
+so this check is insufficient there.  We expand the check so that
+we run pixbuf-lowmem on glibc, while avoiding it on both musl and
+uClibc.
+
+Signed-off-by: Anthony G. Basile 
+---
+ tests/pixbuf-lowmem.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c
+index 9e9571f..ec7504f 100644
+--- a/tests/pixbuf-lowmem.c
 b/tests/pixbuf-lowmem.c
+@@ -24,7 +24,7 @@
+ #include 
+ #include 
+ 
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ #define PRETEND_MEM_SIZE (16 * 1024 * 1024)
+ #define REMAINING_MEM_SIZE 10
+ 
+-- 
+2.4.9
+

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild 
b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild
index a8fa239..5ca298a 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild
@@ -43,6 +43,9 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 src_prepare() {
+   # See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+   epatch "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+
# This will avoid polluting the pkg-config file with versioned libpng,
# which is causing problems with libpng14 -> libpng15 upgrade
# See upstream bug #667068

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild 
b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
index 27a8968..b7f6597 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
@@ -43,6 +43,9 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 src_prepare() {
+   # See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+   epatch "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+
# This will avoid polluting the pkg-config file with versioned libpng,
# which is causing problems with libpng14 -> libpng15 upgrade
# See upstream bug #667068

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/, x11-libs/gdk-pixbuf/files/

2015-10-14 Thread Alexandre Rostovtsev 
commit: 91c97a5dae6ab5ca1fead8aacba2c5e058f38212
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Wed Oct 14 12:39:32 2015 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Wed Oct 14 12:44:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91c97a5d

x11-libs/gdk-pixbuf: run glibc-specific test only on glibc

Gentoo-Bug: 563052
Reported-by: Anthony Basile

 .../gdk-pixbuf-2.32.1-lowmem-test-glibc.patch  | 60 ++
 x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild   |  4 +-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git 
a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch 
b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch
new file mode 100644
index 000..3915dff
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch
@@ -0,0 +1,60 @@
+From e1fd25a3d0c18bd941f685bbdf5aa3812403a48e Mon Sep 17 00:00:00 2001
+From: Natanael Copa 
+Date: Tue, 6 Oct 2015 09:11:38 +0200
+Subject: [PATCH] Run only pixbuf-lowmem test on GNU libc
+
+The test case depends on GNU libc specific internals so we only run it
+on GNU libc.
+
+This fixes build on Linux with musl libc.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=756078
+---
+ tests/Makefile.am | 5 -
+ tests/pixbuf-lowmem.c | 8 
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 1f09711..2a0325a 100644
+--- a/tests/Makefile.am
 b/tests/Makefile.am
+@@ -19,13 +19,8 @@ LDADD = \
+ noinst_PROGRAMS +=\
+   pixbuf-read \
+   pixbuf-random   \
+-  $(NULL)
+-
+-if OS_LINUX
+-noinst_PROGRAMS +=\
+   pixbuf-lowmem   \
+   $(NULL)
+-endif
+ 
+ test_programs =   \
+   animation   \
+diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c
+index ae71788..9e9571f 100644
+--- a/tests/pixbuf-lowmem.c
 b/tests/pixbuf-lowmem.c
+@@ -24,6 +24,7 @@
+ #include 
+ #include 
+ 
++#ifdef __GLIBC__
+ #define PRETEND_MEM_SIZE (16 * 1024 * 1024)
+ #define REMAINING_MEM_SIZE 10
+ 
+@@ -225,3 +226,10 @@ main (int argc, char **argv)
+   
+   return 0;
+ }
++#else
++int
++main (int argc, char **argv)
++{
++  return 0;
++}
++#endif
+-- 
+2.6.1
+

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild 
b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild
index 54226b3..978be55 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
+inherit autotools eutils flag-o-matic gnome2 multilib libtool multilib-minimal
 
 DESCRIPTION="Image loading library for GTK+"
 HOMEPAGE="http://www.gtk.org/;
@@ -49,6 +49,8 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
# Upstream patches from 2.32.x
epatch "${FILESDIR}"/${P}-gint64-shift-overflow.patch
+   epatch "${FILESDIR}"/${P}-lowmem-test-glibc.patch #563052, needs 
eautoreconf
+   eautoreconf
 
# This will avoid polluting the pkg-config file with versioned libpng,
# which is causing problems with libpng14 -> libpng15 upgrade

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/, x11-libs/gdk-pixbuf/files/

2015-10-12 Thread Alexandre Rostovtsev 
commit: 1dfb62b200770993df34d207358805fba6612605
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Mon Oct 12 23:19:17 2015 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Mon Oct 12 23:33:34 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfb62b2

x11-libs/gdk-pixbuf: bump to 2.32.1, fixes heap overflows

Fixes multiple heap overflows (CVE-2015-7673, CVE-2015-7674).
Drops support for wbmp, ras, pcx formats.
Fixes support for icns and 256x256 ico formats.

Gentoo-Bug: 562878, 562880
Reported-by: Agostino Sarubbo

 x11-libs/gdk-pixbuf/Manifest   |   1 +
 .../gdk-pixbuf-2.32.1-gint64-shift-overflow.patch  |  81 +
 x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild   | 129 +
 3 files changed, 211 insertions(+)

diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 3bbc8ef..a6dadd3 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1 +1,2 @@
 DIST gdk-pixbuf-2.30.8.tar.xz 1336788 SHA256 
4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be SHA512 
2888cf035b70330e8d3ac87af54b69b2c990440fd59922464088d2a685e90022ad39c83d1ce1fac3872b55ce9445ec4a3e9c7ab6371e20b19e20df7f261d
 WHIRLPOOL 
e7f69807ed629c5703750a91cc7a95ee2b3aa178a74c9197c20f863648436a023d140cf1274ba38369e8da3d77216bb1fcc66bae5b612ee8ee33ee4b42e11d65
+DIST gdk-pixbuf-2.32.1.tar.xz 2427908 SHA256 
4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc SHA512 
4c744f166e86c17cafebe0db9434794666b64850a60597e34675cf9b902e48e89c3ff45032a10899944ae59b6c0db63c1ff33c4d2c50846393e77bad3a3adec2
 WHIRLPOOL 
566b73752c1e478fdf7011c3dea39eb13052741c70a0dffd6a0800e892e951207856b90e0d20c352981565682dec28c51fc4951f2236767e97c838d239a2

diff --git 
a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch 
b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch
new file mode 100644
index 000..273956e
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch
@@ -0,0 +1,81 @@
+From 2fb6bce8b3fdae67b8cdd93f253dad3743fc01b8 Mon Sep 17 00:00:00 2001
+From: Mike Gorse 
+Date: Tue, 6 Oct 2015 11:46:24 -0500
+Subject: [PATCH] pixops: use gint64 in more places to avoid overflow when
+ shifting
+
+---
+ gdk-pixbuf/pixops/pixops.c | 34 +-
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
+index b0abecd..6a4a096 100644
+--- a/gdk-pixbuf/pixops/pixops.c
 b/gdk-pixbuf/pixops/pixops.c
+@@ -354,11 +354,11 @@ pixops_composite_nearest (guchar*dest_buf,
+ double scale_y,
+ intoverall_alpha)
+ {
+-  int i;
+-  int x;
+-  int x_step = (1 << SCALE_SHIFT) / scale_x;
+-  int y_step = (1 << SCALE_SHIFT) / scale_y;
+-  int xmax, xstart, xstop, x_pos, y_pos;
++  gint64 i;
++  gint64 x;
++  gint64 x_step = (1 << SCALE_SHIFT) / scale_x;
++  gint64 y_step = (1 << SCALE_SHIFT) / scale_y;
++  gint64 xmax, xstart, xstop, x_pos, y_pos;
+   const guchar *p;
+   unsigned int  a0;
+ 
+@@ -524,13 +524,13 @@ pixops_composite_color_nearest (guchar*dest_buf,
+   guint32color1,
+   guint32color2)
+ {
+-  int i, j;
+-  int x;
+-  int x_step = (1 << SCALE_SHIFT) / scale_x;
+-  int y_step = (1 << SCALE_SHIFT) / scale_y;
++  gint64 i, j;
++  gint64 x;
++  gint64 x_step = (1 << SCALE_SHIFT) / scale_x;
++  gint64 y_step = (1 << SCALE_SHIFT) / scale_y;
+   int r1, g1, b1, r2, g2, b2;
+   int check_shift = get_check_shift (check_size);
+-  int xmax, xstart, xstop, x_pos, y_pos;
++  gint64 xmax, xstart, xstop, x_pos, y_pos;
+   const guchar *p;
+   unsigned int  a0;
+ 
+@@ -1338,20 +1338,20 @@ pixops_process (guchar *dest_buf,
+   PixopsLineFunc  line_func,
+   PixopsPixelFunc pixel_func)
+ {
+-  int i, j;
+-  int x, y;   /* X and Y position in source (fixed_point) */
++  gint64 i, j;
++  gint64 x, y;/* X and Y position in source 
(fixed_point) */
+ 
+   guchar **line_bufs;
+   int *filter_weights;
+ 
+-  int x_step;
+-  int y_step;
++  gint64 x_step;
++  gint64 y_step;
+ 
+   int check_shift;
+-  int scaled_x_offset;
++  gint64 scaled_x_offset;
+ 
+-  int run_end_x;
+-  int run_end_index;
++  gint64 run_end_x;
++  gint64 run_end_index;
+ 
+   x_step = (1 << SCALE_SHIFT) / scale_x; /* X step in source (fixed point) */
+   y_step = (1 << SCALE_SHIFT) / scale_y; /* Y step in source (fixed point) */
+-- 
+2.6.1
+

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild 
b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild
new file mode 100644
index 000..a0ddb14
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/, x11-libs/gdk-pixbuf/files/

2015-08-31 Thread Alexandre Rostovtsev 
commit: 084b0771c60902525706033d8d1ef2ac489954e1
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Tue Sep  1 04:28:13 2015 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Tue Sep  1 05:15:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084b0771

x11-libs/gdk-pixbuf: more DoS fixes (CVE-2015-4491)

Really fix the overflows this time.

Gentoo-Bug: 556314
Upstream-Bug-url: https://bugzilla.gnome.org/show_bug.cgi?id=752297
Upstream-Bug-url: https://bugzilla.gnome.org/show_bug.cgi?id=753908
Upstream-Bug-url: https://bugzilla.gnome.org/show_bug.cgi?id=734556
Upstream-Bug-url: https://bugzilla.gnome.org/show_bug.cgi?id=753569
Package-Manager: portage-2.2.20.1

 .../gdk-pixbuf-2.31.1-pixops-no-scaling.patch  | 129 
 .../files/gdk-pixbuf-2.31.5-pixops-overflow.patch  |  38 +
 .../gdk-pixbuf-2.31.6-alpha-overflow-rebased.patch |  79 ++
 .../files/gdk-pixbuf-2.31.6-jpeg-overflow.patch|  35 +
 .../gdk-pixbuf-2.31.6-pixops-gcc-optimizer.patch   |  46 ++
 ...gdk-pixbuf-2.31.6-pixops-overflow-rebased.patch | 162 +
 .../gdk-pixbuf-2.31.6-pixops-variable-type.patch   |  37 +
 .../files/gdk-pixbuf-2.31.6-png-overflow.patch |  72 +
 .../files/gdk-pixbuf-2.31.6-rotate-overflow.patch  |  27 
 x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild| 134 +
 10 files changed, 759 insertions(+)

diff --git 
a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.1-pixops-no-scaling.patch 
b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.1-pixops-no-scaling.patch
new file mode 100644
index 000..a8587fc
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.1-pixops-no-scaling.patch
@@ -0,0 +1,129 @@
+From cc5fce6315dcc1127a3e2106223305ff763be815 Mon Sep 17 00:00:00 2001
+From: Hans Petter Jansson 
+Date: Thu, 10 Nov 2005 19:13:00 +
+Subject: [PATCH] pixops: Special-case compositing/copying with no scaling
+
+When there is no scaling involved, make gdk_pixbuf_composite_color()
+faster by avoiding the scaling code path.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=80927
+---
+ gdk-pixbuf/pixops/pixops.c | 95 +++---
+ 1 file changed, 90 insertions(+), 5 deletions(-)
+
+diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
+index 993223e..29a1c14 100644
+--- a/gdk-pixbuf/pixops/pixops.c
 b/gdk-pixbuf/pixops/pixops.c
+@@ -421,6 +421,86 @@ pixops_composite_nearest (guchar*dest_buf,
+ }
+ 
+ static void
++pixops_composite_nearest_noscale (guchar*dest_buf,
++intrender_x0,
++intrender_y0,
++intrender_x1,
++intrender_y1,
++intdest_rowstride,
++intdest_channels,
++gboolean   dest_has_alpha,
++const guchar  *src_buf,
++intsrc_width,
++intsrc_height,
++intsrc_rowstride,
++intsrc_channels,
++gboolean   src_has_alpha,
++intoverall_alpha)
++{
++  int i, j;
++  int x;
++
++  for (i = 0; i < (render_y1 - render_y0); i++)
++{
++  const guchar *src  = src_buf + (i + render_y0) * src_rowstride;
++  guchar   *dest = dest_buf + i * dest_rowstride;
++
++  x = render_x0 * src_channels;
++
++  for (j=0; j < (render_x1 - render_x0); j++)
++  {
++const guchar *p = src + x;
++unsigned int  a0;
++
++if (src_has_alpha)
++  a0 = (p[3] * overall_alpha) / 0xff;
++else
++  a0 = overall_alpha;
++
++switch (a0)
++  {
++  case 0:
++break;
++  case 255:
++dest[0] = p[0];
++dest[1] = p[1];
++dest[2] = p[2];
++if (dest_has_alpha)
++  dest[3] = 0xff;
++break;
++  default:
++if (dest_has_alpha)
++  {
++unsigned int w0 = 0xff * a0;
++unsigned int w1 = (0xff - a0) * dest[3];
++unsigned int w = w0 + w1;
++
++dest[0] = (w0 * p[0] + w1 * dest[0]) / w;
++dest[1] = (w0 * p[1] + w1 * dest[1]) / w;
++dest[2] = (w0 * p[2] + w1 * dest[2]) / w;
++dest[3] = w / 0xff;
++  }
++else
++  {
++unsigned int a1 = 0xff - a0;
++unsigned int tmp;
++
++tmp = a0 * p[0] + a1 * dest[0] + 0x80;
++dest[0] = (tmp + (tmp >> 8)) >> 8;
++tmp