refresh and drop patches

6 files changed, 6 insertions, 40 deletions

diff --git a/debian/patches/0001-Change-isAlive-to-is_alive-as-isAlive-is-unsupported.patch b/debian/patches/0001-Change-isAlive-to-is_alive-as-isAlive-is-unsupported.patch
deleted file mode 100644
index 091f69c..0000000
--- a/debian/patches/0001-Change-isAlive-to-is_alive-as-isAlive-is-unsupported.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 3b8bd0770bff2486c30012606562e4d90e23d655 Mon Sep 17 00:00:00 2001
-From: asht <amitgoren12@gmail.com>
-Date: Fri, 31 Jul 2020 00:28:54 +0300
-Subject: [PATCH] Change isAlive() to is_alive() as isAlive() is unsupported in
- newer Python versions
-
----
- searx/search.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/searx/search.py
-+++ b/searx/search.py
-@@ -234,7 +234,7 @@ def search_multiple_requests(requests, r
-         if th.name == search_id:
-             remaining_time = max(0.0, timeout_limit - (time() - start_time))
-             th.join(remaining_time)
--            if th.isAlive():
-+            if th.is_alive():
-                 result_container.add_unresponsive_engine(th._engine_name, 'timeout')
-                 logger.warning('engine timeout: {0}'.format(th._engine_name))
- 
diff --git a/debian/patches/clean-gruntfiles b/debian/patches/clean-gruntfiles
index 559b44c..5453ae9 100644
--- a/debian/patches/clean-gruntfiles
+++ b/debian/patches/clean-gruntfiles
@@ -1,6 +1,6 @@
 --- a/searx/static/themes/oscar/gruntfile.js
 +++ b/searx/static/themes/oscar/gruntfile.js
-@@ -79,16 +79,9 @@ module.exports = function(grunt) {
+@@ -80,16 +80,9 @@ module.exports = function(grunt) {
      }
    });
  
diff --git a/debian/patches/encoding b/debian/patches/encoding
deleted file mode 100644
index 0b80694..0000000
--- a/debian/patches/encoding
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -12,7 +12,7 @@ sys.path.insert(0, './searx')
- from version import VERSION_STRING
- import brand
- 
--with open('README.rst') as f:
-+with open('README.rst', encoding='utf-8') as f:
-     long_description = f.read()
- 
- with open('requirements.txt') as f:
diff --git a/debian/patches/makefile b/debian/patches/makefile
index e3a0825..034fbd4 100644
--- a/debian/patches/makefile
+++ b/debian/patches/makefile
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -138,7 +138,6 @@ buildenv:
+@@ -137,7 +137,6 @@ buildenv:
  # ----------
  
  node.env: buildenv
@@ -8,7 +8,7 @@
  
  node.clean:
  	$(Q)echo "CLEAN     locally installed npm dependencies"
-@@ -157,20 +156,23 @@ PHONY += themes.bootstrap themes themes.
+@@ -156,20 +155,23 @@ PHONY += themes.bootstrap themes themes.
  themes: buildenv themes.bootstrap themes.oscar themes.simple themes.legacy themes.courgette themes.pixart
  
  quiet_cmd_lessc = LESSC     $3
@@ -36,7 +36,7 @@
  
  themes.legacy: node.env
  	$(Q)echo '[!] build legacy theme'
-@@ -187,7 +189,6 @@ themes.pixart: node.env
+@@ -186,7 +188,6 @@ themes.pixart: node.env
  	$(call cmd,lessc,themes/pix-art/less/style.less,themes/pix-art/css/style.css)
  
  themes.bootstrap: node.env
diff --git a/debian/patches/series b/debian/patches/series
index f668289..0569fd8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,3 @@ clean-gruntfiles
 settingsyml
 setuppy
 makefile
-encoding
-0001-Change-isAlive-to-is_alive-as-isAlive-is-unsupported.patch
diff --git a/debian/patches/settingsyml b/debian/patches/settingsyml
index ed30dc4..5603a33 100644
--- a/debian/patches/settingsyml
+++ b/debian/patches/settingsyml
@@ -1,7 +1,7 @@
 --- a/searx/settings.yml
 +++ b/searx/settings.yml
-@@ -18,8 +18,8 @@ server:
-     http_protocol_version : "1.0"  # 1.0 and 1.1 are supported
+@@ -25,8 +25,8 @@ server:
+         Referrer-Policy : no-referrer
  
  ui:
 -    static_path : "" # Custom static path - leave it blank if you didn't change