[Buildroot] [PATCH 1/2] libpcap: drop libnl headers patch

[Buildroot] [PATCH 1/2] libpcap: drop libnl headers patch

[Baruch Siach]

We can avoid host headers using a --with-libnl parameter to override the
default host headers path. The configure script adds /include suffix to the
include path. So we still need to manually add -I with the correct path to
CFLAGS because libnl headers are under the libnl3/ directory.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 .../libpcap/0001-remove-libnl-include-path.patch   | 25 ----------------------
 package/libpcap/libpcap.mk                         |  1 +
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 package/libpcap/0001-remove-libnl-include-path.patch

diff --git a/package/libpcap/0001-remove-libnl-include-path.patch b/package/libpcap/0001-remove-libnl-include-path.patch
deleted file mode 100644
index d0760d4f9d86..000000000000
--- a/package/libpcap/0001-remove-libnl-include-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Remove hardcoded path to libnl3 include directory
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Gustavo: update for 1.7.2]
-
-diff -Nura libpcap-1.7.2.orig/configure.in libpcap-1.7.2/configure.in
---- libpcap-1.7.2.orig/configure.in	2015-03-14 08:02:05.538706347 -0300
-+++ libpcap-1.7.2/configure.in	2015-03-14 08:17:22.637519050 -0300
-@@ -461,14 +461,13 @@
- 			#
- 			# Yes, we have libnl 3.x.
- 			#
--			LIBS="${libnldir} -lnl-genl-3 -lnl-3 $LIBS"
-+			LIBS="-lnl-genl-3 -lnl-3 $LIBS"
- 			AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
- 			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
- 			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
- 			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
--			V_INCLS="$V_INCLS ${incdir}"
- 			have_any_nl="yes"
--		],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
-+		],[], -lnl-genl-3 -lnl-3 )
- 
- 		if test x$have_any_nl = xno ; then
- 			#
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 4c7a66c09d13..0a74de7b8ea7 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -51,6 +51,7 @@ endif
 ifeq ($(BR2_PACKAGE_LIBNL),y)
 LIBPCAP_DEPENDENCIES += libnl
 LIBPCAP_CFLAGS += "-I$(STAGING_DIR)/usr/include/libnl3"
+LIBPCAP_CONF_OPTS += --with-libnl=$(STAGING_DIR)/usr
 else
 LIBPCAP_CONF_OPTS += --without-libnl
 endif
-- 
2.9.3

[Buildroot] [PATCH 2/2] libpcap: bump to version 1.8.1

[Baruch Siach]

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>
---
 ....in-fix-detect-of-if_bonding.h-on-uclinux.patch | 30 ----------------------
 package/libpcap/libpcap.hash                       |  2 +-
 package/libpcap/libpcap.mk                         |  5 +---
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 package/libpcap/0002-configure.in-fix-detect-of-if_bonding.h-on-uclinux.patch

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 7838c6f25676..000000000000
--- 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 5ce53673b803..6894046aff45 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 0a74de7b8ea7..258308795379 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)
-- 
2.9.3

[Buildroot] [PATCH 1/2] libpcap: drop libnl headers patch

[Thomas Petazzoni]

Hello,

On Wed, 26 Oct 2016 20:03:09 +0300, Baruch Siach wrote:
> We can avoid host headers using a --with-libnl parameter to override the
> default host headers path. The configure script adds /include suffix to the
> include path. So we still need to manually add -I with the correct path to
> CFLAGS because libnl headers are under the libnl3/ directory.
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  .../libpcap/0001-remove-libnl-include-path.patch   | 25 ----------------------
>  package/libpcap/libpcap.mk                         |  1 +
>  2 files changed, 1 insertion(+), 25 deletions(-)
>  delete mode 100644 package/libpcap/0001-remove-libnl-include-path.patch

Both patches applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/2] libpcap: bump to version 1.8.1

[Thomas Petazzoni]

Hello,

On Wed, 26 Oct 2016 20:03:10 +0300, Baruch Siach wrote:
> 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>
> ---
>  ....in-fix-detect-of-if_bonding.h-on-uclinux.patch | 30 ----------------------
>  package/libpcap/libpcap.hash                       |  2 +-
>  package/libpcap/libpcap.mk                         |  5 +---
>  3 files changed, 2 insertions(+), 35 deletions(-)
>  delete mode 100644 package/libpcap/0002-configure.in-fix-detect-of-if_bonding.h-on-uclinux.patch

This bump breaks the build of ngrep, see
http://autobuild.buildroot.net/results/809/80982b07bddb8092accc643f2dc8105cd17ecb37/build-end.log.
I've tested, and indeed after reverting the bump, ngrep builds fine.

Could you have a look?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/2] libpcap: bump to version 1.8.1

[Baruch Siach]

Hi Thomas,

On Wed, Oct 26, 2016 at 11:31:36PM +0200, Thomas Petazzoni wrote:
> On Wed, 26 Oct 2016 20:03:10 +0300, Baruch Siach wrote:
> > 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>
> > ---
> >  ....in-fix-detect-of-if_bonding.h-on-uclinux.patch | 30 ----------------------
> >  package/libpcap/libpcap.hash                       |  2 +-
> >  package/libpcap/libpcap.mk                         |  5 +---
> >  3 files changed, 2 insertions(+), 35 deletions(-)
> >  delete mode 100644 package/libpcap/0002-configure.in-fix-detect-of-if_bonding.h-on-uclinux.patch
> 
> This bump breaks the build of ngrep, see
> http://autobuild.buildroot.net/results/809/80982b07bddb8092accc643f2dc8105cd17ecb37/build-end.log.
> I've tested, and indeed after reverting the bump, ngrep builds fine.
> 
> Could you have a look?

Thanks for the head-up. I have posted a patch.

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -