summaryrefslogtreecommitdiff
path: root/www/ruby-actionpack31
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2012-03-03 04:47:13 +0000
committertaca <taca@pkgsrc.org>2012-03-03 04:47:13 +0000
commit8f1b96c8061acaccc31d2b0d4208fdb56878a63f (patch)
tree5198cb97e9fdc06b110a2e4623b40144776475cc /www/ruby-actionpack31
parent7190e1851c29373b37d9c4fba8eb0498c7012c9a (diff)
downloadpkgsrc-8f1b96c8061acaccc31d2b0d4208fdb56878a63f.tar.gz
Add fix for CVE-2012-1098 to:
devel/ruby-activesupport3 devel/ruby-activesupport31 www/ruby-actionpack3 www/ruby-actionpack31 And bump each PKGREVISION.
Diffstat (limited to 'www/ruby-actionpack31')
-rw-r--r--www/ruby-actionpack31/Makefile3
-rw-r--r--www/ruby-actionpack31/distinfo3
-rw-r--r--www/ruby-actionpack31/patches/patch-lib_action__view_helpers_capture__helper.rb15
3 files changed, 19 insertions, 2 deletions
diff --git a/www/ruby-actionpack31/Makefile b/www/ruby-actionpack31/Makefile
index 8e7a7fbcc18..bd696d4d8d3 100644
--- a/www/ruby-actionpack31/Makefile
+++ b/www/ruby-actionpack31/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/12/16 12:26:29 taca Exp $
+# $NetBSD: Makefile,v 1.2 2012/03/03 04:47:14 taca Exp $
DISTNAME= actionpack-${RUBY_RAILS_VERSION}
+PKGREVISION= 1
CATEGORIES= www
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/www/ruby-actionpack31/distinfo b/www/ruby-actionpack31/distinfo
index d8900230c68..6b2a0748bec 100644
--- a/www/ruby-actionpack31/distinfo
+++ b/www/ruby-actionpack31/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/12/16 12:26:29 taca Exp $
+$NetBSD: distinfo,v 1.2 2012/03/03 04:47:14 taca Exp $
SHA1 (actionpack-3.1.3.gem) = 3869fcc993a4b4cdbed14bb0b03d12d2beeb6802
RMD160 (actionpack-3.1.3.gem) = b9d474a97e3f64535c094d133bd337329d888acd
Size (actionpack-3.1.3.gem) = 369664 bytes
+SHA1 (patch-lib_action__view_helpers_capture__helper.rb) = b1cbedccc782ac4c669c9360e003a1e38fc0baf2
diff --git a/www/ruby-actionpack31/patches/patch-lib_action__view_helpers_capture__helper.rb b/www/ruby-actionpack31/patches/patch-lib_action__view_helpers_capture__helper.rb
new file mode 100644
index 00000000000..7c8c07b36b5
--- /dev/null
+++ b/www/ruby-actionpack31/patches/patch-lib_action__view_helpers_capture__helper.rb
@@ -0,0 +1,15 @@
+$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:18:29.000000000 +0000
++++ lib/action_view/helpers/capture_helper.rb
+@@ -194,7 +194,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