From 868726f3cb0166d4c5f91aa879e3acdd7a52acf8 Mon Sep 17 00:00:00 2001 From: remittor Date: Sat, 12 Oct 2024 15:20:57 +0300 Subject: [PATCH] Bump version to v64 --- luci-app-zapret/Makefile | 4 ++-- zapret-ip2net/Makefile | 14 ++++++++------ zapret-mdig/Makefile | 14 ++++++++------ zapret-tpws/Makefile | 14 ++++++++------ zapret/Makefile | 24 +++++++----------------- 5 files changed, 33 insertions(+), 37 deletions(-) diff --git a/luci-app-zapret/Makefile b/luci-app-zapret/Makefile index 8439ada..35bd91b 100644 --- a/luci-app-zapret/Makefile +++ b/luci-app-zapret/Makefile @@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-zapret -PKG_RELEASE:=20241008 -PKG_VERSION:=1.63-$(PKG_RELEASE) +PKG_RELEASE:=20241012 +PKG_VERSION:=64-$(PKG_RELEASE) PKG_LICENSE:=MIT LUCI_TITLE:=LuCI support for zapret diff --git a/zapret-ip2net/Makefile b/zapret-ip2net/Makefile index 3a8a4cf..bdbb196 100644 --- a/zapret-ip2net/Makefile +++ b/zapret-ip2net/Makefile @@ -1,20 +1,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zapret-ip2net -PKG_VERSION:=1.63 -PKG_RELEASE:=20241008 +PKG_VERSION:=64 +PKG_RELEASE:=20241012 PKG_MAINTAINER:=bol-van PKG_LICENSE:=MIT PKG_LICENSE_FILES:=docs/LICENSE.txt -PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=2cd6db3ba5ac2fa1494bed1c1903bc3531c76bc5 -PKG_SOURCE_DATE:=2024-10-08 +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? +PKG_HASH:=skip include $(INCLUDE_DIR)/package.mk +TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) +TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) + MAKE_PATH:=ip2net define Package/$(PKG_NAME) diff --git a/zapret-mdig/Makefile b/zapret-mdig/Makefile index bbea27d..bcdfc92 100644 --- a/zapret-mdig/Makefile +++ b/zapret-mdig/Makefile @@ -1,20 +1,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zapret-mdig -PKG_VERSION:=1.63 -PKG_RELEASE:=20241008 +PKG_VERSION:=64 +PKG_RELEASE:=20241012 PKG_MAINTAINER:=bol-van PKG_LICENSE:=MIT PKG_LICENSE_FILES:=docs/LICENSE.txt -PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=2cd6db3ba5ac2fa1494bed1c1903bc3531c76bc5 -PKG_SOURCE_DATE:=2024-10-08 +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? +PKG_HASH:=skip include $(INCLUDE_DIR)/package.mk +TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) +TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) + MAKE_PATH:=mdig define Package/$(PKG_NAME) diff --git a/zapret-tpws/Makefile b/zapret-tpws/Makefile index 2098400..07e711e 100644 --- a/zapret-tpws/Makefile +++ b/zapret-tpws/Makefile @@ -1,20 +1,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zapret-tpws -PKG_VERSION:=1.63 -PKG_RELEASE:=20241008 +PKG_VERSION:=64 +PKG_RELEASE:=20241012 PKG_MAINTAINER:=bol-van PKG_LICENSE:=MIT PKG_LICENSE_FILES:=docs/LICENSE.txt -PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=2cd6db3ba5ac2fa1494bed1c1903bc3531c76bc5 -PKG_SOURCE_DATE:=2024-10-08 +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? +PKG_HASH:=skip include $(INCLUDE_DIR)/package.mk +TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) +TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) + MAKE_PATH:=tpws define Package/$(PKG_NAME) diff --git a/zapret/Makefile b/zapret/Makefile index 4492970..f99a46a 100644 --- a/zapret/Makefile +++ b/zapret/Makefile @@ -5,27 +5,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zapret -PKG_VERSION:=1.63 -PKG_RELEASE:=20241008 +PKG_VERSION:=64 +PKG_RELEASE:=20241012 PKG_MAINTAINER:=bol-van PKG_LICENSE:=MIT PKG_LICENSE_FILES:=opt/zapret/docs/LICENSE.txt -PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=2cd6db3ba5ac2fa1494bed1c1903bc3531c76bc5 -PKG_SOURCE_DATE:=2024-10-08 - -#PKG_SOURCE:=zapret-master.tar.gz -#PKG_HASH:=skip - -#PKG_BUILD_DEPENDS:=secilc/host policycoreutils/host +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? +PKG_HASH:=skip include $(INCLUDE_DIR)/package.mk -#TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) -#TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) +TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) +TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) MAKE_PATH:=nfq @@ -38,10 +32,6 @@ define Package/$(PKG_NAME) DEPENDS:= +nftables +curl +gzip +coreutils +coreutils-sort +coreutils-sleep DEPENDS+= +kmod-nft-nat +kmod-nft-offload +kmod-nft-queue DEPENDS+= +libnetfilter-queue +libcap +zlib - #DEPENDS+= +zapret-nfqws - #DEPENDS+= +zapret-ip2set - #DEPENDS+= +zapret-mdig - #DEPENDS+= +zapret-tpws endef define Build/Prepare