Version bump to Rails 4.1.4 for security bug 516084.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 94 insertions, 5 deletions

diff --git a/dev-ruby/activerecord/ChangeLog b/dev-ruby/activerecord/ChangeLog
index 6a3ec907bdcd..37d586cd2d50 100644
--- a/dev-ruby/activerecord/ChangeLog
+++ b/dev-ruby/activerecord/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activerecord
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.272 2014/07/03 05:57:54 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.273 2014/07/03 06:20:28 graaff Exp $
+
+*activerecord-4.1.4 (03 Jul 2014)
+
+  03 Jul 2014; Hans de Graaff <graaff@gentoo.org> +activerecord-4.1.4.ebuild:
+  Version bump to Rails 4.1.4 for security bug 516084.
 
 *activerecord-4.0.8 (03 Jul 2014)
 
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index b0fcc2222d14..da37a5348d50 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -12,6 +12,7 @@ DIST rails-4.0.6.tgz 3753513 SHA256 0c4cd017d5b5282c092b4aa1e6611545395c179d8370
 DIST rails-4.0.8.tgz 3754211 SHA256 8e005661e342feca5145e3100bd814387f23b6e1578731c0f0051d361f23ba4d SHA512 4344b58bd02ff7d14d634260c65030d4f4d6bbb52096d34399ef97c40f6892987d5111cc80653eb33e4ad579fec6b863bfc66dd3a577663c29155b03da113d6b WHIRLPOOL bcc901197404f03af025eac239c82be64643860da88c1626918322aff28c40fe24e440d4b711d7f3fc9f247fb7f273d05154f5ff04c1a91ed138b49bb4e6804c
 DIST rails-4.1.1.tgz 3678749 SHA256 c17a1a1c699645e12a4ce8d3edd247939719a3f038e5b8ecb86dcd7d2cf7837a SHA512 5868b1bea447d932f9b0b2d77f3373b8cfeec0e9bb7ccfd0cf7eb3407d1544bc696b88dbaf10492c1f957551021e7efb7334cf13d47230afceb6bb570b617175 WHIRLPOOL 1057b69f2f264a2d4daa50e4995b17afc434569d462f23857ba10327ee0b044ae5c2954457acdd518598dc43503189bb0c00b5063c6584c0501c674eb666d28a
 DIST rails-4.1.2.tgz 3697580 SHA256 08271a52f14a5611956ebc82f71ab7d7446e42140628ae4fe3abc549681555fe SHA512 18549729bdfdf3b8f2b260339f6f6d30739233d9ce8987e5ae4319b0aecf24a79b769c307f06c9c73c4f26e8516b2be2bc065e31b3916ffd4286ae218352c085 WHIRLPOOL 8eb3708b0ac30ea4d7b43548de8c7db8abf2fdafff3bc65478fc5c0851272ed51d01b5a558aa55f03b4333ff04d12c60e8ad3b7c15d8901801d3af5f41971570
+DIST rails-4.1.4.tgz 3698616 SHA256 77cfd1a7cc5ef37ae3bb9373e3d6770e5886c8bb316bc3d043dfc7afeccc877b SHA512 95eee02d04669ce47799df1677709c3c7364c18f23e1403d090826f18a087c890a329920a00de46d2b23c458464fea72dbcfb067bae229880c2bec979ae5c083 WHIRLPOOL 538fdca3e46b74f612b4c594e96fbbad5c100ab8230d38442b5ec9058b5f69ed606096025e7ec531ce747ec9a773d8f8daf717a41eedb4f509bb525d282efee5
 EBUILD activerecord-3.2.18.ebuild 2622 SHA256 5e2764a71be330405c8bc1717d5bb11a7099ba51f5a865bf4fea5571d13c3223 SHA512 562ec280bf13ba91a99708bbe7f6d5d8d938d96c621178c6be0dd1d12e34a81b36b0e22f2ea55499b5c79c6f76fbd5dfbefc48c8b19360ca5765aae2400b413d WHIRLPOOL 7974aa37afd3ebbd3db477414dcd3166cfa2a937ab886584de1e607158f6d2f3e33c050c80d7d4de178605c8ba43e9cca5954186571295cb9248e6a82897c692
 EBUILD activerecord-3.2.19.ebuild 2622 SHA256 d725917853ce0d24f334d2ad045ce9f755fb146f98674a8a0eb83fb62133bae1 SHA512 f13ca5aefe15ca073ee872bf94f8c0077cea5d67032ecd78d70c9125c76414ecb5a8bbe5bea9a3ded64376eeab377b5a3a00602c35fe6651a2b211ae710648ea WHIRLPOOL bae3eeefba02600d66e8c821d073cf442579c737bae90fb8ffc03874f2f6007e8ea8d8b683e82111725601fa69019396e5ecd7439f0e0a807732aef491a4a8ea
 EBUILD activerecord-4.0.5.ebuild 2617 SHA256 9b305c3846a18145b5064f912e95d3f390e0f6346aeb154ef9cd2e0eea4c4593 SHA512 1bc77c117ef75fb995cdd1333611b4ce46c1142e54c6203a0e6790b99c13cb522acaf0046dbb168171d347b0f04a090c95be8539e8454594b9e5c675c33d6103 WHIRLPOOL da7ed81bd8e65b71e910e9d4701ce959783f33aa63c4eb6ed54cfffea5ece849068b9a5a9707fae7d78ddf84dd0ea0216d945a8cdd55f76f3ecfedeeda86eaa8
@@ -19,12 +20,13 @@ EBUILD activerecord-4.0.6.ebuild 2657 SHA256 2e9005213e4f051b723baea9b80d011f3a4
 EBUILD activerecord-4.0.8.ebuild 2657 SHA256 0c1e900c2be9dde7dbf0a27167311843ae1172871ae8aa66d478ec7662aef36a SHA512 4a9cb23dc88d828e5a8b5433bff80e9d9b0f60986cc5801dee008ea63a4f95556a38c56c89e42b53aa363ae51eb39588419a4d890e08396b8495d818fb57af9b WHIRLPOOL a28015c0ef5ab4c9e639fb7e3ee055a9cfe7ec7bc4b7732999b04b159afc3771d6d69cd8fb9cb958f081282fd561927e661b4f82e19067cd3d1b5a56d65652d3
 EBUILD activerecord-4.1.1.ebuild 2721 SHA256 aebea3aeed395489559d9457a6819ff65db9cdea0af586647cfedbfadf977ef1 SHA512 b7f14e8d1686677e7bf3674241115653fbfac55fff916953e2e3da4d9b8c8ffda61f98e73feadd1276e0f477808a20dbed4de544d47a59f50cabff31c69795b5 WHIRLPOOL bcdccabb7c330668e877c2ab6e1e9d0eb04bcf056a4fec3f9b94d883c797e2af782ea10ad574a6f37ae59130bd6ba65de8c21c318b7748d7329175e4af1e60d4
 EBUILD activerecord-4.1.2.ebuild 2767 SHA256 fe1c955e25952bf0fd863c62e7f1f1aca0ac4e6865ba3b3b4114fa9349c8c141 SHA512 a9b8b5eb63ceeea231b5d5474c389d6b430c00ff0da41b52566354d79a0b9701736a94faab7bf9f7804a94963b08cfc84e15f623bf661e140f556f0c8baea608 WHIRLPOOL a9c87f87c034c1384453b3a1e5179fb2dfe6eee97543ca96bf72121c60735741f45f7ea2ff15507becbac8c015dbc7e90ee2177ec5e4d2b02c9775813bd9c077
-MISC ChangeLog 38049 SHA256 f3be50e8c22a2a9e3c1a39afe25349adc08f78c7afd6cab6086b4224ab603962 SHA512 83225f5e48b1f39028fe338f62371a613f182f45dcc8862ac9104bf0b134b538699a4f37be97a9ab9509d34d48c599ba56b1973cd640f94ea199068673023c50 WHIRLPOOL 6140c02a3669a2262d4ff4cf15fde18a10133af495531b02778f97c87dc2e4b0bd5cf95c43b0bf7fa5b2b2212dd951c9959b99d38fcdc55303f9e09bc07ff992
+EBUILD activerecord-4.1.4.ebuild 2767 SHA256 0fb13a6314fba6a81fea64967851221ae2530763177fc65ad01d2e6dd23d6f23 SHA512 61e712dbb88b2a41f28412ae1b248bb4ed60cafb31a5a00b913abbd8c13d48adf6918263f06e58710f0fc0f84e1ac15cb54fd35f6cb3dbbfff4a82de06e734ce WHIRLPOOL d1bf081d1d29c575706c031593ca59156ce3de1448cf99cc8f300af3bc0c8e021e1beb30618467714ebd2927bc0b9e483037a78b7da46fb92c024c55f2350a0a
+MISC ChangeLog 38218 SHA256 c4a24cb1dce3b9841e7726fb8bbb0ddbca1d020d3b8c6d0d31dd81d581aa1e73 SHA512 948d002d055eba205d3ffabb12a42f534598c275d751f5ef46745118c917fefe941e58256d176e3f76e9986aaeac17e0a55e5152003df618625c4b9eb1241f88 WHIRLPOOL 9e0ef7f4e153c69063a9f9bea9f045d942af3ed682cc74087b470ddd28bd1ff1b8dd2b36ac368f41b76e918a5e5dd931c18504ff6e22a70771d9cf1b6e267518
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlO08OMACgkQiIP6VqMIqNcjnAD+MXCmy3Ri8ak9FGniuEMFwuWz
-pw5JGGqZIo1qzmdI4XEA/RunzX1IhpS/35fciaqqUexDrzPLZat878NbFBPxOWJT
-=sKtv
+iF4EAREIAAYFAlO09i4ACgkQiIP6VqMIqNc/DAD8Dsjy3lZbjvby3S6WdYonIrIm
+14DWrj5gDlTEdYXjj+IA/jaB4k5WS+w0sMSMMhxloWrvLuRCJPX4mXnX8Ir+kDQb
+=FPlM
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activerecord/activerecord-4.1.4.ebuild b/dev-ruby/activerecord/activerecord-4.1.4.ebuild
new file mode 100644
index 000000000000..414d47962591
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-4.1.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-4.1.4.ebuild,v 1.1 2014/07/03 06:20:28 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="http://rubyforge.org/projects/activerecord/"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm"
+IUSE="mysql postgres sqlite3"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	>=dev-ruby/arel-5.0.0:5.0
+	sqlite3? ( >=dev-ruby/sqlite3-1.3.6 )
+	mysql? ( >=dev-ruby/mysql2-0.3.13:0.3 )
+	postgres? ( >=dev-ruby/pg-0.11.0 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		>=dev-ruby/sqlite3-1.3.5
+		dev-ruby/mocha:0.13
+		<dev-ruby/minitest-5.3.4:5
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\)/ s:^:#:" ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+
+	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid tests depending on hash ordering
+	sed -i -e '/test_should_automatically_build_new_associated/,/ end/ s:^:#:' test/cases/nested_attributes_test.rb || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single test using mysql dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+
+	# Avoid test depending on specific sqlite3 binding or database version.
+	sed -i -e '/test_uniqueness_violations_are_translated/,/^    end/ s:^:#:' test/cases/adapter_test.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*jruby)
+			;;
+		*)
+			if use sqlite3; then
+				${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+			fi
+			;;
+	esac
+}