* update nftables to 1:1.1.0-2
This commit is contained in:
parent
640651ac2c
commit
17e7faba6c
40
nftables/.SRCINFO
Normal file
40
nftables/.SRCINFO
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
pkgbase = nftables
|
||||||
|
pkgdesc = Netfilter tables userspace tools
|
||||||
|
pkgver = 1.1.0
|
||||||
|
pkgrel = 2
|
||||||
|
epoch = 1
|
||||||
|
url = https://netfilter.org/projects/nftables/
|
||||||
|
install = nftables.install
|
||||||
|
arch = x86_64
|
||||||
|
arch = powerpc64le
|
||||||
|
arch = powerpc64
|
||||||
|
arch = powerpc
|
||||||
|
arch = riscv64
|
||||||
|
license = GPL-2.0-only
|
||||||
|
makedepends = asciidoc
|
||||||
|
makedepends = python
|
||||||
|
makedepends = python-setuptools
|
||||||
|
makedepends = python-build
|
||||||
|
makedepends = python-installer
|
||||||
|
makedepends = python-wheel
|
||||||
|
depends = libmnl
|
||||||
|
depends = libnftnl
|
||||||
|
depends = gmp
|
||||||
|
depends = readline
|
||||||
|
depends = ncurses
|
||||||
|
depends = jansson
|
||||||
|
optdepends = python: Python bindings
|
||||||
|
backup = etc/nftables.conf
|
||||||
|
source = https://netfilter.org/projects/nftables/files/nftables-1.1.0.tar.xz
|
||||||
|
source = https://netfilter.org/projects/nftables/files/nftables-1.1.0.tar.xz.sig
|
||||||
|
source = 0001-Revert-cache-recycle-existing-cache-with-incremental.patch
|
||||||
|
source = nftables.conf
|
||||||
|
source = nftables.service
|
||||||
|
validpgpkeys = 37D964ACC04981C75500FB9BD55D978A8A1420E4
|
||||||
|
sha256sums = ef3373294886c5b607ee7be82c56a25bc04e75f802f8e8adcd55aac91eb0aa24
|
||||||
|
sha256sums = SKIP
|
||||||
|
sha256sums = 0c49e931a9546f1d6bbf17d1cc1b6799e9f685259530e0bb7a630e6825c904e5
|
||||||
|
sha256sums = f83d6f2f99f306866850c60ff0e343bbd9bc0c989d333ebe288563f7be4afe20
|
||||||
|
sha256sums = deffeef36fe658867dd9203ec13dec85047a6d224ea63334dcf60db97e1809ea
|
||||||
|
|
||||||
|
pkgname = nftables
|
@ -0,0 +1,51 @@
|
|||||||
|
From dc3e9eec4b74082bb5787077b391de904ee4ddc2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christian Hesse <mail@eworm.de>
|
||||||
|
Date: Fri, 19 Jul 2024 14:19:28 +0200
|
||||||
|
Subject: [PATCH 1/1] Revert "cache: recycle existing cache with incremental
|
||||||
|
updates"
|
||||||
|
|
||||||
|
This reverts commit e791dbe109b6dd891a63a4236df5dc29d7a4b863.
|
||||||
|
---
|
||||||
|
src/cache.c | 18 +++---------------
|
||||||
|
1 file changed, 3 insertions(+), 15 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/cache.c b/src/cache.c
|
||||||
|
index 4b797ec7..e88cbae2 100644
|
||||||
|
--- a/src/cache.c
|
||||||
|
+++ b/src/cache.c
|
||||||
|
@@ -1184,21 +1184,9 @@ static bool nft_cache_needs_refresh(struct nft_cache *cache, unsigned int flags)
|
||||||
|
(flags & NFT_CACHE_REFRESH);
|
||||||
|
}
|
||||||
|
|
||||||
|
-static bool nft_cache_is_updated(struct nft_cache *cache, unsigned int flags,
|
||||||
|
- uint16_t genid)
|
||||||
|
+static bool nft_cache_is_updated(struct nft_cache *cache, uint16_t genid)
|
||||||
|
{
|
||||||
|
- if (!genid)
|
||||||
|
- return false;
|
||||||
|
-
|
||||||
|
- if (genid == cache->genid)
|
||||||
|
- return true;
|
||||||
|
-
|
||||||
|
- if (genid == cache->genid + 1) {
|
||||||
|
- cache->genid++;
|
||||||
|
- return true;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- return false;
|
||||||
|
+ return genid && genid == cache->genid;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool nft_cache_needs_update(struct nft_cache *cache)
|
||||||
|
@@ -1223,7 +1211,7 @@ replay:
|
||||||
|
genid = mnl_genid_get(&ctx);
|
||||||
|
if (!nft_cache_needs_refresh(cache, flags) &&
|
||||||
|
nft_cache_is_complete(cache, flags) &&
|
||||||
|
- nft_cache_is_updated(cache, flags, genid))
|
||||||
|
+ nft_cache_is_updated(cache, genid))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (cache->genid)
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
@ -3,8 +3,8 @@
|
|||||||
|
|
||||||
pkgname=nftables
|
pkgname=nftables
|
||||||
epoch=1
|
epoch=1
|
||||||
pkgver=1.0.9
|
pkgver=1.1.0
|
||||||
pkgrel=3
|
pkgrel=2
|
||||||
pkgdesc='Netfilter tables userspace tools'
|
pkgdesc='Netfilter tables userspace tools'
|
||||||
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
||||||
url='https://netfilter.org/projects/nftables/'
|
url='https://netfilter.org/projects/nftables/'
|
||||||
@ -16,11 +16,13 @@ makedepends=('asciidoc' 'python' 'python-setuptools' 'python-build'
|
|||||||
backup=('etc/nftables.conf')
|
backup=('etc/nftables.conf')
|
||||||
validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team
|
validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team
|
||||||
source=("https://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.xz"{,.sig}
|
source=("https://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.xz"{,.sig}
|
||||||
|
'0001-Revert-cache-recycle-existing-cache-with-incremental.patch'
|
||||||
'nftables.conf'
|
'nftables.conf'
|
||||||
'nftables.service')
|
'nftables.service')
|
||||||
install=nftables.install
|
install=nftables.install
|
||||||
sha256sums=('a3c304cd9ba061239ee0474f9afb938a9bb99d89b960246f66f0c3a0a85e14cd'
|
sha256sums=('ef3373294886c5b607ee7be82c56a25bc04e75f802f8e8adcd55aac91eb0aa24'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
|
'0c49e931a9546f1d6bbf17d1cc1b6799e9f685259530e0bb7a630e6825c904e5'
|
||||||
'f83d6f2f99f306866850c60ff0e343bbd9bc0c989d333ebe288563f7be4afe20'
|
'f83d6f2f99f306866850c60ff0e343bbd9bc0c989d333ebe288563f7be4afe20'
|
||||||
'deffeef36fe658867dd9203ec13dec85047a6d224ea63334dcf60db97e1809ea')
|
'deffeef36fe658867dd9203ec13dec85047a6d224ea63334dcf60db97e1809ea')
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user