diff --git a/libnftnl/Makefile b/libnftnl/Makefile index db74e3a91..f240770da 100644 --- a/libnftnl/Makefile +++ b/libnftnl/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnftnl PKG_CPE_ID:=cpe:/a:netfilter:libnftnl -PKG_VERSION:=1.2.9 +PKG_VERSION:=1.3.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files -PKG_HASH:=e8c216255e129f26270639fee7775265665a31b11aa920253c3e5d5d62dfc4b8 +PKG_HASH:=0f4be47a8bb8b77a350ee58cbd4b5fae6260ad486a527706ab15cfe1dd55a3c4 PKG_MAINTAINER:=Steven Barth PKG_LICENSE:=GPL-2.0-or-later diff --git a/libnftnl/patches/001-libnftnl-add-fullcone-expression-support.patch b/libnftnl/patches/001-libnftnl-add-fullcone-expression-support.patch index aa1925c5f..a10f4d0cf 100644 --- a/libnftnl/patches/001-libnftnl-add-fullcone-expression-support.patch +++ b/libnftnl/patches/001-libnftnl-add-fullcone-expression-support.patch @@ -31,7 +31,7 @@ Signed-off-by: Syrone Wong NFTNL_EXPR_REDIR_FLAGS, --- a/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) /** diff --git a/nftables/Makefile b/nftables/Makefile index 86ab2b7ab..580979dfb 100644 --- a/nftables/Makefile +++ b/nftables/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nftables -PKG_VERSION:=1.1.3 +PKG_VERSION:=1.1.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files -PKG_HASH:=9c8a64b59c90b0825e540a9b8fcb9d2d942c636f81ba50199f068fde44f34ed8 +PKG_HASH:=1daf10f322e14fd90a017538aaf2c034d7cc1eb1cc418ded47445d714ea168d4 PKG_MAINTAINER:= PKG_LICENSE:=GPL-2.0 diff --git a/nftables/patches/002-nftables-add-fullcone-expression-support.patch b/nftables/patches/002-nftables-add-fullcone-expression-support.patch index 7e8a1d5f9..005664a3b 100644 --- a/nftables/patches/002-nftables-add-fullcone-expression-support.patch +++ b/nftables/patches/002-nftables-add-fullcone-expression-support.patch @@ -51,7 +51,7 @@ Signed-off-by: Syrone Wong --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c -@@ -1501,6 +1501,53 @@ out_err: +@@ -1506,6 +1506,53 @@ out_err: stmt_free(stmt); } @@ -105,7 +105,7 @@ Signed-off-by: Syrone Wong static void netlink_parse_redir(struct netlink_parse_ctx *ctx, const struct location *loc, 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 = "notrack", .parse = netlink_parse_notrack }, { .name = "masq", .parse = netlink_parse_masq }, @@ -131,7 +131,7 @@ Signed-off-by: Syrone Wong --- a/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 DNAT "dnat" %token MASQUERADE "masquerade" @@ -139,7 +139,7 @@ Signed-off-by: Syrone Wong %token REDIRECT "redirect" %token RANDOM "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 limit_burst_pkts limit_burst_bytes limit_mode limit_bytes time_unit quota_mode %type reject_stmt reject_stmt_alloc %destructor { stmt_free($$); } reject_stmt reject_stmt_alloc @@ -150,7 +150,7 @@ Signed-off-by: Syrone Wong %type nf_nat_flags nf_nat_flag offset_opt %type tproxy_stmt %destructor { stmt_free($$); } tproxy_stmt -@@ -3210,6 +3211,7 @@ stmt : verdict_stmt +@@ -3213,6 +3214,7 @@ stmt : verdict_stmt | queue_stmt | ct_stmt | masq_stmt close_scope_nat @@ -158,7 +158,7 @@ Signed-off-by: Syrone Wong | redir_stmt close_scope_nat | dup_stmt close_scope_dup | 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 { $0->nat.proto = $3; } @@ -199,7 +199,7 @@ Signed-off-by: Syrone Wong { --- a/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_DNAT] = "dnat", [NFT_NAT_MASQ] = "masquerade",