From: Alexander Aring <aar@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Alexander Aring <aar@pengutronix.de>
Subject: [ptxdist] [PATCH 3/4] libpcap: version bump 1.5.3 -> 1.7.4
Date: Wed, 27 Apr 2016 17:54:22 +0200 [thread overview]
Message-ID: <1461772463-1825-3-git-send-email-aar@pengutronix.de> (raw)
In-Reply-To: <1461772463-1825-1-git-send-email-aar@pengutronix.de>
Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
.../0001-build-and-install-share-lib-only.patch | 6 +++---
.../0002-pcap-config-add-SYSROOT-support.patch | 2 +-
.../0003-configure.in-allow-specifying-path-for-libnl3.patch | 10 +++++-----
patches/{libpcap-1.5.3 => libpcap-1.7.4}/autogen.sh | 0
patches/{libpcap-1.5.3 => libpcap-1.7.4}/series | 0
rules/libpcap.make | 11 +++++++----
6 files changed, 16 insertions(+), 13 deletions(-)
rename patches/{libpcap-1.5.3 => libpcap-1.7.4}/0001-build-and-install-share-lib-only.patch (88%)
rename patches/{libpcap-1.5.3 => libpcap-1.7.4}/0002-pcap-config-add-SYSROOT-support.patch (95%)
rename patches/{libpcap-1.5.3 => libpcap-1.7.4}/0003-configure.in-allow-specifying-path-for-libnl3.patch (77%)
rename patches/{libpcap-1.5.3 => libpcap-1.7.4}/autogen.sh (100%)
rename patches/{libpcap-1.5.3 => libpcap-1.7.4}/series (100%)
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
similarity index 88%
rename from patches/libpcap-1.5.3/0001-build-and-install-share-lib-only.patch
rename to patches/libpcap-1.7.4/0001-build-and-install-share-lib-only.patch
index 6803037..c12a5b9 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
similarity index 95%
rename from patches/libpcap-1.5.3/0002-pcap-config-add-SYSROOT-support.patch
rename to patches/libpcap-1.7.4/0002-pcap-config-add-SYSROOT-support.patch
index 5a6e85f..51cf6c5 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
similarity index 77%
rename from patches/libpcap-1.5.3/0003-configure.in-allow-specifying-path-for-libnl3.patch
rename to patches/libpcap-1.7.4/0003-configure.in-allow-specifying-path-for-libnl3.patch
index df133a0..0318ac8 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
similarity index 100%
rename from patches/libpcap-1.5.3/autogen.sh
rename to patches/libpcap-1.7.4/autogen.sh
diff --git a/patches/libpcap-1.5.3/series b/patches/libpcap-1.7.4/series
similarity index 100%
rename from patches/libpcap-1.5.3/series
rename to patches/libpcap-1.7.4/series
diff --git a/rules/libpcap.make b/rules/libpcap.make
index 88a3686..a18f9fa 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBPCAP) += libpcap
#
# Paths and names
#
-LIBPCAP_VERSION := 1.5.3
-LIBPCAP_MD5 := 7e7321fb3aff2f2bb05c8229f3795d4a
+LIBPCAP_VERSION := 1.7.4
+LIBPCAP_MD5 := b2e13142bbaba857ab1c6894aedaf547
LIBPCAP := libpcap-$(LIBPCAP_VERSION)
LIBPCAP_SUFFIX := tar.gz
LIBPCAP_URL := http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX)
@@ -47,19 +47,22 @@ LIBPCAP_COMPILE_ENV := \
#
LIBPCAP_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
- $(GLOBAL_IPV6_OPTION) \
--enable-protochain \
+ $(GLOBAL_IPV6_OPTION) \
--disable-optimizer-dbg \
--disable-yydebug \
--disable-universal \
--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-septel \
+ --without-snf
ifdef PTXCONF_ARCH_MINGW
LIBPCAP_AUTOCONF += --with-pcap=null
--
2.8.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2016-04-27 15:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-27 15:54 [ptxdist] [PATCHv2 1/4] unstrung: initial commit Alexander Aring
2016-04-27 15:54 ` [ptxdist] [PATCH 2/4] wpan-tools: version bump 0.5 -> 0.6 Alexander Aring
2016-04-27 15:54 ` Alexander Aring [this message]
2016-04-27 15:54 ` [ptxdist] [PATCH 4/4] wireshark: version bump 1.10.6 -> 2.0.3 Alexander Aring
2016-05-17 6:31 ` [ptxdist] [PATCHv2 1/4] unstrung: initial commit Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461772463-1825-3-git-send-email-aar@pengutronix.de \
--to=aar@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox