Bump to v0.17.0; squash versioned dep relaxation patches into one to aid `git apply -3`.

4 files changed, 24 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f45861eb8a83..ac49b6ccdf3b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Aug  3 22:11:36 UTC 2016
+# Mon Aug  8 13:24:01 UTC 2016
 pkgbase = matrix-synapse-git
 	pkgdesc = Matrix reference homeserver
 	pkgver = 0.17.0rc1.r59.g05e3354
@@ -41,12 +41,10 @@ pkgbase = matrix-synapse-git
 	backup = etc/synapse/log_config.yaml
 	source = git://github.com/matrix-org/synapse.git#branch=develop
 	source = sysusers-synapse.conf
-	source = deps-relax-pynacl-check.patch
-	source = deps-relax-pysaml2-check.patch
+	source = deps-relax-checks.patch
 	md5sums = SKIP
 	md5sums = dfbffdd307c5559357a2ff51a1906700
-	md5sums = cd0dfc4733756743f4c3b9b2cd2abdee
-	md5sums = fe48abc55d72e4db7d2ed1b449036bab
+	md5sums = 6a088fd21cdaa4b93b1eee67a5cc0090
 
 pkgname = matrix-synapse-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 998e039b1cd4..47925a1ad649 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,12 +20,10 @@ makedepends=('python2-twisted' 'python2-mock' 'python2-setuptools_trial' 'git')
 optdepends=('python2-psycopg2: PostgreSQL support (instead of built-in SQLite)')
 source=("git://github.com/matrix-org/synapse.git#branch=develop"
 		'sysusers-synapse.conf'
-		'deps-relax-pynacl-check.patch'
-		'deps-relax-pysaml2-check.patch')
+		'deps-relax-checks.patch')
 md5sums=('SKIP'
          'dfbffdd307c5559357a2ff51a1906700'
-         'cd0dfc4733756743f4c3b9b2cd2abdee'
-         'fe48abc55d72e4db7d2ed1b449036bab')
+         '6a088fd21cdaa4b93b1eee67a5cc0090')
 backup=('etc/synapse/log_config.yaml')
 install='synapse.install'
 provides=('matrix-synapse')
@@ -38,8 +36,7 @@ pkgver() {
 
 prepare() {
 	cd synapse
-	git apply -3 "$srcdir/deps-relax-pynacl-check.patch"
-	git apply -3 "$srcdir/deps-relax-pysaml2-check.patch"
+	git apply -3 "$srcdir/deps-relax-checks.patch"
 }
 
 build() {
diff --git a/deps-relax-pynacl-check.patch b/deps-relax-checks.patch
index dcb114d7d016..cde624b742d2 100644
--- a/deps-relax-pynacl-check.patch
+++ b/deps-relax-checks.patch
@@ -1,14 +1,18 @@
-From adbc4a9b8f09fbac4dffb810de87b54774f6fb5e Mon Sep 17 00:00:00 2001
+From 728c3a13ef41e002995033f3e82938d4c72bd297 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Thu, 11 Feb 2016 22:55:01 +0300
-Subject: [PATCH 1/2] python_dependencies.py: relax versioned dep on pynacl.
+Subject: [PATCH] python_dependencies.py: relax versioned deps on pynacl and
+ pysaml2.
 
+Revert "Pin pysaml2 version to 3.x"
+
+This reverts commit 07cf96ebf7c806ba570d167e200e54e07034f5ce.
 ---
- synapse/python_dependencies.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ synapse/python_dependencies.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
-index 799d35d..a2d87ef 100644
+index 86e3d89..9eca07d 100644
 --- a/synapse/python_dependencies.py
 +++ b/synapse/python_dependencies.py
 @@ -22,7 +22,7 @@ REQUIREMENTS = {
@@ -20,6 +24,15 @@ index 799d35d..a2d87ef 100644
      "service_identity>=1.0.0": ["service_identity>=1.0.0"],
      "Twisted>=15.1.0": ["twisted>=15.1.0"],
      "pyopenssl>=0.14": ["OpenSSL>=0.14"],
+@@ -34,7 +34,7 @@ REQUIREMENTS = {
+     "pydenticon": ["pydenticon"],
+     "ujson": ["ujson"],
+     "blist": ["blist"],
+-    "pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"],
++    "pysaml2": ["saml2"],
+     "pymacaroons-pynacl": ["pymacaroons"],
+ }
+ CONDITIONAL_REQUIREMENTS = {
 -- 
 2.9.2
 
diff --git a/deps-relax-pysaml2-check.patch b/deps-relax-pysaml2-check.patch
deleted file mode 100644
index 4b2c8e4acfe3..000000000000
--- a/deps-relax-pysaml2-check.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 43abaade961f32253c88f15b575fbf472c668335 Mon Sep 17 00:00:00 2001
-From: Ivan Shapovalov <intelfx@intelfx.name>
-Date: Mon, 21 Mar 2016 01:29:11 +0300
-Subject: [PATCH 2/2] Revert "Pin pysaml2 version to 3.x"
-
-This reverts commit 07cf96ebf7c806ba570d167e200e54e07034f5ce.
----
- synapse/python_dependencies.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
-index a2d87ef..f2b4a1f 100644
---- a/synapse/python_dependencies.py
-+++ b/synapse/python_dependencies.py
-@@ -34,7 +34,7 @@ REQUIREMENTS = {
-     "pydenticon": ["pydenticon"],
-     "ujson": ["ujson"],
-     "blist": ["blist"],
--    "pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"],
-+    "pysaml2": ["saml2"],
-     "pymacaroons-pynacl": ["pymacaroons"],
-     "psutil>=2.0.0": ["psutil>=2.0.0"],
- }
--- 
-2.9.2
-