iptables: update to 1.8.2.

This commit is contained in:
Christian Buschau 2019-01-09 00:17:00 +01:00 committed by Helmut Pozimski
parent 2fe2d3d201
commit a38840ef6a
3 changed files with 58 additions and 13 deletions

View File

@ -0,0 +1,28 @@
From e8ba70f898179ede0170e36db49ca27570b12371 Mon Sep 17 00:00:00 2001
From: Nathan <ndowens04@gmail.com>
Date: Wed, 9 Jan 2019 21:03:56 -0600
Subject: [PATCH 1/2] Fix glibc build
---
include/linux/netfilter.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git include/linux/netfilter.h include/linux/netfilter.h
index c3f087a..c934044 100644
--- include/linux/netfilter.h
+++ include/linux/netfilter.h
@@ -2,9 +2,10 @@
#define __LINUX_NETFILTER_H
#include <linux/types.h>
-
+#ifndef __GLIBC__
#include <linux/in.h>
#include <linux/in6.h>
+#endif
#include <limits.h>
/* Responses from hook functions. */
--
2.20.1

View File

@ -0,0 +1,26 @@
From 3186b4418d5c11fd7943623722478eec9727282a Mon Sep 17 00:00:00 2001
From: Nathan <ndowens04@gmail.com>
Date: Wed, 9 Jan 2019 21:04:59 -0600
Subject: [PATCH 2/2] Fix musl build
---
extensions/libebt_vlan.c | 2 ++
1 file changed, 2 insertions(+)
diff --git extensions/libebt_vlan.c extensions/libebt_vlan.c
index 4a2eb71..a5c7dc4 100644
--- extensions/libebt_vlan.c
+++ extensions/libebt_vlan.c
@@ -13,7 +13,9 @@
#include <ctype.h>
#include <xtables.h>
#include <linux/netfilter_bridge/ebt_vlan.h>
+#ifdef __GLIBC__
#include <linux/if_ether.h>
+#endif
#include "iptables/nft.h"
#include "iptables/nft-bridge.h"
--
2.20.1

View File

@ -1,7 +1,7 @@
# Template file for 'iptables'
pkgname=iptables
version=1.6.2
revision=4
version=1.8.2
revision=1
build_style=gnu-configure
configure_args="--enable-libipq --enable-shared --enable-devel --enable-bpf-compiler"
hostmakedepends="pkg-config flex"
@ -10,18 +10,9 @@ makedepends="libpcap-devel libfl-devel libmnl-devel libnfnetlink-devel
short_desc="Linux IPv[46] packet filtering ruleset"
maintainer="Juan RP <xtraeme@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.netfilter.org/"
homepage="https://www.netfilter.org/"
distfiles="${homepage}/projects/iptables/files/${pkgname}-${version}.tar.bz2"
checksum=55d02dfa46263343a401f297d44190f2a3e5113c8933946f094ed40237053733
disable_parallel_build=yes
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" automake libtool gettext-devel"
pre_configure() {
autoreconf -fi
}
fi
checksum=a3778b50ed1a3256f9ca975de82c2204e508001fc2471238c8c97f3d1c4c12af
pre_build() {
rm include/linux/types.h