Version bump for security bug 451620.

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

4 files changed, 90 insertions, 6 deletions

diff --git a/dev-ruby/rack/ChangeLog b/dev-ruby/rack/ChangeLog
index 05ac4ae439c5..ca242665d6a3 100644
--- a/dev-ruby/rack/ChangeLog
+++ b/dev-ruby/rack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rack
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.94 2013/01/13 09:17:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.95 2013/01/13 09:31:39 graaff Exp $
+
+*rack-1.2.6 (13 Jan 2013)
+
+  13 Jan 2013; Hans de Graaff <graaff@gentoo.org> +rack-1.2.6.ebuild,
+  files/rack-1.4.3-tmpdir.patch:
+  Version bump for security bug 451620.
 
   13 Jan 2013; Hans de Graaff <graaff@gentoo.org> rack-1.4.3.ebuild,
   +files/rack-1.4.3-tmpdir.patch:
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index d9cfba60916f..a1b8da4f7657 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -4,23 +4,25 @@ Hash: SHA256
 AUX rack-1.0.1-gentoo.patch 877 SHA256 2260ce111cf6d07a7b6169f0c5e829d28d00c17d42fcc1dbed82d5953ede04db SHA512 f91f9530493f1e6a5af58877ea1996f8d702bbfb438e78fa2c026940eaaa4e52b69929e42bbab6a43af0d7e1417cb133703fc09ee375cd31d648aa21a111cf68 WHIRLPOOL 79d67b6de0b2030179e8596ea4ed3f55f35f16fddf5c72a95417e0b21af2d4ac87762a20f38af8d20563e79e3d40c13d733e82e4a8e8f07912850c2a50cc996a
 AUX rack-1.1.0-gentoo.patch 1293 SHA256 2af3afc6b90d379e63137b798417a1aa6e13c1d6f1bd40d47344b6662bce676a SHA512 9c5acae0564efb4b04831336366de07926d876491f1662808f8c8f8dae35d635cc120f14f431eed34f27b854a4badfe5db34307947f499162065b23efd93fd74 WHIRLPOOL 0d8567ba829bb2ec7dc363af71031744be63eefa00f264206c1cd262374716baf9f727c50a4c4af323beda5ff23ba5df5e57a22bc547f3815cd1f2d131ed68a4
 AUX rack-1.2.1-gentoo.patch 410 SHA256 d3cbfe39aed870e43ae6c9a0b9f87ded69b1303d1a67929df3ad6516637d2b2e SHA512 03dba431bbdd77f87e0f26ccc6022248edbde20930254da1c55db6115dd49be5dd3f16919e15ee7baab40682b3f959b52692d5018b09ad79d4db3acb3adf6f43 WHIRLPOOL e72ca37a315bb44604162ad6960aca510efefb0ebbeac0c6671de332eb4d944829f15d335b9fe08c32932370290ffefc1e72119785de1dc57b913d6769fdecd2
-AUX rack-1.4.3-tmpdir.patch 1451 SHA256 57e5755f7be358cce042403bd031a899024373eeae3a907c45be7e4b00439705 SHA512 b9fc8d257df96ee074560f5ada917787d27cb69a688347b13130503fb6e2d3d84566ecb9e1ec12b899767a8bb82d8856863d562eca0f8bdbe56449190ca7e411 WHIRLPOOL 0d556402f012258389d9bf41ad51356466835d1f2a4aa2f7d4de0ccf442bb4af6f719c32d6db17ddb08b62e40016bd6c6262bf11533cc81b05b5f49b81afdd21
+AUX rack-1.4.3-tmpdir.patch 1492 SHA256 0b35ced52a54a3a00d8ac151a78e9872ef9eabb3880e03ab7e65a121d946deb7 SHA512 c58ea6a0458ed42b711255b66e1afd2d2ff0a446ea818a352383620011321f01627819d2d6815998c7211db5ed4dc32b8c026f69cde2000a5a05a873a1d14616 WHIRLPOOL 75503f45a86e017f8938995e61e56349566c812c5025c5877d12ad865a4cdd3d189041e17910328c02bc1688750c50734570634fc66001d6d76a22b1f9ea1494
 DIST rack-1.1.3.tar.gz 350849 SHA256 70e2e88805401ce650b7e01b5346962725bd599f86dedaacd345451f9ee749f6 SHA512 b84d976e6b299258ed0245f47e877a69846118a1d1d02086668f1164f2ad7af04be73d3b6ccafd9400bd8202aa0fa7cfff58de5b0cebbf69ba3d8813ac1b7995 WHIRLPOOL 2008011284a06865d70b66d628bd36fd58bd8961a6c02dcc4ca5233e6bf321f922f439523a02a1cee52b0478c8b347a23c618d203c8411e87eab56e50980420c
 DIST rack-1.2.5.tar.gz 362175 SHA256 4e8931b4681d85970195643d2dcf3cc82d4a2833313a210d3bf1d3046b5d8b78 SHA512 b522d5ffc103bd25e7d6a0e1847b5c5ca176a266f8e166508bc76231eb370b13e9be623ce124edd2cccf1a3040676a67a709d4d2a3758c0999ad3cc0ea06a2ee WHIRLPOOL 75028b59ff8aa0963c6db66d405733b33d3d52ae7b9311d5788b01f6d38fddcaf1c79131e74c662ae5591c2a4b8ca05995830419d4e1c2bca91c3846732f4602
+DIST rack-1.2.6.tar.gz 361635 SHA256 078288e23955796a59d14f95fb6817504bf67c3eaef66c438e6978f6f8a91616 SHA512 5e1a8ad5415db1602fd8722eb888a3ee99206220ea206fb7e5cddd07f0077598d60216629d1f9fa6f78e30f3d8cffce777eab90708638ac78901597c2a991544 WHIRLPOOL c076740b30beb6e07729a01cf2802d98c36d16e0956b15c616a4e3e70f5b43c63d86d986c40c4601603d60d1e210b2c066beb95bb29e2887a669a7f46c9c6741
 DIST rack-1.3.6.tar.gz 408553 SHA256 1f163f1075a9de968a8fe92d51b3ce7b1bacdfd96fb4635f24bd5f46f261ebf4 SHA512 1b254c01f25f44f98a5a64ed9a21c79c563deeb90b2fac9a57464681f263d2f5091bca4f2c7931e54b1552911544e07b37071987594f01d24bb07c60272c68a6 WHIRLPOOL 501a47e2ad1d7a31f9dc515653521b410c5523f1ee608a32ceef7cc75b0a510c18e5f90eb1edf71577c6b2bded07a6c2ce08cf8e79fec63e8729744e6368aad3
 DIST rack-1.4.1.tar.gz 425436 SHA256 66b8e0fc1edd9d4c1cf52b91b4459ecf173472378256adfab1fb821ae03a166a SHA512 fbb71a6ac504a6faa2de10e19b47408caa2a274227da42108386fd21cc471adfb5cf8eaf46559fdf3ef8a6a8f8268b990b3c3228bf270310937acc6e17ac240b WHIRLPOOL 0a120432f94e220ba28a6dc9a8db0b950061817fe125c97064e1caeb1fcc9efd3a56cca7f6a5ca73c2dba6994c8ae6f2b16187544304f4d95a1cdd9492a41aac
 DIST rack-1.4.3.tar.gz 484047 SHA256 ba6a71f05ae421baa7d0a61f34078fb2d3eb937a25a1762c0182a118b9d89b5b SHA512 37fb1db8fb933eadcba8089c99f61a62ab2331112e8cc118734413b465cb4f1e25082e2a553596eb2386efe4e3eb715d9fa6b1419fc86c7207cb549040dfa8e0 WHIRLPOOL c1901bc94968c00825ccedf2eeacd99a5c5077e72634c67e4975b43ffa5fb0b83225d06b1c3008cfc965232c3507cd67d5c773394e1a149bd238a72bb32e6e71
 EBUILD rack-1.1.3-r1.ebuild 1532 SHA256 38ad08c49d6b4ee85d87a8770d3bb42c88b01991e3868d8752c8cf885dc15ea4 SHA512 eacdfed49c8a119c6c05c350ae10f8940e6bd9fea4268056a17d020fe625950e21d74cf6f303eb275ab3fe120d31206e3836f06d3b3d13110c38479e84bfe85c WHIRLPOOL fda50b0a956f305f530f1242f242130cc020600707763d8baad6f15a961b12dad81e0b729dcc6e2c76d884221d3a6fdd97fd33a7536aa407919a2d03fea5444d
 EBUILD rack-1.2.5.ebuild 2735 SHA256 3238e4f0c79b9e44b8216b27dbdfc138b6ad71bc42bfbe2d2f0f847dfa1435b8 SHA512 fc9d0eea6d05dbf2049f26ef7151d5b58225a9ab6298e86486cc5bfc876db3e08ea434d95fddcdca8e26b326629085a0526d92e26a7f2f02f1bfa489a6e066a0 WHIRLPOOL e0683fa7323bd6f55c778a7e7963a7618e12c60145e2c3d14284d23d278274165bd478b64ff538826aba845f7cd52526ba46491962dabe7471d9f6cdd61bf0bc
+EBUILD rack-1.2.6.ebuild 2736 SHA256 0330121926dce0a53608810626c8bb2a209b0516ff3ad4051be32c70bf6d9494 SHA512 9701e2edf512e3980c0601262bfd823ea0d5acf5cb0cb2e30cd4858653e5c4f4983dd88330124f7ec092f80ed52e78dde30fe2d343f71ea4c43c4ed7d80a70b3 WHIRLPOOL 99c731fbdae7e67c75a97bf6c2fe1d3d1babc549900e00348b92b5a1935291b2ab541f939cbc960a1815e7f27bac9a6f71a136ae29829c225bc3572e22958a65
 EBUILD rack-1.3.6-r1.ebuild 2198 SHA256 67ef29e120dbf304dca62f4ad51798b2632fc192bad849644cc69825139755ed SHA512 dad9d4945d2eb0f5da6f8b7c6e389bf28dfc3a4f05ce3a867fc70966213bfc654efb50074e7298e886e048901c681e77a9e77ed1d4d00aed89fd6fd431767e36 WHIRLPOOL 9bdf8591ec184d32f12411f94c79e048ade8f96547627056b063e62973b6156c4cd062998a9daabcb169c600c3d4d80232f610c0b87238600ab28de5b3a233fd
 EBUILD rack-1.4.1.ebuild 2205 SHA256 9662cc56d0d8e9119047c1526a025772414746ae058acc0a942fb36d577d4f8e SHA512 f33e4ed0184ca46e1b83f8fcae15fa323e591743e3aa4021c69bdb520653e4a71a7c44c7136ccf9072a45a5d2dbe45538c558c44e724aaf2750b39c1b0bcf610 WHIRLPOOL 669ba17c909340531807c3aa85b089debcbe330b63e53890e2cfccadaec0d374aca3a57f9465569bb955bf6fd7956de5e8b2148e61e029439500b899af3cb64d
 EBUILD rack-1.4.3.ebuild 1891 SHA256 b8381e733c19354dbd779ec414be706d7d722888c0f56cc3dfae99ec57dd5756 SHA512 a0a1a7f6b851c8527a76563da3c82e79de89f2460ba3b4c4d656ad74d912785ce92500c7f504e47f02a9b873317a1bc23fed8b66f8c8683a22509f5a0ad2d526 WHIRLPOOL a0772d4102e2fac8ea79fbfdb2add734792b5fd779191cef42145aeae1e67400795f516c0fa6913e31b16b3188e4222731146a979c344791a6adc39cef1364d4
-MISC ChangeLog 12560 SHA256 33025ec8bbb52dddc118e374c2459f6416db08de3573d3b3ce55f29998bd38c4 SHA512 705295479301e0548b9e87a45c2bb9179264b69f8a4b716ff9f47151fd2b9f40a65e71067f41face4a3fdd79f1418a16e356277c6d8067c17e7a014534966bbd WHIRLPOOL ea9ede275576f62d9783002fde1f8871095d163d2b2346d6d6044a683e2bd5dc1fef83e693cd2bfed53c903e79e61403cf7f09005d5c6bbe7aba82b36630e44d
+MISC ChangeLog 12731 SHA256 afd121a2e9317847c19917d158bafd97607d0bb562313550d948753ed24c5679 SHA512 fc0c90e00080891f78b42d190a25f63457767c81c83e49d3b464ea052842b113e4fa18836c72efa08612db70c77d9dbfe4430d047b501a106a1e39574f15a6a7 WHIRLPOOL c6d666f47d9648adea263026d939b7f9df6fdacc4a3ee3b88cfa9b5928accac099063f3aaaf762c1bc424841ca6dcff0dd7550bf643865e2ba5edd03fcfef918
 MISC metadata.xml 370 SHA256 f9714dd2a4a9e60fa008d7c243a4d97d4e73786b8714f0cbd2108551e08438bd SHA512 bf9353ed39af73c7f86fa1f7b781b6156afc890f62f2d5f95d1f6803bc4e7152969fe097182007ac7d3d108916935db6887dc4eef91bf9855c4f81bb14a3e2b3 WHIRLPOOL 89ba48a7b72ae2800d95bc4bcc5786a38f35fd5d201626856c2d07bcd04f018bd21525ca1d3b8248b98f73bc16b4d65747d79a5362fceebea05e250ce1e2403b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDye64ACgkQiIP6VqMIqNd0hAEAkKnZMIjmVMDW6VUymMlOA1pZ
-t9dKcR5Vi64ppoi4l2YA/iaOQYqqCSRmuxYUkCh4kCN9Bpo+8aSG5wwpeB10/mtG
-=QxhM
+iF4EAREIAAYFAlDyfvwACgkQiIP6VqMIqNfUSQD/dh/S9V9oQcrheKc9cDF92CFW
+8GwJDOALgbGdyPA4OkcA/jqMqXgRrnDT5S9egSx2P/EPjfWziDT674TCGYHr719g
+=TQjB
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rack/files/rack-1.4.3-tmpdir.patch b/dev-ruby/rack/files/rack-1.4.3-tmpdir.patch
index dc05ee774535..5f67826a933a 100644
--- a/dev-ruby/rack/files/rack-1.4.3-tmpdir.patch
+++ b/dev-ruby/rack/files/rack-1.4.3-tmpdir.patch
@@ -1,3 +1,5 @@
+https://github.com/rack/rack/issues/492
+
 --- test/spec_sendfile.rb.~1~	2013-01-07 19:49:40.000000000 +0100
 +++ test/spec_sendfile.rb	2013-01-13 09:50:37.950890803 +0100
 @@ -10,10 +10,10 @@
diff --git a/dev-ruby/rack/rack-1.2.6.ebuild b/dev-ruby/rack/rack-1.2.6.ebuild
new file mode 100644
index 000000000000..5395c033bec7
--- /dev/null
+++ b/dev-ruby/rack/rack-1.2.6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.2.6.ebuild,v 1.1 2013/01/13 09:31:39 graaff Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog KNOWN-ISSUES README SPEC"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eutils versionator
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="http://rubyforge.org/projects/rack"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all. We do add the fcgi dependency because
+# that spec isn't optional.
+ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/fcgi )"
+
+# Block against versions in older slots that also try to install a binary.
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.1.3-r1"
+
+#USE_RUBY=ruby19 \
+#	ruby_add_bdepend "ruby_targets_ruby19 test" '=dev-ruby/test-unit-1*'
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.1-gentoo.patch
+
+	# Add missing require for Mutex use. This may show up in the tests
+	# depending on load order.
+	sed -i -e '1 irequire "thread"' lib/rack/lock.rb || die
+
+	# Avoid tests depending on now randomized hash ordering.
+	sed -i -e '/foobarfoo/ s:^:#:' test/spec_response.rb || die
+	sed -i -e '/build query strings correctly/,/end/ s:^:#:' test/spec_utils.rb || die
+	sed -i -e '/build nested query strings correctly/,/end/ s:^:#:' test/spec_utils.rb || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby19)
+			# Avoid failing encoding-related specs, most likely due to
+			# changes in handling of encodings in newer ruby 19
+			# versions.
+			sed -i -e '/escape non-UTF8 strings/,/end/ s:^:#:' test/spec_utils.rb || die
+			sed -i -e '/escape html entities in unicode strings/,/end/ s:^:#:' test/spec_utils.rb || die
+			sed -i -e '/escape html entities even on MRI/,/^  end/ s:^:#:' test/spec_utils.rb || die
+			sed -i -e '/accept params and build multipart encoded params/,/^  end/ s:^:#:' test/spec_mock.rb || die
+			;;
+		*)
+			;;
+	esac
+}
+
+each_ruby_test() {
+	# Since the Rakefile calls specrb directly rather than loading it, we
+	# cannot use it to launch the tests or only the currently-selected
+	# RUBY interpreter will be tested.
+	${RUBY} -S bacon -Ilib -w -a \
+		-q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|rackup)' \
+		|| die "test failed for ${RUBY}"
+}