Version bump

Package-Manager: portage-2.1.4.5

3 files changed, 61 insertions, 5 deletions

diff --git a/dev-ruby/rails/ChangeLog b/dev-ruby/rails/ChangeLog
index fd9749b559da..b698308ffdf2 100644
--- a/dev-ruby/rails/ChangeLog
+++ b/dev-ruby/rails/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rails
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.113 2008/10/20 19:35:46 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.114 2008/10/24 12:23:04 graaff Exp $
+
+*rails-2.1.2 (24 Oct 2008)
+
+  24 Oct 2008; Hans de Graaff <graaff@gentoo.org> +rails-2.1.2.ebuild:
+  Version bump. Fixes security issue #242914 (header-injection) and #237285.
+  Also features minor fixes.
 
 *rails-2.0.5 (20 Oct 2008)
 
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index a62ec4e0faad..6b7fa7653f2b 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -7,18 +7,20 @@ DIST rails-2.0.4.gem 210944 RMD160 4da8137f35cf3434fa5791f44708290031f41851 SHA1
 DIST rails-2.0.5.gem 184320 RMD160 88ca29eb1b9d825cf6e5b6f669cfdc566f7e9362 SHA1 297a78601bcad4803929ee41dea3cbf4d9c50f23 SHA256 5e8a6e36f2537b795b7bb237e2aea18a166349e1e54e463a64beba5ae84cd406
 DIST rails-2.1.0.gem 204288 RMD160 321cf6fc1eee86183eaa45aa098631d3ea20bad6 SHA1 7c5ab9edba65923d7332d842217e0e7fc6b66404 SHA256 9a9a2b7c710926e83d76ed308e5863be0c9011146bc983703437820d9cd405fe
 DIST rails-2.1.1.gem 205312 RMD160 68f05b543dd67a1efcfb0e7834395b689d67383d SHA1 df16906481cd5602ff62df61254f28ab7e485882 SHA256 44f2f19ddd15f51725a5b92447adefbc9ee5a500fcb8db6e9bdb4a3a7ead7438
+DIST rails-2.1.2.gem 205312 RMD160 17c72d42748b8f7c77f630dafd2016e9387d806a SHA1 68971f9a5b10d94cf697f4b0f6e804e7797def4d SHA256 4a55304ae08e3fcd2a2e2bb627d442e5aa9f1b1d6a542587b97ed0cee6079276
 EBUILD rails-1.2.6.ebuild 1357 RMD160 c9263a58a2d35a18fa40c0765a3cc3a476ab6417 SHA1 bcbe8430585b76a94b725c947fb4cae99aa86b7d SHA256 0a78bf01a76e3d7f9f6edea9748cd0daecd17eb04bdeaee43dbac83fda8c3c03
 EBUILD rails-2.0.2.ebuild 1343 RMD160 7638d1288ca95a6d350791bd8dc118e46cc82a11 SHA1 a305ca968b4abecffc780fc75f3ca724eebf7ef6 SHA256 ea75bc9b6a320808ca733e4eec6c26fff7c5fe074c4d88411841e145c0d76cc1
 EBUILD rails-2.0.4.ebuild 1348 RMD160 187875eb95e9efe6d5978a3950d781a9a141d29c SHA1 81a08adbcfaef75ceb1e08e70763f057e4eed722 SHA256 c6013f702dd2a3be905d3b3b68ec00fc706c5edab8c5143f51ac2413c5f770f6
 EBUILD rails-2.0.5.ebuild 1348 RMD160 d728c46425e920ebe848f3823a9212be4bd7538a SHA1 f2289a4fde98e6684fda63449b8db561bc00287a SHA256 66b0605e643dcf3238a41679d412140d291300694361423e6a4943fc37cc9e36
 EBUILD rails-2.1.0.ebuild 1350 RMD160 bfd7be13069a6b4dc69988c3b57226510a0afc99 SHA1 ee520c431b499ba79f62ef07383656640abfb2a1 SHA256 c53b0b82be4e76db1cfa6b832d946684265e536eb12b44a1d7cce74be30e7125
 EBUILD rails-2.1.1.ebuild 1350 RMD160 7f760a576c15d9b1edfc08e901f7605e6268454e SHA1 d8387658eac9934e490097b017aabfbc6cb80659 SHA256 66b8abab25aebfd2f3740ff7a065c750575d16bd1237127cf4b1c8695e3a782a
-MISC ChangeLog 14862 RMD160 02da5a04f2d0f6b4af74bdb7f8557146ae62ba19 SHA1 badb99f37e9cacf057e2c19e94a95cea9a4c81eb SHA256 039ec098fcf4442bc7e567dd2f8028585a330785411fb0c97ff5e838a745d0da
+EBUILD rails-2.1.2.ebuild 1350 RMD160 08485b156fbfcd1c0b66b5ec3c4633a8c51dea0a SHA1 d900de92332a5d2e7c925dceaab79d1b1b73f05f SHA256 0c43cccce0341bbbf8253fea85af728312f54246d49ed78ccd2ab7c9236523f2
+MISC ChangeLog 15068 RMD160 61e0b588e1077b794a84fabe88839dafce2ceb63 SHA1 11a572c7891f4ceacf6195c1952a90d2adc43a40 SHA256 4556ed17897c7bc6d7ad0f523fa5a4b188d858917a576ff6dbeaf9626f59d796
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj83ZkACgkQCzgcb6sPj4/9+QCgnjAM4hnXyZtxtVXYetirPCQs
-PrYAn2HJpE5dHFoxpg5cgKmC0azios9S
-=0lAO
+iEYEARECAAYFAkkBvjAACgkQCzgcb6sPj4+3ngCeJuR8PvqlFfe+1EDElmUSt3av
+7NUAn0bv6Hpfzk/k1rukJqg09k++BZO7
+=zCOT
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rails/rails-2.1.2.ebuild b/dev-ruby/rails/rails-2.1.2.ebuild
new file mode 100644
index 000000000000..2c53662f97bc
--- /dev/null
+++ b/dev-ruby/rails/rails-2.1.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-2.1.2.ebuild,v 1.1 2008/10/24 12:23:04 graaff Exp $
+
+inherit ruby gems
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="http://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="2.1"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="fastcgi"
+DEPEND=">=dev-lang/ruby-1.8.5
+	>=app-admin/eselect-rails-0.12
+	>=dev-ruby/rake-0.8.1
+	~dev-ruby/activerecord-2.1.2
+	~dev-ruby/activeresource-2.1.2
+	~dev-ruby/activesupport-2.1.2
+	~dev-ruby/actionmailer-2.1.2
+	~dev-ruby/actionpack-2.1.2
+	!<dev-ruby/rails-1.1.6-r1"
+
+RDEPEND="${DEPEND}
+	fastcgi? ( >=dev-ruby/ruby-fcgi-0.8.6 )"
+
+src_install() {
+	gems_src_install
+	# Rename slotted files that may clash so that eselect can handle
+	# them
+	mv "${D}/usr/bin/rails" "${D}/usr/bin/rails-${PV}"
+	mv "${D}/${GEMSDIR}/bin/rails" "${D}/${GEMSDIR}/bin/rails-${PV}"
+}
+
+pkg_postinst() {
+	einfo "To select between slots of rails, use:"
+	einfo "\teselect rails"
+	# Bring users to rails 2.1.x by default when updating
+	eselect rails update 2.1
+
+	ewarn "All database USE flags have been moved to dev-ruby/activerecord"
+}
+
+pkg_postrm() {
+	# Drop users back to rails 2.0.x when they remove 2.1.x
+	eselect rails update 2
+}