update 2025-09-23 00:28:22

This commit is contained in:
kenzok8
2025-09-23 00:28:22 +08:00
parent ea22648bd2
commit 34df01cdda
4 changed files with 12 additions and 12 deletions

View File

@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libnftnl PKG_NAME:=libnftnl
PKG_CPE_ID:=cpe:/a:netfilter:libnftnl PKG_CPE_ID:=cpe:/a:netfilter:libnftnl
PKG_VERSION:=1.2.9 PKG_VERSION:=1.3.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files
PKG_HASH:=e8c216255e129f26270639fee7775265665a31b11aa920253c3e5d5d62dfc4b8 PKG_HASH:=0f4be47a8bb8b77a350ee58cbd4b5fae6260ad486a527706ab15cfe1dd55a3c4
PKG_MAINTAINER:=Steven Barth <steven@midlink.org> PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later

View File

@@ -31,7 +31,7 @@ Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
NFTNL_EXPR_REDIR_FLAGS, NFTNL_EXPR_REDIR_FLAGS,
--- a/include/linux/netfilter/nf_tables.h --- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h +++ b/include/linux/netfilter/nf_tables.h
@@ -1504,6 +1504,22 @@ enum nft_masq_attributes { @@ -1508,6 +1508,22 @@ enum nft_masq_attributes {
#define NFTA_MASQ_MAX (__NFTA_MASQ_MAX - 1) #define NFTA_MASQ_MAX (__NFTA_MASQ_MAX - 1)
/** /**

View File

@@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=nftables PKG_NAME:=nftables
PKG_VERSION:=1.1.3 PKG_VERSION:=1.1.5
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files
PKG_HASH:=9c8a64b59c90b0825e540a9b8fcb9d2d942c636f81ba50199f068fde44f34ed8 PKG_HASH:=1daf10f322e14fd90a017538aaf2c034d7cc1eb1cc418ded47445d714ea168d4
PKG_MAINTAINER:= PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

View File

@@ -51,7 +51,7 @@ Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
--- a/src/netlink_delinearize.c --- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c
@@ -1501,6 +1501,53 @@ out_err: @@ -1506,6 +1506,53 @@ out_err:
stmt_free(stmt); stmt_free(stmt);
} }
@@ -105,7 +105,7 @@ Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
static void netlink_parse_redir(struct netlink_parse_ctx *ctx, static void netlink_parse_redir(struct netlink_parse_ctx *ctx,
const struct location *loc, const struct location *loc,
const struct nftnl_expr *nle) const struct nftnl_expr *nle)
@@ -1931,6 +1978,7 @@ static const struct expr_handler netlink @@ -1936,6 +1983,7 @@ static const struct expr_handler netlink
{ .name = "tproxy", .parse = netlink_parse_tproxy }, { .name = "tproxy", .parse = netlink_parse_tproxy },
{ .name = "notrack", .parse = netlink_parse_notrack }, { .name = "notrack", .parse = netlink_parse_notrack },
{ .name = "masq", .parse = netlink_parse_masq }, { .name = "masq", .parse = netlink_parse_masq },
@@ -131,7 +131,7 @@ Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
--- a/src/parser_bison.y --- a/src/parser_bison.y
+++ b/src/parser_bison.y +++ b/src/parser_bison.y
@@ -642,6 +642,7 @@ int nft_lex(void *, void *, void *); @@ -643,6 +643,7 @@ int nft_lex(void *, void *, void *);
%token SNAT "snat" %token SNAT "snat"
%token DNAT "dnat" %token DNAT "dnat"
%token MASQUERADE "masquerade" %token MASQUERADE "masquerade"
@@ -139,7 +139,7 @@ Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
%token REDIRECT "redirect" %token REDIRECT "redirect"
%token RANDOM "random" %token RANDOM "random"
%token FULLY_RANDOM "fully-random" %token FULLY_RANDOM "fully-random"
@@ -788,8 +789,8 @@ int nft_lex(void *, void *, void *); @@ -789,8 +790,8 @@ int nft_lex(void *, void *, void *);
%type <val> limit_burst_pkts limit_burst_bytes limit_mode limit_bytes time_unit quota_mode %type <val> limit_burst_pkts limit_burst_bytes limit_mode limit_bytes time_unit quota_mode
%type <stmt> reject_stmt reject_stmt_alloc %type <stmt> reject_stmt reject_stmt_alloc
%destructor { stmt_free($$); } reject_stmt reject_stmt_alloc %destructor { stmt_free($$); } reject_stmt reject_stmt_alloc
@@ -150,7 +150,7 @@ Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
%type <val> nf_nat_flags nf_nat_flag offset_opt %type <val> nf_nat_flags nf_nat_flag offset_opt
%type <stmt> tproxy_stmt %type <stmt> tproxy_stmt
%destructor { stmt_free($$); } tproxy_stmt %destructor { stmt_free($$); } tproxy_stmt
@@ -3210,6 +3211,7 @@ stmt : verdict_stmt @@ -3213,6 +3214,7 @@ stmt : verdict_stmt
| queue_stmt | queue_stmt
| ct_stmt | ct_stmt
| masq_stmt close_scope_nat | masq_stmt close_scope_nat
@@ -158,7 +158,7 @@ Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
| redir_stmt close_scope_nat | redir_stmt close_scope_nat
| dup_stmt close_scope_dup | dup_stmt close_scope_dup
| fwd_stmt close_scope_fwd | fwd_stmt close_scope_fwd
@@ -4039,6 +4041,28 @@ masq_stmt_args : TO COLON stmt_expr @@ -4043,6 +4045,28 @@ masq_stmt_args : TO COLON stmt_expr
{ {
$<stmt>0->nat.proto = $3; $<stmt>0->nat.proto = $3;
} }
@@ -199,7 +199,7 @@ Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
<SCANSTATE_STMT_NAT>{ <SCANSTATE_STMT_NAT>{
--- a/src/statement.c --- a/src/statement.c
+++ b/src/statement.c +++ b/src/statement.c
@@ -679,6 +679,7 @@ const char *nat_etype2str(enum nft_nat_e @@ -680,6 +680,7 @@ const char *nat_etype2str(enum nft_nat_e
[NFT_NAT_SNAT] = "snat", [NFT_NAT_SNAT] = "snat",
[NFT_NAT_DNAT] = "dnat", [NFT_NAT_DNAT] = "dnat",
[NFT_NAT_MASQ] = "masquerade", [NFT_NAT_MASQ] = "masquerade",