Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10593 from Rmys/master

Browse Source 
iptales-1.8.8
This commit is contained in:
Rmys
2022-08-03 23:36:16 +03:00
committed by GitHub
parent 96b853f4e2 cc4e94b5e5
commit 4984085f34
4 changed files with 66 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/filter/iptables/actions.py
+1
View File
@@ -11,6 +11,7 @@ from pisi.actionsapi import get
def setup():
shelltools.system("rm -f include/linux/types.h")
autotools.autoreconf("-fiv")
autotools.configure("--sbindir=/sbin \
--libexecdir=/usr/lib \
--enable-bpf-compiler \
network/filter/iptables/files/0001-xshared-Fix-build-for-Werror-format-security.patch
+29
View File
@@ -0,0 +1,29 @@
From fe9bd3b29dd7661e6f74c24db8356014798d1d78 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Fri, 13 May 2022 16:51:58 +0200
Subject: [PATCH] xshared: Fix build for -Werror=format-security
Gcc complains about the omitted format string.
Signed-off-by: Phil Sutter <phil@nwl.cc>
(cherry picked from commit b72eb12ea5a61df0655ad99d5048994e916be83a)
---
iptables/xshared.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/iptables/xshared.c b/iptables/xshared.c
index fae5ddd5df93e..a8512d3808154 100644
--- a/iptables/xshared.c
+++ b/iptables/xshared.c
@@ -1307,7 +1307,7 @@ static void check_empty_interface(struct xtables_args *args, const char *arg)
return;
if (args->family != NFPROTO_ARP)
- xtables_error(PARAMETER_PROBLEM, msg);
+ xtables_error(PARAMETER_PROBLEM, "%s", msg);
fprintf(stderr, "%s", msg);
}
--
2.34.1
network/filter/iptables/files/iptables-1.8.2-link.patch
+24
View File
@@ -0,0 +1,24 @@
From ee4fc7c558d9eb9c37035250046d4eac9af3fa28 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Thu, 27 Dec 2018 23:47:33 +0100
Subject: [PATCH] Fix link errors for USE="conntrack static-libs" (bug #586106)
---
iptables/Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/iptables/Makefile.am b/iptables/Makefile.am
index 581dc32..2c3db86 100644
--- a/iptables/Makefile.am
+++ b/iptables/Makefile.am
@@ -26,6 +26,7 @@ xtables_legacy_multi_LDADD += ../libiptc/libip6tc.la ../extensions/libext6.a
endif
xtables_legacy_multi_SOURCES += xshared.c
xtables_legacy_multi_LDADD += ../libxtables/libxtables.la -lm
+xtables_legacy_multi_LDADD += ${libnetfilter_conntrack_LIBS}
# iptables using nf_tables api
if ENABLE_NFTABLES
--
2.19.1
network/filter/iptables/pspec.xml
+12 -2
View File
@@ -12,18 +12,20 @@
<IsA>app:console</IsA>
<Summary>Firewall, NAT and packet mangling tools</Summary>
<Description>Contains iptables firewall, NAT and packet mangling tools.</Description>
<Archive sha1sum="05ef75415cb7cb7641f51d51e74f3ea29cc31ab1" type="tarbz2">https://www.netfilter.org/projects/iptables/files/iptables-1.8.7.tar.bz2</Archive>
<Archive sha1sum="98783621a5e58ff55f83b1350523f3de41af621d" type="tarbz2">https://www.netfilter.org/projects/iptables/files/iptables-1.8.8.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libmnl-devel</Dependency>
<Dependency>libpcap-devel</Dependency>
<Dependency>libnfnetlink-devel</Dependency>
<Dependency>libnetfilter_conntrack-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- these got in
<Patch>iptables-1.4.2-as-needed.patch</Patch>
<Patch>iptables-1.4.2-no-ldconfig.patch</Patch>
-->
<!--<Patch>iptables-1.4.2-glibc.patch</Patch>-->
<Patch>iptables-1.8.2-link.patch</Patch>
<Patch>0001-xshared-Fix-build-for-Werror-format-security.patch</Patch>
</Patches>
</Source>
@@ -33,6 +35,7 @@
<Dependency>libmnl</Dependency>
<Dependency>libpcap</Dependency>
<Dependency>libnfnetlink</Dependency>
<Dependency>libnetfilter_conntrack</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -65,6 +68,13 @@
</Package>
<History>
<Update release="8">
<Date>2022-08-03</Date>
<Version>1.8.8</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7">
<Date>2021-07-19</Date>
<Version>1.8.7</Version>