libpcap: update 1.7.4 -> 1.8.1

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 100 insertions, 0 deletions

diff --git a/patches/libpcap-1.8.1/0001-build-and-install-share-lib-only.patch b/patches/libpcap-1.8.1/0001-build-and-install-share-lib-only.patch
new file mode 100644
index 000000000..85ce7015d
--- /dev/null
+++ b/patches/libpcap-1.8.1/0001-build-and-install-share-lib-only.patch
@@ -0,0 +1,35 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Fri, 31 May 2013 17:28:01 +0200
+Subject: [PATCH] build and install share lib only
+
+This patch removes the static library from the dependency list
+for "all" and "install". This way libpcap.a is not built and
+tcpdump cannot link against it.
+
+Signed-off-by: Alexander Aring <alex.aring@gmail.com>
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e71d973ca448..e0debadeb837 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -358,7 +358,7 @@ EXTRA_DIST = \
+ 	Win32/Prj/wpcap.vcxproj \
+ 	Win32/Prj/wpcap.vcxproj.filters
+ 
+-all: libpcap.a shared pcap-config
++all: shared pcap-config
+ 
+ libpcap.a: $(OBJ)
+ 	@rm -f $@
+@@ -550,7 +550,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)
+ 
+-install: install-shared install-archive pcap-config
++install: install-shared pcap-config
+ 	[ -d $(DESTDIR)$(libdir) ] || \
+ 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
+ 	[ -d $(DESTDIR)$(includedir) ] || \
diff --git a/patches/libpcap-1.8.1/0002-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.8.1/0002-pcap-config-add-SYSROOT-support.patch
new file mode 100644
index 000000000..51cf6c554
--- /dev/null
+++ b/patches/libpcap-1.8.1/0002-pcap-config-add-SYSROOT-support.patch
@@ -0,0 +1,33 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sun, 10 Jan 2010 00:49:07 +0100
+Subject: [PATCH] pcap-config: add SYSROOT support
+
+Signed-off-by: Alexander Aring <alex.aring@gmail.com>
+---
+ pcap-config.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pcap-config.in b/pcap-config.in
+index 206be3b4a644..50b05f53d32e 100644
+--- a/pcap-config.in
++++ b/pcap-config.in
+@@ -6,8 +6,8 @@
+ #
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+-includedir="@includedir@"
+-libdir="@libdir@"
++includedir="${SYSROOT}@includedir@"
++libdir="${SYSROOT}@libdir@"
+ V_RPATH_OPT="@V_RPATH_OPT@"
+ LIBS="@LIBS@"
+ 
+@@ -41,7 +41,7 @@ then
+ 	#
+ 	# If libdir isn't /usr/lib, add it to the run-time linker path.
+ 	#
+-	if [ "$libdir" != "/usr/lib" ]
++	if [ "$libdir" != "${SYSROOT}/usr/lib" ]
+ 	then
+ 		RPATH=$V_RPATH_OPT$libdir
+ 	fi
diff --git a/patches/libpcap-1.8.1/0003-configure.ac-allow-specifying-path-for-libnl3.patch b/patches/libpcap-1.8.1/0003-configure.ac-allow-specifying-path-for-libnl3.patch
new file mode 100644
index 000000000..3e56d90c9
--- /dev/null
+++ b/patches/libpcap-1.8.1/0003-configure.ac-allow-specifying-path-for-libnl3.patch
@@ -0,0 +1,25 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 29 Jan 2014 09:17:52 +0100
+Subject: [PATCH] configure.ac: allow specifying path for libnl3
+
+---
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index da2f940da963..8a3ab56d865c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -511,7 +511,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 ${incdir}"
++			if test x$with_libnl != xyes ; then
++				V_INCLS="$V_INCLS -I${with_libnl}/include/libnl3"
++			else
++				V_INCLS="$V_INCLS ${incdir}"
++			fi
+ 			have_any_nl="yes"
+ 		],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
+ 
diff --git a/patches/libpcap-1.8.1/autogen.sh b/patches/libpcap-1.8.1/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/libpcap-1.8.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/libpcap-1.8.1/series b/patches/libpcap-1.8.1/series
new file mode 100644
index 000000000..5b8e8a230
--- /dev/null
+++ b/patches/libpcap-1.8.1/series
@@ -0,0 +1,6 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-build-and-install-share-lib-only.patch
+0002-pcap-config-add-SYSROOT-support.patch
+0003-configure.ac-allow-specifying-path-for-libnl3.patch
+# 04919371617f914a399e4491d8b76206  - git-ptx-patches magic