Bump version to v65-20241018

luci-app-zapret/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-zapret
-PKG_RELEASE:=20241016
+PKG_RELEASE:=20241018
 PKG_VERSION:=65-$(PKG_RELEASE)
 PKG_LICENSE:=MIT
 

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

@@ -36,7 +36,7 @@ document.head.append(E('style', {'type': 'text/css'},
 
 return baseclass.extend({
     appName           : 'zapret',
-    execPath          : '/opt/zapret/init.d/openwrt/zapret',
+    execPath          : '/etc/init.d/zapret',
     hostsUserFN       : '/opt/zapret/ipset/zapret-hosts-user.txt',
     hostsUserExcludeFN: '/opt/zapret/ipset/zapret-hosts-user-exclude.txt',
     iplstExcludeFN    : '/opt/zapret/ipset/zapret-ip-exclude.txt',

zapret-ip2net/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-ip2net
 PKG_VERSION:=65
-PKG_RELEASE:=20241016
+PKG_RELEASE:=20241018
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +10,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fc0b8266e3e02c62af699b18c032800b0032866f
-PKG_SOURCE_DATE:=2024-10-16
+PKG_SOURCE_VERSION:=d97e7920cc79ff93a46a0ad30d8803a8e635157c
+PKG_SOURCE_DATE:=2024-10-18
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret-mdig/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-mdig
 PKG_VERSION:=65
-PKG_RELEASE:=20241016
+PKG_RELEASE:=20241018
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +10,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fc0b8266e3e02c62af699b18c032800b0032866f
-PKG_SOURCE_DATE:=2024-10-16
+PKG_SOURCE_VERSION:=d97e7920cc79ff93a46a0ad30d8803a8e635157c
+PKG_SOURCE_DATE:=2024-10-18
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret-tpws/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-tpws
 PKG_VERSION:=65
-PKG_RELEASE:=20241016
+PKG_RELEASE:=20241018
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +10,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fc0b8266e3e02c62af699b18c032800b0032866f
-PKG_SOURCE_DATE:=2024-10-16
+PKG_SOURCE_VERSION:=d97e7920cc79ff93a46a0ad30d8803a8e635157c
+PKG_SOURCE_DATE:=2024-10-18
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret
 PKG_VERSION:=65
-PKG_RELEASE:=20241016
+PKG_RELEASE:=20241018
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -14,8 +14,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fc0b8266e3e02c62af699b18c032800b0032866f
-PKG_SOURCE_DATE:=2024-10-16
+PKG_SOURCE_VERSION:=d97e7920cc79ff93a46a0ad30d8803a8e635157c
+PKG_SOURCE_DATE:=2024-10-18
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?
@@ -90,10 +90,6 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_CONF) ./ipset/zapret-ip-user.txt            $(1)/opt/zapret/ipset/zapret-ip-user.txt
 	$(INSTALL_CONF) ./ipset/zapret-ip-user-exclude.txt    $(1)/opt/zapret/ipset/zapret-ip-user-exclude.txt
 	$(INSTALL_CONF) ./ipset/zapret-ip-user-ipban.txt      $(1)/opt/zapret/ipset/zapret-ip-user-ipban.txt
-	$(INSTALL_CONF) ./ipset/cust1.txt      $(1)/opt/zapret/ipset/cust1.txt
-	$(INSTALL_CONF) ./ipset/cust2.txt      $(1)/opt/zapret/ipset/cust2.txt
-	$(INSTALL_CONF) ./ipset/cust3.txt      $(1)/opt/zapret/ipset/cust3.txt
-	$(INSTALL_CONF) ./ipset/cust4.txt      $(1)/opt/zapret/ipset/cust4.txt
 	$(INSTALL_BIN) ./sync_config.sh $(1)/opt/zapret/sync_config.sh
 endef
 
@@ -101,6 +97,13 @@ define Package/$(PKG_NAME)/preinst
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
+	if [ -f "/etc/init.d/zapret" ]; then
+		SCRIPT=$$( readlink /etc/init.d/zapret )
+		if [ -n "$${SCRIPT}" ]; then
+			echo "Please uninstall original zapret utility!"
+			exit 44
+		fi
+	fi
 	if [ "$${PKG_UPGRADE}" = "1" ]; then
 		# stop service if PKG_UPGRADE
 		[ -x "/etc/init.d/zapret" ] && /etc/init.d/zapret stop >/dev/null 2>&1
@@ -138,7 +141,7 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	# stop all
 	/etc/init.d/zapret stop_fw
 	/etc/init.d/zapret stop_daemons
-	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $1}' | xargs -r kill -9
+	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 	# start main service
 	/etc/init.d/zapret start
 	# restart firewall
@@ -162,7 +165,7 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	. "$${ZAPRET_BASE}/common/installer.sh"
 	/etc/init.d/zapret disable
 	/etc/init.d/zapret stop
-	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $1}' | xargs -r kill -9
+	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 	remove_openwrt_firewall
 	nft_del_table
 	restart_openwrt_firewall