diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 1a3a9ed..5ccc3ec 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1716910044 -commit: cb13a807e948b9e2ee7f30031672e0410b673646daf7a327e92699b9254efbbd +mtime: 1731082713 +commit: afadf7cc4cf654b96187e401e444d359b4adf1210c0cd73f6959365b82182079 url: https://src.opensuse.org/jengelh/iptables revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 425f4c0..865281b 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2eb708ac1c9276ca2a5191d551fde3e6cc2bc99b93683499442c156c1ff3a4f +oid sha256:0047592c39bd7deffc7bc29d7c037d6873029747c5a67b4ec4c93353e3e3b069 size 256 diff --git a/iptables-1.8.10.tar.xz b/iptables-1.8.10.tar.xz deleted file mode 100644 index 36f17e6..0000000 --- a/iptables-1.8.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c -size 641168 diff --git a/iptables-1.8.10.tar.xz.sig b/iptables-1.8.10.tar.xz.sig deleted file mode 100644 index 51a3574..0000000 Binary files a/iptables-1.8.10.tar.xz.sig and /dev/null differ diff --git a/iptables-1.8.11.tar.xz b/iptables-1.8.11.tar.xz new file mode 100644 index 0000000..d92db88 --- /dev/null +++ b/iptables-1.8.11.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d87303d55ef8c92bcad4dd3f978b26d272013642b029425775f5bad1009fe7b2 +size 649284 diff --git a/iptables-1.8.11.tar.xz.sig b/iptables-1.8.11.tar.xz.sig new file mode 100644 index 0000000..44921dc Binary files /dev/null and b/iptables-1.8.11.tar.xz.sig differ diff --git a/iptables-batch-lock.patch b/iptables-batch-lock.patch index fe6f729..100b8f9 100644 --- a/iptables-batch-lock.patch +++ b/iptables-batch-lock.patch @@ -10,10 +10,10 @@ Date: 2017-06-26T10:53:24+0000 iptables/xshared.c | 8 +++++++- 2 files changed, 28 insertions(+), 1 deletion(-) -Index: iptables-1.8.10/iptables/iptables-batch.c +Index: iptables-1.8.11/iptables/iptables-batch.c =================================================================== ---- iptables-1.8.10.orig/iptables/iptables-batch.c -+++ iptables-1.8.10/iptables/iptables-batch.c +--- iptables-1.8.11.orig/iptables/iptables-batch.c ++++ iptables-1.8.11/iptables/iptables-batch.c @@ -44,6 +44,7 @@ #include #endif @@ -49,10 +49,10 @@ Index: iptables-1.8.10/iptables/iptables-batch.c while((r = getline(&iline, &llen, fp)) != -1) { -Index: iptables-1.8.10/iptables/xshared.c +Index: iptables-1.8.11/iptables/xshared.c =================================================================== ---- iptables-1.8.10.orig/iptables/xshared.c -+++ iptables-1.8.10/iptables/xshared.c +--- iptables-1.8.11.orig/iptables/xshared.c ++++ iptables-1.8.11/iptables/xshared.c @@ -255,10 +255,14 @@ static void alarm_ignore(int i) { static int xtables_lock(int wait) @@ -72,8 +72,8 @@ Index: iptables-1.8.10/iptables/xshared.c alarm(wait); } -- if (flock(fd, LOCK_EX) == 0) -+ if (flock(fd, LOCK_EX) == 0) { +- if (flock(fd, LOCK_EX | (wait ? 0 : LOCK_NB)) == 0) ++ if (flock(fd, LOCK_EX | (wait ? 0 : LOCK_NB)) == 0) { + already_locked = true; return fd; + } diff --git a/iptables.changes b/iptables.changes index 663aad5..4b4ac15 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Nov 8 16:14:22 UTC 2024 - Jan Engelhardt + +- Update to release 1.8.11 + * New arptables-translate tool + * ebtables-nft: support --replace and --list-rules commands + * iptables-translate: support socket match and TPROXY target + ------------------------------------------------------------------- Fri May 24 15:07:24 UTC 2024 - Jan Engelhardt diff --git a/iptables.spec b/iptables.spec index c6cb679..68b89bb 100644 --- a/iptables.spec +++ b/iptables.spec @@ -23,7 +23,7 @@ %endif Name: iptables -Version: 1.8.10 +Version: 1.8.11 Release: 0 Summary: IP packet filter administration utilities License: Artistic-2.0 AND GPL-2.0-only @@ -47,7 +47,7 @@ BuildRequires: xz BuildRequires: pkgconfig(libmnl) >= 1.0 BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.4 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0 -BuildRequires: pkgconfig(libnftnl) >= 1.1.6 +BuildRequires: pkgconfig(libnftnl) >= 1.2.6 Requires: netcfg >= 11.6 Requires: xtables-plugins = %version-%release %if %{with libalternatives} @@ -319,6 +319,7 @@ fi %files %license COPYING %_bindir/iptables-xml +%_sbindir/arptables-*translate* %_sbindir/iptables-apply %_sbindir/iptables-legacy* %_sbindir/iptables-nft*