Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/gdk-pixbuf: ChangeLog gdk-pixbuf-2.22.1-r2.ebuild
Date: Mon, 04 Jul 2011 11:40:00
Message-Id: 20110704113950.7C0792004B@flycatcher.gentoo.org
1 pacho 11/07/04 11:39:50
2
3 Modified: ChangeLog
4 Added: gdk-pixbuf-2.22.1-r2.ebuild
5 Log:
6 GIF: Don't return a partially initialized pixbuf structure, fix security bug #373999 by Tim Sammut.
7
8 (Portage version: 2.1.10.3/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.21 x11-libs/gdk-pixbuf/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog?rev=1.21&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog?rev=1.21&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog?r1=1.20&r2=1.21
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v
20 retrieving revision 1.20
21 retrieving revision 1.21
22 diff -u -r1.20 -r1.21
23 --- ChangeLog 29 Jun 2011 14:59:58 -0000 1.20
24 +++ ChangeLog 4 Jul 2011 11:39:50 -0000 1.21
25 @@ -1,6 +1,13 @@
26 # ChangeLog for x11-libs/gdk-pixbuf
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.20 2011/06/29 14:59:58 angelos Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.21 2011/07/04 11:39:50 pacho Exp $
30 +
31 +*gdk-pixbuf-2.22.1-r2 (04 Jul 2011)
32 +
33 + 04 Jul 2011; Pacho Ramos <pacho@g.o> +gdk-pixbuf-2.22.1-r2.ebuild,
34 + +files/gdk-pixbuf-2.22.1-CVE-2011-2485.patch:
35 + GIF: Don't return a partially initialized pixbuf structure, fix security bug
36 + #373999 by Tim Sammut.
37
38 29 Jun 2011; Christoph Mende <angelos@g.o>
39 gdk-pixbuf-2.22.1-r1.ebuild:
40
41
42
43 1.1 x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild?rev=1.1&content-type=text/plain
47
48 Index: gdk-pixbuf-2.22.1-r2.ebuild
49 ===================================================================
50 # Copyright 1999-2011 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild,v 1.1 2011/07/04 11:39:50 pacho Exp $
53
54 EAPI="3"
55
56 inherit gnome.org multilib libtool autotools
57
58 DESCRIPTION="Image loading library for GTK+"
59 HOMEPAGE="http://www.gtk.org/"
60
61 LICENSE="LGPL-2"
62 SLOT="2"
63 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
64 IUSE="+X debug doc +introspection jpeg jpeg2k svg tiff test"
65
66 # librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
67 RDEPEND="
68 >=dev-libs/glib-2.25.15
69 >=media-libs/libpng-1.2.44:0
70 introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
71 jpeg? ( virtual/jpeg )
72 jpeg2k? ( media-libs/jasper )
73 tiff? ( >=media-libs/tiff-3.9.2 )
74 X? ( x11-libs/libX11 )
75 !<gnome-base/gail-1000
76 !<gnome-base/librsvg-2.31.0
77 !<x11-libs/gtk+-2.21.3:2
78 !<x11-libs/gtk+-2.90.4:3"
79 DEPEND="${RDEPEND}
80 >=dev-util/pkgconfig-0.9
81 >=sys-devel/gettext-0.17
82 >=dev-util/gtk-doc-am-1.11
83 doc? (
84 >=dev-util/gtk-doc-1.11
85 ~app-text/docbook-xml-dtd-4.1.2 )"
86 # Needed as reported in bug #363715
87 PDEPEND="svg? ( gnome-base/librsvg )"
88
89 src_prepare() {
90 # Only build against libX11 if the user wants to do so
91 epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch
92
93 # Fix libpng-1.5 compatibility, bug 354557 — taken from upstream
94 epatch "${FILESDIR}/${P}-fix-libpng15.patch"
95
96 # GIF: Don't return a partially initialized pixbuf structure
97 epatch "${FILESDIR}/${P}-CVE-2011-2485.patch"
98
99 elibtoolize
100 eautoreconf
101 }
102
103 src_configure() {
104 # png always on to display icons (foser)
105 local myconf="
106 $(use_enable doc gtk-doc)
107 $(use_with jpeg libjpeg)
108 $(use_with jpeg2k libjasper)
109 $(use_with tiff libtiff)
110 $(use_enable introspection)
111 $(use_with X x11)
112 --with-libpng"
113
114 # Passing --disable-debug is not recommended for production use
115 use debug && myconf="${myconf} --enable-debug=yes"
116
117 econf ${myconf}
118 }
119
120 src_install() {
121 emake DESTDIR="${D}" install || die
122
123 dodoc AUTHORS NEWS* README* || die
124
125 find "${ED}" -name '*.la' -exec rm -f {} +
126 }
127
128 pkg_postinst() {
129 gdk-pixbuf-query-loaders > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
130
131 if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
132 elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
133 elog "to do that you can use qfile from portage-utils:"
134 elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
135 fi
136 }