From 8aee6d8f74df2c382da1e39c4324f5cd8f2ea962 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Thu, 17 Sep 2015 23:10:10 -0600 Subject: [PATCH 1/9] dev-scheme/guile: Fix breakage with GCC 5 (bug #560736) Preprocessor changes in GCC 5 cause guile-snarf to output garbage. Gentoo-Bug: https://bugs.gentoo.org/560736 --- dev-scheme/guile/files/guile-1.8.8-gcc5.patch | 15 +++ dev-scheme/guile/guile-1.8.8-r2.ebuild | 116 ++++++++++++++++++ 2 files changed, 131 insertions(+) create mode 100644 dev-scheme/guile/files/guile-1.8.8-gcc5.patch create mode 100644 dev-scheme/guile/guile-1.8.8-r2.ebuild diff --git a/dev-scheme/guile/files/guile-1.8.8-gcc5.patch b/dev-scheme/guile/files/guile-1.8.8-gcc5.patch new file mode 100644 index 0000000000000..742ea0ba9de27 --- /dev/null +++ b/dev-scheme/guile/files/guile-1.8.8-gcc5.patch @@ -0,0 +1,15 @@ +Preprocessor changes in GCC 5 cause guile-snarf to output garbage. + +https://bugs.gentoo.org/560736 + +--- a/libguile/guile-snarf.in ++++ b/libguile/guile-snarf.in +@@ -50,7 +50,7 @@ + ## Apparently, AIX's preprocessor is unhappy if you try to #include an + ## empty file. + echo "/* cpp arguments: $@ */" ; +- ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true ++ ${cpp} -P -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true + grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/" + } + diff --git a/dev-scheme/guile/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild new file mode 100644 index 0000000000000..2737d570aaf33 --- /dev/null +++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils autotools flag-o-matic elisp-common + +DESCRIPTION="Scheme interpreter" +HOMEPAGE="https://www.gnu.org/software/guile/" +SRC_URI="mirror://gnu/guile/${P}.tar.gz" + +LICENSE="LGPL-2.1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads" +RESTRICT="!regex? ( test )" + +RDEPEND=" + >=dev-libs/gmp-4.1:0= + >=sys-devel/libtool-1.5.6 + sys-devel/gettext + sys-libs/ncurses:0= + emacs? ( virtual/emacs )" +DEPEND="${RDEPEND} + sys-apps/texinfo" + +# Guile seems to contain some slotting support, /usr/share/guile/ is slotted, +# but there are lots of collisions. Most in /usr/share/libguile. Therefore +# I'm slotting this in the same slot as guile-1.6* for now. +SLOT="12" +MAJOR="1.8" + +src_prepare() { + epatch "${FILESDIR}/${P}-fix_guile-config.patch" \ + "${FILESDIR}/${P}-gcc46.patch" \ + "${FILESDIR}/${P}-gcc5.patch" \ + "${FILESDIR}/${P}-makeinfo-5.patch" \ + "${FILESDIR}/${P}-gtexinfo-5.patch" + sed \ + -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \ + -e "/AM_PROG_CC_STDC/d" \ + -i guile-readline/configure.in + eautoreconf +} + +src_configure() { + # see bug #178499 + filter-flags -ftree-vectorize + + #will fail for me if posix is disabled or without modules -- hkBst + econf \ + --disable-error-on-warning \ + --disable-static \ + --enable-posix \ + $(use_enable networking) \ + $(use_enable regex) \ + $(use deprecated || use_enable discouraged) \ + $(use_enable deprecated) \ + $(use_enable emacs elisp) \ + $(use_enable nls) \ + --disable-rpath \ + $(use_enable debug-freelist) \ + $(use_enable debug-malloc) \ + $(use_enable debug guile-debug) \ + $(use_with threads) \ + --with-modules \ + EMACS=no +} + +src_compile() { + emake + + # Above we have disabled the build system's Emacs support; + # for USE=emacs we compile (and install) the files manually + if use emacs; then + cd emacs + elisp-compile *.el || die + fi +} + +src_install() { + einstall + + dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS + + # texmacs needs this, closing bug #23493 + dodir /etc/env.d + echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile + + # necessary for registering slib, see bug 206896 + keepdir /usr/share/guile/site + + if use emacs; then + elisp-install ${PN} emacs/*.{el,elc} || die + elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die + fi +} + +pkg_postinst() { + [ "${EROOT}" == "/" ] && pkg_config + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} + +pkg_config() { + if has_version dev-scheme/slib; then + einfo "Registering slib with guile" + install_slib_for_guile + fi +} + +_pkg_prerm() { + rm -f "${EROOT}"/usr/share/guile/site/slibcat +} From 590cfd77349020fe506ac17520b6eae5d9b17e80 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Fri, 18 Sep 2015 19:53:16 -0600 Subject: [PATCH 2/9] dev-scheme/guile: Use emake install (bug #521546). A sandbox violation was preventing us from using emake install rather than einstall. Gentoo-Bug: https://bugs.gentoo.org/521546 --- dev-scheme/guile/files/guile-1.8.8-sandbox.patch | 15 +++++++++++++++ dev-scheme/guile/guile-1.8.8-r2.ebuild | 6 ++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 dev-scheme/guile/files/guile-1.8.8-sandbox.patch diff --git a/dev-scheme/guile/files/guile-1.8.8-sandbox.patch b/dev-scheme/guile/files/guile-1.8.8-sandbox.patch new file mode 100644 index 0000000000000..70d752fdae97f --- /dev/null +++ b/dev-scheme/guile/files/guile-1.8.8-sandbox.patch @@ -0,0 +1,15 @@ +Prevent sandbox violation when installing + +https://bugs.gentoo.org/521546 + +--- a/guile-config/Makefile.am ++++ b/guile-config/Makefile.am +@@ -39,8 +39,3 @@ guile-config: guile-config.in ${top_builddir}/libguile/libpath.h + -e s:@-GUILE_VERSION-@:${GUILE_VERSION}: + chmod +x guile-config.tmp + mv guile-config.tmp guile-config +- +-## Get rid of any copies of the configuration script under the old +-## name, so people don't end up running ancient copies of it. +-install-exec-local: +- rm -f ${bindir}/build-guile diff --git a/dev-scheme/guile/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild index 2737d570aaf33..619d6784961f8 100644 --- a/dev-scheme/guile/guile-1.8.8-r2.ebuild +++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild @@ -34,7 +34,9 @@ src_prepare() { "${FILESDIR}/${P}-gcc46.patch" \ "${FILESDIR}/${P}-gcc5.patch" \ "${FILESDIR}/${P}-makeinfo-5.patch" \ - "${FILESDIR}/${P}-gtexinfo-5.patch" + "${FILESDIR}/${P}-gtexinfo-5.patch" \ + "${FILESDIR}/${P}-sandbox.patch" + sed \ -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \ -e "/AM_PROG_CC_STDC/d" \ @@ -78,7 +80,7 @@ src_compile() { } src_install() { - einstall + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS From 98ac88a75ec4ae4373c5efdf79bc4a2adb25cb4e Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Fri, 18 Sep 2015 21:15:16 -0600 Subject: [PATCH 3/9] dev-scheme/guile: Split libtool/libltdl dependencies (bug #539370) Gentoo-Bug: https://bugs.gentoo.org/539370 --- dev-scheme/guile/guile-1.8.8-r2.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-scheme/guile/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild index 619d6784961f8..858ec549b832f 100644 --- a/dev-scheme/guile/guile-1.8.8-r2.ebuild +++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild @@ -16,12 +16,13 @@ RESTRICT="!regex? ( test )" RDEPEND=" >=dev-libs/gmp-4.1:0= - >=sys-devel/libtool-1.5.6 + dev-libs/libltdl:0= sys-devel/gettext sys-libs/ncurses:0= emacs? ( virtual/emacs )" DEPEND="${RDEPEND} - sys-apps/texinfo" + sys-apps/texinfo + sys-devel/libtool" # Guile seems to contain some slotting support, /usr/share/guile/ is slotted, # but there are lots of collisions. Most in /usr/share/libguile. Therefore From 337098283222c6887f5f2d77c3f58a2139cf8233 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Fri, 18 Sep 2015 21:47:29 -0600 Subject: [PATCH 4/9] dev-scheme/guile: Add epatch_user (bug #507152) --- dev-scheme/guile/guile-1.8.8-r2.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-scheme/guile/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild index 858ec549b832f..3f854da958b8b 100644 --- a/dev-scheme/guile/guile-1.8.8-r2.ebuild +++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild @@ -42,6 +42,8 @@ src_prepare() { -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \ -e "/AM_PROG_CC_STDC/d" \ -i guile-readline/configure.in + + epatch_user eautoreconf } From 167178f6da3e1de26d6a670bec95359dd52a0385 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Fri, 18 Sep 2015 21:58:04 -0600 Subject: [PATCH 5/9] dev-scheme/guile: configure.in -> .ac --- dev-scheme/guile/guile-1.8.8-r2.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dev-scheme/guile/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild index 3f854da958b8b..e0f62a9caac3a 100644 --- a/dev-scheme/guile/guile-1.8.8-r2.ebuild +++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild @@ -44,6 +44,10 @@ src_prepare() { -i guile-readline/configure.in epatch_user + + mv "${S}"/configure.{in,ac} || die + mv "${S}"/guile-readline/configure.{in,ac} || die + eautoreconf } From 827c7b55b865c20157d0ad17b6883b15cd5167bb Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Fri, 18 Sep 2015 22:57:01 -0600 Subject: [PATCH 6/9] dev-scheme/guile: Also look for tgoto in libtinfo (bug #539316) This is the case when ncurses is built with USE=tinfo. Gentoo-Bug: https://bugs.gentoo.org/539316 --- dev-scheme/guile/files/guile-1.8.8-tinfo.patch | 15 +++++++++++++++ dev-scheme/guile/guile-1.8.8-r2.ebuild | 1 + 2 files changed, 16 insertions(+) create mode 100644 dev-scheme/guile/files/guile-1.8.8-tinfo.patch diff --git a/dev-scheme/guile/files/guile-1.8.8-tinfo.patch b/dev-scheme/guile/files/guile-1.8.8-tinfo.patch new file mode 100644 index 0000000000000..6c4d0116246e4 --- /dev/null +++ b/dev-scheme/guile/files/guile-1.8.8-tinfo.patch @@ -0,0 +1,15 @@ +With ncurses[tinfo] tgoto will be in libtinfo + +https://bugs.gentoo.org/539316 + +--- a/guile-readline/configure.in ++++ b/guile-readline/configure.in +@@ -33,7 +33,7 @@ if test "$MINGW32" = "yes" ; then + fi + AC_SUBST(EXTRA_DEFS) + +-for termlib in ncurses curses termcap terminfo termlib ; do ++for termlib in ncurses curses termcap terminfo termlib tinfo ; do + AC_CHECK_LIB(${termlib}, tgoto, + [LIBS="-l${termlib} $LIBS"; break]) + done diff --git a/dev-scheme/guile/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild index e0f62a9caac3a..2856054af7629 100644 --- a/dev-scheme/guile/guile-1.8.8-r2.ebuild +++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild @@ -36,6 +36,7 @@ src_prepare() { "${FILESDIR}/${P}-gcc5.patch" \ "${FILESDIR}/${P}-makeinfo-5.patch" \ "${FILESDIR}/${P}-gtexinfo-5.patch" \ + "${FILESDIR}/${P}-tinfo.patch" \ "${FILESDIR}/${P}-sandbox.patch" sed \ From db9b115582ff1e2135acda0f3e74d79bc6b093fd Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Fri, 18 Sep 2015 23:58:54 -0600 Subject: [PATCH 7/9] dev-scheme/guile: Make building guile-readline optional (bug #392553) --- .../guile/files/guile-1.8.8-readline.patch | 34 +++++++++++++++++++ dev-scheme/guile/guile-1.8.8-r2.ebuild | 8 +++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 dev-scheme/guile/files/guile-1.8.8-readline.patch diff --git a/dev-scheme/guile/files/guile-1.8.8-readline.patch b/dev-scheme/guile/files/guile-1.8.8-readline.patch new file mode 100644 index 0000000000000..68f64c528a4be --- /dev/null +++ b/dev-scheme/guile/files/guile-1.8.8-readline.patch @@ -0,0 +1,34 @@ +Make guile-readline optional + +https://bugs.gentoo.org/392553 + +--- a/Makefile.am ++++ b/Makefile.am +@@ -24,7 +24,7 @@ + # + AUTOMAKE_OPTIONS = 1.10 + +-SUBDIRS = oop libguile ice-9 guile-config guile-readline emacs \ ++SUBDIRS = oop libguile ice-9 guile-config @GUILE_READLINE@ emacs \ + scripts srfi doc examples test-suite benchmark-suite lang am + + bin_SCRIPTS = guile-tools +--- a/configure.in ++++ b/configure.in +@@ -57,7 +57,15 @@ AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/) + # + #-------------------------------------------------------------------- + +-AC_CONFIG_SUBDIRS(guile-readline) ++GUILE_READLINE= ++AC_ARG_ENABLE([readline], ++ [AS_HELP_STRING([--disable-readline], ++ [disable building guile-readline])], ++ if test "x$enable_readline" != xno; then ++ AC_CONFIG_SUBDIRS([guile-readline]) ++ GUILE_READLINE="guile-readline" ++ fi) ++AC_SUBST([GUILE_READLINE]) + + #-------------------------------------------------------------------- + diff --git a/dev-scheme/guile/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild index 2856054af7629..b6381265a652d 100644 --- a/dev-scheme/guile/guile-1.8.8-r2.ebuild +++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild @@ -11,7 +11,8 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz" LICENSE="LGPL-2.1" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads" +IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads" + RESTRICT="!regex? ( test )" RDEPEND=" @@ -19,7 +20,8 @@ RDEPEND=" dev-libs/libltdl:0= sys-devel/gettext sys-libs/ncurses:0= - emacs? ( virtual/emacs )" + emacs? ( virtual/emacs ) + readline? ( sys-libs/readline:0= )" DEPEND="${RDEPEND} sys-apps/texinfo sys-devel/libtool" @@ -36,6 +38,7 @@ src_prepare() { "${FILESDIR}/${P}-gcc5.patch" \ "${FILESDIR}/${P}-makeinfo-5.patch" \ "${FILESDIR}/${P}-gtexinfo-5.patch" \ + "${FILESDIR}/${P}-readline.patch" \ "${FILESDIR}/${P}-tinfo.patch" \ "${FILESDIR}/${P}-sandbox.patch" @@ -62,6 +65,7 @@ src_configure() { --disable-static \ --enable-posix \ $(use_enable networking) \ + $(use_enable readline) \ $(use_enable regex) \ $(use deprecated || use_enable discouraged) \ $(use_enable deprecated) \ From 1dfb62b200770993df34d207358805fba6612605 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Mon, 12 Oct 2015 19:19:17 -0400 Subject: [PATCH 8/9] 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 + ...-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(+) create mode 100644 x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch create mode 100644 x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index 3bbc8ef7816b0..a6dadd3c99c43 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 2888cf035b70330e8d3ac87af54b69b2c990440fd59922464088d2a685e90022ad39c83d1ce1ccccfac3872b55ce9445ec4a3e9c7ab6371e20b19e20df7f261d WHIRLPOOL e7f69807ed629c5703750a91cc7a95ee2b3aa178a74c9197c20f863648436a023d140cf1274ba38369e8da3d77216bb1fcc66bae5b612ee8ee33ee4b42e11d65 +DIST gdk-pixbuf-2.32.1.tar.xz 2427908 SHA256 4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc SHA512 4c744f166e86c17cafebe0db9434794666b64850a60597e34675cf9b902e48e89c3ff45032a10899944ae59b6c0db63c1ff33c4d2c50846393e77bad3a3adec2 WHIRLPOOL 566b73752c1e478fdf7011c3d2222ea39eb13052741c70a0dffd6a0800e892e951207856b90e0d20c352981565682dec28c51fc4951f2236767e97c838d239a2 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 0000000000000..273956ea402ed --- /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, + int overall_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, + guint32 color1, + guint32 color2) + { +- 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 0000000000000..a0ddb14adbb99 --- /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 terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal + +DESCRIPTION="Image loading library for GTK+" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~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.37.6: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} + ! libpng15 upgrade + # See upstream bug #667068 + # First check that the pattern is present, to catch upstream changes on bumps, + # because sed doesn't return failure code if it doesn't do any replacements + grep -q 'l in libpng16' configure || die "libpng check order has changed upstream" + sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die + [[ ${CHOST} == *-solaris* ]] && append-libs intl + + gnome2_src_prepare +} + +multilib_src_configure() { + # png always on to display icons + ECONF_SOURCE="${S}" \ + gnome2_src_configure \ + $(usex debug --enable-debug=yes "") \ + $(use_with jpeg libjpeg) \ + $(use_with jpeg2k libjasper) \ + $(use_with tiff libtiff) \ + $(multilib_native_use_enable introspection) \ + $(use_with X x11) \ + --with-libpng + + # work-around gtk-doc out-of-source brokedness + if multilib_is_native_abi; then + ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die + fi +} + +multilib_src_install() { + # Parallel install fails when no gdk-pixbuf is already installed, bug #481372 + MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install +} + +pkg_preinst() { + gnome2_pkg_preinst + + multilib_pkg_preinst() { + # Make sure loaders.cache belongs to gdk-pixbuf alone + local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"/${cache} || die + fi + } + + multilib_foreach_abi multilib_pkg_preinst +} + +pkg_postinst() { + # causes segfault if set, see bug 375615 + unset __GL_NO_DSO_FINALIZER + + multilib_foreach_abi gnome2_pkg_postinst + + # Migration snippet for when this was handled by gtk+ + if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then + elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders + elog "to do that you can use qfile from portage-utils:" + elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)" + fi +} + +pkg_postrm() { + gnome2_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSIONS} ]]; then + rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache + fi +} From 30add819bfa23d65664b38ebf6f89820c37035b7 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Mon, 12 Oct 2015 19:35:24 -0400 Subject: [PATCH 9/9] x11-libs/gdk-pixbuf: clean up old comment Package-Manager: portage-2.2.23 --- x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild | 4 ---- 1 file changed, 4 deletions(-) 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 a0ddb14adbb99..7abd159a3d2f9 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild @@ -50,10 +50,6 @@ src_prepare() { # Upstream patches from 2.32.x epatch "${FILESDIR}"/${P}-gint64-shift-overflow.patch - # ERROR: cve-2015-4491 - missing test plan - # FIXME - check if this works in 2.31.7 - # $sed -e 's/cve-2015-4491$(EXEEXT)//' -i tests/Makefile.in || die - # This will avoid polluting the pkg-config file with versioned libpng, # which is causing problems with libpng14 -> libpng15 upgrade # See upstream bug #667068