From 60b6d3d324c90ea7ee6c0c5ec89f89cddc5b617e Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 5 Sep 2020 14:26:14 -0400 Subject: [PATCH] Update to 0.9.6 (RH#1846663) --- .gitignore | 1 + nftables-0.4-fix-dep-gen.patch | 62 ---------------------------------- nftables.spec | 7 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 nftables-0.4-fix-dep-gen.patch diff --git a/.gitignore b/.gitignore index 495b2f7..73aa14a 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /nftables-0.9.1.tar.bz2 /nftables-0.9.2.tar.bz2 /nftables-0.9.3.tar.bz2 +/nftables-0.9.6.tar.bz2 diff --git a/nftables-0.4-fix-dep-gen.patch b/nftables-0.4-fix-dep-gen.patch deleted file mode 100644 index cca76e6..0000000 --- a/nftables-0.4-fix-dep-gen.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 545c93d54d900e8e20071891b7e2bf3bb0e5fed2 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso -Date: Tue, 6 Jan 2015 21:28:53 +0100 -Subject: evaluate: reject: fix dependency generation from nft -f - -When nft -f is used, ctx->cmd points to the table object, which -contains the corresponding chain, set and rule lists. The reject -statement evaluator relies on ctx->cmd->rule to add the payload -dependencies, which is doesn't point to the rule in that case. - -This patch adds the rule context to the eval_ctx structure to update -the rule list of statements when generating dependencies, as the reject -statement needs. - -Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=993 -Reported-by: Ting-Wei Lan -Signed-off-by: Pablo Neira Ayuso - -diff --git a/include/rule.h b/include/rule.h -index 936177b..0c52315 100644 ---- a/include/rule.h -+++ b/include/rule.h -@@ -344,6 +344,7 @@ extern void cmd_free(struct cmd *cmd); - * @msgs: message queue - * @cmd: current command - * @table: current table -+ * @rule: current rule - * @set: current set - * @stmt: current statement - * @ectx: expression context -@@ -353,6 +354,7 @@ struct eval_ctx { - struct list_head *msgs; - struct cmd *cmd; - struct table *table; -+ struct rule *rule; - struct set *set; - struct stmt *stmt; - struct expr_ctx ectx; -diff --git a/src/evaluate.c b/src/evaluate.c -index 8f0acf7..2c4e811 100644 ---- a/src/evaluate.c -+++ b/src/evaluate.c -@@ -1203,7 +1203,7 @@ static int stmt_reject_gen_dependency(struct eval_ctx *ctx, struct stmt *stmt, - if (payload_gen_dependency(ctx, payload, &nstmt) < 0) - return -1; - -- list_add(&nstmt->list, &ctx->cmd->rule->stmts); -+ list_add(&nstmt->list, &ctx->rule->stmts); - return 0; - } - -@@ -1722,6 +1722,7 @@ static int rule_evaluate(struct eval_ctx *ctx, struct rule *rule) - proto_ctx_init(&ctx->pctx, rule->handle.family); - memset(&ctx->ectx, 0, sizeof(ctx->ectx)); - -+ ctx->rule = rule; - list_for_each_entry(stmt, &rule->stmts, list) { - if (tstmt != NULL) - return stmt_binary_error(ctx, stmt, tstmt, --- -cgit v0.10.2 - diff --git a/nftables.spec b/nftables.spec index 78a0930..68f304f 100644 --- a/nftables.spec +++ b/nftables.spec @@ -1,6 +1,6 @@ Name: nftables -Version: 0.9.3 -Release: 6%{?dist} +Version: 0.9.6 +Release: 1%{?dist} # Upstream released a 0.100 version, then 0.4. Need Epoch to get back on track. Epoch: 1 Summary: Netfilter Tables userspace utillites @@ -118,6 +118,9 @@ sed -i -e 's/\(sofile=\)".*"/\1"'$sofile'"/' \ %{python3_sitelib}/nftables/ %changelog +* Sat Sep 05 2020 Neal Gompa - 1:0.9.6-1 +- Update to 0.9.6 (RH#1846663) + * Tue Jul 28 2020 Fedora Release Engineering - 1:0.9.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index d2e30c2..899cff3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nftables-0.9.3.tar.bz2) = d264f6fc75c95510e29fe7d5b82ae418d502f40437b098ba6117ffb1374d9989d70a7296e2e58c5fb25142145a987bb9c160902637899f892589809f9541db43 +SHA512 (nftables-0.9.6.tar.bz2) = ca6524ff1cb1e79d636afeb96f54e4699773e1cbda8e9a3ec5728f4d5b764c0df16b195cdcc0e304ae5643c8761b6b5a6685c737965a7415aec07aeb9f3dc5df