From e073ff3c736f70fbf0ae9767db9b223becee0b4e Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 26 Nov 2014 21:06:25 +0100
Subject: force tls v1 in soledad client. Partially fixes #6437

---
 client/changes/bug_6437_use_tls            | 1 +
 client/src/leap/soledad/client/__init__.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 client/changes/bug_6437_use_tls

diff --git a/client/changes/bug_6437_use_tls b/client/changes/bug_6437_use_tls
new file mode 100644
index 00000000..7138d962
--- /dev/null
+++ b/client/changes/bug_6437_use_tls
@@ -0,0 +1 @@
+  o Use TLS v1 in soledad client. Fixes partially #6437
diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py
index 586e3389..4703133c 100644
--- a/client/src/leap/soledad/client/__init__.py
+++ b/client/src/leap/soledad/client/__init__.py
@@ -1335,7 +1335,8 @@ class VerifiedHTTPSConnection(httplib.HTTPSConnection):
 
         self.sock = ssl.wrap_socket(sock,
                                     ca_certs=SOLEDAD_CERT,
-                                    cert_reqs=ssl.CERT_REQUIRED)
+                                    cert_reqs=ssl.CERT_REQUIRED,
+                                    ssl_version=ssl.PROTOCOL_TLSv1)
         match_hostname(self.sock.getpeercert(), self.host)
 
 
-- 
cgit v1.2.3


From c88472a94c15adef4275242934f2a3eec9778dd4 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Wed, 26 Nov 2014 20:20:52 -0200
Subject: Enforce TLSv1 in soledad server (#6437).

---
 server/changes/bug_6437_avoid-sslv3 | 1 +
 server/pkg/soledad                  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 server/changes/bug_6437_avoid-sslv3

diff --git a/server/changes/bug_6437_avoid-sslv3 b/server/changes/bug_6437_avoid-sslv3
new file mode 100644
index 00000000..5d41fbb3
--- /dev/null
+++ b/server/changes/bug_6437_avoid-sslv3
@@ -0,0 +1 @@
+  o Avoid use of SSLv3 (#6437).
diff --git a/server/pkg/soledad b/server/pkg/soledad
index 841233d1..62b7c5f8 100644
--- a/server/pkg/soledad
+++ b/server/pkg/soledad
@@ -19,6 +19,7 @@ CERT_PATH=/etc/leap/soledad-server.pem
 PRIVKEY_PATH=/etc/leap/soledad-server.key
 TWISTD_PATH=/usr/bin/twistd
 HOME=/var/lib/soledad/
+SSL_METHOD=TLSv1_METHOD
 
 [ -r /etc/default/soledad ] && . /etc/default/soledad
 
@@ -35,7 +36,7 @@ case "$1" in
             --logfile=$LOGFILE \
             web \
             --wsgi=$OBJ \
-            --port=ssl:$HTTPS_PORT:privateKey=$PRIVKEY_PATH:certKey=$CERT_PATH
+            --port=ssl:${HTTPS_PORT}:privateKey=${PRIVKEY_PATH}:certKey=${CERT_PATH}:sslmethod=${SSL_METHOD}
         echo "."
     ;;
 
-- 
cgit v1.2.3


From 6b6b4af8edc807726341b848165c91ff02e9148b Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Wed, 26 Nov 2014 20:23:33 -0200
Subject: Run daemon as user soledad (#6436).

---
 server/changes/bug_6436_run-daemon-as-user-soledad | 1 +
 server/pkg/soledad                                 | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 server/changes/bug_6436_run-daemon-as-user-soledad

diff --git a/server/changes/bug_6436_run-daemon-as-user-soledad b/server/changes/bug_6436_run-daemon-as-user-soledad
new file mode 100644
index 00000000..886964f1
--- /dev/null
+++ b/server/changes/bug_6436_run-daemon-as-user-soledad
@@ -0,0 +1 @@
+  o Run daemon as user soledad (#6436).
diff --git a/server/pkg/soledad b/server/pkg/soledad
index 62b7c5f8..7f48e2c8 100644
--- a/server/pkg/soledad
+++ b/server/pkg/soledad
@@ -20,6 +20,8 @@ PRIVKEY_PATH=/etc/leap/soledad-server.key
 TWISTD_PATH=/usr/bin/twistd
 HOME=/var/lib/soledad/
 SSL_METHOD=TLSv1_METHOD
+USER=soledad
+GROUP=soledad
 
 [ -r /etc/default/soledad ] && . /etc/default/soledad
 
@@ -31,7 +33,9 @@ test -r /etc/leap/ || exit 0
 case "$1" in
     start)
         echo -n "Starting soledad: twistd"
-          start-stop-daemon --start --quiet --exec $TWISTD_PATH -- \
+          start-stop-daemon --start --quiet \
+            --user=$USER --group=$GROUP \
+            --exec $TWISTD_PATH -- \
             --pidfile=$PIDFILE \
             --logfile=$LOGFILE \
             web \
-- 
cgit v1.2.3


From 4f7a1e1063199cb91535ab9cd3ca428bca2ced96 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Fri, 28 Nov 2014 09:39:41 -0200
Subject: Enclose server initscript variables in curly brackets.

---
 server/pkg/soledad | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/server/pkg/soledad b/server/pkg/soledad
index 7f48e2c8..bf24dac2 100644
--- a/server/pkg/soledad
+++ b/server/pkg/soledad
@@ -30,16 +30,16 @@ test -r /etc/leap/ || exit 0
 . /lib/lsb/init-functions
 
 
-case "$1" in
+case "${1}" in
     start)
         echo -n "Starting soledad: twistd"
           start-stop-daemon --start --quiet \
-            --user=$USER --group=$GROUP \
-            --exec $TWISTD_PATH -- \
-            --pidfile=$PIDFILE \
-            --logfile=$LOGFILE \
+            --user=${USER} --group=${GROUP} \
+            --exec ${TWISTD_PATH} -- \
+            --pidfile=${PIDFILE} \
+            --logfile=${LOGFILE} \
             web \
-            --wsgi=$OBJ \
+            --wsgi=${OBJ} \
             --port=ssl:${HTTPS_PORT}:privateKey=${PRIVKEY_PATH}:certKey=${CERT_PATH}:sslmethod=${SSL_METHOD}
         echo "."
     ;;
@@ -47,21 +47,21 @@ case "$1" in
     stop)
         echo -n "Stopping soledad: twistd"
         start-stop-daemon --stop --quiet  \
-            --pidfile $PIDFILE
+            --pidfile ${PIDFILE}
         echo "."
     ;;
 
     restart)
-        $0 stop
-        $0 start
+        ${0} stop
+        ${0} start
     ;;
 
     force-reload)
-        $0 restart
+        ${0} restart
     ;;
 
     status)
-        status_of_proc -p $PIDFILE $TWISTD_PATH soledad && exit 0 || exit $?
+        status_of_proc -p ${PIDFILE} ${TWISTD_PATH} soledad && exit 0 || exit ${?}
     ;;
 
     *)
-- 
cgit v1.2.3


From 6fc80e14d568d83df7899e516d1422b2e011d2cb Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 3 Dec 2014 00:22:18 +0100
Subject: Use SSL negotiation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Although the API can be misleading, PROTOCOL_SSLv23 selects the highest
protocol version that both the client and server support. Despite the
name, this option can select “TLS” protocols as well as “SSL”.

In this way, we can use TLSv1.2 (PROTOCOL_TLSv1 will *only* give us TLS
v1.0)

In the client side, we try to disable SSLv2 and SSLv3 options
explicitely.

The python version in wheezy does not offer PROTOCOL_TLSv1_2 nor
OP_NO_SSLv2 or OP_NO_SSLv3 (It's new in 2.7.9)
---
 client/src/leap/soledad/client/__init__.py | 21 +++++++++++++++++----
 server/pkg/soledad                         |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py
index 4703133c..7ef5f6a9 100644
--- a/client/src/leap/soledad/client/__init__.py
+++ b/client/src/leap/soledad/client/__init__.py
@@ -1333,10 +1333,23 @@ class VerifiedHTTPSConnection(httplib.HTTPSConnection):
             self.sock = sock
             self._tunnel()
 
-        self.sock = ssl.wrap_socket(sock,
-                                    ca_certs=SOLEDAD_CERT,
-                                    cert_reqs=ssl.CERT_REQUIRED,
-                                    ssl_version=ssl.PROTOCOL_TLSv1)
+        # negotiate the best availabe version...
+        ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+
+        # but if possible, we want to disable bad ones
+        # needs python 2.7.9+
+        try:
+            ctx.options |= ssl.OP_NO_SSLv2
+            ctx.options |= ssl.OP_NO_SSLv3
+        except AttributeError:
+            pass
+
+        ctx.load_cert_chain(certfile=SOLEDAD_CERT)
+        ctx.verify_mode = ssl.CERT_REQUIRED
+
+        self.sock = ctx.wrap_socket(
+            sock, server_side=True, server_hostname=self.host)
+
         match_hostname(self.sock.getpeercert(), self.host)
 
 
diff --git a/server/pkg/soledad b/server/pkg/soledad
index bf24dac2..ccb3e9b0 100644
--- a/server/pkg/soledad
+++ b/server/pkg/soledad
@@ -19,7 +19,7 @@ CERT_PATH=/etc/leap/soledad-server.pem
 PRIVKEY_PATH=/etc/leap/soledad-server.key
 TWISTD_PATH=/usr/bin/twistd
 HOME=/var/lib/soledad/
-SSL_METHOD=TLSv1_METHOD
+SSL_METHOD=SSLv23_METHOD
 USER=soledad
 GROUP=soledad
 
-- 
cgit v1.2.3


From 527c28c73d22b5f852273e2c5d1713e82a2c49fd Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 4 Dec 2014 18:13:06 +0100
Subject: fix ssl negotiation

since ssl.SSLContext does not exist prior to python 2.7.9
---
 client/src/leap/soledad/client/__init__.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py
index 7ef5f6a9..c350d021 100644
--- a/client/src/leap/soledad/client/__init__.py
+++ b/client/src/leap/soledad/client/__init__.py
@@ -1333,22 +1333,25 @@ class VerifiedHTTPSConnection(httplib.HTTPSConnection):
             self.sock = sock
             self._tunnel()
 
-        # negotiate the best availabe version...
-        ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+        highest_supported = ssl.PROTOCOL_SSLv23
 
-        # but if possible, we want to disable bad ones
-        # needs python 2.7.9+
         try:
+            # needs python 2.7.9+
+            # negotiate the best available version,
+            # but explicitely disabled bad ones.
+            ctx = ssl.SSLContext(highest_supported)
             ctx.options |= ssl.OP_NO_SSLv2
             ctx.options |= ssl.OP_NO_SSLv3
-        except AttributeError:
-            pass
 
-        ctx.load_cert_chain(certfile=SOLEDAD_CERT)
-        ctx.verify_mode = ssl.CERT_REQUIRED
+            ctx.load_cert_chain(certfile=SOLEDAD_CERT)
+            ctx.verify_mode = ssl.CERT_REQUIRED
+            self.sock = ctx.wrap_socket(
+                sock, server_side=True, server_hostname=self.host)
 
-        self.sock = ctx.wrap_socket(
-            sock, server_side=True, server_hostname=self.host)
+        except AttributeError:
+            self.sock = ssl.wrap_socket(
+                sock, ca_certs=SOLEDAD_CERT, cert_reqs=ssl.CERT_REQUIRED,
+                ssl_version=highest_supported)
 
         match_hostname(self.sock.getpeercert(), self.host)
 
-- 
cgit v1.2.3


From 2abe641215b6435fa3c18ae802a621a23d01f643 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 8 Dec 2014 14:36:25 -0200
Subject: Fold in changes.

---
 CHANGELOG                                          | 8 ++++++++
 client/changes/bug_6437_use_tls                    | 1 -
 server/changes/bug_6436_run-daemon-as-user-soledad | 1 -
 server/changes/bug_6437_avoid-sslv3                | 1 -
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 client/changes/bug_6437_use_tls
 delete mode 100644 server/changes/bug_6436_run-daemon-as-user-soledad
 delete mode 100644 server/changes/bug_6437_avoid-sslv3

diff --git a/CHANGELOG b/CHANGELOG
index 0dce4847..7cf5a3b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+0.6.1 Dec 08 2014:
+Client:
+  o Use TLS v1 in soledad client. Fixes partially #6437
+
+Server:
+  o Run daemon as user soledad (#6436).
+  o Avoid use of SSLv3 (#6437).
+
 0.6.0 Jul 18, 2014:
 Client:
   o Close all connections after syncing. Fixes #5518.
diff --git a/client/changes/bug_6437_use_tls b/client/changes/bug_6437_use_tls
deleted file mode 100644
index 7138d962..00000000
--- a/client/changes/bug_6437_use_tls
+++ /dev/null
@@ -1 +0,0 @@
-  o Use TLS v1 in soledad client. Fixes partially #6437
diff --git a/server/changes/bug_6436_run-daemon-as-user-soledad b/server/changes/bug_6436_run-daemon-as-user-soledad
deleted file mode 100644
index 886964f1..00000000
--- a/server/changes/bug_6436_run-daemon-as-user-soledad
+++ /dev/null
@@ -1 +0,0 @@
-  o Run daemon as user soledad (#6436).
diff --git a/server/changes/bug_6437_avoid-sslv3 b/server/changes/bug_6437_avoid-sslv3
deleted file mode 100644
index 5d41fbb3..00000000
--- a/server/changes/bug_6437_avoid-sslv3
+++ /dev/null
@@ -1 +0,0 @@
-  o Avoid use of SSLv3 (#6437).
-- 
cgit v1.2.3


From dafcfac4663d00ee2049b0a245c2ecb84ef2bad5 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 9 Dec 2014 16:07:17 -0600
Subject: Fix incorrect ssl context setup

The changes introduced in aafa79c0f5 having to do with the cert
verification are incorrect, regarding the use of the newest ssl context
api introduced in python 2.7.9. There the use of the server setup was
taken, instead of the correct client options.

I hereby apologize for the insuficient testing on that fix. It happens
that I wrongly tested in an evironment that did the fallback to
pre-2.7.9 interpreter.
---
 client/src/leap/soledad/client/__init__.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py
index c350d021..c5832249 100644
--- a/client/src/leap/soledad/client/__init__.py
+++ b/client/src/leap/soledad/client/__init__.py
@@ -1343,10 +1343,9 @@ class VerifiedHTTPSConnection(httplib.HTTPSConnection):
             ctx.options |= ssl.OP_NO_SSLv2
             ctx.options |= ssl.OP_NO_SSLv3
 
-            ctx.load_cert_chain(certfile=SOLEDAD_CERT)
+            ctx.load_verify_locations(cafile=SOLEDAD_CERT)
             ctx.verify_mode = ssl.CERT_REQUIRED
-            self.sock = ctx.wrap_socket(
-                sock, server_side=True, server_hostname=self.host)
+            self.sock = ctx.wrap_socket(sock)
 
         except AttributeError:
             self.sock = ssl.wrap_socket(
-- 
cgit v1.2.3


From a7abb6eb3fe9a0a904bcabd0bf344637e9fd4e62 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 15 Dec 2014 15:55:25 -0200
Subject: Fix deferred enc/dec params and fallback (#6500).

---
 client/changes/bug_6500_fix-deferred-enc-dec | 1 +
 client/src/leap/soledad/client/__init__.py   | 2 +-
 client/src/leap/soledad/client/sqlcipher.py  | 5 +++++
 client/src/leap/soledad/client/target.py     | 3 ---
 4 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 client/changes/bug_6500_fix-deferred-enc-dec

diff --git a/client/changes/bug_6500_fix-deferred-enc-dec b/client/changes/bug_6500_fix-deferred-enc-dec
new file mode 100644
index 00000000..f3361507
--- /dev/null
+++ b/client/changes/bug_6500_fix-deferred-enc-dec
@@ -0,0 +1 @@
+  o Fix deferred encryption/decryption parameters (#6500).
diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py
index c5832249..07255406 100644
--- a/client/src/leap/soledad/client/__init__.py
+++ b/client/src/leap/soledad/client/__init__.py
@@ -224,7 +224,7 @@ class Soledad(object):
 
     def __init__(self, uuid, passphrase, secrets_path, local_db_path,
                  server_url, cert_file,
-                 auth_token=None, secret_id=None, defer_encryption=False):
+                 auth_token=None, secret_id=None, defer_encryption=True):
         """
         Initialize configuration, cryptographic keys and dbs.
 
diff --git a/client/src/leap/soledad/client/sqlcipher.py b/client/src/leap/soledad/client/sqlcipher.py
index 2df9606e..fded2119 100644
--- a/client/src/leap/soledad/client/sqlcipher.py
+++ b/client/src/leap/soledad/client/sqlcipher.py
@@ -452,6 +452,11 @@ class SQLCipherDatabase(sqlite_backend.SQLitePartialExpandDatabase):
 
             # XXX could mark the critical section here...
             try:
+                if defer_decryption and not self.defer_encryption:
+                    logger.warning("Can't defer decryption without first having "
+                                   "created a sync db. Falling back to normal "
+                                   "syncing mode.")
+                    defer_decryption = False
                 res = syncer.sync(autocreate=autocreate,
                                   defer_decryption=defer_decryption)
 
diff --git a/client/src/leap/soledad/client/target.py b/client/src/leap/soledad/client/target.py
index 70e4d3a2..1eb84e64 100644
--- a/client/src/leap/soledad/client/target.py
+++ b/client/src/leap/soledad/client/target.py
@@ -28,12 +28,10 @@ import logging
 import re
 import urllib
 import threading
-import urlparse
 
 from collections import defaultdict
 from time import sleep
 from uuid import uuid4
-from contextlib import contextmanager
 
 import simplejson as json
 from taskthread import TimerTask
@@ -44,7 +42,6 @@ from u1db.remote.http_client import _encode_query_parameter, HTTPClientBase
 from zope.proxy import ProxyBase
 from zope.proxy import sameProxiedObjects, setProxiedObject
 
-from leap.soledad.common import soledad_assert
 from leap.soledad.common.document import SoledadDocument
 from leap.soledad.client.auth import TokenBasedAuth
 from leap.soledad.client.crypto import is_symmetrically_encrypted
-- 
cgit v1.2.3


From b44103de55cd9d2f347c344c23d71cb87d8d06cb Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Tue, 16 Dec 2014 13:05:19 -0200
Subject: Fold in changes.

---
 CHANGELOG                                    | 8 ++++++++
 client/changes/bug_6500_fix-deferred-enc-dec | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)
 delete mode 100644 client/changes/bug_6500_fix-deferred-enc-dec

diff --git a/CHANGELOG b/CHANGELOG
index 7cf5a3b4..e3ada799 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+0.6.3 Dec 16 2014:
+Client:
+  o Fix deferred encryption/decryption parameters (#6500).
+
+0.6.2 Dec 11 2014:
+Client:
+  o Fix incorrect ssl context setup.
+
 0.6.1 Dec 08 2014:
 Client:
   o Use TLS v1 in soledad client. Fixes partially #6437
diff --git a/client/changes/bug_6500_fix-deferred-enc-dec b/client/changes/bug_6500_fix-deferred-enc-dec
deleted file mode 100644
index f3361507..00000000
--- a/client/changes/bug_6500_fix-deferred-enc-dec
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix deferred encryption/decryption parameters (#6500).
-- 
cgit v1.2.3


From 9c527fe9aa6ceaa7ed380a31ac4e1e4bfdc566dd Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Fri, 23 Jan 2015 14:54:08 -0400
Subject: Bail out ddocs installation if the path doesn't exist. Fix: #6671

Conflicts:
	common/MANIFEST.in
---
 common/MANIFEST.in                               | 4 ++++
 common/changes/bug_6671-bail-out-if-no-cdocs-dir | 1 +
 common/setup.py                                  | 5 +++++
 3 files changed, 10 insertions(+)
 create mode 100644 common/changes/bug_6671-bail-out-if-no-cdocs-dir

diff --git a/common/MANIFEST.in b/common/MANIFEST.in
index 7f6148ef..a26a12a6 100644
--- a/common/MANIFEST.in
+++ b/common/MANIFEST.in
@@ -2,3 +2,7 @@ include pkg/*
 include versioneer.py
 include LICENSE
 include CHANGELOG
+
+# What do we want the ddocs folder in the source package for? -- kali
+# it should be enough with having the compiled stuff.
+recursive-include src/leap/soledad/common/ddocs *
diff --git a/common/changes/bug_6671-bail-out-if-no-cdocs-dir b/common/changes/bug_6671-bail-out-if-no-cdocs-dir
new file mode 100644
index 00000000..e57e50e5
--- /dev/null
+++ b/common/changes/bug_6671-bail-out-if-no-cdocs-dir
@@ -0,0 +1 @@
+o Bail out if cdocs/ dir does not exist. Closes: #6671
diff --git a/common/setup.py b/common/setup.py
index 6ee166ef..365006b2 100644
--- a/common/setup.py
+++ b/common/setup.py
@@ -155,6 +155,11 @@ def build_ddocs_py(basedir=None, with_src=True):
         dest_prefix = join(basedir, *dest_common_path)
 
     ddocs_prefix = join(prefix, 'ddocs')
+
+    if not isdir(ddocs_prefix):
+        print "No ddocs/ folder, bailing out..."
+        return
+
     ddocs = {}
 
     # design docs are represented by subdirectories of `ddocs_prefix`
-- 
cgit v1.2.3


From 1edacb035f0fc65ca26f8b1324b5cff6fdabf7bf Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Thu, 9 Apr 2015 12:20:19 -0300
Subject: [fix] remove unneded params to CouchServerState

This commit removes some leftover code from a time when Soledad Server used to
check for permissions on certain databases when starting (i.e. shared and
tokens databases). This was later removed as correct permissions enforcement
was relayed to tapicero.

Closes: #6833.
---
 .../bug_6833_remove-unneeded-params-from-couch-server-state       | 2 ++
 common/src/leap/soledad/common/couch.py                           | 8 +-------
 .../bug_6833_remove-unneeded-params-from-couch-server-state       | 2 ++
 server/src/leap/soledad/server/__init__.py                        | 5 +----
 4 files changed, 6 insertions(+), 11 deletions(-)
 create mode 100644 common/changes/bug_6833_remove-unneeded-params-from-couch-server-state
 create mode 100644 server/changes/bug_6833_remove-unneeded-params-from-couch-server-state

diff --git a/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state
new file mode 100644
index 00000000..2c927717
--- /dev/null
+++ b/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state
@@ -0,0 +1,2 @@
+  o Remove unneeded parameters from CouchServerState initialization. Closes
+    #6833.
diff --git a/common/src/leap/soledad/common/couch.py b/common/src/leap/soledad/common/couch.py
index 5658f4ce..b38b5b96 100644
--- a/common/src/leap/soledad/common/couch.py
+++ b/common/src/leap/soledad/common/couch.py
@@ -1529,20 +1529,14 @@ class CouchServerState(ServerState):
     Inteface of the WSGI server with the CouchDB backend.
     """
 
-    def __init__(self, couch_url, shared_db_name, tokens_db_name):
+    def __init__(self, couch_url):
         """
         Initialize the couch server state.
 
         :param couch_url: The URL for the couch database.
         :type couch_url: str
-        :param shared_db_name: The name of the shared database.
-        :type shared_db_name: str
-        :param tokens_db_name: The name of the tokens database.
-        :type tokens_db_name: str
         """
         self._couch_url = couch_url
-        self._shared_db_name = shared_db_name
-        self._tokens_db_name = tokens_db_name
 
     def open_database(self, dbname):
         """
diff --git a/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
new file mode 100644
index 00000000..2c927717
--- /dev/null
+++ b/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
@@ -0,0 +1,2 @@
+  o Remove unneeded parameters from CouchServerState initialization. Closes
+    #6833.
diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py
index cd006f51..adb5b561 100644
--- a/server/src/leap/soledad/server/__init__.py
+++ b/server/src/leap/soledad/server/__init__.py
@@ -296,10 +296,7 @@ def load_configuration(file_path):
 
 def application(environ, start_response):
     conf = load_configuration('/etc/leap/soledad-server.conf')
-    state = CouchServerState(
-        conf['couch_url'],
-        SoledadApp.SHARED_DB_NAME,
-        SoledadTokenAuthMiddleware.TOKENS_DB)
+    state = CouchServerState(conf['couch_url'])
     # WSGI application that may be used by `twistd -web`
     application = GzipMiddleware(
         SoledadTokenAuthMiddleware(SoledadApp(state)))
-- 
cgit v1.2.3


From bbb19ed9a755a079da5b79567cb98a921c02f2f4 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Thu, 9 Apr 2015 14:39:05 -0300
Subject: Fold in changes.

---
 CHANGELOG                                                        | 9 +++++++++
 common/changes/bug_6671-bail-out-if-no-cdocs-dir                 | 1 -
 .../bug_6833_remove-unneeded-params-from-couch-server-state      | 2 --
 .../bug_6833_remove-unneeded-params-from-couch-server-state      | 2 --
 4 files changed, 9 insertions(+), 5 deletions(-)
 delete mode 100644 common/changes/bug_6671-bail-out-if-no-cdocs-dir
 delete mode 100644 common/changes/bug_6833_remove-unneeded-params-from-couch-server-state
 delete mode 100644 server/changes/bug_6833_remove-unneeded-params-from-couch-server-state

diff --git a/CHANGELOG b/CHANGELOG
index e3ada799..4e3f2038 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+0.6.5 Apr 09 2015:
+Server:
+  o Remove unneeded parameters from CouchServerState initialization. Closes
+    #6833.
+
+0.6.4 Jan 23 2015:
+Common:
+  o Bail out if cdocs/ dir does not exist. Closes: #6671
+
 0.6.3 Dec 16 2014:
 Client:
   o Fix deferred encryption/decryption parameters (#6500).
diff --git a/common/changes/bug_6671-bail-out-if-no-cdocs-dir b/common/changes/bug_6671-bail-out-if-no-cdocs-dir
deleted file mode 100644
index e57e50e5..00000000
--- a/common/changes/bug_6671-bail-out-if-no-cdocs-dir
+++ /dev/null
@@ -1 +0,0 @@
-o Bail out if cdocs/ dir does not exist. Closes: #6671
diff --git a/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state
deleted file mode 100644
index 2c927717..00000000
--- a/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Remove unneeded parameters from CouchServerState initialization. Closes
-    #6833.
diff --git a/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
deleted file mode 100644
index 2c927717..00000000
--- a/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Remove unneeded parameters from CouchServerState initialization. Closes
-    #6833.
-- 
cgit v1.2.3