Prepare for 2.3.4 release

mislav · Sep 3, 2009 · a43ef24 · a43ef24
1 parent 9a68c72
commit a43ef24
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 19 deletions.
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
@@ -1,3 +1,7 @@
+*2.3.4 (September 4, 2009)*
+
+* Minor bug fixes.
+
 *2.3.3 (July 12, 2009)*
 
 * No changes, just a version bump.

diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
@@ -54,7 +54,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 2.3.3' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 2.3.4' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'

diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
@@ -2,7 +2,7 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -1,4 +1,6 @@
-*2.3.4 (pending)*
+*2.3.4 (September 4, 2009)*
+
+* Sanitize multibyte strings before escaping them with escape_once. CVE-2009-3009
 
 * Introduce grouped_collection_select helper.  #1249 [Dan Codeape, Erik Ostrom]
 

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
@@ -79,7 +79,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 2.3.3' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.3.4' + PKG_BUILD)
   s.add_dependency('rack', '~> 1.0.0')
 
   s.require_path = 'lib'

diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
@@ -2,7 +2,7 @@ module ActionPack #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
@@ -1,4 +1,4 @@
-*2.3.4 (pending)*
+*2.3.4 (September 4, 2009)*
 
 * PostgreSQL: XML datatype support.  #1874 [Leonardo Borges]
 

diff --git a/activerecord/Rakefile b/activerecord/Rakefile
@@ -192,7 +192,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
 
-  s.add_dependency('activesupport', '= 2.3.3' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.3.4' + PKG_BUILD)
 
   s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite"
   s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite"

diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
@@ -2,7 +2,7 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
@@ -1,4 +1,4 @@
-*2.3.4 (pending)*
+*2.3.4 (September 4, 2009)*
 
 * Add support for errors in JSON format.  #1956 [Fabien Jakimowicz]
 

diff --git a/activeresource/Rakefile b/activeresource/Rakefile
@@ -66,7 +66,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
 
-  s.add_dependency('activesupport', '= 2.3.3' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.3.4' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'active_resource'

diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb
@@ -2,7 +2,7 @@ module ActiveResource
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
@@ -1,3 +1,9 @@
+*2.3.4 (September 4, 2009)*
+
+* Introduce ActiveSupport::Multibyte.clean to clean invalid multibyte strings.
+
+* Bug fixes
+
 *2.3.3 (July 12, 2009)*
 
 * JSON: +Object#to_json+ calls +as_json+ to coerce itself into something natively encodable like +Hash+, +Integer+, or +String+. Override +as_json+ instead of +to_json+ so you're JSON-library-agnostic.  [Jeremy Kemper]

diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
@@ -2,7 +2,7 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
@@ -1,4 +1,4 @@
-*2.3.4 (pending)*
+*2.3.4 (September 4, 2009)*
 
 * I18n support for plugins.  #2325 [Antonio Tapiador, Sven Fuchs]
 

diff --git a/railties/Rakefile b/railties/Rakefile
@@ -314,11 +314,11 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.8.3')
-  s.add_dependency('activesupport',    '= 2.3.3' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 2.3.3' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 2.3.3' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 2.3.3' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 2.3.3' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 2.3.4' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.3.4' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.3.4' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.3.4' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.3.4' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false

diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
@@ -2,7 +2,7 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end