Fix for CVE-2008-3533. Bug #234079

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64
RepoMan-Options: --force

6 files changed, 252 insertions, 2 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 747a1249f96e..9dd631e74501 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.192 2008/08/12 14:04:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.193 2008/08/15 14:16:04 dang Exp $
+
+*yelp-2.22.1-r11 (15 Aug 2008)
+*yelp-2.22.1-r2 (15 Aug 2008)
+*yelp-2.20.0-r1 (15 Aug 2008)
+
+  15 Aug 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +files/yelp-2.22.1-format-string.patch, +yelp-2.20.0-r1.ebuild,
+  +yelp-2.22.1-r2.ebuild, +yelp-2.22.1-r11.ebuild:
+  Fix for CVE-2008-3533. Bug #234079
 
   12 Aug 2008; Raúl Porcel <armin76@gentoo.org> yelp-2.22.1-r1.ebuild:
   alpha/ia64/sparc stable wrt #229709
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 0c3be07fb84c..aa7132b921d1 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX yelp-2.22-with-beagle-0.3.patch 1534 RMD160 b35a62b419497c91ab6348259f87c0d30953ad57 SHA1 bee78d88d8d6908100d69ab7e288bc4ab8098fa2 SHA256 7a39a45370849720f5e3f147809c114bfc38743ed56a9caff8325297b701fb0f
+AUX yelp-2.22.1-format-string.patch 574 RMD160 0e6830bf9adb768fd0e463e1a5b46cbcb8a04fd4 SHA1 79fcf2d1c4e2eeb0c392552c5686c3061a9ee894 SHA256 810f76edb954ecb96d4a08e0ea53dd0fa5ebca9d3f4e2adde48605b07d33bacc
 AUX yelp-2.22.1-xulrunner-1.9.patch 19677 RMD160 b463718314652821946a3cf9ca9e77e36ac2f5cc SHA1 c95312cfb2063f4d93f318d72c92a22d4b036353 SHA256 09fb68c73587dcda653701efb9a2893da5942cc12795c95f1305b5e02ac29466
 DIST yelp-2.16.2.tar.bz2 858693 RMD160 5c33700f40c6f533406d99f06731f2ffcb31d448 SHA1 d165a6a31eed3f6f2c251b9217299cd5e04ac6e0 SHA256 d3582665af98c8f4fd2f3c62d378360ea4de699bfe9e7213054071462f0650d5
 DIST yelp-2.18.1.tar.bz2 900142 RMD160 8aaf7e5f7f37369fa6822eed615f110babbecd28 SHA1 66e446596c22902290d6614b2d356b64d5bd304c SHA256 3add75de19550015a526a875bca66be81f73910561f1a84493d76d990717d1fa
@@ -6,9 +10,19 @@ DIST yelp-2.20.0.tar.bz2 903106 RMD160 381b71583bc98dcce52a3de19407cc7f7e123ab0
 DIST yelp-2.22.1.tar.bz2 995734 RMD160 236acd566b5e0cde0cc1365b1fdae75b2451bcce SHA1 29586dd5415fc6470c43dbd68fdb491f91778231 SHA256 6e990b35d914869dc82ada4790e2215ef71c884f6ccb8acf2e7a1c7d4b6f7614
 EBUILD yelp-2.16.2.ebuild 1078 RMD160 447c272d74b726cb01c8d6d6c5e9ebd1b10cba94 SHA1 5d3ae35ab0cc8533298929b73e63251d42d9b508 SHA256 9ed192e3c97fdfbebf42154c05c495fd7a14956fe6665b2395850c80af4d90b5
 EBUILD yelp-2.18.1.ebuild 1231 RMD160 d004768614c3e5e673b617b2bad5303b10ece780 SHA1 104ce5cf40331a033667bf962805e11f1f86f289 SHA256 a9aa5a617e0f83fb493209db4d9d3109fc53d7d35878bdd8550469f623fb44f1
+EBUILD yelp-2.20.0-r1.ebuild 1644 RMD160 b3914d24cf6f5bb5c62d80a9a29492b39bbeb90b SHA1 b4404531b1b50c36a4d9d75b7b79470bfc22d8cc SHA256 a8fe38bcb1821f4f3b74035681d29443207067489f416931e3d24950ad4c4e3d
 EBUILD yelp-2.20.0.ebuild 1629 RMD160 32914222279eb1ba53038e25bf3298b3c5b6b5f6 SHA1 bb7508d2d3bb0f4a0ba2f6056d2d196c1f65302a SHA256 8543661c42b1ad0043a3aadbc3bcba10db7e8ad6da96b46af23eb889d02fd1d5
 EBUILD yelp-2.22.1-r1.ebuild 2016 RMD160 86bff7268879ccfcacaac21ab06c2554722a66e7 SHA1 33cbb56b44cc5b16d8b3707e0de6c7b82ccaaf3d SHA256 7ffaa6e6f74de7ee1da1702121c74489f51566636d823351427e7dfb5d5ab58f
 EBUILD yelp-2.22.1-r10.ebuild 1916 RMD160 4239ba59bac2f5bb4dd9ed676c7835813cb13228 SHA1 2b64e5ff532ea1711ad508d83591628e0943a773 SHA256 dddc8c2f47d393c8e5d5d29af01e8cc533c9cb1708b19fe4f28b1e5ed5de6f3e
+EBUILD yelp-2.22.1-r11.ebuild 2000 RMD160 dce16d034276dddf0215af2d62257c284637b56b SHA1 f28fb168c242692e2acf8f01a5e054e584cdfe05 SHA256 53566f9450897c87f9b0c10c6fc09f5beaf2713e2a16bc9f2eb338484d7ed75b
+EBUILD yelp-2.22.1-r2.ebuild 2105 RMD160 3326be1816a2533df12ea9d9060bdddf76282d19 SHA1 7becb874c3242436849f2da232cc928d6716b127 SHA256 e35c28065e41e458f0af695168bf6caa49fcc5d81c11a5e7762dd653f66004c2
 EBUILD yelp-2.22.1.ebuild 1661 RMD160 7b8c25efd8e7139ffce157d670e8ae191567be9f SHA1 c30e24ebfeea3334e5cfc292eda0b24664f96d5b SHA256 268b8619a1ab40f0056d0a043fe54409575bc0cfa7ca8cfea65dc5e079b5db90
-MISC ChangeLog 22268 RMD160 a1c1493d57a9a340e7895bba8dd0a840be2d2b05 SHA1 9c5b20df107d75ecd30a50f71a3116022da29b1d SHA256 9ce64808b2812e614075bfba88047745bac851bf71100cbc7a1fee002dc0341d
+MISC ChangeLog 22563 RMD160 cf04aadfce7d1c4711da7aa1bf4d73a6d0b307b8 SHA1 99f3a5697dfa4951e148e4b897258794f822a258 SHA256 dd8671efd325b05064463a88ea5373d1c4e02b70831c3b135bbe76480d9d824e
 MISC metadata.xml 364 RMD160 b8d1a4cb0331c368c94ba6f8b72b52396b1728da SHA1 99cf408c018565500005654707a4bd1b1ab28334 SHA256 7f315cc2f1c8d303ba2dfa5c2542ba3b9b65635a3d1b978032f114ce6ebc5a4c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iD8DBQFIpY+yomPajV0RnrERAtCfAJ9uSceRHRt8PeLKxZi+MHfMryYrlgCfcZ5/
+LODVM0Hs7nEGnTuOwNXpDiQ=
+=DhNr
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp/files/yelp-2.22.1-format-string.patch b/gnome-extra/yelp/files/yelp-2.22.1-format-string.patch
new file mode 100644
index 000000000000..e490677529b6
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-2.22.1-format-string.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN yelp-2.22.1.orig/src/yelp-window.c yelp-2.22.1/src/yelp-window.c
+--- yelp-2.22.1.orig/src/yelp-window.c	2008-04-07 14:16:39.000000000 -0400
++++ yelp-2.22.1/src/yelp-window.c	2008-08-07 10:57:10.000000000 -0400
+@@ -1154,7 +1154,7 @@ window_error (YelpWindow *window, gchar 
+ 	 GTK_BUTTONS_OK,
+ 	 title);
+     gtk_message_dialog_format_secondary_markup
+-	(GTK_MESSAGE_DIALOG (dialog), message);
++	(GTK_MESSAGE_DIALOG (dialog), "%s", message);
+ 	 gtk_dialog_run (GTK_DIALOG (dialog));
+ 
+     gtk_widget_destroy (dialog);
diff --git a/gnome-extra/yelp/yelp-2.20.0-r1.ebuild b/gnome-extra/yelp/yelp-2.20.0-r1.ebuild
new file mode 100644
index 000000000000..22128aa5be7e
--- /dev/null
+++ b/gnome-extra/yelp/yelp-2.20.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.20.0-r1.ebuild,v 1.1 2008/08/15 14:16:04 dang Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="beagle xulrunner"
+
+RDEPEND=">=gnome-base/gconf-2
+	>=app-text/gnome-doc-utils-0.11.1
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2.14
+	>=gnome-base/libgnomeui-2.14
+	>=dev-libs/libxml2-2.6.5
+	>=dev-libs/libxslt-1.1.4
+	>=x11-libs/startup-notification-0.8
+	>=dev-libs/glib-2
+	>=dev-libs/dbus-glib-0.71
+	beagle? ( =app-misc/beagle-0.2* )
+	!xulrunner? ( =www-client/mozilla-firefox-2* )
+	xulrunner? ( =net-libs/xulrunner-1.8* )
+	sys-libs/zlib
+	app-arch/bzip2
+	>=app-text/rarian-0.5
+	>=app-text/scrollkeeper-9999"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix format string.  Bug #234079
+	epatch "${FILESDIR}"/${PN}-2.22.1-format-string.patch
+
+	# strip stupid options in configure, see bug #196621
+	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure
+}
+
+pkg_setup() {
+	G2CONF="${G2CONF} --enable-man --enable-info"
+
+	if use beagle; then
+		G2CONF="${G2CONF} --with-search=beagle"
+	else
+		G2CONF="${G2CONF} --with-search=basic"
+	fi
+
+	if use xulrunner; then
+		G2CONF="${G2CONF} --with-gecko=xulrunner"
+	else
+		G2CONF="${G2CONF} --with-gecko=firefox"
+	fi
+}
diff --git a/gnome-extra/yelp/yelp-2.22.1-r11.ebuild b/gnome-extra/yelp/yelp-2.22.1-r11.ebuild
new file mode 100644
index 000000000000..7510cc528c88
--- /dev/null
+++ b/gnome-extra/yelp/yelp-2.22.1-r11.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.22.1-r11.ebuild,v 1.1 2008/08/15 14:16:04 dang Exp $
+
+EAPI=1
+
+inherit eutils autotools gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="beagle lzma"
+
+RDEPEND=">=gnome-base/gconf-2
+	>=app-text/gnome-doc-utils-0.11.1
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2.14
+	>=gnome-base/libgnomeui-2.14
+	>=dev-libs/libxml2-2.6.5
+	>=dev-libs/libxslt-1.1.4
+	>=x11-libs/startup-notification-0.8
+	>=dev-libs/glib-2
+	>=dev-libs/dbus-glib-0.71
+	beagle? ( || ( >=dev-libs/libbeagle-0.3.0 =app-misc/beagle-0.2* ) )
+	net-libs/xulrunner:1.9
+	sys-libs/zlib
+	app-arch/bzip2
+	lzma? ( app-arch/lzma-utils )
+	>=app-text/rarian-0.7
+	>=app-text/scrollkeeper-9999"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# patch to work with >=libbeagle-0.3, bug #215026
+	epatch "${FILESDIR}"/yelp-2.22-with-beagle-0.3.patch
+
+	# Patch format string.  Bug #234079
+	epatch "${FILESDIR}"/yelp-2.22.1-format-string.patch
+
+	# Use xulrunner 1.9.  Bug #204632
+	epatch "${FILESDIR}"/${P}-xulrunner-1.9.patch
+
+	# patch to fix parallel make, see bug #217250
+	sed -e "s/install-exec-local:/install-exec-hook:/" -i src/Makefile.am
+
+	intltoolize --force --automake || die "intltoolize failed"
+	eautoreconf
+
+	# strip stupid options in configure, see bug #196621
+	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure
+}
+
+pkg_setup() {
+	# FIXME: Add patch to make lzma-utils not automagic and use_enable here
+	G2CONF="${G2CONF} --with-gecko=libxul"
+
+	if use beagle; then
+		G2CONF="${G2CONF} --with-search=beagle"
+	else
+		G2CONF="${G2CONF} --with-search=basic"
+	fi
+}
diff --git a/gnome-extra/yelp/yelp-2.22.1-r2.ebuild b/gnome-extra/yelp/yelp-2.22.1-r2.ebuild
new file mode 100644
index 000000000000..7ddaf23edd17
--- /dev/null
+++ b/gnome-extra/yelp/yelp-2.22.1-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.22.1-r2.ebuild,v 1.1 2008/08/15 14:16:04 dang Exp $
+
+inherit eutils autotools gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd"
+IUSE="beagle lzma xulrunner"
+
+RDEPEND=">=gnome-base/gconf-2
+	>=app-text/gnome-doc-utils-0.11.1
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2.14
+	>=gnome-base/libgnomeui-2.14
+	>=dev-libs/libxml2-2.6.5
+	>=dev-libs/libxslt-1.1.4
+	>=x11-libs/startup-notification-0.8
+	>=dev-libs/glib-2
+	>=dev-libs/dbus-glib-0.71
+	beagle? ( || ( >=dev-libs/libbeagle-0.3.0 =app-misc/beagle-0.2* ) )
+	!xulrunner? ( =www-client/mozilla-firefox-2* )
+	xulrunner? ( =net-libs/xulrunner-1.8* )
+	sys-libs/zlib
+	app-arch/bzip2
+	lzma? ( app-arch/lzma-utils )
+	>=app-text/rarian-0.7
+	>=app-text/scrollkeeper-9999"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# patch to work with >=libbeagle-0.3, bug #215026
+	epatch "${FILESDIR}"/yelp-2.22-with-beagle-0.3.patch
+
+	# Patch format string.  Bug #234079
+	epatch "${FILESDIR}"/yelp-2.22.1-format-string.patch
+
+	# patch to fix parallel make, see bug #217250
+	sed -e "s/install-exec-local:/install-exec-hook:/" -i src/Makefile.am
+
+	intltoolize --force --automake || die "intltoolize failed"
+	eautoreconf
+
+	# strip stupid options in configure, see bug #196621
+	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure
+}
+
+pkg_setup() {
+	# FIXME: Add patch to make lzma-utils not automagic and use_enable here
+	G2CONF="${G2CONF} --enable-man --enable-info"
+
+	if use beagle; then
+		G2CONF="${G2CONF} --with-search=beagle"
+	else
+		G2CONF="${G2CONF} --with-search=basic"
+	fi
+
+	if use xulrunner; then
+		G2CONF="${G2CONF} --with-gecko=xulrunner"
+	else
+		G2CONF="${G2CONF} --with-gecko=firefox"
+	fi
+}