diff options
| -rw-r--r-- | patches/libpcap-1.8.1/0001-build-and-install-share-lib-only.patch (renamed from patches/libpcap-1.7.4/0001-build-and-install-share-lib-only.patch) | 8 | ||||
| -rw-r--r-- | patches/libpcap-1.8.1/0002-pcap-config-add-SYSROOT-support.patch (renamed from patches/libpcap-1.7.4/0002-pcap-config-add-SYSROOT-support.patch) | 0 | ||||
| -rw-r--r-- | patches/libpcap-1.8.1/0003-configure.ac-allow-specifying-path-for-libnl3.patch (renamed from patches/libpcap-1.7.4/0003-configure.in-allow-specifying-path-for-libnl3.patch) | 14 | ||||
| l--------- | patches/libpcap-1.8.1/autogen.sh (renamed from patches/libpcap-1.7.4/autogen.sh) | 0 | ||||
| -rw-r--r-- | patches/libpcap-1.8.1/series (renamed from patches/libpcap-1.7.4/series) | 4 | ||||
| -rw-r--r-- | rules/libpcap.make | 10 |
6 files changed, 18 insertions, 18 deletions
diff --git a/patches/libpcap-1.7.4/0001-build-and-install-share-lib-only.patch b/patches/libpcap-1.8.1/0001-build-and-install-share-lib-only.patch index c12a5b904..85ce7015d 100644 --- a/patches/libpcap-1.7.4/0001-build-and-install-share-lib-only.patch +++ b/patches/libpcap-1.8.1/0001-build-and-install-share-lib-only.patch @@ -12,19 +12,19 @@ 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 4c35bde7caab..d472dd487d71 100644 +index e71d973ca448..e0debadeb837 100644 --- a/Makefile.in +++ b/Makefile.in @@ -358,7 +358,7 @@ EXTRA_DIST = \ - Win32/Src/inet_net.c \ - Win32/Src/inet_pton.c + Win32/Prj/wpcap.vcxproj \ + Win32/Prj/wpcap.vcxproj.filters -all: libpcap.a shared pcap-config +all: shared pcap-config libpcap.a: $(OBJ) @rm -f $@ -@@ -549,7 +549,7 @@ selpolltest: tests/selpolltest.c libpcap.a +@@ -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) diff --git a/patches/libpcap-1.7.4/0002-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.8.1/0002-pcap-config-add-SYSROOT-support.patch index 51cf6c554..51cf6c554 100644 --- a/patches/libpcap-1.7.4/0002-pcap-config-add-SYSROOT-support.patch +++ b/patches/libpcap-1.8.1/0002-pcap-config-add-SYSROOT-support.patch diff --git a/patches/libpcap-1.7.4/0003-configure.in-allow-specifying-path-for-libnl3.patch b/patches/libpcap-1.8.1/0003-configure.ac-allow-specifying-path-for-libnl3.patch index 0318ac8e1..3e56d90c9 100644 --- a/patches/libpcap-1.7.4/0003-configure.in-allow-specifying-path-for-libnl3.patch +++ b/patches/libpcap-1.8.1/0003-configure.ac-allow-specifying-path-for-libnl3.patch @@ -1,16 +1,16 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> Date: Wed, 29 Jan 2014 09:17:52 +0100 -Subject: [PATCH] configure.in: allow specifying path for libnl3 +Subject: [PATCH] configure.ac: allow specifying path for libnl3 --- - configure.in | 6 +++++- + configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -diff --git a/configure.in b/configure.in -index be4b29e2f8ba..34dcf02a1481 100644 ---- a/configure.in -+++ b/configure.in -@@ -476,7 +476,11 @@ linux) +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]) diff --git a/patches/libpcap-1.7.4/autogen.sh b/patches/libpcap-1.8.1/autogen.sh index 9f8a4cb7d..9f8a4cb7d 120000 --- a/patches/libpcap-1.7.4/autogen.sh +++ b/patches/libpcap-1.8.1/autogen.sh diff --git a/patches/libpcap-1.7.4/series b/patches/libpcap-1.8.1/series index d68098e92..5b8e8a230 100644 --- a/patches/libpcap-1.7.4/series +++ b/patches/libpcap-1.8.1/series @@ -2,5 +2,5 @@ #tag:base --start-number 1 0001-build-and-install-share-lib-only.patch 0002-pcap-config-add-SYSROOT-support.patch -0003-configure.in-allow-specifying-path-for-libnl3.patch -# 94d8ab7be7249a642f246cfb06146722 - git-ptx-patches magic +0003-configure.ac-allow-specifying-path-for-libnl3.patch +# 04919371617f914a399e4491d8b76206 - git-ptx-patches magic diff --git a/rules/libpcap.make b/rules/libpcap.make index 4b3a76eea..3f2c85205 100644 --- a/rules/libpcap.make +++ b/rules/libpcap.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBPCAP) += libpcap # # Paths and names # -LIBPCAP_VERSION := 1.7.4 -LIBPCAP_MD5 := b2e13142bbaba857ab1c6894aedaf547 +LIBPCAP_VERSION := 1.8.1 +LIBPCAP_MD5 := 3d48f9cd171ff12b0efd9134b52f1447 LIBPCAP := libpcap-$(LIBPCAP_VERSION) LIBPCAP_SUFFIX := tar.gz LIBPCAP_URL := http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX) @@ -48,6 +48,7 @@ LIBPCAP_COMPILE_ENV := \ # LIBPCAP_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ + $(GLOBAL_LARGE_FILE_OPTION) \ --enable-protochain \ $(GLOBAL_IPV6_OPTION) \ --disable-optimizer-dbg \ @@ -56,14 +57,13 @@ LIBPCAP_AUTOCONF := \ --enable-shared \ --disable-usb \ --$(call ptx/endis, PTXCONF_LIBPCAP_BLUETOOTH)-bluetooth \ - --disable-canusb \ - --disable-can \ --disable-dbus \ --disable-packet-ring \ --with-libnl=$(SYSROOT)/usr \ --without-dag \ --without-septel \ - --without-snf + --without-snf \ + --without-turbocap ifdef PTXCONF_ARCH_MINGW LIBPCAP_AUTOCONF += --with-pcap=null |