diff options
author | Alexander Aring <aar@pengutronix.de> | 2016-04-27 17:54:22 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-17 08:28:34 +0200 |
commit | 3bb02472422390ea508ddf5b7a05b3ed9173361f (patch) | |
tree | 17a77980c1439182e98ac97293f5d1f4d7c06b87 /patches/libpcap-1.7.4 | |
parent | 32dc89d1684015aac52d3ed813432020f06a904a (diff) | |
download | ptxdist-3bb02472422390ea508ddf5b7a05b3ed9173361f.tar.gz ptxdist-3bb02472422390ea508ddf5b7a05b3ed9173361f.tar.xz |
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>
Diffstat (limited to 'patches/libpcap-1.7.4')
5 files changed, 100 insertions, 0 deletions
diff --git a/patches/libpcap-1.7.4/0001-build-and-install-share-lib-only.patch b/patches/libpcap-1.7.4/0001-build-and-install-share-lib-only.patch new file mode 100644 index 000000000..c12a5b904 --- /dev/null +++ b/patches/libpcap-1.7.4/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 4c35bde7caab..d472dd487d71 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -358,7 +358,7 @@ EXTRA_DIST = \ + Win32/Src/inet_net.c \ + Win32/Src/inet_pton.c + +-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 + 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.7.4/0002-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.7.4/0002-pcap-config-add-SYSROOT-support.patch new file mode 100644 index 000000000..51cf6c554 --- /dev/null +++ b/patches/libpcap-1.7.4/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.7.4/0003-configure.in-allow-specifying-path-for-libnl3.patch b/patches/libpcap-1.7.4/0003-configure.in-allow-specifying-path-for-libnl3.patch new file mode 100644 index 000000000..0318ac8e1 --- /dev/null +++ b/patches/libpcap-1.7.4/0003-configure.in-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.in: allow specifying path for libnl3 + +--- + configure.in | 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) + 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.7.4/autogen.sh b/patches/libpcap-1.7.4/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/libpcap-1.7.4/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/libpcap-1.7.4/series b/patches/libpcap-1.7.4/series new file mode 100644 index 000000000..d68098e92 --- /dev/null +++ b/patches/libpcap-1.7.4/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.in-allow-specifying-path-for-libnl3.patch +# 94d8ab7be7249a642f246cfb06146722 - git-ptx-patches magic |