Version 1.9.1

Update source to version 1.9.1
Update upstream url to new docs
Remove no longer required patches
Fix uncommented sqluri in syncserver.ini

2 files changed, 12 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 44f298f93fa8..76d475e67d08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = mozilla-firefox-sync-server
 	pkgdesc = Mozilla Sync Server for built-in Firefox Sync
-	pkgver = 1.8.0
-	pkgrel = 2
-	url = http://docs.services.mozilla.com/howtos/run-sync-1.5.html
+	pkgver = 1.9.1
+	pkgrel = 1
+	url = https://mozilla-services.readthedocs.io/en/latest/howtos/run-sync-1.5.html
 	install = mozilla-firefox-sync-server.install
 	arch = i686
 	arch = x86_64
@@ -17,13 +17,13 @@ pkgbase = mozilla-firefox-sync-server
 	optdepends = mozilla-firefox-account-server: Run your own firefox account server
 	options = !debug
 	backup = opt/mozilla-firefox-sync-server/syncserver.ini
-	source = https://github.com/mozilla-services/syncserver/archive/1.8.0.tar.gz
+	source = https://github.com/mozilla-services/syncserver/archive/1.9.1.tar.gz
 	source = ffsync.service
 	source = ffsync.tmpfiles
-	sha256sums = 728206bcffec7a305e97e7cd4d465b3fa56f39f8e1fd55d98e49a866016d61e0
+	sha256sums = dd12e7b4d97052ab5227151886a92ecbc368a987c4ad5fef7a9b759197a86c1f
 	sha256sums = 8664ad8361d6751aad47e86900270d2efd8b65d520248cd1c164432baba42212
 	sha256sums = 462bfdccc672339a03622dbe0a76a2df1b4293de8b240e82fe127a6befaa1a89
-	sha384sums = 077129ce69d86cfe683401cb04f2678cdb9eae861f77fb052e97fc4f55d9780b5199259911c7a0d0adaa386e3aad0996
+	sha384sums = 8dfe5784a013c4b8af16bc9af4b1c1c7d36261c62d16e6b5afb986b473195e051f8b1d392db96c562c06095da0596c6f
 	sha384sums = a7384b5b55b2377ee4445e45bfd0545435c2a6a19730ff4219340e3c6e8a3b51fcb46e4215093df860f9fa99a0b471ab
 	sha384sums = 236b285f7e390d31cd13a0ac78c524acfbc8a7325d7b0b114b39f69a5963535d5f1f73bdef575728b2f6e81860c4ea16
 
diff --git a/PKGBUILD b/PKGBUILD
index acd1b9035040..eead76673be4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
 # Contributor: Timothée Ravier <tim@siosm.fr>
 
 pkgname=mozilla-firefox-sync-server
-pkgver=1.8.0
-pkgrel=2
+pkgver=1.9.1
+pkgrel=1
 pkgdesc='Mozilla Sync Server for built-in Firefox Sync'
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
-url='http://docs.services.mozilla.com/howtos/run-sync-1.5.html'
+url='https://mozilla-services.readthedocs.io/en/latest/howtos/run-sync-1.5.html'
 license=('MPL2')
 depends=('python2' 'python2-virtualenv')
 options=(!debug)
@@ -15,10 +15,10 @@ install="${pkgname}.install"
 source=("https://github.com/mozilla-services/syncserver/archive/${pkgver}.tar.gz"
 	'ffsync.service'
 	'ffsync.tmpfiles')
-sha256sums=('728206bcffec7a305e97e7cd4d465b3fa56f39f8e1fd55d98e49a866016d61e0'
+sha256sums=('dd12e7b4d97052ab5227151886a92ecbc368a987c4ad5fef7a9b759197a86c1f'
 	'8664ad8361d6751aad47e86900270d2efd8b65d520248cd1c164432baba42212'
 	'462bfdccc672339a03622dbe0a76a2df1b4293de8b240e82fe127a6befaa1a89')
-sha384sums=('077129ce69d86cfe683401cb04f2678cdb9eae861f77fb052e97fc4f55d9780b5199259911c7a0d0adaa386e3aad0996'
+sha384sums=('8dfe5784a013c4b8af16bc9af4b1c1c7d36261c62d16e6b5afb986b473195e051f8b1d392db96c562c06095da0596c6f'
 	'a7384b5b55b2377ee4445e45bfd0545435c2a6a19730ff4219340e3c6e8a3b51fcb46e4215093df860f9fa99a0b471ab'
 	'236b285f7e390d31cd13a0ac78c524acfbc8a7325d7b0b114b39f69a5963535d5f1f73bdef575728b2f6e81860c4ea16')
 backup=('opt/mozilla-firefox-sync-server/syncserver.ini')
@@ -30,16 +30,10 @@ prepare() {
 
 	# Change default sqlite database location
 	sed -i "s|/tmp/syncserver.db|/var/lib/ffsync/sync_storage.db|g" syncserver.ini
-	sed -i "s|^\#sqluri|sqluri|" syncserver.ini
+	sed -i "0,/^\#sqluri/s//sqluri/" syncserver.ini
 
 	# Remove obsolete parameter
 	sed -i "s| --no-site-packages||g" Makefile
-
-	# Remove incompatible setuptools
-	sed -i "s| distribute||g" Makefile
-
-	# Fix wrong python version being used for virtualenv
-	sed -i "s|virtualenv|\$(SYSTEMPYTHON) -m virtualenv|g" Makefile
 }
 
 build() {