[DRE-commits] r4093 - in trunk/thin/debian: . patches

[Ryan Niebur]

Author: ryan52-guest
Date: 2009-09-07 08:44:00 +0000 (Mon, 07 Sep 2009)
New Revision: 4093

Added:
   trunk/thin/debian/patches/1.2.4.patch
Modified:
   trunk/thin/debian/changelog
   trunk/thin/debian/patches/series
Log:
tarball from 1.2.3, patch up to 1.2.4

Modified: trunk/thin/debian/changelog
===================================================================
--- trunk/thin/debian/changelog	2009-09-07 08:36:36 UTC (rev 4092)
+++ trunk/thin/debian/changelog	2009-09-07 08:44:00 UTC (rev 4093)
@@ -1,7 +1,8 @@
-thin (1.2.3-1) UNRELEASED; urgency=low
+thin (1.2.4-1) UNRELEASED; urgency=low
 
   * New upstream release
   * set Standards-Version to 3.8.3
+  * tarball from 1.2.3, patch up to 1.2.4
 
  -- Ryan Niebur <ryanryan52 at gmail.com>  Mon, 07 Sep 2009 01:36:21 -0700
 

Added: trunk/thin/debian/patches/1.2.4.patch
===================================================================
--- trunk/thin/debian/patches/1.2.4.patch	                        (rev 0)
+++ trunk/thin/debian/patches/1.2.4.patch	2009-09-07 08:44:00 UTC (rev 4093)
@@ -0,0 +1,44 @@
+commit f52228f87ef443276a76719bd281c03403c17b3d
+Author: macournoyer <macournoyer at gmail.com>
+Date:   Sat Sep 5 22:56:48 2009 -0400
+
+    Fix syntax error in rails adapter, oye! Bump version number to 1.2.4
+
+diff --git a/CHANGELOG b/CHANGELOG
+index 2689e4c..ae76373 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -1,4 +1,4 @@
+-== 1.2.3
++== 1.2.4 Flaming Astroboy
+  * Fix a few issues in thin to make it a better "gem citizen" [josh]
+  * Fix test for rack based Rails in adapter under Ruby >= 1.8.7 [#109 state:resolved]
+  * Fix Remote address spoofing vulnerability in Connection#remote_address [Alexey Borzenkov]
+diff --git a/lib/rack/adapter/rails.rb b/lib/rack/adapter/rails.rb
+index abfd9c6..8e5fd81 100644
+--- a/lib/rack/adapter/rails.rb
++++ b/lib/rack/adapter/rails.rb
+@@ -33,8 +33,8 @@ module Rack
+       
+       def rack_based?
+         ActionController.const_defined?(:Dispatcher) &&
+-          (ActionController::Dispatcher.instance_methods.include?(:call)
+-           || ActionController::Dispatcher.instance_methods.include?("call"))
++          (ActionController::Dispatcher.instance_methods.include?(:call) ||
++           ActionController::Dispatcher.instance_methods.include?("call"))
+       end
+       
+       def load_application
+diff --git a/lib/thin/version.rb b/lib/thin/version.rb
+index 319269f..3992fa3 100644
+--- a/lib/thin/version.rb
++++ b/lib/thin/version.rb
+@@ -6,7 +6,7 @@ module Thin
+   module VERSION #:nodoc:
+     MAJOR    = 1
+     MINOR    = 2
+-    TINY     = 3
++    TINY     = 4
+     
+     STRING   = [MAJOR, MINOR, TINY].join('.')
+     

Modified: trunk/thin/debian/patches/series
===================================================================
--- trunk/thin/debian/patches/series	2009-09-07 08:36:36 UTC (rev 4092)
+++ trunk/thin/debian/patches/series	2009-09-07 08:44:00 UTC (rev 4093)
@@ -1,3 +1,4 @@
 fix-path
 fix-init-script
 dont-allow-install
+1.2.4.patch