Re: [ptxdist] [PATCH] libpcap: Add support for libnl-2.0
On Thu, Jun 16, 2011 at 01:01:17PM -0400, Jon Ringle wrote: > Bump I've this on my todo. However, I know that there are other packages using libnl, and I need to see how it affects them. Unfortunately I'm rather busy lately. Regards,.. Michael -- 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
Re: [ptxdist] [PATCH] libpcap: Add support for libnl-2.0
Bump On Fri, Jun 10, 2011 at 9:28 AM, Jon Ringle wrote: > Upstream commit that enables support for libnl-2: > https://github.com/mcr/libpcap/commit/bc937fc4ff6715e9bee939041fa02be0755d7d58 > > patch series rebuilt with git-ptx-patches > > Signed-off-by: Jon Ringle > --- > ...FLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch | 12 +- > .../0002-build-and-install-share-lib-only.patch | 38 +++ > .../0002-dont-compile-static-lib.diff | 34 -- > .../0003-pcap-config-add-SYSROOT-support.patch | 57 > ...-for-libnl-2.x-adapted-from-a-newer-versi.patch | 343 > > .../0004-pcap-config-add-SYSROOT-support.patch | 55 > patches/libpcap-1.1.1/series | 7 +- > 7 files changed, 450 insertions(+), 96 deletions(-) > create mode 100644 > patches/libpcap-1.1.1/0002-build-and-install-share-lib-only.patch > delete mode 100644 patches/libpcap-1.1.1/0002-dont-compile-static-lib.diff > create mode 100644 > patches/libpcap-1.1.1/0003-pcap-config-add-SYSROOT-support.patch > create mode 100644 > patches/libpcap-1.1.1/0004-Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch > delete mode 100644 > patches/libpcap-1.1.1/0004-pcap-config-add-SYSROOT-support.patch > > 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 > index 25e5c9d..d772bc0 100644 > --- > 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 > @@ -1,7 +1,6 @@ > -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 > +Subject: [PATCH] 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. > @@ -10,10 +9,10 @@ This patch adds them. > Signed-off-by: Marc Kleine-Budde > --- > Makefile.in | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > + 1 files changed, 1 insertions(+), 1 deletions(-) > > -Index: b/Makefile.in > -=== > +diff --git a/Makefile.in b/Makefile.in > +index f576462..ee9bfca 100644 > --- a/Makefile.in > +++ b/Makefile.in > @@ -58,7 +58,7 @@ V_RPATH_OPT = @V_RPATH_OPT@ > @@ -25,3 +24,6 @@ Index: b/Makefile.in > > INSTALL = @INSTALL@ > INSTALL_PROGRAM = @INSTALL_PROGRAM@ > +-- > +1.7.0.4 > + > diff --git > a/patches/libpcap-1.1.1/0002-build-and-install-share-lib-only.patch > b/patches/libpcap-1.1.1/0002-build-and-install-share-lib-only.patch > new file mode 100644 > index 000..c1bf462 > --- /dev/null > +++ b/patches/libpcap-1.1.1/0002-build-and-install-share-lib-only.patch > @@ -0,0 +1,38 @@ > +From: Michael Olbrich > +Date: Fri, 10 Jun 2011 08:57:31 -0400 > +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: Michael Olbrich > +--- > + Makefile.in | 4 ++-- > + 1 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/Makefile.in b/Makefile.in > +index ee9bfca..6cab4e5 100644 > +--- 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) ] || \ > +-- > +1.7.0.4 > + > 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/Mak
[ptxdist] [PATCH] libpcap: Add support for libnl-2.0
Upstream commit that enables support for libnl-2: https://github.com/mcr/libpcap/commit/bc937fc4ff6715e9bee939041fa02be0755d7d58 patch series rebuilt with git-ptx-patches Signed-off-by: Jon Ringle --- ...FLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch | 12 +- .../0002-build-and-install-share-lib-only.patch| 38 +++ .../0002-dont-compile-static-lib.diff | 34 -- .../0003-pcap-config-add-SYSROOT-support.patch | 57 ...-for-libnl-2.x-adapted-from-a-newer-versi.patch | 343 .../0004-pcap-config-add-SYSROOT-support.patch | 55 patches/libpcap-1.1.1/series |7 +- 7 files changed, 450 insertions(+), 96 deletions(-) create mode 100644 patches/libpcap-1.1.1/0002-build-and-install-share-lib-only.patch delete mode 100644 patches/libpcap-1.1.1/0002-dont-compile-static-lib.diff create mode 100644 patches/libpcap-1.1.1/0003-pcap-config-add-SYSROOT-support.patch create mode 100644 patches/libpcap-1.1.1/0004-Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch delete mode 100644 patches/libpcap-1.1.1/0004-pcap-config-add-SYSROOT-support.patch 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 index 25e5c9d..d772bc0 100644 --- 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 @@ -1,7 +1,6 @@ -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 +Subject: [PATCH] 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. @@ -10,10 +9,10 @@ This patch adds them. Signed-off-by: Marc Kleine-Budde --- Makefile.in |2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 1 files changed, 1 insertions(+), 1 deletions(-) -Index: b/Makefile.in -=== +diff --git a/Makefile.in b/Makefile.in +index f576462..ee9bfca 100644 --- a/Makefile.in +++ b/Makefile.in @@ -58,7 +58,7 @@ V_RPATH_OPT = @V_RPATH_OPT@ @@ -25,3 +24,6 @@ Index: b/Makefile.in INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-- +1.7.0.4 + diff --git a/patches/libpcap-1.1.1/0002-build-and-install-share-lib-only.patch b/patches/libpcap-1.1.1/0002-build-and-install-share-lib-only.patch new file mode 100644 index 000..c1bf462 --- /dev/null +++ b/patches/libpcap-1.1.1/0002-build-and-install-share-lib-only.patch @@ -0,0 +1,38 @@ +From: Michael Olbrich +Date: Fri, 10 Jun 2011 08:57:31 -0400 +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: Michael Olbrich +--- + Makefile.in |4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index ee9bfca..6cab4e5 100644 +--- 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) ] || \ +-- +1.7.0.4 + 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 - $
