From e59be61e1f99c3f8db14bce6f7fba58c6e4ab393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 1 May 2018 22:27:41 +0200 Subject: [PATCH 1/4] Fix pip import --- scripts/install | 1 + scripts/restore | 1 + scripts/upgrade | 2 ++ 3 files changed, 4 insertions(+) diff --git a/scripts/install b/scripts/install index 4fae671..5f1d484 100644 --- a/scripts/install +++ b/scripts/install @@ -101,6 +101,7 @@ test ! -e /etc/matrix-$app/dh.pem && \ # For any update do it in all files ynh_install_app_dependencies coturn build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libxml2-dev libxslt1-dev python-lxml libjpeg-dev libpq-dev postgresql acl pip install --upgrade pip +hash -d pip pip install --upgrade virtualenv #================================================= diff --git a/scripts/restore b/scripts/restore index cf0f468..c93a920 100644 --- a/scripts/restore +++ b/scripts/restore @@ -61,6 +61,7 @@ ynh_restore # For any update do it in all files ynh_install_app_dependencies coturn build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libxml2-dev libxslt1-dev python-lxml libjpeg-dev libpq-dev postgresql acl pip install --upgrade pip +hash -d pip pip install --upgrade virtualenv #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index fac42ea..58a46c6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -121,6 +121,7 @@ then # For any update do it in all files ynh_install_app_dependencies coturn build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libxml2-dev libxslt1-dev python-lxml libjpeg-dev libpq-dev postgresql acl pip install --upgrade pip + hash -d pip pip install --upgrade virtualenv #================================================= @@ -172,6 +173,7 @@ else # We set all necessary environement variable to create a python virtualenvironnement. source $final_path/bin/activate pip install --upgrade pip + hash -d pip pip install --upgrade setuptools pip install --upgrade cffi ndg-httpsclient psycopg2 lxml From 8afb6f9d5870cb36b1ad69778d47d0962c2dd9ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 1 May 2018 23:31:53 +0200 Subject: [PATCH 2/4] Don't upgrade pip in global system --- scripts/install | 2 -- scripts/restore | 2 -- scripts/upgrade | 4 ---- 3 files changed, 8 deletions(-) diff --git a/scripts/install b/scripts/install index 5f1d484..1bde217 100644 --- a/scripts/install +++ b/scripts/install @@ -100,8 +100,6 @@ test ! -e /etc/matrix-$app/dh.pem && \ # WARRNING : theses command are used in INSTALL, UPGRADE, RESTORE # For any update do it in all files ynh_install_app_dependencies coturn build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libxml2-dev libxslt1-dev python-lxml libjpeg-dev libpq-dev postgresql acl -pip install --upgrade pip -hash -d pip pip install --upgrade virtualenv #================================================= diff --git a/scripts/restore b/scripts/restore index c93a920..9274f69 100644 --- a/scripts/restore +++ b/scripts/restore @@ -60,8 +60,6 @@ ynh_restore # WARRNING : theses command are used in INSTALL, UPGRADE, RESTORE # For any update do it in all files ynh_install_app_dependencies coturn build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libxml2-dev libxslt1-dev python-lxml libjpeg-dev libpq-dev postgresql acl -pip install --upgrade pip -hash -d pip pip install --upgrade virtualenv #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 58a46c6..6773c22 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -120,8 +120,6 @@ then # WARRNING : theses command are used in INSTALL, UPGRADE, RESTORE # For any update do it in all files ynh_install_app_dependencies coturn build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libxml2-dev libxslt1-dev python-lxml libjpeg-dev libpq-dev postgresql acl - pip install --upgrade pip - hash -d pip pip install --upgrade virtualenv #================================================= @@ -172,8 +170,6 @@ else # We set all necessary environement variable to create a python virtualenvironnement. source $final_path/bin/activate - pip install --upgrade pip - hash -d pip pip install --upgrade setuptools pip install --upgrade cffi ndg-httpsclient psycopg2 lxml From 7f59b4b23ac1639124084957cdb586bd342dd441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 2 May 2018 01:49:40 +0000 Subject: [PATCH 3/4] Upgrade synapse to 0.28.1 --- README.md | 2 +- conf/armv7.src | 5 ++--- conf/python_source.src | 4 ++-- manifest.json | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f801cb9..09b2047 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://riot.im/app/#/room/#yunohost:matrix.org](https://riot.im/app/#/room/#yunohost:matrix.org) -**Shipped version:** 0.28.0 +**Shipped version:** 0.28.1 Configuration ------------- diff --git a/conf/armv7.src b/conf/armv7.src index be9d045..c2ad3b6 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,6 +1,5 @@ - -SOURCE_URL=https://github.com/Josue-T/synapse_python_build/releases/download/v0.28.0/matrix-synapse_0.28.0-bin1_armv7l.tar.gz -SOURCE_SUM=00a2b9dba4e79de01cfad5595ed71e695793dff88d3c93ee481aebdb97b51348 +SOURCE_URL=https://github.com/Josue-T/synapse_python_build/releases/download/v0.28.1/matrix-synapse_0.28.1-bin1_armv7l.tar.gz +SOURCE_SUM=c23baff6b198d80ac8938e95d6d79cd7ff5ca7996119af1ddd2936ee313f9a87 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/python_source.src b/conf/python_source.src index 3fad1eb..f8d573b 100644 --- a/conf/python_source.src +++ b/conf/python_source.src @@ -1,2 +1,2 @@ -SOURCE_URL=https://github.com/matrix-org/synapse/archive/v0.28.0.tar.gz -SOURCE_SUM=543e5551e595b3d9cf850223640eceaa7efe6d1138074bed820e259b29a1c231 +SOURCE_URL=https://github.com/matrix-org/synapse/archive/v0.28.1.tar.gz +SOURCE_SUM=3f2238172341506614a1b6ba5275bee79b418fee639a7fef3917b1188c515e70 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8fafd7a..572f862 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "en": "Instant messaging server who use matrix", "fr": "Un serveur de messagerie instantané basé sur matrix" }, - "version": "0.28.0~ynh1", + "version": "0.28.1~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 3ba2bf279795b1fe92d760d5fc4d2d6891119b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 2 May 2018 20:58:07 +0200 Subject: [PATCH 4/4] Update check_process --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 4f1b45b..810ba25 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,7 @@ setup_private=0 setup_public=1 upgrade=1 - upgrade=1 from_commit=a62bce7dbc6bc0e1f1b4e872286ff124747ea009 + upgrade=1 from_commit=a907e39c738997b0e30e9637a5b150bfecf06b18 upgrade=1 from_commit=f050f88fbfe7bad1bf74d4584ec62ffcf28248e7 backup_restore=1 multi_instance=1 @@ -31,7 +31,7 @@ Level 9=0 Level 10=0 ;;; Upgrade options - ; commit=a62bce7dbc6bc0e1f1b4e872286ff124747ea009 + ; commit=a907e39c738997b0e30e9637a5b150bfecf06b18 name=Before multi_instance ; commit=f050f88fbfe7bad1bf74d4584ec62ffcf28248e7 name=Old version package