diff options
Diffstat (limited to 'main/nftables')
| -rw-r--r-- | main/nftables/01-fix-object-order-via-nft--f.patch | 50 | ||||
| -rw-r--r-- | main/nftables/APKBUILD | 20 |
2 files changed, 8 insertions, 62 deletions
diff --git a/main/nftables/01-fix-object-order-via-nft--f.patch b/main/nftables/01-fix-object-order-via-nft--f.patch deleted file mode 100644 index 6092032c5a..0000000000 --- a/main/nftables/01-fix-object-order-via-nft--f.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 454ffab9cc695b9618324a6a0a4dead6d5289f8d Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso <pablo@netfilter.org> -Date: Sat, 14 Feb 2015 21:41:23 +0100 -Subject: rule: fix object order via nft -f - -The objects need to be loaded in the following order: - - #1 tables - #2 chains - #3 sets - #4 rules - -We have to make sure that chains are in place by when we add rules with -jumps/gotos. Similarly, we have to make sure that the sets are in place -by when rules reference them. - -Without this patch, you may hit ENOENT errors depending on your ruleset -configuration. - -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> - -diff --git a/src/rule.c b/src/rule.c -index feafe26..8d76fd0 100644 ---- a/src/rule.c -+++ b/src/rule.c -@@ -658,14 +658,19 @@ static int do_add_table(struct netlink_ctx *ctx, const struct handle *h, - if (netlink_add_table(ctx, h, loc, table, excl) < 0) - return -1; - if (table != NULL) { -+ list_for_each_entry(chain, &table->chains, list) { -+ if (netlink_add_chain(ctx, &chain->handle, -+ &chain->location, chain, -+ excl) < 0) -+ return -1; -+ } - list_for_each_entry(set, &table->sets, list) { - handle_merge(&set->handle, &table->handle); - if (do_add_set(ctx, &set->handle, set) < 0) - return -1; - } - list_for_each_entry(chain, &table->chains, list) { -- if (do_add_chain(ctx, &chain->handle, &chain->location, -- chain, excl) < 0) -+ if (netlink_add_rule_list(ctx, h, &chain->rules) < 0) - return -1; - } - } --- -cgit v0.10.2 - diff --git a/main/nftables/APKBUILD b/main/nftables/APKBUILD index d7971bf4a4..8794931974 100644 --- a/main/nftables/APKBUILD +++ b/main/nftables/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=nftables -pkgver=0.4 +pkgver=0.5 pkgrel=0 pkgdesc="Netfilter tables userspace tools" url="http://netfilter.org/projects/nftables/" @@ -14,8 +14,7 @@ install="" subpackages="" # -doc would require docbook2x which isn't packaged yet source="http://netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2 nftables.confd - nftables.initd - 01-fix-object-order-via-nft--f.patch" + nftables.initd" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -56,15 +55,12 @@ package() { "$pkgdir"/etc/conf.d/$pkgname || return 1 } -md5sums="09b686c489ff10db670ca60dbed7ff43 nftables-0.4.tar.bz2 +md5sums="94bfe1c54bcb9f6ed974835f2fca8069 nftables-0.5.tar.bz2 52273a548f7cbfe17ba9ba97b10cf685 nftables.confd -63e330d514aed839ce9985c3cb918e2c nftables.initd -c0a18f43a5ce02cb61c9e0071725529a 01-fix-object-order-via-nft--f.patch" -sha256sums="f6ca69b75c68915f9f3a3972274ec68354dfbbcfc0b9fc55c813a0525c351d3c nftables-0.4.tar.bz2 +63e330d514aed839ce9985c3cb918e2c nftables.initd" +sha256sums="1fb6dff333d8a4fc347cbbe273bf905a2634b27a8c39df0d3a45d5a3fde10ad6 nftables-0.5.tar.bz2 8f09ab3f86f326d3b78dca50db0bfdde2d8bf5e5d45e3495a836edebe99ec2ff nftables.confd -787873899c07c74e8d26731922df2d26ecb98e1c2e2ca9cdf2450f85621730ff nftables.initd -ab5068a30e4a0df72b589aec500a4a6a1c3a5ab50ee73fad034eee676eabe9bb 01-fix-object-order-via-nft--f.patch" -sha512sums="0932cf987da602285fbf7c7f61328b0d74d687889c2d4a5bd2bd7fe11e8b99433bc5ee53ebbddadf2c90e40acdcb28f6babf07e11feedff815c571c3b782dffc nftables-0.4.tar.bz2 +787873899c07c74e8d26731922df2d26ecb98e1c2e2ca9cdf2450f85621730ff nftables.initd" +sha512sums="d5ac46bada26522e59461e36d793a2f4dbf42e070d71ac33259d86b343c0d7436975988b7e7878c340f9d81479a11a66518f1307384635ae0229b2f969f8f342 nftables-0.5.tar.bz2 f709e203d949380dce8ffdaed616c047280d3fe7448bb024a6f6c01a17c11bf7caaa5f67b412bc90c9bff4ce91a6fd5e5270d259dc30fdcda81dd2f6221ad0d8 nftables.confd -c99ecc03b19615aa53c6b8dbec2b2006b28b8f44817e08a30a48970c100f40877cfb6c214eb6b36b6cd0517a0e07d07f1157d930661a31ac46fbc2ec0d3a502d nftables.initd -9b7b51c55681fc25bb53fef6bf38e125377a3b32bdf6e9c8c7056a72deb7f24b7b6e2dcccb3065645e69675848585c6051e8992d9179f1609fbe1d873cb3bddf 01-fix-object-order-via-nft--f.patch" +c99ecc03b19615aa53c6b8dbec2b2006b28b8f44817e08a30a48970c100f40877cfb6c214eb6b36b6cd0517a0e07d07f1157d930661a31ac46fbc2ec0d3a502d nftables.initd" |