From 1f1de026a35c3041df70076c21a8e4751891b1e7 Mon Sep 17 00:00:00 2001
From: Alex Young <alex@bytemark.co.uk>
Date: Mon, 13 Apr 2015 10:12:51 +0100
Subject: Roll back thin and eventmachine gem versions to those used on lenny

Using the most recent version of each of these results in segfaults on
1.9.3-p551.
---
 Gemfile      | 3 ++-
 Gemfile.lock | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index cb2fdd8..64f9db0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,8 @@ gem "dm-validations", "=1.2.0"
 gem "sanitize", "=2.0.3"
 gem "rmail", "=0.17"
 gem "xmpp4r", "=0.5"
-gem "thin", "=1.2.11"
+gem "eventmachine", "=0.12.10"
+gem "thin", "=1.2.4"
 gem "haml", "=3.0.15"
 gem "RedCloth"
 gem "rack", "=1.3.4"
diff --git a/Gemfile.lock b/Gemfile.lock
index e120967..d3d1a69 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
     bcrypt-ruby (3.0.1)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    daemons (1.1.9)
+    daemons (1.2.2)
     data_objects (0.10.15)
       addressable (~> 2.1)
     datamapper (1.2.0)
@@ -61,7 +61,7 @@ GEM
     do_sqlite3 (0.10.15)
       data_objects (= 0.10.15)
     docile (1.1.5)
-    eventmachine (1.0.7)
+    eventmachine (0.12.10)
     fastercsv (1.5.5)
     haml (3.0.15)
     ipaddress (0.8.0)
@@ -93,7 +93,7 @@ GEM
       tilt (~> 1.3, >= 1.3.3)
     spruz (0.2.13)
     stringex (1.3.3)
-    thin (1.2.11)
+    thin (1.2.4)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
@@ -120,6 +120,7 @@ DEPENDENCIES
   dm-transactions (= 1.2.0)
   dm-types (= 1.2.0)
   dm-validations (= 1.2.0)
+  eventmachine (= 0.12.10)
   haml (= 3.0.15)
   ipaddress (= 0.8.0)
   json (= 1.5.4)
@@ -133,7 +134,7 @@ DEPENDENCIES
   sanitize (= 2.0.3)
   simplecov
   sinatra (= 1.3.1)
-  thin (= 1.2.11)
+  thin (= 1.2.4)
   tilt (= 1.3.3)
   timecop (= 0.3.5)
   webmock (= 1.7.6)
-- 
cgit v1.2.1