summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2010-08-23 14:52:03 +0000
committerChristian Faulhammer <fauli@gentoo.org>2010-08-23 14:52:03 +0000
commit12e0e022cc1bd0a38e557aee8e6a47a7c7f35ce0 (patch)
tree7a219ae081b9daf65af9e08bdb762a83343b686d /dev-java
parentexplicitly disable dhclient if dhcpcd is enabled. That should finally fix (diff)
downloadgentoo-2-12e0e022cc1bd0a38e557aee8e6a47a7c7f35ce0.tar.gz
gentoo-2-12e0e022cc1bd0a38e557aee8e6a47a7c7f35ce0.tar.bz2
gentoo-2-12e0e022cc1bd0a38e557aee8e6a47a7c7f35ce0.zip
stable x86, security bug 332957
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/jruby/ChangeLog5
-rw-r--r--dev-java/jruby/jruby-1.5.2.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index a0af3d8f4101..6d5cdefb184b 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/jruby
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.68 2010/08/22 15:14:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.69 2010/08/23 14:52:03 fauli Exp $
+
+ 23 Aug 2010; Christian Faulhammer <fauli@gentoo.org> jruby-1.5.2.ebuild:
+ stable x86, security bug 332957
*jruby-1.5.2 (22 Aug 2010)
diff --git a/dev-java/jruby/jruby-1.5.2.ebuild b/dev-java/jruby/jruby-1.5.2.ebuild
index 8dccf773e841..a74e2278f165 100644
--- a/dev-java/jruby/jruby-1.5.2.ebuild
+++ b/dev-java/jruby/jruby-1.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.2.ebuild,v 1.1 2010/08/22 15:14:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.2.ebuild,v 1.2 2010/08/23 14:52:03 fauli Exp $
EAPI="2"
JAVA_PKG_IUSE="doc source test"
@@ -13,7 +13,7 @@ HOMEPAGE="http://jruby.codehaus.org/"
SRC_URI="http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${PV}.tar.gz"
LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="bsf ssl"
CDEPEND=">=dev-java/bytelist-1.0.6:0