public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in gnome-extra/yelp: ChangeLog yelp-2.22.1-r2.ebuild yelp-2.22.1-r11.ebuild yelp-2.20.0-r1.ebuild
@ 2008-08-15 14:16 Daniel Gryniewicz (dang)
  0 siblings, 0 replies; only message in thread
From: Daniel Gryniewicz (dang) @ 2008-08-15 14:16 UTC (permalink / raw
  To: gentoo-commits

dang        08/08/15 14:16:04

  Modified:             ChangeLog
  Added:                yelp-2.22.1-r2.ebuild yelp-2.22.1-r11.ebuild
                        yelp-2.20.0-r1.ebuild
  Log:
  Fix for CVE-2008-3533. Bug #234079
  (Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64, RepoMan options: --force)

Revision  Changes    Path
1.193                gnome-extra/yelp/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/ChangeLog?rev=1.193&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/ChangeLog?rev=1.193&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/ChangeLog?r1=1.192&r2=1.193

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- ChangeLog	12 Aug 2008 14:04:24 -0000	1.192
+++ ChangeLog	15 Aug 2008 14:16:04 -0000	1.193
@@ -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



1.1                  gnome-extra/yelp/yelp-2.22.1-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/yelp-2.22.1-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/yelp-2.22.1-r2.ebuild?rev=1.1&content-type=text/plain

Index: yelp-2.22.1-r2.ebuild
===================================================================
# 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
}



1.1                  gnome-extra/yelp/yelp-2.22.1-r11.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/yelp-2.22.1-r11.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/yelp-2.22.1-r11.ebuild?rev=1.1&content-type=text/plain

Index: yelp-2.22.1-r11.ebuild
===================================================================
# 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
}



1.1                  gnome-extra/yelp/yelp-2.20.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/yelp-2.20.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/yelp-2.20.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: yelp-2.20.0-r1.ebuild
===================================================================
# 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
}






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-08-15 14:16 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-15 14:16 [gentoo-commits] gentoo-x86 commit in gnome-extra/yelp: ChangeLog yelp-2.22.1-r2.ebuild yelp-2.22.1-r11.ebuild yelp-2.20.0-r1.ebuild Daniel Gryniewicz (dang)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox