Skip to contentSkip to conversation

package/libpcap: bump to version 1.9.0

PATCH New Fabrice Fontaine 3 participants 3 messages Feb 3, 2019 – Feb 4, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libpcap: bump to version 1.9.0

- Disable Endace DAG card support as libdag is not available in buildroot
- Add upstream patch to fix build on musl

---
 ...x.c-add-missing-limits.h-for-musl-systems.patch | 26 ++++++++++++++++++++++
 package/libpcap/libpcap.hash                       |  2 +-
 package/libpcap/libpcap.mk                         |  4 ++--
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 package/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-systems.patch
package/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-systems.patch new file +26 -0
new file mode 100644
index 0000000000..aabaef3383
@@ -0,0 +1,26 @@
+From aafa3512b7b742f5e66a5543e41974cc5e7eebfa Mon Sep 17 00:00:00 2001
+From: maxice8 <[email protected]>
+Date: Sun, 22 Jul 2018 18:54:17 -0300
+Subject: [PATCH] pcap-usb-linux.c: add missing limits.h for musl systems.
+
+fix compilation on musl libc systems like Void Linux and Alpine.
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Retrieved from:
+https://github.com/the-tcpdump-group/libpcap/commit/aafa3512b7b742f5e66a5543e41974cc5e7eebfa]
+---
+ pcap-usb-linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
+index 6f8adf65e..b92c05ea1 100644
+--- a/pcap-usb-linux.c
++++ b/pcap-usb-linux.c
+@@ -50,6 +50,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <string.h>
+ #include <dirent.h>
+ #include <byteswap.h>
package/libpcap/libpcap.hash +1 -1
index f8bc1bcfef..19ce2adbe1 100644
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256	673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e	libpcap-1.8.1.tar.gz
+sha256	2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019	libpcap-1.9.0.tar.gz
 
 # Hash for license file:
 sha256	8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd	LICENSE
package/libpcap/libpcap.mk +2 -2
index 8cc444e7af..126087220b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBPCAP_VERSION = 1.8.1
+LIBPCAP_VERSION = 1.9.0
 LIBPCAP_SITE = http://www.tcpdump.org/release
 LIBPCAP_LICENSE = BSD-3-Clause
 LIBPCAP_LICENSE_FILES = LICENSE
@@ -15,7 +15,7 @@ LIBPCAP_CONF_ENV = \
 	ac_cv_header_linux_wireless_h=yes \
 	CFLAGS="$(LIBPCAP_CFLAGS)"
 LIBPCAP_CFLAGS = $(TARGET_CFLAGS)
-LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux
+LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag
 LIBPCAP_CONFIG_SCRIPTS = pcap-config
 
 # Omit -rpath from pcap-config output
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 package/libpcap: bump to version 1.9.0

Hello Fabrice and all,

Quoted 5 lines · Fabrice Fontaine

- Disable Endace DAG card support as libdag is not available in buildroot
- Add upstream patch to fix build on musl

[Yann: Tested by building tcpdump]
Quoted 86 lines
---
 ...x.c-add-missing-limits.h-for-musl-systems.patch | 26
++++++++++++++++++++++
 package/libpcap/libpcap.hash                       |  2 +-
 package/libpcap/libpcap.mk                         |  4 ++--
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 package/libpcap/0001-pcap-usb-linux.c-add-

missing-limits.h-for-musl-systems.patch

(quoted diff) +0 -0

limits.h-for-musl-systems.patch b/package/libpcap/0001-pcap-usb- linux.c-add-missing-limits.h-for-musl-systems.patch new file mode 100644
index 0000000000..aabaef3383

package/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for- new file +0 -0

musl-systems.patch

package/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for- new file +1 -0
@@ -0,0 +1,26 @@
+From aafa3512b7b742f5e66a5543e41974cc5e7eebfa Mon Sep 17 00:00:00

2001

package/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for- new file +3 -0
+From: maxice8 <[email protected]>
+Date: Sun, 22 Jul 2018 18:54:17 -0300
+Subject: [PATCH] pcap-usb-linux.c: add missing limits.h for musl

systems.

package/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for- new file +6 -0
+
+fix compilation on musl libc systems like Void Linux and Alpine.
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Retrieved from:
+https://github.com/the-tcpdump-group/libpcap/commit/aafa3512b7b742f5

e66a5543e41974cc5e7eebfa]

+---
+ pcap-usb-linux.c | 1 +

+ 1 file changed, 1 insertion(+)

package/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for- new file +13 -0
+
+diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
+index 6f8adf65e..b92c05ea1 100644
+--- a/pcap-usb-linux.c
++++ b/pcap-usb-linux.c
+@@ -50,6 +50,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <string.h>
+ #include <dirent.h>
+ #include <byteswap.h>
package/libpcap/libpcap.hash +0 -1
index f8bc1bcfef..19ce2adbe1 100644
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256	673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c

6f0c83541e libpcap-1.8.1.tar.gz
+sha256 2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe4
4d68f37019 libpcap-1.9.0.tar.gz

# Hash for license file:
sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697
014eda7afd LICENSE

package/libpcap/libpcap.mk +1 -1
index 8cc444e7af..126087220b 100644
@@ -4,7 +4,7 @@
 #
 ####################################################################
 ############
 
-LIBPCAP_VERSION = 1.8.1
+LIBPCAP_VERSION = 1.9.0
 LIBPCAP_SITE = http://www.tcpdump.org/release
 LIBPCAP_LICENSE = BSD-3-Clause

LIBPCAP_LICENSE_FILES = LICENSE

package/libpcap/libpcap.mk +1 -1
@@ -15,7 +15,7 @@ LIBPCAP_CONF_ENV = \
 	ac_cv_header_linux_wireless_h=yes \
 	CFLAGS="$(LIBPCAP_CFLAGS)"
 LIBPCAP_CFLAGS = $(TARGET_CFLAGS)
-LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux
+LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-

dag
LIBPCAP_CONFIG_SCRIPTS = pcap-config

# Omit -rpath from pcap-config output