libpcap: version bump 1.5.3 -> 1.7.4

Signed-off-by: Alexander Aring <aar@pengutronix.de>
[mol: fix building with bluetooth support]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 9 insertions, 9 deletions

diff --git a/patches/libpcap-1.5.3/0001-build-and-install-share-lib-only.patch b/patches/libpcap-1.7.4/0001-build-and-install-share-lib-only.patch
index 68030377a..c12a5b904 100644
--- a/patches/libpcap-1.5.3/0001-build-and-install-share-lib-only.patch
+++ b/patches/libpcap-1.7.4/0001-build-and-install-share-lib-only.patch
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Aring <alex.aring@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 2784960..653b353 100644
+index 4c35bde7caab..d472dd487d71 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -356,7 +356,7 @@ EXTRA_DIST = \
+@@ -358,7 +358,7 @@ EXTRA_DIST = \
  	Win32/Src/inet_net.c \
  	Win32/Src/inet_pton.c
  
@@ -24,7 +24,7 @@ index 2784960..653b353 100644
  
  libpcap.a: $(OBJ)
  	@rm -f $@
-@@ -544,7 +544,7 @@ selpolltest: tests/selpolltest.c libpcap.a
+@@ -549,7 +549,7 @@ selpolltest: tests/selpolltest.c libpcap.a
  valgrindtest: tests/valgrindtest.c libpcap.a
  	$(CC) $(FULL_CFLAGS) -I. -L. -o valgrindtest $(srcdir)/tests/valgrindtest.c libpcap.a $(LIBS)
  
diff --git a/patches/libpcap-1.5.3/0002-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.7.4/0002-pcap-config-add-SYSROOT-support.patch
index 5a6e85f4e..51cf6c554 100644
--- a/patches/libpcap-1.5.3/0002-pcap-config-add-SYSROOT-support.patch
+++ b/patches/libpcap-1.7.4/0002-pcap-config-add-SYSROOT-support.patch
@@ -8,7 +8,7 @@ Signed-off-by: Alexander Aring <alex.aring@gmail.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/pcap-config.in b/pcap-config.in
-index 206be3b..50b05f5 100644
+index 206be3b4a644..50b05f53d32e 100644
 --- a/pcap-config.in
 +++ b/pcap-config.in
 @@ -6,8 +6,8 @@
diff --git a/patches/libpcap-1.5.3/0003-configure.in-allow-specifying-path-for-libnl3.patch b/patches/libpcap-1.7.4/0003-configure.in-allow-specifying-path-for-libnl3.patch
index df133a081..0318ac8e1 100644
--- a/patches/libpcap-1.5.3/0003-configure.in-allow-specifying-path-for-libnl3.patch
+++ b/patches/libpcap-1.7.4/0003-configure.in-allow-specifying-path-for-libnl3.patch
@@ -7,19 +7,19 @@ Subject: [PATCH] configure.in: allow specifying path for libnl3
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/configure.in b/configure.in
-index 2cae646..a83acdf 100644
+index be4b29e2f8ba..34dcf02a1481 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -460,7 +460,11 @@ linux)
+@@ -476,7 +476,11 @@ linux)
  			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 -I/usr/include/libnl3"
+-			V_INCLS="$V_INCLS ${incdir}"
 +			if test x$with_libnl != xyes ; then
 +				V_INCLS="$V_INCLS -I${with_libnl}/include/libnl3"
 +			else
-+				V_INCLS="$V_INCLS -I/usr/include/libnl3"
++				V_INCLS="$V_INCLS ${incdir}"
 +			fi
  			have_any_nl="yes"
- 		])
+ 		],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
  
diff --git a/patches/libpcap-1.5.3/autogen.sh b/patches/libpcap-1.7.4/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/libpcap-1.5.3/autogen.sh
+++ b/patches/libpcap-1.7.4/autogen.sh
diff --git a/patches/libpcap-1.5.3/series b/patches/libpcap-1.7.4/series
index d68098e92..d68098e92 100644
--- a/patches/libpcap-1.5.3/series
+++ b/patches/libpcap-1.7.4/series