diff --git a/net-libs/libpcap/libpcap-1.8.1.recipe b/net-libs/libpcap/libpcap-1.8.1.recipe index 28755fca8..19f29f0d5 100644 --- a/net-libs/libpcap/libpcap-1.8.1.recipe +++ b/net-libs/libpcap/libpcap-1.8.1.recipe @@ -22,7 +22,7 @@ COPYRIGHT="1988-1998 The Regents of the University of California 2009 Felix Obenhuber 2014 Michal Labedzki for Tieto Corporation" LICENSE="BSD (3-clause)" -REVISION="3" +REVISION="4" SOURCE_URI="http://www.tcpdump.org/release/libpcap-$portVersion.tar.gz" CHECKSUM_SHA256="673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e" PATCHES="libpcap-$portVersion.patchset" diff --git a/net-libs/libpcap/patches/libpcap-1.8.1.patchset b/net-libs/libpcap/patches/libpcap-1.8.1.patchset index 2d4f20e9b..924f3c169 100644 --- a/net-libs/libpcap/patches/libpcap-1.8.1.patchset +++ b/net-libs/libpcap/patches/libpcap-1.8.1.patchset @@ -1,4 +1,4 @@ -From 3f1d0e27568b5228dd4092fff614c81449fc1530 Mon Sep 17 00:00:00 2001 +From e14a0062b596f09bb98f18fe55a7b51add633d62 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 28 Apr 2015 18:39:03 +0000 Subject: Haiku patch @@ -377,5 +377,29 @@ index 0000000..983a7dc + return pcap_findalldevs_interfaces(_allDevices, errorBuffer, canBeBound); +} -- -2.10.2 +2.19.1 + + +From 498332fb124c8041297e7d1055bc2330197b627a Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 26 Feb 2019 20:07:07 +0100 +Subject: libpcap: fix 32bit x86 build + +Confusion around the definition of int32... + +diff --git a/pcap/bpf.h b/pcap/bpf.h +index 78ad890..fc05d7c 100644 +--- a/pcap/bpf.h ++++ b/pcap/bpf.h +@@ -81,7 +81,7 @@ extern "C" { + /* BSD style release date */ + #define BPF_RELEASE 199606 + +-#ifdef MSDOS /* must be 32-bit */ ++#if defined(MSDOS) || (defined(__HAIKU__) && defined(__X86__)) /* must be 32-bit */ + typedef long bpf_int32; + typedef unsigned long bpf_u_int32; + #else +-- +2.19.1