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
commit36097e90912a463e7c9e9bea0fad65b1b44e5c01 (patch)
tree0f337f79a9ed04d30dd23e054d937e4ca3aa8b72 /dev-java/jruby
parentexplicitly disable dhclient if dhcpcd is enabled. That should finally fix (diff)
downloadhistorical-36097e90912a463e7c9e9bea0fad65b1b44e5c01.tar.gz
historical-36097e90912a463e7c9e9bea0fad65b1b44e5c01.tar.bz2
historical-36097e90912a463e7c9e9bea0fad65b1b44e5c01.zip
stable x86, security bug 332957
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'dev-java/jruby')
-rw-r--r--dev-java/jruby/ChangeLog5
-rw-r--r--dev-java/jruby/Manifest10
-rw-r--r--dev-java/jruby/jruby-1.5.2.ebuild4
3 files changed, 11 insertions, 8 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/Manifest b/dev-java/jruby/Manifest
index 96a49e7250e6..120bffa3328e 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -16,13 +16,13 @@ DIST jruby-src-1.4.1.tar.gz 12351374 RMD160 079036e7df373d444221083a9487b6ad8a67
DIST jruby-src-1.5.2.tar.gz 11259922 RMD160 add2181d47b90cae6ea601b27cb8331f682375da SHA1 796cf6f3f7d6b6cec752d160bcab0cd442547568 SHA256 fd951b93f8917b59bfa687656ee0612c61cd29f5b32bd562e4f71eb2a4a70ee0
EBUILD jruby-1.3.1-r1.ebuild 5350 RMD160 19a52b4bdb5fcc48a6a7d94ad9ede6aea3583327 SHA1 a92b88d5934a1e3e060c595d190782ce34165aaf SHA256 3f85aa08aa29e0f209544109f18b54318d450a28320a3692448213bee8521da4
EBUILD jruby-1.4.1.ebuild 5993 RMD160 06e37d3b9d1e6b4bcf8048e60ab8df655a0d3d61 SHA1 587f8bbf4c60f41ac8ce33dd73c3dcb21c2c9da8 SHA256 07bd146f37ac94430458e0e239acc50c30f50542b75b6356a404050ac64d1b71
-EBUILD jruby-1.5.2.ebuild 5991 RMD160 355a16852e83916f27bd11a49c235a8bf6485489 SHA1 3557e84e338560fa96fabbdb740cc7a0429ae5c6 SHA256 97fb6ce5cb5dd1b65dde4986b9a39260b69e2c6a5517c8f80c4c43c413b3a1ce
-MISC ChangeLog 13248 RMD160 2b7c95ee3af6e4caf3bdb83e8398e05ecd71ec46 SHA1 6c2bcb6e57cd33b82b5a0eac2d56bb199bf68c48 SHA256 797db05b41661d2971b4e8ad0e452f4ad08839ee36b6fd5a17e76ed73316c5ac
+EBUILD jruby-1.5.2.ebuild 5986 RMD160 4dd1ed4a12f7a2e236b3739b4ad9d93b8c17b97d SHA1 7d398f6a9ac88ab546ef99a87cd40c33d5d870a3 SHA256 23ac193660d8dfd1a7a8499232db0cda6fb5948670d6f6449a85cce1e56beac5
+MISC ChangeLog 13354 RMD160 e674dc4f9b404213654df39d2b80b97393219fe7 SHA1 b513c5ec2092aad52178116cc29eef8ac1a9e7fc SHA256 60ea2bbfdf816e102366d5598642f19c38015741ba15e9307f8015dffad54bf0
MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkxxPuIACgkQAiZjviIA2Xj59wCgo9FrVoDIU5nQHogsNyE1+EP6
-us4An2bOkYN07ohZIQOKmyTXj3Y7vHTk
-=t4GM
+iEYEARECAAYFAkxyiy4ACgkQNQqtfCuFneN0EQCfd1nozZvid5lftL19puHcC6+d
+NRAAniQjI5kCbm5RnHKB9Ji0TIhRDWiq
+=C8vE
-----END PGP SIGNATURE-----
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