luci-app-adblock: update 4.5.5-2

* sync with base package

Signed-off-by: Dirk Brenken <redacted>

diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile
index 8e3eaf7b16f6ab1047700b52ce36fa8506b9b22a..8b6a6f9b11f8d17b06b7cc33336328a248b35ecf 100644 (file)
--- a/applications/luci-app-adblock/Makefile
+++ b/applications/luci-app-adblock/Makefile
@@ -7,7 +7,7 @@ LUCI_TITLE:=LuCI support for Adblock
 LUCI_DEPENDS:=+luci-base +luci-lib-uqr +adblock
 
 PKG_VERSION:=4.5.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=Apache-2.0
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
index 4cabd9e6c080a39d0d90a04c950b2a0219420fb8..453cd03e5a30e6c021ad32b1d3ae3af79f14ca44 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
@@ -308,6 +308,22 @@ return view.extend({
                o.optional = true;
                o.rmempty = true;
 
+               o = s.taboption('additional', form.Value, 'adb_fetchparm', _('Download Parameters'), _('Override the pre-configured download options for the selected download utility. The output flag, e.g. \'-o\' for curl or \'-O\' for wget, must be the last parameter.'));
+               o.optional = true;
+               o.rmempty = true;
+
+               o = s.taboption('additional', form.ListValue, 'adb_fetchretry', _('Download Retries'), _('Number of download attempts in case of an error (not supported by uclient-fetch).'));
+               o.value('1');
+               o.value('3');
+               o.value('5');
+               o.value('10');
+               o.value('20');
+               o.default = '5';
+               o.placeholder = _('-- default --');
+               o.create = true;
+               o.optional = true;
+               o.rmempty = true;
+
                o = s.taboption('additional', form.Flag, 'adb_fetchinsecure', _('Download Insecure'), _('Don\'t check SSL server certificates during download.'));
                o.default = 0;
                o.rmempty = true;
@@ -617,7 +633,7 @@ return view.extend({
                o.rmempty = true;
 
                o = s.taboption('adv_dns', form.Value, 'adb_dnstimeout', _('DNS Restart Timeout'), _('Timeout to wait for a successful DNS backend restart.'));
-               o.placeholder = '20';
+               o.placeholder = '30';
                o.datatype = 'range(5,60)';
                o.rmempty = true;