From de77350be2a9e94d3652fe8a348921224ab8f60c Mon Sep 17 00:00:00 2001 From: maniack Date: Sun, 16 Feb 2020 20:12:12 +0100 Subject: [PATCH 1/2] Upgrade to 0.16.0 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- sources/extra_files/app/requirements-ynh.txt | 20 +++++++++++--------- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 65274eb..f80fee5 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to Searx is a privacy-respecting, hackable metasearch engine. -**Shipped version:** 0.15.0 +**Shipped version:** 0.16.0 ## Screenshots diff --git a/conf/app.src b/conf/app.src index c45aaf2..0974272 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/asciimoo/searx/archive/v0.15.0.tar.gz -SOURCE_SUM=9d605ca08adc91fab27b4fd5311c9585620a9152e9f3e8b4f41f6ec7231af3efe3effdd3f8c0e6d08898c2116ef429455ec8525dad35e17329bd1e509828ba4b +SOURCE_URL=https://github.com/asciimoo/searx/archive/v0.16.0.tar.gz +SOURCE_SUM=4ea6d5a3cce8fb2b49d873f1ac16401ae7fb83672e5fe1e1b443b7b8563befeaa61e79e7383b85ff4360cbcf0a4bdf90e16cc7a16394f8b40c364d814404b03b SOURCE_SUM_PRG=sha512sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index cef3f8d..9141613 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,7 @@ "fr": "Un méta-moteur de recherche respectueux de la vie privée et bidouillable", "de": "Eine Meta-Suchmaschine, die den Privatsphäre wahrt und 'hackable' ist." }, - "version": "0.15.0~ynh1", + "version": "0.16.0~ynh1", "url": "https://asciimoo.github.io/searx/", "license": "AGPL-3.0-or-later", "maintainer": { diff --git a/sources/extra_files/app/requirements-ynh.txt b/sources/extra_files/app/requirements-ynh.txt index eb02727..0174d36 100644 --- a/sources/extra_files/app/requirements-ynh.txt +++ b/sources/extra_files/app/requirements-ynh.txt @@ -1,14 +1,16 @@ # Have a look to https://github.com/asciimoo/searx/blob/master/requirements.txt for each upgrade of Searx -certifi==2017.11.5 -flask==0.12.2 -flask-babel==0.11.2 -# lxml==4.1.1 -idna==2.5 +certifi==2019.3.9 +babel==2.7.0 +flask-babel==1.0.0 +flask==1.0.2 +idna==2.8 +jinja2==2.10.1 +lxml==4.3.3 pygments==2.1.3 -pyopenssl==17.4.0 -python-dateutil==2.6.1 -pyyaml==3.12 -requests[socks]==2.18.4 +pyopenssl==19.0.0 +python-dateutil==2.8.0 +pyyaml==5.1 +requests[socks]==2.22.0 # Additionnals requirements markupsafe>=0.23 From 3d97015e9a55c218863a8062e3d3c6411996710b Mon Sep 17 00:00:00 2001 From: maniack Date: Sun, 16 Feb 2020 21:09:39 +0100 Subject: [PATCH 2/2] Patch 0.16.0 --- scripts/install | 7 +++++++ scripts/upgrade | 7 +++++++ sources/extra_files/app/requirements-ynh.txt | 6 +++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 437b66d..f6a1719 100644 --- a/scripts/install +++ b/scripts/install @@ -84,6 +84,13 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" +#================================================= +# PATCH VERSION 0.16.0 +#================================================= + +# Apply fix https://github.com/asciimoo/searx/pull/1831 on the current 0.16.0 release. +ynh_replace_string --match_string="werkzeug.contrib.fixers" --replace_string="werkzeug.middleware.proxy_fix" --target_file="$final_path/searx/webapp.py" + #================================================= # SPECIFIC SETUP #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index fee6454..9d2062a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -90,6 +90,13 @@ then # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" + + #================================================= + # PATCH VERSION 0.16.0 + #================================================= + + # Apply fix https://github.com/asciimoo/searx/pull/1831 on the current 0.16.0 release. + ynh_replace_string --match_string="werkzeug.contrib.fixers" --replace_string="werkzeug.middleware.proxy_fix" --target_file="$final_path/searx/webapp.py" fi #================================================= diff --git a/sources/extra_files/app/requirements-ynh.txt b/sources/extra_files/app/requirements-ynh.txt index 0174d36..1d6c2a3 100644 --- a/sources/extra_files/app/requirements-ynh.txt +++ b/sources/extra_files/app/requirements-ynh.txt @@ -1,11 +1,11 @@ # Have a look to https://github.com/asciimoo/searx/blob/master/requirements.txt for each upgrade of Searx certifi==2019.3.9 -babel==2.7.0 +#babel==2.7.0 flask-babel==1.0.0 flask==1.0.2 idna==2.8 jinja2==2.10.1 -lxml==4.3.3 +#lxml==4.3.3 pygments==2.1.3 pyopenssl==19.0.0 python-dateutil==2.8.0 @@ -17,4 +17,4 @@ markupsafe>=0.23 ndg-httpsclient>=0.4.2 pyasn1>=0.2.3 pyasn1-modules>=0.0.9 -cffi>=1.12.1 +#cffi>=1.12.1