Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages /
nftables
Commits:
28c36ac5 by Christian Hesse at 2024-10-03T19:53:00+02:00
upgpkg: 1:1.1.1-1: new upstream release
- - - - -
3 changed files:
- .SRCINFO
- − 0001-Revert-cache-recycle-existing-cache-with-incremental.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = nftables
pkgdesc = Netfilter tables userspace tools
- pkgver = 1.1.0
- pkgrel = 2
+ pkgver = 1.1.1
+ pkgrel = 1
epoch = 1
url = https://netfilter.org/projects/nftables/
install = nftables.install
@@ -21,15 +21,13 @@ pkgbase = nftables
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 =
https://netfilter.org/projects/nftables/files/nftables-1.1.1.tar.xz
+ source =
https://netfilter.org/projects/nftables/files/nftables-1.1.1.tar.xz.sig
source = nftables.conf
source = nftables.service
validpgpkeys = 37D964ACC04981C75500FB9BD55D978A8A1420E4
- sha256sums =
ef3373294886c5b607ee7be82c56a25bc04e75f802f8e8adcd55aac91eb0aa24
+ sha256sums =
6358830f3a64f31e39b0ad421d7dadcd240b72343ded48d8ef13b8faf204865a
sha256sums = SKIP
- sha256sums =
0c49e931a9546f1d6bbf17d1cc1b6799e9f685259530e0bb7a630e6825c904e5
sha256sums =
f83d6f2f99f306866850c60ff0e343bbd9bc0c989d333ebe288563f7be4afe20
sha256sums =
deffeef36fe658867dd9203ec13dec85047a6d224ea63334dcf60db97e1809ea
=====================================
0001-Revert-cache-recycle-existing-cache-with-incremental.patch deleted
=====================================
@@ -1,51 +0,0 @@
-From dc3e9eec4b74082bb5787077b391de904ee4ddc2 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <[email protected]>
-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
-
=====================================
PKGBUILD
=====================================
@@ -2,8 +2,8 @@
pkgname=nftables
epoch=1
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
pkgdesc='Netfilter tables userspace tools'
arch=('x86_64')
url='https://netfilter.org/projects/nftables/'
@@ -15,13 +15,11 @@ makedepends=('asciidoc' 'python' 'python-setuptools'
'python-build'
backup=('etc/nftables.conf')
validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team
source=("https://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.xz"{,.sig}
- '0001-Revert-cache-recycle-existing-cache-with-incremental.patch'
'nftables.conf'
'nftables.service')
install=nftables.install
-sha256sums=('ef3373294886c5b607ee7be82c56a25bc04e75f802f8e8adcd55aac91eb0aa24'
+sha256sums=('6358830f3a64f31e39b0ad421d7dadcd240b72343ded48d8ef13b8faf204865a'
'SKIP'
- '0c49e931a9546f1d6bbf17d1cc1b6799e9f685259530e0bb7a630e6825c904e5'
'f83d6f2f99f306866850c60ff0e343bbd9bc0c989d333ebe288563f7be4afe20'
'deffeef36fe658867dd9203ec13dec85047a6d224ea63334dcf60db97e1809ea')
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/nftables/-/commit/28c36ac5a9db014c39f69d6894691d90e644076c
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/nftables/-/commit/28c36ac5a9db014c39f69d6894691d90e644076c
You're receiving this email because of your account on gitlab.archlinux.org.
