summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2012-03-18 05:24:54 +0000
committertaca <taca@pkgsrc.org>2012-03-18 05:24:54 +0000
commit74b56c12a5beea95dcdfe7df1ac9e9f5a08cd18b (patch)
treed3ea1f9910711906a912b441206cdbb6f9ebebea
parentf9629d4ee795494fac5d7487e348b35ca8a5ac01 (diff)
downloadpkgsrc-74b56c12a5beea95dcdfe7df1ac9e9f5a08cd18b.tar.gz
Update ruby-actionpack3 to 3.0.12.
pkgsrc change: * Tweak COMMENT. *Rails 3.0.12 (unreleased)* * Fix using `tranlate` helper with a html translation which uses the `:count` option for pluralization. *Jon Leighton*
-rw-r--r--www/ruby-actionpack3/Makefile5
-rw-r--r--www/ruby-actionpack3/distinfo9
-rw-r--r--www/ruby-actionpack3/patches/patch-lib_action__view_helpers_capture__helper.rb15
3 files changed, 6 insertions, 23 deletions
diff --git a/www/ruby-actionpack3/Makefile b/www/ruby-actionpack3/Makefile
index 732de46faf1..87faf1eedf8 100644
--- a/www/ruby-actionpack3/Makefile
+++ b/www/ruby-actionpack3/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2012/03/03 04:47:14 taca Exp $
+# $NetBSD: Makefile,v 1.12 2012/03/18 05:24:54 taca Exp $
DISTNAME= actionpack-${RUBY_RAILS3_VERSION}
-PKGREVISION= 3
CATEGORIES= www
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.rubyonrails.org/
-COMMENT= Toolkit for building modeling frameworks (part of Rails)
+COMMENT= Toolkit for building modeling frameworks (part of Rails 3.0)
LICENSE= mit
# Comment out dependency in gemspec but already depends indirectly one.
diff --git a/www/ruby-actionpack3/distinfo b/www/ruby-actionpack3/distinfo
index 3d4bfe54706..7912d537185 100644
--- a/www/ruby-actionpack3/distinfo
+++ b/www/ruby-actionpack3/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2012/03/03 04:47:14 taca Exp $
+$NetBSD: distinfo,v 1.12 2012/03/18 05:24:54 taca Exp $
-SHA1 (actionpack-3.0.11.gem) = 2161526f06ead521d0473b2bbad7e4db4a20fd5a
-RMD160 (actionpack-3.0.11.gem) = e21ccd58f0051e053a2dea3f3a7b2d97b6483012
-Size (actionpack-3.0.11.gem) = 358912 bytes
-SHA1 (patch-lib_action__view_helpers_capture__helper.rb) = bfbb8431086bc97e0e8b98e6cc29cf6705ed5070
+SHA1 (actionpack-3.0.12.gem) = 8e5743bbe68b7eb1fad90d2eb50d2eba71ba96c9
+RMD160 (actionpack-3.0.12.gem) = 96bbdbfe9e5b6fc94227bb982215af2915bcf1aa
+Size (actionpack-3.0.12.gem) = 358400 bytes
diff --git a/www/ruby-actionpack3/patches/patch-lib_action__view_helpers_capture__helper.rb b/www/ruby-actionpack3/patches/patch-lib_action__view_helpers_capture__helper.rb
deleted file mode 100644
index 61d52a83e60..00000000000
--- a/www/ruby-actionpack3/patches/patch-lib_action__view_helpers_capture__helper.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_action__view_helpers_capture__helper.rb,v 1.1 2012/03/03 04:47:14 taca Exp $
-
-Fix for CVE-2012-1099.
-
---- lib/action_view/helpers/capture_helper.rb.orig 2012-03-03 04:21:54.000000000 +0000
-+++ lib/action_view/helpers/capture_helper.rb
-@@ -179,7 +179,7 @@ module ActionView
- def flush_output_buffer #:nodoc:
- if output_buffer && !output_buffer.empty?
- response.body_parts << output_buffer
-- self.output_buffer = output_buffer[0,0]
-+ self.output_buffer = output_buffer.respond_to?(:clone_empty) ? output_buffer.clone_empty : output_buffer[0, 0]
- nil
- end
- end