From 5833ae8cbeb071d0f7975aa6bd9d6707596c78d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 1 Jun 2020 06:35:29 +0200 Subject: [PATCH 1/5] Fix build error and wrong license Remove obsolete parameter to stop virtualenv from complaining about an unrecognized argument (that is already default by now) Fix package using wrong license (The project is using MPL 2.0) --- .SRCINFO | 4 ++-- PKGBUILD | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6ceecc2..629c9b7 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,12 @@ pkgbase = mozilla-firefox-sync-server-git pkgdesc = Mozilla Sync Server for built-in Firefox Sync - 1.5+ version for Firefox 29+ - pkgver = 1.8.0.r32.gbebd2f3 + pkgver = 1.8.0.r67.g516807e pkgrel = 1 url = http://docs.services.mozilla.com/howtos/run-sync-1.5.html install = mozilla-firefox-sync-server-git.install arch = i686 arch = x86_64 - license = GPL + license = MPL2 makedepends = git depends = python2 depends = python2-virtualenv diff --git a/PKGBUILD b/PKGBUILD index 153be8a..63f1330 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,12 +2,12 @@ # Contributor: Timothée Ravier pkgname=mozilla-firefox-sync-server-git -pkgver=1.8.0.r32.gbebd2f3 +pkgver=1.8.0.r67.g516807e pkgrel=1 pkgdesc="Mozilla Sync Server for built-in Firefox Sync - 1.5+ version for Firefox 29+" arch=('i686' 'x86_64') url='http://docs.services.mozilla.com/howtos/run-sync-1.5.html' -license=('GPL') +license=('MPL2') depends=('python2' 'python2-virtualenv') makedepends=('git') options=(!debug) @@ -34,14 +34,17 @@ prepare() { # Change default sqlite database location sed -i "s|/tmp/syncserver.db|/var/lib/ffsync/sync_storage.db|g" syncserver.ini + + # Remove obsolete parameter + sed -i "s|--no-site-packages||g" Makefile } build() { cd ${pkgname} make build - # PostgreSQL support - # local/bin/pip install psycopg2 + # PostgreSQL support (please uncomment) + #local/bin/pip install psycopg2 # There is no install target in the Makefile, so let's do some cleaning rm -rf .git .gitignore Dockerfile Makefile MANIFEST.in README.rst setup.py \ From c55ca8bc90e47bf726c3ab744445608d8939d9f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 1 Jun 2020 06:45:22 +0200 Subject: [PATCH 2/5] Bump up version number (release) --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 629c9b7..71519f6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = mozilla-firefox-sync-server-git pkgdesc = Mozilla Sync Server for built-in Firefox Sync - 1.5+ version for Firefox 29+ pkgver = 1.8.0.r67.g516807e - pkgrel = 1 + pkgrel = 2 url = http://docs.services.mozilla.com/howtos/run-sync-1.5.html install = mozilla-firefox-sync-server-git.install arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 63f1330..3b7f0e1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=mozilla-firefox-sync-server-git pkgver=1.8.0.r67.g516807e -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Sync Server for built-in Firefox Sync - 1.5+ version for Firefox 29+" arch=('i686' 'x86_64') url='http://docs.services.mozilla.com/howtos/run-sync-1.5.html' From 6e0a7bcdd0036963bba7cc35992c00daacdbb2fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 1 Jun 2020 07:09:06 +0200 Subject: [PATCH 3/5] Add support for ARM and add additional database backends (commented) --- .SRCINFO | 6 +++++- PKGBUILD | 12 +++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 71519f6..e27393d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,11 +1,15 @@ pkgbase = mozilla-firefox-sync-server-git pkgdesc = Mozilla Sync Server for built-in Firefox Sync - 1.5+ version for Firefox 29+ pkgver = 1.8.0.r67.g516807e - pkgrel = 2 + pkgrel = 3 url = http://docs.services.mozilla.com/howtos/run-sync-1.5.html install = mozilla-firefox-sync-server-git.install arch = i686 arch = x86_64 + arch = arm + arch = armv6h + arch = armv7h + arch = aarch64 license = MPL2 makedepends = git depends = python2 diff --git a/PKGBUILD b/PKGBUILD index 3b7f0e1..af08169 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,9 +3,9 @@ pkgname=mozilla-firefox-sync-server-git pkgver=1.8.0.r67.g516807e -pkgrel=2 +pkgrel=3 pkgdesc="Mozilla Sync Server for built-in Firefox Sync - 1.5+ version for Firefox 29+" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') url='http://docs.services.mozilla.com/howtos/run-sync-1.5.html' license=('MPL2') depends=('python2' 'python2-virtualenv') @@ -43,7 +43,13 @@ build() { cd ${pkgname} make build - # PostgreSQL support (please uncomment) + # SQLite support + #local/bin/pip install pysqlite2 + + # MySQL support (should already be included) + #local/bin/pip install PyMySQL + + # PostgreSQL support #local/bin/pip install psycopg2 # There is no install target in the Makefile, so let's do some cleaning From 839b9c0eebe54350ed8ac6e1978c936d69a5d3f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 2 Jun 2020 04:44:55 +0200 Subject: [PATCH 4/5] Minor PKGBUILD changes Added optional dependencies as well as provides/conflicts Updated description Changed sqluri not being commented out by default Minor formatting changes --- .SRCINFO | 8 ++++++-- PKGBUILD | 27 ++++++++++++++------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e27393d..969a2b6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = mozilla-firefox-sync-server-git - pkgdesc = Mozilla Sync Server for built-in Firefox Sync - 1.5+ version for Firefox 29+ + pkgdesc = Mozilla Sync Server for built-in Firefox Sync pkgver = 1.8.0.r67.g516807e - pkgrel = 3 + pkgrel = 4 url = http://docs.services.mozilla.com/howtos/run-sync-1.5.html install = mozilla-firefox-sync-server-git.install arch = i686 @@ -14,6 +14,10 @@ pkgbase = mozilla-firefox-sync-server-git makedepends = git depends = python2 depends = python2-virtualenv + optdepends = uwsgi-plugin-python2: Serve the webapp using uwsgi + optdepends = mozilla-firefox-account-server: Run your own firefox account server + provides = mozilla-firefox-sync-server + conflicts = mozilla-firefox-sync-server conflicts = mozilla-firefox-sync-server-hg options = !debug backup = opt/mozilla-firefox-sync-server/syncserver.ini diff --git a/PKGBUILD b/PKGBUILD index af08169..eae6a02 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,16 +3,17 @@ pkgname=mozilla-firefox-sync-server-git pkgver=1.8.0.r67.g516807e -pkgrel=3 -pkgdesc="Mozilla Sync Server for built-in Firefox Sync - 1.5+ version for Firefox 29+" +pkgrel=4 +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' license=('MPL2') depends=('python2' 'python2-virtualenv') makedepends=('git') options=(!debug) -conflicts=('mozilla-firefox-sync-server-hg') -install=${pkgname}.install +conflicts=('mozilla-firefox-sync-server' 'mozilla-firefox-sync-server-hg') +provides=('mozilla-firefox-sync-server') +install="${pkgname}.install" source=("${pkgname}::git+https://github.com/mozilla-services/syncserver" 'ffsync.service' 'ffsync.tmpfiles') @@ -23,29 +24,29 @@ sha384sums=('SKIP' 'a7384b5b55b2377ee4445e45bfd0545435c2a6a19730ff4219340e3c6e8a3b51fcb46e4215093df860f9fa99a0b471ab' '236b285f7e390d31cd13a0ac78c524acfbc8a7325d7b0b114b39f69a5963535d5f1f73bdef575728b2f6e81860c4ea16') backup=('opt/mozilla-firefox-sync-server/syncserver.ini') +optdepends=('uwsgi-plugin-python2: Serve the webapp using uwsgi' + 'mozilla-firefox-account-server: Run your own firefox account server') pkgver() { - cd ${pkgname} + cd "${pkgname}" git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } prepare() { - cd ${pkgname} + cd "${pkgname}" # 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 # Remove obsolete parameter - sed -i "s|--no-site-packages||g" Makefile + sed -i "s| --no-site-packages||g" Makefile } build() { - cd ${pkgname} + cd "${pkgname}" make build - # SQLite support - #local/bin/pip install pysqlite2 - # MySQL support (should already be included) #local/bin/pip install PyMySQL @@ -65,13 +66,13 @@ build() { } check() { - cd ${pkgname} + cd "${pkgname}" #make test } package() { - cd ${pkgname} + cd "${pkgname}" # There is no install target in the Makefile, installing manually install -dm 755 "${pkgdir}"/opt/${pkgname/-git} "${pkgdir}"/var/lib/ffsync From 31dd4337f044dd0c4ad2f0ce989800af5dc3b54e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Wed, 21 Oct 2020 14:14:42 +0200 Subject: [PATCH 5/5] New version and PKGBUILD changes Update to latest commit Update upstream url to new docs Remove no longer required patches Fix uncommented sqluri in syncserver.ini --- .SRCINFO | 6 +++--- PKGBUILD | 11 ++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 969a2b6..9837c58 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ pkgbase = mozilla-firefox-sync-server-git pkgdesc = Mozilla Sync Server for built-in Firefox Sync - pkgver = 1.8.0.r67.g516807e - pkgrel = 4 - url = http://docs.services.mozilla.com/howtos/run-sync-1.5.html + pkgver = 1.9.1.r10.g58b8036 + pkgrel = 5 + url = https://mozilla-services.readthedocs.io/en/latest/howtos/run-sync-1.5.html install = mozilla-firefox-sync-server-git.install arch = i686 arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index eae6a02..29062e8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,11 +2,11 @@ # Contributor: Timothée Ravier pkgname=mozilla-firefox-sync-server-git -pkgver=1.8.0.r67.g516807e -pkgrel=4 +pkgver=1.9.1.r10.g58b8036 +pkgrel=5 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') makedepends=('git') @@ -37,10 +37,7 @@ 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 - - # Remove obsolete parameter - sed -i "s| --no-site-packages||g" Makefile + sed -i "0,/^\#sqluri/s//sqluri/" syncserver.ini } build() {