1
0
forked from jengelh/iptables

iptables 1.8.11

This commit is contained in:
Jan Engelhardt 2024-11-08 17:18:33 +01:00
parent cb13a807e9
commit afadf7cc4c
7 changed files with 22 additions and 13 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c
size 641168

Binary file not shown.

BIN
iptables-1.8.11.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

BIN
iptables-1.8.11.tar.xz.sig Normal file

Binary file not shown.

View File

@ -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 <iptables.h>
#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;
+ }

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Nov 8 16:14:22 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- 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 <jengelh@inai.de>

View File

@ -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*