Bump version to v0.7.20251225

luci-app-zapret/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-zapret2
-PKG_VERSION:=0.7.20251224
+PKG_VERSION:=0.7.20251225
 PKG_RELEASE:=1
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=remittor <https://github.com/remittor>

luci-app-zapret/htdocs/luci-static/resources/view/zapret2/tools.js

@@ -543,7 +543,7 @@ return baseclass.extend({
             }
             value = value.replace(/˂/g, '<');
             value = value.replace(/˃/g, '>');
-            let elem = document.getElementById("cbi-zapret-" + this.cfgsec + "-_" + this.cfgparam);
+            let elem = document.getElementById("cbi-zapret2-" + this.cfgsec + "-_" + this.cfgparam);
             if (elem) {
                 let val = value.trim();
                 if (this.multiline) {
@@ -555,20 +555,8 @@ return baseclass.extend({
                     elem.querySelector('div').textContent = val;
                 }
             }
-            uci.set('zapret', this.cfgsec, this.cfgparam, value);
-            uci.save().then(() => window.location.reload());
-            /*
-            return uci.save()
-            .then(L.bind(ui.changes.init, ui.changes))
-            .then(L.bind(ui.changes.displayChanges, ui.changes))
-            //.then(L.bind(ui.changes.apply, ui.changes))
-            .then(ui.addNotification(null, E('p', _('Contents have been saved.')), 'info'))
-            .catch(e => {
-                ui.addNotification(null, E('p', _('Unable to save the contents') + ': %s'.format(e.message)));
-            }).finally(() => {
-                ui.hideModal();
-            });
-            */
+            uci.set('zapret2', this.cfgsec, this.cfgparam, value);
+            uci.save().then(ui.hideModal);
         },
 
         error: function(e) {

luci-app-zapret/htdocs/luci-static/resources/view/zapret2/updater.js

@@ -132,7 +132,11 @@ return baseclass.extend({
         }
         let lastLen = 0;
         let retCode = -1;
+        let timerBusy = false;
         let timer = setInterval(async () => {
+            if (timerBusy)
+                return;  // skip iteration
+            timerBusy = true;
             try {
                 let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
                 if (res.stdout && res.stdout.length > lastLen) {
@@ -169,7 +173,10 @@ return baseclass.extend({
             } catch (e) {
                 clearInterval(timer);
                 this.appendLog('ERROR: installUpdates: ' + e.message);
+                this.appendLog('ERROR: installUpdates: ' + e.stack?.trim().split('\n').pop());
                 this.setStage(999);
+            } finally {
+                timerBusy = false;
             }
         }, 500);
     },

zapret-ip2net/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret2-ip2net
-PKG_VERSION:=0.7.20251224
+PKG_VERSION:=0.7.20251225
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
@@ -10,8 +10,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret2.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=505e8ff82ca92457d18daf90671d0f589929405b
-PKG_SOURCE_DATE:=2025-12-24
+PKG_SOURCE_VERSION:=b0ce5c0c1bf1d3d75d5ca068d61650d1749bf2af
+PKG_SOURCE_DATE:=2025-12-25
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret2/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret-mdig/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret2-mdig
-PKG_VERSION:=0.7.20251224
+PKG_VERSION:=0.7.20251225
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
@@ -10,8 +10,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret2.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=505e8ff82ca92457d18daf90671d0f589929405b
-PKG_SOURCE_DATE:=2025-12-24
+PKG_SOURCE_VERSION:=b0ce5c0c1bf1d3d75d5ca068d61650d1749bf2af
+PKG_SOURCE_DATE:=2025-12-25
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret2/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret2
-PKG_VERSION:=0.7.20251224
+PKG_VERSION:=0.7.20251225
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
@@ -14,8 +14,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret2.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=505e8ff82ca92457d18daf90671d0f589929405b
-PKG_SOURCE_DATE:=2025-12-24
+PKG_SOURCE_VERSION:=b0ce5c0c1bf1d3d75d5ca068d61650d1749bf2af
+PKG_SOURCE_DATE:=2025-12-25
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret2/archive/refs/tags/v$(PKG_VERSION).tar.gz?