swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51252 from c0bw3b/pkg/iptables

Browse source 
iptables: 1.6.2 -> 1.8.2
This commit is contained in:
Renaud 2018-12-03 21:46:22 +01:00 committed by GitHub
parent dad991e63f f190b5f226
commit 4f7df755f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/os-specific/linux/iptables/default.nix
View file

@ -1,18 +1,38 @@
{ stdenv, fetchurl, bison, flex, pkgconfig
, libnetfilter_conntrack, libnftnl, libmnl }:
{ stdenv, fetchurl, fetchpatch, bison, flex, pkgconfig
, libnetfilter_conntrack, libnftnl, libmnl, libpcap }:
stdenv.mkDerivation rec {
name = "iptables-${version}";
version = "1.6.2";
version = "1.8.2";
src = fetchurl {
url = "https://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
sha256 = "0crp0lvh5m2f15pr8cw97h8yb8zjj10x95zj06j46cr68vx2vl2m";
sha256 = "1bqj9hf3szy9r0w14iy23w00ir8448nfhpcprbwmcchsxm88nxx3";
};
patches = [
# Adds missing bits to extensions' libipt_icmp.c and libip6t_icmp6.c that were causing build to fail
(fetchpatch {
url = "https://git.netfilter.org/iptables/patch/?id=907e429d7548157016cd51aba4adc5d0c7d9f816";
sha256 = "0vc7ljcglz5152lc3jx4p44vjfi6ipvxdrgkdb5dmkhlb5v93i2h";
})
# Build with musl libc fails because of conflicting struct ethhdr definitions
(fetchpatch {
url = "https://git.netfilter.org/iptables/patch/?id=51d374ba41ae4f1bb851228c06b030b83dd2092f";
sha256 = "05fwrq03f9sm0v2bfwshbrg7pi2p978w1460arnmpay3135gj266";
})
# extensions: libip6t_mh: fix bogus translation error
(fetchpatch {
url = "https://git.netfilter.org/iptables/patch/?id=5839d7fe62ff667af7132fc7d589b386951f27b3";
sha256 = "0578jn1ip710z9kijwg9g2vjq2kfrbafl03m1rgi4fasz215gvkf";
})
# Prevent headers collisions between linux and netfilter (in.h and in6.h)
(./netinet-headers-collision.patch)
];
nativeBuildInputs = [ bison flex pkgconfig ];
buildInputs = [ libnetfilter_conntrack libnftnl libmnl ];
buildInputs = [ libnetfilter_conntrack libnftnl libmnl libpcap ];
preConfigure = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl"
@ -21,17 +41,18 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-devel"
"--enable-shared"
"--enable-bpf-compiler"
];
outputs = [ "out" "dev" ];
meta = with stdenv.lib; {
description = "A program to configure the Linux IP packet filtering ruleset";
homepage = http://www.netfilter.org/projects/iptables/index.html;
homepage = https://www.netfilter.org/projects/iptables/index.html;
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz ];
license = licenses.gpl2;
downloadPage = "http://www.netfilter.org/projects/iptables/files/";
downloadPage = "https://www.netfilter.org/projects/iptables/files/";
updateWalker = true;
inherit version;
};

11
pkgs/os-specific/linux/iptables/netinet-headers-collision.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -3,7 +3,9 @@
#include <linux/types.h>
+#ifndef _NETINET_IN_H
#include <linux/in.h>
#include <linux/in6.h>
+#endif
#include <limits.h>