From f1fea3bfb94a90518d49d80ff1b7c939b171c77a Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 30 Oct 2014 14:35:35 +0100
Subject: use chardet instead of cchardet (closes #6279)

---
 client/pkg/requirements.pip | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip
index b5abd4c7..a341226f 100644
--- a/client/pkg/requirements.pip
+++ b/client/pkg/requirements.pip
@@ -3,7 +3,10 @@ simplejson
 u1db
 scrypt
 pycryptopp
-cchardet
+
+# cchardet not packaged, we need python-chardet from the
+# repos instead.
+chardet
 zope.proxy
 
 #
-- 
cgit v1.2.3


From 372aa8a4d86073f57f3f4280bfdbb50705fbab44 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 30 Oct 2014 14:37:18 +0100
Subject: remove pysqlite dep from requirements

---
 client/pkg/requirements.pip | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip
index a341226f..90277fc1 100644
--- a/client/pkg/requirements.pip
+++ b/client/pkg/requirements.pip
@@ -22,6 +22,3 @@ leap.soledad.common>=0.6.0
 # this is not strictly needed by us, but we need it
 # until u1db adds it to its release as a dep.
 oauth
-
-# pysqlite should not be a dep, see #2945
-pysqlite
-- 
cgit v1.2.3


From a82b40f403bd7315ace6ae6f7dda15294ac439f9 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 30 Oct 2014 14:41:10 +0100
Subject: disable WAL for the time being. #5562

---
 client/src/leap/soledad/client/sqlcipher.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/src/leap/soledad/client/sqlcipher.py b/client/src/leap/soledad/client/sqlcipher.py
index 2df9606e..41707953 100644
--- a/client/src/leap/soledad/client/sqlcipher.py
+++ b/client/src/leap/soledad/client/sqlcipher.py
@@ -238,7 +238,10 @@ class SQLCipherDatabase(sqlite_backend.SQLitePartialExpandDatabase):
                 self._pragma_synchronous_normal(self._db_handle)
             if os.environ.get('LEAP_SQLITE_MEMSTORE'):
                 self._pragma_mem_temp_store(self._db_handle)
-            self._pragma_write_ahead_logging(self._db_handle)
+
+            # Disabled for 0.6.x branch. See #5562
+            # self._pragma_write_ahead_logging(self._db_handle)
+
             self._real_replica_uid = None
             self._ensure_schema()
             self._crypto = crypto
-- 
cgit v1.2.3


From ac9a0212c03cb9e35241b7ce07eb0d0bd64b7879 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 30 Oct 2014 14:45:42 +0100
Subject: bump changelog

---
 debian/changelog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a8e5ac31..a349a8e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 soledad (0.6.0) unstable; urgency=low
 
+  [ Ben Carrillo ]
+  * Disable WAL (workaround for #5562)
+  * Use python-chardet
+
+  [ db ]
   * Update to 0.6.0 release.
   * Do not depend on pysqlite (closes #2945)
 
-- 
cgit v1.2.3