diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-04-06 08:22:21 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-04-06 08:22:21 +0000 |
| commit | 55d2446c03ea142b577dbb7f122106b65b6bf266 (patch) | |
| tree | 49260891ba385b4b54fe949a1ea39ae4c480fbff /dev-java/jruby | |
| parent | Removing vulnerable ebuilds for CVE-2010-1224 / AST-2010-003 (Remote host acc... (diff) | |
| download | historical-55d2446c03ea142b577dbb7f122106b65b6bf266.tar.gz historical-55d2446c03ea142b577dbb7f122106b65b6bf266.tar.bz2 historical-55d2446c03ea142b577dbb7f122106b65b6bf266.zip | |
Fix symlink upgrade instructions. Thanks to Martin von Gagern <Martin.vGagern@gmx.net> in bug #302187.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-java/jruby')
| -rw-r--r-- | dev-java/jruby/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/jruby/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/jruby/jruby-1.4.0-r6.ebuild | 12 |
3 files changed, 17 insertions, 5 deletions
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index f5df768753e5..f0cb2cc657c9 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -1,6 +1,10 @@ # 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.56 2010/04/05 23:03:49 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.57 2010/04/06 08:22:21 caster Exp $ + + 06 Apr 2010; Vlastimil Babka <caster@gentoo.org> jruby-1.4.0-r6.ebuild: + Fix symlink upgrade instructions. Thanks to Martin von Gagern + <Martin.vGagern@gmx.net> in bug #302187. *jruby-1.4.0-r6 (05 Apr 2010) diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest index 3cb796f3455c..8f3e5a8cc441 100644 --- a/dev-java/jruby/Manifest +++ b/dev-java/jruby/Manifest @@ -12,6 +12,6 @@ DIST jruby-src-1.4.0.tar.gz 12731458 RMD160 70b6a34a9e1b174fe1c8f1df8ba8ea7cbfa4 EBUILD jruby-1.3.1-r1.ebuild 5362 RMD160 9cc4b0f1cd310a6a3d833e8bb339e15853ca44fa SHA1 cdf3e7003c9794372c3c949c37c92eedb95310bd SHA256 f955390140221f98f15b837fc2d62b45be4c0289fb3521e71e65c554fd1f4218 EBUILD jruby-1.4.0-r4.ebuild 5535 RMD160 2d345137b735c9124d29a8d73c14be45154cb8c3 SHA1 1bd28d26583b138162962f6fcb78e55584a3d5b8 SHA256 a2ea17ef76c7bac171063da50ee8701204e5bd60b7a15eaf3e689ed7d6bdabe3 EBUILD jruby-1.4.0-r5.ebuild 5547 RMD160 4d88b1c6fc9b717a63f123a2161605653da9485f SHA1 61d83f8bc54766bf39c90b91ec966c3fdf98ef2d SHA256 af63d46d1b8e15083f5464c6a64c3c7d712cd5d1b7f72354d72dcda2bcf984f8 -EBUILD jruby-1.4.0-r6.ebuild 5409 RMD160 45a238c39efa875bcc9d5c1a041faa3818cb36b0 SHA1 feb9d3c97c12ed683836d4de879b7ea2bb5d09fd SHA256 976633d2f67514008c1956f28b64ca3b1268ed5ee36b5685a1133ac46bf71569 -MISC ChangeLog 10671 RMD160 bdbe04a0a62de587a10db63d68c877c2ce48370d SHA1 836e695f347f8f90377daa83429205efbb9ba444 SHA256 ded626b60aeb07d4cc90fa9e089b05068181c02366a27f85225dcff92da27c2f +EBUILD jruby-1.4.0-r6.ebuild 5777 RMD160 1718bd345b2fa937bdce1e255aef1db842b48949 SHA1 fb7ba19b178a9be17546fe8bc468f6ef7102c688 SHA256 dc8def68740a3a9b2b8d1f69aaf9da0eaabdbe25ef72d9c0e8df9617ece512fb +MISC ChangeLog 10853 RMD160 42136194457d9c3d5725e916ba0f7bd77fbbfa4f SHA1 5763b176ef48f4d045c89e7a51a71a21dcfd2d22 SHA256 b65732e7a73212d371e8702f2e1842e482e2adfddad65f56e6bb3440d5de52ff MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b diff --git a/dev-java/jruby/jruby-1.4.0-r6.ebuild b/dev-java/jruby/jruby-1.4.0-r6.ebuild index 953368d70489..f9ebba42fd50 100644 --- a/dev-java/jruby/jruby-1.4.0-r6.ebuild +++ b/dev-java/jruby/jruby-1.4.0-r6.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.4.0-r6.ebuild,v 1.1 2010/04/05 23:03:49 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.0-r6.ebuild,v 1.2 2010/04/06 08:22:21 caster Exp $ EAPI="2" JAVA_PKG_IUSE="doc source test" @@ -71,7 +71,15 @@ pkg_setup() { for directory in "${GEMS}" "${SITE_RUBY}"; do if [[ -L ${directory} ]]; then - eerror "${directory} is a symlink. Please remove this symlink." + eerror "${directory} is a symlink. Please do the following to resolve the situation:" + echo 'emerge -an app-portage/gentoolkit' + echo 'equery -qC b '"${directory}"' | sort | uniq | sed s/^/=/ > ~/jruby.fix' + echo 'emerge -1C $(< ~/jruby.fix)' + echo "rm ${directory}" + echo 'emerge -1 $(< ~/jruby.fix)' + echo 'rm ~/jruby.fix' + + eerror "For more information, please see http://bugs.gentoo.org/show_bug.cgi?id=302187" fail="true" fi done |