[arch-commits] Commit in matrix-synapse/repos/community-any (8 files)
Johannes Löthberg
demize at archlinux.org
Thu Feb 23 12:59:35 UTC 2017
Date: Thursday, February 23, 2017 @ 12:59:34
Author: demize
Revision: 213631
archrelease: copy trunk to community-any
Added:
matrix-synapse/repos/community-any/PKGBUILD
(from rev 213630, matrix-synapse/trunk/PKGBUILD)
matrix-synapse/repos/community-any/deps-relax-checks.patch
(from rev 213630, matrix-synapse/trunk/deps-relax-checks.patch)
matrix-synapse/repos/community-any/synapse.install
(from rev 213630, matrix-synapse/trunk/synapse.install)
matrix-synapse/repos/community-any/sysusers-synapse.conf
(from rev 213630, matrix-synapse/trunk/sysusers-synapse.conf)
Deleted:
matrix-synapse/repos/community-any/PKGBUILD
matrix-synapse/repos/community-any/deps-relax-checks.patch
matrix-synapse/repos/community-any/synapse.install
matrix-synapse/repos/community-any/sysusers-synapse.conf
-------------------------+
PKGBUILD | 119 +++++++++++++++++++++++-----------------------
deps-relax-checks.patch | 76 ++++++++++++++---------------
synapse.install | 74 ++++++++++++++--------------
sysusers-synapse.conf | 2
4 files changed, 136 insertions(+), 135 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-02-23 12:59:23 UTC (rev 213630)
+++ PKGBUILD 2017-02-23 12:59:34 UTC (rev 213631)
@@ -1,59 +0,0 @@
-# Maintainer: Ivan Shapovalov <intelfx at intelfx.name>
-
-pkgname=matrix-synapse
-pkgver=0.19.1
-pkgrel=1
-
-pkgdesc="Matrix reference homeserver"
-url="https://github.com/matrix-org/synapse"
-arch=('any')
-license=('Apache')
-
-depends=('python2-twisted>=15.1.0' 'python2-service-identity'
- 'python2-pyopenssl' 'python2-yaml' 'python2-pyasn1' 'python2-pynacl'
- 'python2-daemonize' 'python2-py-bcrypt' 'python2-frozendict'
- 'python2-pillow' 'python2-pydenticon' 'python2-ujson' 'python2-blist'
- 'python2-pysaml2' 'python2-setuptools'
- 'python2-systemd' 'python2-unpaddedbase64' 'python2-canonicaljson'
- 'python2-signedjson' 'python2-pymacaroons-pynacl'
- 'python2-service-identity' 'python2-msgpack'
- 'systemd')
-makedepends=('python2-mock')
-optdepends=('python2-psycopg2: PostgreSQL support'
- 'python2-netaddr: URL previewing'
- 'python2-jinja: e-mail notifications'
- 'python2-bleach: e-mail notifications'
- 'python2-matrix-synapse-ldap3: LDAP support'
- 'python2-psutil: metrics'
- 'python2-matrix-angular-sdk: built-in web client')
-
-source=("synapse-$pkgver.tar.gz::https://github.com/matrix-org/synapse/archive/v$pkgver.tar.gz"
- 'sysusers-synapse.conf'
- 'deps-relax-checks.patch')
-
-md5sums=('8ffba340861253efa963cdac9be773e1'
- 'ecd9f66fb57fe1a2e1e2df07a460a35b'
- '74d3d018e588d70ff0a22863d3d7aa4e')
-
-backup=('etc/synapse/log_config.yaml')
-install=synapse.install
-
-prepare() {
- cd synapse-$pkgver
- patch -p1 <"$srcdir/deps-relax-checks.patch"
-}
-
-build() {
- cd synapse-$pkgver
- python2 setup.py build
-}
-
-package() {
- cd synapse-$pkgver
- python2 setup.py install --root "$pkgdir" --optimize=1 --skip-build
-
- install -dm755 -o 198 -g 198 "$pkgdir"/etc/synapse
- install -Dm644 contrib/systemd/log_config.yaml "$pkgdir"/etc/synapse/log_config.yaml
- install -Dm644 contrib/systemd/synapse.service "$pkgdir"/usr/lib/systemd/system/synapse.service
- install -Dm644 "$srcdir"/sysusers-synapse.conf "$pkgdir"/usr/lib/sysusers.d/synapse.conf
-}
Copied: matrix-synapse/repos/community-any/PKGBUILD (from rev 213630, matrix-synapse/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-02-23 12:59:34 UTC (rev 213631)
@@ -0,0 +1,60 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Contributor: Ivan Shapovalov <intelfx at intelfx.name>
+
+pkgname=matrix-synapse
+pkgver=0.19.2
+pkgrel=1
+
+pkgdesc="Matrix reference homeserver"
+url="https://github.com/matrix-org/synapse"
+arch=('any')
+license=('Apache')
+
+depends=('python2-twisted' 'python2-service-identity'
+ 'python2-pyopenssl' 'python2-yaml' 'python2-pyasn1' 'python2-pynacl'
+ 'python2-daemonize' 'python2-py-bcrypt' 'python2-frozendict'
+ 'python2-pillow' 'python2-pydenticon' 'python2-ujson' 'python2-blist'
+ 'python2-pysaml2' 'python2-setuptools'
+ 'python2-systemd' 'python2-unpaddedbase64' 'python2-canonicaljson'
+ 'python2-signedjson' 'python2-pymacaroons-pynacl'
+ 'python2-service-identity' 'python2-msgpack'
+ 'systemd')
+makedepends=('python2-mock')
+optdepends=('python2-psycopg2: PostgreSQL support'
+ 'python2-netaddr: URL previewing'
+ 'python2-jinja: e-mail notifications'
+ 'python2-bleach: e-mail notifications'
+ 'python2-matrix-synapse-ldap3: LDAP support'
+ 'python2-psutil: metrics'
+ 'python2-matrix-angular-sdk: built-in web client')
+
+source=("synapse-$pkgver.tar.gz::https://github.com/matrix-org/synapse/archive/v$pkgver.tar.gz"
+ 'sysusers-synapse.conf'
+ 'deps-relax-checks.patch')
+
+md5sums=('7733164470d77fe87b7bafbf78485915'
+ 'ecd9f66fb57fe1a2e1e2df07a460a35b'
+ '74d3d018e588d70ff0a22863d3d7aa4e')
+
+backup=('etc/synapse/log_config.yaml')
+install=synapse.install
+
+prepare() {
+ cd synapse-$pkgver
+ patch -p1 <"$srcdir/deps-relax-checks.patch"
+}
+
+build() {
+ cd synapse-$pkgver
+ python2 setup.py build
+}
+
+package() {
+ cd synapse-$pkgver
+ python2 setup.py install --root "$pkgdir" --optimize=1 --skip-build
+
+ install -dm755 -o 198 -g 198 "$pkgdir"/etc/synapse
+ install -Dm644 contrib/systemd/log_config.yaml "$pkgdir"/etc/synapse/log_config.yaml
+ install -Dm644 contrib/systemd/synapse.service "$pkgdir"/usr/lib/systemd/system/synapse.service
+ install -Dm644 "$srcdir"/sysusers-synapse.conf "$pkgdir"/usr/lib/sysusers.d/synapse.conf
+}
Deleted: deps-relax-checks.patch
===================================================================
--- deps-relax-checks.patch 2017-02-23 12:59:23 UTC (rev 213630)
+++ deps-relax-checks.patch 2017-02-23 12:59:34 UTC (rev 213631)
@@ -1,38 +0,0 @@
-From 4963b2744c1c0312648e8bb4fe82d476ed2c614f Mon Sep 17 00:00:00 2001
-From: Ivan Shapovalov <intelfx at intelfx.name>
-Date: Thu, 11 Feb 2016 22:55:01 +0300
-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 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
-index b9e4177..4efb853 100644
---- a/synapse/python_dependencies.py
-+++ b/synapse/python_dependencies.py
-@@ -22,7 +22,7 @@ REQUIREMENTS = {
- "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"],
- "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"],
- "signedjson>=1.0.0": ["signedjson>=1.0.0"],
-- "pynacl==0.3.0": ["nacl==0.3.0", "nacl.bindings"],
-+ "pynacl>=0.3.0": ["nacl>=0.3.0", "nacl.bindings"],
- "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"],
- "msgpack-python>=0.3.0": ["msgpack"],
- }
---
-2.10.0
-
Copied: matrix-synapse/repos/community-any/deps-relax-checks.patch (from rev 213630, matrix-synapse/trunk/deps-relax-checks.patch)
===================================================================
--- deps-relax-checks.patch (rev 0)
+++ deps-relax-checks.patch 2017-02-23 12:59:34 UTC (rev 213631)
@@ -0,0 +1,38 @@
+From 4963b2744c1c0312648e8bb4fe82d476ed2c614f Mon Sep 17 00:00:00 2001
+From: Ivan Shapovalov <intelfx at intelfx.name>
+Date: Thu, 11 Feb 2016 22:55:01 +0300
+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 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
+index b9e4177..4efb853 100644
+--- a/synapse/python_dependencies.py
++++ b/synapse/python_dependencies.py
+@@ -22,7 +22,7 @@ REQUIREMENTS = {
+ "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"],
+ "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"],
+ "signedjson>=1.0.0": ["signedjson>=1.0.0"],
+- "pynacl==0.3.0": ["nacl==0.3.0", "nacl.bindings"],
++ "pynacl>=0.3.0": ["nacl>=0.3.0", "nacl.bindings"],
+ "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"],
+ "msgpack-python>=0.3.0": ["msgpack"],
+ }
+--
+2.10.0
+
Deleted: synapse.install
===================================================================
--- synapse.install 2017-02-23 12:59:23 UTC (rev 213630)
+++ synapse.install 2017-02-23 12:59:34 UTC (rev 213631)
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# arg 1: the new package version
-post_install() {
- if [[ ! -e /etc/synapse/homeserver.yaml ]]; then
- cat <<-EOF
- ==> A synapse configuration file needs to be generated before you can
- start synapse, and you should make sure that it's readable by the
- synapse user.
-
- cd /var/lib/synapse
- sudo -u synapse python2 -m synapse.app.homeserver \\
- --server-name my.domain.name \\
- --config-path /etc/synapse/homeserver.yaml \\
- --generate-config \\
- --report-stats=yes
-
- N.B.: The default synapse config enables the webclient feature.
- Unless you have python2-matrix-angular-sdk installed this will make
- synapse fail to start. Either disable it, or install
- python2-matrix-angular-sdk.
- EOF
- install -dm700 -o 198 -g 198 /var/lib/synapse
- fi
-
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- cat <<-EOF
- ==> N.B.: The default synapse config enables the webclient feature.
- Unless you have python2-matrix-angular-sdk installed this will make
- synapse fail to start. Either disable it, or install
- python2-matrix-angular-sdk.
- EOF
-}
Copied: matrix-synapse/repos/community-any/synapse.install (from rev 213630, matrix-synapse/trunk/synapse.install)
===================================================================
--- synapse.install (rev 0)
+++ synapse.install 2017-02-23 12:59:34 UTC (rev 213631)
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# arg 1: the new package version
+post_install() {
+ if [[ ! -e /etc/synapse/homeserver.yaml ]]; then
+ cat <<-EOF
+ ==> A synapse configuration file needs to be generated before you can
+ start synapse, and you should make sure that it's readable by the
+ synapse user.
+
+ cd /var/lib/synapse
+ sudo -u synapse python2 -m synapse.app.homeserver \\
+ --server-name my.domain.name \\
+ --config-path /etc/synapse/homeserver.yaml \\
+ --generate-config \\
+ --report-stats=yes
+
+ N.B.: The default synapse config enables the webclient feature.
+ Unless you have python2-matrix-angular-sdk installed this will make
+ synapse fail to start. Either disable it, or install
+ python2-matrix-angular-sdk.
+ EOF
+ install -dm700 -o 198 -g 198 /var/lib/synapse
+ fi
+
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ cat <<-EOF
+ ==> N.B.: The default synapse config enables the webclient feature.
+ Unless you have python2-matrix-angular-sdk installed this will make
+ synapse fail to start. Either disable it, or install
+ python2-matrix-angular-sdk.
+ EOF
+}
Deleted: sysusers-synapse.conf
===================================================================
--- sysusers-synapse.conf 2017-02-23 12:59:23 UTC (rev 213630)
+++ sysusers-synapse.conf 2017-02-23 12:59:34 UTC (rev 213631)
@@ -1 +0,0 @@
-u synapse 198 "Matrix Synapse user" /var/lib/synapse
Copied: matrix-synapse/repos/community-any/sysusers-synapse.conf (from rev 213630, matrix-synapse/trunk/sysusers-synapse.conf)
===================================================================
--- sysusers-synapse.conf (rev 0)
+++ sysusers-synapse.conf 2017-02-23 12:59:34 UTC (rev 213631)
@@ -0,0 +1 @@
+u synapse 198 "Matrix Synapse user" /var/lib/synapse
More information about the arch-commits
mailing list