[ptxdist] [PATCH] libpcap: version bump to 1.4.0
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 --- ...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..000 --- 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 -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 - 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..000 --- a/patches/libpcap-1.1.1/0002-dont-compile-static-lib.diff +++ /dev/null @@ -1,34 +0,0 @@ -From: Michael Olbrich -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 - 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..000 --- 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 -Date: Sun, 10 Jan 2010 00:49:07 +0100 -Subject: [PATCH 4/4] pcap-config: add SYSROOT support - -Si
Re: [ptxdist] [PATCH] libpcap: version bump to 1.4.0
On Fri, May 31, 2013 at 06:18:21PM +0200, Alexander Aring wrote: > 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 > --- > ...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..000 > --- > 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 > -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 > > - 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..000 > --- a/patches/libpcap-1.1.1/0002-dont-compile-static-lib.diff > +++ /dev/null > @@ -1,34 +0,0 @@ > -From: Michael Olbrich > -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 > > - 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 45
Re: [ptxdist] [PATCH] libpcap: version bump to 1.4.0
On Mon, Jun 03, 2013 at 01:57:40PM +0200, Michael Olbrich wrote: > On Fri, May 31, 2013 at 06:18:21PM +0200, Alexander Aring wrote: > > 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. > > > > I think this patch can be avoided by setting > *_MAKE_OPT and *_INSTALL_OPT, right? > > I'll test this after the release as well. > ping here too. Should test the avoid of this patch and resend this patch with wireshark on top? With an old libpcap version, wireshark displays that I am using a known broken protocol and I don't know what happens there when I take a capture it. - Alex -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libpcap: version bump to 1.4.0
On Mon, Jan 27, 2014 at 08:41:48AM +0100, Alexander Aring wrote: > On Mon, Jun 03, 2013 at 01:57:40PM +0200, Michael Olbrich wrote: > > On Fri, May 31, 2013 at 06:18:21PM +0200, Alexander Aring wrote: > > > 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. > > > > > > > I think this patch can be avoided by setting > > *_MAKE_OPT and *_INSTALL_OPT, right? > > > > I'll test this after the release as well. > > > > ping here too. Should test the avoid of this patch and resend this patch > with wireshark on top? > > With an old libpcap version, wireshark displays that I am using a known broken > protocol and I don't know what happens there when I take a capture it. Same as with wireshark. Please test. Michael > - Alex > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
