Merge branch 'debian/experimental' of ssh://leap.se/soledad into debian/experimental

Conflicts:
	client/pkg/requirements.pip

3 files changed, 12 insertions, 4 deletions

diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip
index 38b83251..90277fc1 100644
--- a/client/pkg/requirements.pip
+++ b/client/pkg/requirements.pip
@@ -3,6 +3,9 @@ simplejson
 u1db
 scrypt
 pycryptopp
+
+# cchardet not packaged, we need python-chardet from the
+# repos instead.
 chardet
 zope.proxy
 
@@ -19,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
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
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)