summaryrefslogtreecommitdiff
path: root/package/libpcap
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2016-10-26 20:03:10 +0300
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-10-26 21:51:33 +0200
commitb35e87f0dd9e057647d8e3bb29a524fa5477a98c (patch)
treee3defd2e74749ae392d0efcf002a83fb4c68bd91 /package/libpcap
parenta2d9202f6f9119e1cea44a913306e361b03d90e5 (diff)
libpcap: bump to version 1.8.1
Drop upstream patch. Also remove ac_cv_linux_vers caching since this check was remove in upstream commit f3e011b18c55ae. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/libpcap')
-rw-r--r--package/libpcap/0002-configure.in-fix-detect-of-if_bonding.h-on-uclinux.patch30
-rw-r--r--package/libpcap/libpcap.hash2
-rw-r--r--package/libpcap/libpcap.mk5
3 files changed, 2 insertions, 35 deletions
diff --git a/package/libpcap/0002-configure.in-fix-detect-of-if_bonding.h-on-uclinux.patch b/package/libpcap/0002-configure.in-fix-detect-of-if_bonding.h-on-uclinux.patch
deleted file mode 100644
index 7838c6f25..000000000
--- a/package/libpcap/0002-configure.in-fix-detect-of-if_bonding.h-on-uclinux.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5b8dc4eaeab60d5effc33055e5bce9ac0d98d339 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Tue, 2 Jun 2015 21:39:15 +0300
-Subject: [PATCH] configure.in: fix detect of if_bonding.h on uclinux
-
-noMMU Linux (uClinux) is also Linux
-
-Upstream status: https://github.com/the-tcpdump-group/libpcap/pull/440
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index be4b29e2f8ba..31287d0dbe61 100644
---- a/configure.in
-+++ b/configure.in
-@@ -149,7 +149,7 @@ struct rtentry;
- fi
-
- case "$host_os" in
--linux*)
-+linux*|uclinux*)
- AC_CHECK_HEADERS(linux/sockios.h linux/if_bonding.h,,,
- [
- #include <sys/socket.h>
---
-2.1.4
-
diff --git a/package/libpcap/libpcap.hash b/package/libpcap/libpcap.hash
index 5ce53673b..6894046af 100644
--- a/package/libpcap/libpcap.hash
+++ b/package/libpcap/libpcap.hash
@@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
-sha256 7ad3112187e88328b85e46dce7a9b949632af18ee74d97ffc3f2b41fe7f448b0 libpcap-1.7.4.tar.gz
+sha256 673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e libpcap-1.8.1.tar.gz
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 0a74de7b8..258308795 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -4,17 +4,14 @@
#
################################################################################
-LIBPCAP_VERSION = 1.7.4
+LIBPCAP_VERSION = 1.8.1
LIBPCAP_SITE = http://www.tcpdump.org/release
LIBPCAP_LICENSE = BSD-3c
LIBPCAP_LICENSE_FILES = LICENSE
LIBPCAP_INSTALL_STAGING = YES
LIBPCAP_DEPENDENCIES = zlib host-flex host-bison
-# We're patching configure.in
-LIBPCAP_AUTORECONF = YES
LIBPCAP_CONF_ENV = \
- ac_cv_linux_vers=2 \
ac_cv_header_linux_wireless_h=yes \
CFLAGS="$(LIBPCAP_CFLAGS)"
LIBPCAP_CFLAGS = $(TARGET_CFLAGS)