mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] libpcap: version bump to 1.4.0
@ 2013-05-31 16:18 Alexander Aring
  2013-06-03 11:57 ` Michael Olbrich
  0 siblings, 1 reply; 4+ messages in thread
From: Alexander Aring @ 2013-05-31 16:18 UTC (permalink / raw)
  To: ptxdist; +Cc: Alexander Aring

Bump libpcap version to 1.4.0.

Changes:
  - Add --enable-bluetooth configure parameter only if LIBPCAP_BLUETOOTH
    is set.
  - Add --disable-universal to disable build for Mac OS.
  - Add --enable-shared to build shared library.

Both are default parameter but we avoid a change of default behaviour
here.

Remove patch 0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch:
  - This patch is already mainline see:
    https://github.com/the-tcpdump-group/libpcap/commit/3a089e628c2ef39efdb64c53a7566052917ae974

Update other patches to current version and put a signed-off by me in
the commit message.

Change 0002-pcap-config-add-SYSROOT-support.patch patch to add SYSROOT
dir only in includedir and libdir variable, so it's easier to maintain.

Tested with wireshark 1.4.0 and tcpdump 4.1.1

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 ...FLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch | 27 -----------
 .../0002-dont-compile-static-lib.diff              | 34 -------------
 .../0004-pcap-config-add-SYSROOT-support.patch     | 55 ----------------------
 patches/libpcap-1.1.1/series                       |  3 --
 .../0001-build-and-install-share-lib-only.patch    | 39 +++++++++++++++
 .../0002-pcap-config-add-SYSROOT-support.patch     | 28 +++++++++++
 patches/libpcap-1.4.0/series                       |  2 +
 rules/libpcap.make                                 |  7 ++-
 8 files changed, 74 insertions(+), 121 deletions(-)
 delete mode 100644 patches/libpcap-1.1.1/0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch
 delete mode 100644 patches/libpcap-1.1.1/0002-dont-compile-static-lib.diff
 delete mode 100644 patches/libpcap-1.1.1/0004-pcap-config-add-SYSROOT-support.patch
 delete mode 100644 patches/libpcap-1.1.1/series
 create mode 100644 patches/libpcap-1.4.0/0001-build-and-install-share-lib-only.patch
 create mode 100644 patches/libpcap-1.4.0/0002-pcap-config-add-SYSROOT-support.patch
 create mode 100644 patches/libpcap-1.4.0/series

diff --git a/patches/libpcap-1.1.1/0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch b/patches/libpcap-1.1.1/0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch
deleted file mode 100644
index 25e5c9d..0000000
--- a/patches/libpcap-1.1.1/0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 80513b7c807126fddedf114d6cc35f873f9ebd16 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Sun, 10 Jan 2010 00:47:38 +0100
-Subject: [PATCH 1/4] add CFLAGS, CPPFLAGS and LDFLAGS to Makefile.in
-
-the build system is autoconf but not automake :(
-It doesn't care about CFLAGS or CPPFLAGS from outside.
-This patch adds them.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- Makefile.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -58,7 +58,7 @@ V_RPATH_OPT = @V_RPATH_OPT@
- PROG=libpcap
- 
- # Standard CFLAGS
--CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
-+CFLAGS += $(CCOPT) $(INCLS) $(DEFS) $(CPPFLAGS)
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/patches/libpcap-1.1.1/0002-dont-compile-static-lib.diff b/patches/libpcap-1.1.1/0002-dont-compile-static-lib.diff
deleted file mode 100644
index fefd05e..0000000
--- a/patches/libpcap-1.1.1/0002-dont-compile-static-lib.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: 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: Michael Olbrich <m.olbrich@pengutronix.de>
----
- Makefile.in |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -324,7 +324,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 $@
-@@ -497,7 +497,7 @@ selpolltest: selpolltest.c libpcap.a
- opentest: opentest.c libpcap.a
- 	$(CC) $(CFLAGS) -I. -L. -o opentest $(srcdir)/opentest.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.1.1/0004-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.1.1/0004-pcap-config-add-SYSROOT-support.patch
deleted file mode 100644
index 457a7aa..0000000
--- a/patches/libpcap-1.1.1/0004-pcap-config-add-SYSROOT-support.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From e41188c0eb0cbd906c4c649ea2f13de2d57b79ee Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Sun, 10 Jan 2010 00:49:07 +0100
-Subject: [PATCH 4/4] pcap-config: add SYSROOT support
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- pcap-config.in |   16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-Index: b/pcap-config.in
-===================================================================
---- a/pcap-config.in
-+++ b/pcap-config.in
-@@ -47,16 +47,16 @@ then
- 	#
- 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
- 	then
--		echo "-I@includedir@ -L@libdir@ -lpcap @LIBS@"
-+		echo "-I${SYSROOT}@includedir@ -L${SYSROOT}@libdir@ -lpcap @LIBS@"
- 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
- 	then
--		echo "-I@includedir@ -L@libdir@ @LIBS@"
-+		echo "-I${SYSROOT}@includedir@ -L${SYSROOT}@libdir@ @LIBS@"
- 	elif [ "$show_cflags" = 1 ]
- 	then
--		echo "-I@includedir@"
-+		echo "-I${SYSROOT}@includedir@"
- 	elif [ "$show_libs" = 1 ]
- 	then
--		echo "-L@libdir@ -lpcap @LIBS@"
-+		echo "-L${SYSROOT}@libdir@ -lpcap @LIBS@"
- 	elif [ "$show_additional_libs" = 1 ]
- 	then
- 		echo "@LIBS@"
-@@ -68,15 +68,15 @@ else
- 	#
- 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
- 	then
--		echo "-I@includedir@ -L@libdir@ $RPATH -lpcap"
-+		echo "-I${SYSROOT}@includedir@ -L${SYSROOT}@libdir@ $RPATH -lpcap"
- 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
- 	then
--		echo "-I@includedir@"
-+		echo "-I${SYSROOT}@includedir@"
- 	elif [ "$show_cflags" = 1 ]
- 	then
--		echo "-I@includedir@"
-+		echo "-I${SYSROOT}@includedir@"
- 	elif [ "$show_libs" = 1 ]
- 	then
--		echo "-L@libdir@ $RPATH -lpcap"
-+		echo "-L:{SYSROOT}@libdir@ $RPATH -lpcap"
- 	fi
- fi
diff --git a/patches/libpcap-1.1.1/series b/patches/libpcap-1.1.1/series
deleted file mode 100644
index 9c6cddc..0000000
--- a/patches/libpcap-1.1.1/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch
-0002-dont-compile-static-lib.diff
-0004-pcap-config-add-SYSROOT-support.patch
diff --git a/patches/libpcap-1.4.0/0001-build-and-install-share-lib-only.patch b/patches/libpcap-1.4.0/0001-build-and-install-share-lib-only.patch
new file mode 100644
index 0000000..ee6c12e
--- /dev/null
+++ b/patches/libpcap-1.4.0/0001-build-and-install-share-lib-only.patch
@@ -0,0 +1,39 @@
+From eb6374bab46421bafc2734f5451d28184d2bd861 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Fri, 31 May 2013 17:28:01 +0200
+Subject: [PATCH 1/2] 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 772cc7d..7f3c5ca 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -345,7 +345,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 $@
+@@ -530,7 +530,7 @@ opentest: tests/opentest.c libpcap.a
+ selpolltest: tests/selpolltest.c libpcap.a
+ 	$(CC) $(FULL_CFLAGS) -I. -L. -o selpolltest $(srcdir)/tests/selpolltest.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) ] || \
+-- 
+1.8.3
+
diff --git a/patches/libpcap-1.4.0/0002-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.4.0/0002-pcap-config-add-SYSROOT-support.patch
new file mode 100644
index 0000000..fbde3e7
--- /dev/null
+++ b/patches/libpcap-1.4.0/0002-pcap-config-add-SYSROOT-support.patch
@@ -0,0 +1,28 @@
+From c293ce6876bb3c8129dfa14be07ce871808fae81 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sun, 10 Jan 2010 00:49:07 +0100
+Subject: [PATCH 2/2] pcap-config: add SYSROOT support
+
+Signed-off-by: Alexander Aring <alex.aring@gmail.com>
+---
+ pcap-config.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pcap-config.in b/pcap-config.in
+index 206be3b..fb68cb3 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@"
+ 
+-- 
+1.8.3
+
diff --git a/patches/libpcap-1.4.0/series b/patches/libpcap-1.4.0/series
new file mode 100644
index 0000000..78662cf
--- /dev/null
+++ b/patches/libpcap-1.4.0/series
@@ -0,0 +1,2 @@
+0001-build-and-install-share-lib-only.patch
+0002-pcap-config-add-SYSROOT-support.patch
diff --git a/rules/libpcap.make b/rules/libpcap.make
index 9527dd4..251661c 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBPCAP) += libpcap
 #
 # Paths and names
 #
-LIBPCAP_VERSION	:= 1.1.1
-LIBPCAP_MD5	:= 1bca27d206970badae248cfa471bbb47
+LIBPCAP_VERSION	:= 1.4.0
+LIBPCAP_MD5	:= 56e88a5aabdd1e04414985ac24f7e76c
 LIBPCAP		:= libpcap-$(LIBPCAP_VERSION)
 LIBPCAP_SUFFIX	:= tar.gz
 LIBPCAP_URL	:= http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX)
@@ -48,6 +48,9 @@ LIBPCAP_AUTOCONF := \
 	--enable-protochain \
 	--disable-optimizer-dbg \
 	--disable-yydebug \
+	--disable-universal \
+	--enable-shared \
+	--$(call ptx/endis, PTXCONF_LIBPCAP_BLUETOOTH)-bluetooth \
 	--with-libnl \
 	--without-dag \
 	--without-septel
-- 
1.8.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-30  9:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-31 16:18 [ptxdist] [PATCH] libpcap: version bump to 1.4.0 Alexander Aring
2013-06-03 11:57 ` Michael Olbrich
2014-01-27  7:41   ` Alexander Aring
2014-01-30  9:01     ` Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox