jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-02 07:27:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

iptables: update to iptables-1.6.1

Browse Source
This commit is contained in:
MilhouseVH 2017-05-06 21:16:56 +01:00
parent 7ba150651d
commit f3a466fb16
3 changed files with 1 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/network/iptables/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="iptables"
PKG_VERSION="1.6.0"
PKG_VERSION="1.6.1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.netfilter.org/"

24
packages/network/iptables/patches/iptables-01-buildfix.patch
View File

@ -1,24 +0,0 @@
diff -Naur iptables-1.6.0/extensions/GNUmakefile.in iptables-1.6.0.patch/extensions/GNUmakefile.in
--- iptables-1.6.0/extensions/GNUmakefile.in 2015-12-09 13:55:06.000000000 +0100
+++ iptables-1.6.0.patch/extensions/GNUmakefile.in 2015-12-21 07:57:44.698366669 +0100
@@ -21,7 +21,7 @@
kinclude_CPPFLAGS = @kinclude_CPPFLAGS@
AM_CFLAGS = ${regular_CFLAGS}
-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ @libnftnl_CFLAGS@
+AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include -I${top_srcdir} ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ @libnftnl_CFLAGS@
AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
AM_LDFLAGS = @noundef_LDFLAGS@
diff -Naur iptables-1.6.0/iptables/Makefile.am iptables-1.6.0.patch/iptables/Makefile.am
--- iptables-1.6.0/iptables/Makefile.am 2015-12-09 13:55:06.000000000 +0100
+++ iptables-1.6.0.patch/iptables/Makefile.am 2015-12-21 08:03:22.245954635 +0100
@@ -1,7 +1,7 @@
# -*- Makefile -*-
AM_CFLAGS = ${regular_CFLAGS}
-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} ${libnftnl_CFLAGS} ${libnetfilter_conntrack_CFLAGS}
+AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include -I${top_srcdir} ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} ${libnftnl_CFLAGS} ${libnetfilter_conntrack_CFLAGS}
AM_YFLAGS = -d
xtables_multi_SOURCES = xtables-multi.c iptables-xml.c

39
packages/network/iptables/patches/iptables-02-add-xtables-config-parser.h-to-BUILT_SOURCES.patch
View File

@ -1,39 +0,0 @@
From 4dc8e2aa91bd4151f7e5cd56d88d3731b4c1525e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 30 Dec 2015 14:39:35 -0300
Subject: [PATCH] iptables: add xtables-config-parser.h to BUILT_SOURCES
Otherwise other sources that use it might be built before it's ready leading
to build failure, for example by iptables/nft.c
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
Status: sent upstream (mailing list, no link yet)
iptables/Makefile.am | 3 +++
1 file changed, 3 insertions(+)
diff --git a/iptables/Makefile.am b/iptables/Makefile.am
index 3c0faa5..c3eb8a8 100644
--- a/iptables/Makefile.am
+++ b/iptables/Makefile.am
@@ -4,6 +4,8 @@ AM_CFLAGS = ${regular_CFLAGS}
AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} ${libnftnl_CFLAGS} ${libnetfilter_conntrack_CFLAGS}
AM_YFLAGS = -d
+BUILT_SOURCES =
+
xtables_multi_SOURCES = xtables-multi.c iptables-xml.c
xtables_multi_CFLAGS = ${AM_CFLAGS}
xtables_multi_LDADD = ../extensions/libext.a
@@ -27,6 +29,7 @@ xtables_multi_LDADD += ../libxtables/libxtables.la -lm
# nftables compatibility layer
if ENABLE_NFTABLES
+BUILT_SOURCES += xtables-config-parser.h
xtables_compat_multi_SOURCES = xtables-compat-multi.c iptables-xml.c
xtables_compat_multi_CFLAGS = ${AM_CFLAGS}
xtables_compat_multi_LDADD = ../extensions/libext.a ../extensions/libext_ebt.a
--
2.4.10