version bump, improved hardened hack^H^H^H^Hhandling

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

3 files changed, 36 insertions, 11 deletions

diff --git a/dev-ruby/rjb/ChangeLog b/dev-ruby/rjb/ChangeLog
index 82404b9b7c9c..1dd4e593de52 100644
--- a/dev-ruby/rjb/ChangeLog
+++ b/dev-ruby/rjb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rjb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rjb/ChangeLog,v 1.5 2015/03/16 20:30:41 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rjb/ChangeLog,v 1.6 2015/05/04 03:47:31 zerochaos Exp $
+
+*rjb-1.5.3 (04 May 2015)
+
+  04 May 2015; Rick Farina <zerochaos@gentoo.org> +rjb-1.5.3.ebuild,
+  -rjb-1.4.9.ebuild:
+  version bump, improved hardened hack^H^H^H^Hhandling
 
   16 Mar 2015; Hans de Graaff <graaff@gentoo.org> -rjb-1.4.8.ebuild:
   Cleanup.
diff --git a/dev-ruby/rjb/Manifest b/dev-ruby/rjb/Manifest
index 8db7cc1a9519..baa0775070d4 100644
--- a/dev-ruby/rjb/Manifest
+++ b/dev-ruby/rjb/Manifest
@@ -1,14 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST rjb-1.4.9.gem 68608 SHA256 df835dda3c11b805f1c6550b0531860ad94efa5affdb4454333f9acfe53a4e18 SHA512 718776b599dfd59bbb889caa69ffc32284848a1d7848c7db6e384b7c05e11eff48f8d94f918c9c98f84f94e9c7f6008dcc3ff62a56c30eea83f4efe1602677f7 WHIRLPOOL b3abf6dd4311ea8d6f4b0d0dcf17aadc8f0be14e39e990e2eb998050f7155a4168740a38df784cee6d20f79e18196805694b1c3a656842612abedaa87d3ef1a3
-EBUILD rjb-1.4.9.ebuild 1872 SHA256 ccc795874af5656dfb5f16ddd64f0b40e41a86c28c9b642d6510be4a8a84f501 SHA512 8f281b024dcf8881e5ef9d85918f82d649cd5b545056a2e28041e05fd78463f297219cc0e94d370967c8e661398053c5e06ff8cc50cc567da52c90187d6f580b WHIRLPOOL b1acf82aca8943d744504c0d4f380b7558db5412bf8d2d9b8abdb881a3163bb219c06a31004d292c0cff81e05911b7cfb87426d8a47335ddd0dc97eec245933c
-MISC ChangeLog 924 SHA256 fc64510882dab8feac3e51c8e8a9b9caaa4bc878922f9c8b74d75f200676a598 SHA512 85e0f3cf3d7415cdbf58100e80b2b24170bd0f916b571f384b017eee3becccabfc6337823516015a3ca79ee226447bb9113b955e5df60678d9a690a7ee28fde0 WHIRLPOOL fa8440c0ba86711d5d8b09c5373aa0f8f33412486b6f481b7de573ffa05195cc5833348e12056232cb408754197522f1f244fbf668a1a828ec00d2830f870ad9
+DIST rjb-1.5.3.gem 73216 SHA256 e47da10ab3c784fb1a03929832d31ae850bac1c3b6fabc890e28cda79a48fa3f SHA512 fa18a810a938a70920825f79665730152c6e6b9f9fa97949bac6f4920bb2a9f2fd27ad31edd790757db4c06b33f3558a2a7584592a22692de07614c17d65130f WHIRLPOOL 3401d9400916971d5ea8acdcab0a5587f7ac44f52d0f0b951fba20b35d0b1a125a998d070ce35967f2fe62c7d8140fb904296f25cb1032571727b845bada0e37
+EBUILD rjb-1.5.3.ebuild 2139 SHA256 05baa2d92f106caacb6afc31feaad586ac30229e250b4f14ea5cf7d9aa5f228c SHA512 a3a0501020d92ba1e3e720b24c82e7178f0053148b3d82b3024fcd19ed4ffbd52def7c66356747bf9a25355b39e5180eda6d170e6410f9818a9c23f2d9185c50 WHIRLPOOL b5b10790571656b28fe0cbfd57b50668fa205f55686268b82655cf84c30ac52ae539bc2d408e0a448a5c52b61a8c270be97e32a80253d0b212522c874634cabd
+MISC ChangeLog 1099 SHA256 16de65c4ed42a462f77a3ba394af0278c549cd0463900570a3b1d9d2907bc8df SHA512 1a3c28dea726549163293ec09b9cf80cffd54bcb1893be4e8975ab3c0b5f0321cdaf48f182434aa9d18338657afcd130371467494a42da878d7b2bbc879c10e7 WHIRLPOOL 4a84cd5ee5fe7c12f9c937c7cfcecd4e72b776a3ed80e351ee24de34aafcde6937e698826b9eda48555f85a3a93f4f0d04ebceae3319bfea6610e487dc709fc0
 MISC metadata.xml 292 SHA256 cb7bc08e56161cfd708e9e743a5792b5d7793847c2e8b94506cc372281fd6dc6 SHA512 b1f870f4f237affb1473f6d4bfcb870143365e564d8be3ed8ca39a72cc16896f545ef7b97e606b2a39e0fc4161e5ff4512cc0c27186cc12e017d65aebf3edb3c WHIRLPOOL 2d526ce30fb6f82eff831ae6effcec383371d14c57be74b529577123475864e370e7d4b0541c4e88dfc5a2a4cdac58fee3fe8d947b564da84925d12a265ca318
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUHPXIACgkQiIP6VqMIqNeIUAD/bgTVQtdTboThHCIjdy7aFZ4b
-K6DjXp0crNUIBzWx64gA/2bf8/nT9wKdRfLwiR8M6MnWNYOijBxUVChTbfAchMGJ
-=Ihid
+iQIcBAEBCAAGBQJVRuvfAAoJEKXdFCfdEflKdgIQAJ9ZA0uDcRdgbT0hyU9NYvVu
+OfqWl21wveT+ME+fiAxKxIpwvxNwG1Q645EOjTzp4jnKbImygTydQl6ZjLx+lYWn
+ehu5swbSHibatLdqB2FyuGiyuVOw5hOOGmKr1zpIeZweYg41wUdfDtWvXd373IH8
+HZ+bEn0/4VTI7ATd1CPNSrQR8Op5kB2nog3mXmtXK/oYXWWQ0LBCNSt8yUoAjuSe
+B2eya8TPqhZeeO7uZ/P06ZgYmJ4SBxKQkmxgfjjQRT0QQFvRDQWgy38/vPI7VDlZ
+M0uRQ4m/TOK0XUq1AotnUEEG7MiVOLHh7fEThOjBvcPuqmx6WQYM90shYW24HkKB
+nuXvCOtE7E0t6ehY764mzeVRdLeLpnVmCUAwoGQoqH6gi0AX2waIEGnQuW84PAu7
+z0aOVJlblfi0I1gyaoELXGy9C3P0+iYHt4md9cEuTj5wc98ZpCtFpN3WIBI8kn2C
+8rvNb7Ktxx2N4Q1aRgztNNv2xHUy7gMpO0bSul/unn0GimYhr5ij54GOm8sTlwQn
+vED+WJfoI1IX83Q4UR8uuTriYy36+nbQaklWLncFa0yjjMCF0xVSVmIj6WzzN1v9
+aODml4Ab3PLWnCjXwYmPEJO1gRRgc9EDY46ydBH7MfXSJMDPLXAaQjIwHQUCIJzi
+Vlh9IWdVX6VZuEQNBYPE
+=DVVp
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rjb/rjb-1.4.9.ebuild b/dev-ruby/rjb/rjb-1.5.3.ebuild
index 1c1b8fb8d49a..461b6b37c6d4 100644
--- a/dev-ruby/rjb/rjb-1.4.9.ebuild
+++ b/dev-ruby/rjb/rjb-1.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rjb/rjb-1.4.9.ebuild,v 1.1 2014/04/25 05:36:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rjb/rjb-1.5.3.ebuild,v 1.1 2015/05/04 03:47:31 zerochaos Exp $
 
 EAPI=5
 
@@ -42,7 +42,7 @@ all_ruby_prepare() {
 each_ruby_prepare() {
 	#dev-lang/ruby might need the "hardened" flag to enforce the following:
 	if use hardened; then
-		paxctl -v /usr/bin/ruby 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! rjb may only work if ruby is MPROTECT disabled, but not really sure\n  please disable it if required using paxctl -m /usr/bin/ruby'
+		paxctl -v /usr/bin/ruby 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! rjb will only work if ruby is MPROTECT disabled\n  please disable it if required using paxctl -m /usr/bin/ruby'
 	fi
 	# force compilation of class file for our JVM
 	rm -rf data
@@ -69,5 +69,14 @@ each_ruby_install() {
 }
 
 each_ruby_test() {
-	${RUBY} -C test -I../lib:.:../ext test.rb || die
+	if use hardened; then
+		paxctl -v ${RUBY} 2>/dev/null | grep MPROTECT | grep -q disabled
+		if [ $? = 0 ]; then
+			${RUBY} -C test -I../lib:.:../ext test.rb || die
+		else
+			ewarn "${RUBY} has MPROTECT enabled, rjb will not work until it is disabled, skipping tests."
+		fi
+	else
+		${RUBY} -C test -I../lib:.:../ext test.rb || die
+	fi
 }