version bump, includes security fix, bug 331421

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 169 insertions, 7 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index d1d408a2f101..fdf360455ea1 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/uzbl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.30 2010/06/24 21:43:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.31 2010/08/06 10:59:30 wired Exp $
+
+*uzbl-2010.08.05 (06 Aug 2010)
+
+  06 Aug 2010; Alex Alexander <wired@gentoo.org> +uzbl-2010.08.05.ebuild:
+  version bump, includes security fix, bug 331421
 
   24 Jun 2010; Pacho Ramos <pacho@gentoo.org> uzbl-2010.04.03.ebuild:
   stable amd64, bug 323327
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index f05c02363bb2..4dd7f6e69723 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -1,20 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX uzbl-makefile-docdir.patch 1167 RMD160 c9e4c7c927e6cef4d35ced2af11c723f4998d7f5 SHA1 71dfd176b83d5459f5c9915cf8651c38dec2c459 SHA256 dc0a1ebc7b08c17e63afe60d3db39cc846ca43a5ad01789c07f1d3198153d43a
 DIST uzbl-2010.02.02.tar.gz 136063 RMD160 6175ad388d9946a2f02c22bec3d7dd05b7f3f87a SHA1 a24565f554cb15e49e990a381e6f3322eaf4c5c6 SHA256 23b1e7b7b0ce40605e838f2af70cabd7f430a4f4b55f0b7e73a89296c40f2a6a
 DIST uzbl-2010.03.14.tar.gz 142818 RMD160 cf0b6d002111470351e7a065bd331e3f4dd06bc3 SHA1 b26faa5715160bd0aa2b6c82ac25b801ec7bd512 SHA256 6bd65bcb4aeef63f7b21bd910e2fd5ba683d727f4ff20a99d73541a033c61208
 DIST uzbl-2010.04.03.tar.gz 134854 RMD160 00ff7392c58c6092ab921fa489d67949bd0fa2e9 SHA1 17ab43dd9f0212fc74954897b33984bc10138712 SHA256 3aa1412dba013a8db0261b2c0773c94e121aeb98c9d03dce4ea049329f4abacb
+DIST uzbl-2010.08.05.tar.gz 136797 RMD160 b1b85855fb5662315ba93122f46ceb1e2ee0caa8 SHA1 c220463871f0eb86d8d83e97c83c6a4509b12598 SHA256 9a04e835990519b039a35a7652672f4235890af86699aafe73a71a3e1dc9971f
 EBUILD uzbl-2010.02.02-r1.ebuild 2582 RMD160 d5032cd1a6b8d06b7687a381bce7830995b2f36e SHA1 438f080aff4e807e68329cf3d00b7db5db09c6c4 SHA256 01fbad87022856d3afd789525966a7517c280e8d50dde892079cd46d1efc4970
 EBUILD uzbl-2010.03.14.ebuild 2579 RMD160 03ec3d867efb50dcb07091eb871467e03d40065d SHA1 c19d72b2e89ec8af80bd83d0906a08c17bbdc01a SHA256 51117015012d41ef172aade5acfc189de68b80371c1490e3fbe04eda6d57cc82
 EBUILD uzbl-2010.04.03.ebuild 3100 RMD160 44373b5724bbb139c60dfaeccafb5fe65d06a05d SHA1 241e94e650e7660bb77b4d58f19733904648dc29 SHA256 6c921a5d84d84d4997946ae6a7e50ef85c0d2aaa82a8ba718cf9e5c0fad7bff0
+EBUILD uzbl-2010.08.05.ebuild 3730 RMD160 32e54a70f799cad6d13a502a3642891f1f112940 SHA1 59bae24ad7b7827384857b622516c961b01b097c SHA256 d8ca8896b1b449ecd0dd68cd62f66bad200f410286014605b59c1e4f024fa617
 EBUILD uzbl-9999.ebuild 3097 RMD160 07268bff2a35b2845872090f8c6e2a9db9ccf699 SHA1 cb190b4ace3633696e553a80f48dcc0c9cd64565 SHA256 31a0bb31d6ab22b63fb2a877e6378786935231c2de776a9a5823a2a005cc8e96
-MISC ChangeLog 5600 RMD160 67e0a097ee23dbb939b82628c74ffb8b82834d3b SHA1 b82a372cacff14454c3b3f7149cb00f47e65603c SHA256 3c73f949092e3d42d942bf3a65e631a03274caffd3eae7ede86dffbaca0af939
+MISC ChangeLog 5757 RMD160 f15cd2779981f9ebcf092455f18b3ea4ab593e82 SHA1 f81afeffe57abb74b69c56fbdc6f18a783ddb100 SHA256 ccfbe79a5fd6dbd8a077ca8fb1c77ea54a8e4698e2107735e461906f31d8ebfc
 MISC metadata.xml 507 RMD160 60cd39f105f29bac497abebba3966a7db75c70fd SHA1 a67b72d72f0ef3d186c6622918ec680720db5888 SHA256 b532abb6d9c503c8890d76e371fd902de7de0693c442f01f85efaf10b476a535
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkwj0g8ACgkQCaWpQKGI+9SMcwCghqSmx5EUmW9lxYno2CtoZ9wt
-3FwAn3p2jfYjB70bsgodJJtmsu0YoQpE
-=9C+9
+iQIcBAEBCAAGBQJMW+vfAAoJEDZF8K7rm0r6OywQAJdFsQT5T/CAAiqfSFqkbDeQ
+i0MDj2v5cnQ3RFcoUeNV/5ifadZrSuWclWSbITZxy+sbjqsFGVXC0+QuJdSSF7ys
+kdRNfBIdmQzTM/i468xNIQROUUM1AidYjKp4M78NmAJQjqLL84hkFQ4txmcdyh2H
+a0h8+O4JShGXwR9q9fzxXrcownwhkyZgeoG51NmUkk3LP++bbl08M6W//asfGwAw
+DXXVSv9dKyok1geL9r0vKb8rdFWRRwPiXgxGUX7CpGdqVAOcJq8EphcA1nbdNAWf
+LE5V8+UgIG5JZ01QkLS5A1zG8ZjZrPsWOC73Lk4GTL760Vh+esl4tY538B/alc+q
+w2zVwmT9ckNtf1Xr5ULVMK56cQbxKtsFh1Dpetxg2jbWeswvcgkN9lgH3tI+P1Zl
+01s50hUfT3xyunRUmOOZ8ResCJnagBGbV+8C8GtYvqF00pmsTQHH9jMlfgIVAW6W
+pJYUMBr/XnchxtrfqL10X4K6OjQtmUmuCd4qrNjqD2UgtRlpOL3yQmlC781vzarF
+5jNigdBE+vgQeN4xbcz5G6m7hkARJcGfvoFaVb3z5uMYiG7qTql32VG5JyBqq4nb
+MS1fAqke/Aswdt/SWgKahnwQNpLHYm6+/KBBnjLQRCI00U3HlqjveKpAYUwYasxU
+2DpAtwEc32G4hpNGtaCC
+=VdKc
 -----END PGP SIGNATURE-----
diff --git a/www-client/uzbl/uzbl-2010.08.05.ebuild b/www-client/uzbl/uzbl-2010.08.05.ebuild
new file mode 100644
index 000000000000..eb2aa6c03017
--- /dev/null
+++ b/www-client/uzbl/uzbl-2010.08.05.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2010.08.05.ebuild,v 1.1 2010/08/06 10:59:30 wired Exp $
+
+EAPI="2"
+
+inherit base
+
+IUSE=""
+if [[ ${PV} == *9999* ]]; then
+	inherit git
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/Dieterbe/uzbl.git"}
+	KEYWORDS=""
+	SRC_URI=""
+	IUSE="experimental"
+	use experimental &&
+		EGIT_BRANCH="experimental" &&
+		EGIT_COMMIT="experimental"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Web interface tools which adhere to the unix philosophy."
+HOMEPAGE="http://www.uzbl.org"
+
+LICENSE="LGPL-2.1 MPL-1.1"
+SLOT="0"
+IUSE+=" +browser helpers +tabbed vim-syntax"
+
+COMMON_DEPEND="
+	>=dev-libs/icu-4.0.1
+	>=net-libs/libsoup-2.24
+	>=net-libs/webkit-gtk-1.1.15
+	>=x11-libs/gtk+-2.14
+"
+
+DEPEND="
+	>=dev-util/pkgconfig-0.19
+	${COMMON_DEPEND}
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	browser? (
+		x11-misc/xclip
+	)
+	helpers? (
+		dev-python/pygtk
+		dev-python/pygobject
+		gnome-extra/zenity
+		net-misc/socat
+		x11-libs/pango
+		x11-misc/dmenu
+		x11-misc/xclip
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+# TODO document what requires the above helpers
+
+pkg_setup() {
+	if ! use helpers; then
+		elog "uzbl's extra scripts use various optional applications:"
+		elog
+		elog "   dev-python/pygtk"
+		elog "   dev-python/pygobject"
+		elog "   gnome-extra/zenity"
+		elog "   net-misc/socat"
+		elog "   x11-libs/pango"
+		elog "   x11-misc/dmenu"
+		elog "   x11-misc/xclip"
+		elog
+		elog "Make sure you emerge the ones you need manually."
+		elog "You may also activate the *helpers* USE flag to"
+		elog "install all of them automatically."
+	else
+		einfo "You have enabled the *helpers* USE flag that installs"
+		einfo "various optional applications used by uzbl's extra scripts."
+	fi
+
+	if use tabbed && ! use browser; then
+		ewarn
+		ewarn "You enabled the *tabbed* USE flag but not *browser*."
+		ewarn "*tabbed* depends on *browser*, so it will be disabled."
+		ewarn
+		ebeep 3
+	fi
+
+	ewarn
+	ewarn "A security issue was discovered in the mousebutton2 binding that was"
+	ewarn "used in previous versions of the sample config file."
+	ewarn
+	ewarn "If you are using a sample config provided by previous uzbl versions,"
+	ewarn "you need to change the mousebutton2 binding manually to fix it."
+	ewarn
+	ewarn "You can find the fix here:"
+	ewarn "	http://github.com/pawelz/uzbl/commit/342f292c27973c9df5f631a38bd12f14a9c5cdc2"
+	ewarn
+	ewarn "More information about the security issue here:"
+	ewarn "	http://bugs.gentoo.org/show_bug.cgi?id=331421"
+	ewarn "and here:"
+	ewarn "	http://www.uzbl.org/news.php?id=29"
+	ewarn
+}
+
+src_prepare() {
+	if [[ ${PV} == *9999* ]]; then
+		git_src_prepare
+	else
+		cd "${WORKDIR}"/Dieterbe-uzbl-*
+		S=$(pwd)
+	fi
+
+	# remove -ggdb
+	sed -i "s/-ggdb //g" Makefile ||
+		die "-ggdb removal sed failed"
+
+	# adjust path in default config file to /usr/share
+	sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \
+		examples/config/config ||
+		die "config path sed failed"
+}
+
+src_compile() {
+	emake || die "compile failed"
+}
+
+src_install() {
+	local targets="install-uzbl-core"
+	use browser && targets="${targets} install-uzbl-browser"
+	use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
+
+	emake DESTDIR="${D}" PREFIX="/usr" DOCDIR="${D}/usr/share/doc/${PF}" ${targets} ||
+		die "Installation failed"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/uzbl.vim || die "vim-syntax doins failed"
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/uzbl.vim || die "vim-syntax doins failed"
+	fi
+
+}