Procházet zdrojové kódy

package/libnet: bump to v1.3

Changes:
 - Major upgrade, no API or ABI breaking changes (that we know of).
   https://github.com/libnet/libnet/releases/tag/v1.3

Packaging:
 - Verified builds on *all* test-pkg archs & toolchains
 - Verified test-pkg also with ngrep, suricata, and mz
 - Drop backported int64_t patch
 - Disable doxygen (html docs) in build
 - sha256sum of tarball now generated upstream

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Joachim Wiberg před 1 rokem
rodič
revize
0ff153461f

+ 0 - 1
.checkpackageignore

@@ -709,7 +709,6 @@ package/libmpeg2/0001-altivec.patch Upstream
 package/libmpeg2/0002-armv4l.patch Upstream
 package/libmpeg2/0003-fix-arm-detection.patch Upstream
 package/libmpeg2/0004-fix-sparc.patch Upstream
-package/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-cross-build.patch Upstream
 package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch Upstream
 package/libnfc/0001-autotools-make-example-build-optional.patch Upstream
 package/libnfs/0001-Fix-include-sys-time.h.patch Upstream

+ 0 - 31
package/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-cross-build.patch

@@ -1,31 +0,0 @@
-From a1659e261888bdbed51803132d52d9a6c6803c8a Mon Sep 17 00:00:00 2001
-From: Joachim Nilsson <troglobit@gmail.com>
-Date: Sat, 19 Oct 2019 12:26:26 +0200
-Subject: [PATCH] Use standard int64_t instead of __int64_t for mingw cross
- build
-
-Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
-[Retrieved from:
-https://github.com/libnet/libnet/commit/a1659e261888bdbed51803132d52d9a6c6803c8a]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- include/libnet/libnet-structures.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/libnet/libnet-structures.h b/include/libnet/libnet-structures.h
-index 6084caa..34fffc6 100644
---- a/include/libnet/libnet-structures.h
-+++ b/include/libnet/libnet-structures.h
-@@ -49,9 +49,9 @@ struct libnet_port_list_chain
- /* libnet statistics structure */
- struct libnet_stats
- {
--    __int64_t packets_sent;               /* packets sent */
--    __int64_t packet_errors;              /* packets errors */
--    __int64_t bytes_written;              /* bytes written */
-+    int64_t packets_sent;               /* packets sent */
-+    int64_t packet_errors;              /* packets errors */
-+    int64_t bytes_written;              /* bytes written */
- };
- 
- 

+ 3 - 3
package/libnet/libnet.hash

@@ -1,5 +1,5 @@
-# From https://github.com/libnet/libnet/releases/download/v1.2/libnet-1.2.tar.gz.md5
-md5  a36c669e0cdfda6a2aa3adfb1f6fe60a  libnet-1.2.tar.gz
+# From https://github.com/libnet/libnet/releases/
+sha256  ad1e2dd9b500c58ee462acd839d0a0ea9a2b9248a1287840bc601e774fb6b28f  libnet-1.3.tar.gz
+
 # Locally computed
-sha256  caa4868157d9e5f32e9c7eac9461efeff30cb28357f7f6bf07e73933fb4edaa7  libnet-1.2.tar.gz
 sha256  a06f600f67f239898d85f083aeed82ce6015b1c57599ab1def00fb68787ef388  LICENSE

+ 4 - 2
package/libnet/libnet.mk

@@ -4,12 +4,14 @@
 #
 ################################################################################
 
-LIBNET_VERSION = 1.2
+LIBNET_VERSION = 1.3
 LIBNET_SITE = \
 	https://github.com/libnet/libnet/releases/download/v$(LIBNET_VERSION)
 LIBNET_INSTALL_STAGING = YES
 # PF_PACKET is always available on Linux
-LIBNET_CONF_OPTS = libnet_cv_have_packet_socket=yes
+LIBNET_CONF_OPTS = \
+	libnet_cv_have_packet_socket=yes \
+	--disable-doxygen-doc
 LIBNET_LICENSE = BSD-2-Clause, BSD-3-Clause
 LIBNET_LICENSE_FILES = LICENSE
 LIBNET_CPE_ID_VENDOR = libnet_project