From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] package/libnet: bump to version 1.2
Date: Sun, 14 Mar 2021 16:56:12 +0100 [thread overview]
Message-ID: <20210314155612.GF2737665@scaer> (raw)
In-Reply-To: <20210310192139.265084-2-fontaine.fabrice@gmail.com>
Fabrice, All,
On 2021-03-10 20:21 +0100, Fabrice Fontaine spake thusly:
> - As stated in https://sourceforge.net/projects/libnet-dev/, "this
> project no longer uses sourceforge", so switch site to
> https://github.com/libnet/libnet
> - Drop patch (already in version)
> - Use the new LICENSE file:
I've slightly expanded this to explain that it is the same file, but
with new copyright years.
Applied to master, thanks.
Regards,
Yann E. MORIN.
> https://github.com/libnet/libnet/commit/e4fb7e9a1ac7b1695235519ac81bfda616776504
> - Update indentation in hash file (two spaces)
>
> https://github.com/libnet/libnet/releases/tag/v1.2
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> ...d-of-__int64_t-for-mingw-cross-build.patch | 31 ++++++++++++
> package/libnet/0001-support-musl-libc.patch | 50 -------------------
> package/libnet/Config.in | 2 +-
> package/libnet/libnet.hash | 8 +--
> package/libnet/libnet.mk | 7 +--
> 5 files changed, 40 insertions(+), 58 deletions(-)
> create mode 100644 package/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-cross-build.patch
> delete mode 100644 package/libnet/0001-support-musl-libc.patch
>
> diff --git a/package/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-cross-build.patch b/package/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-cross-build.patch
> new file mode 100644
> index 0000000000..793b3069c8
> --- /dev/null
> +++ b/package/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-cross-build.patch
> @@ -0,0 +1,31 @@
> +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 */
> + };
> +
> +
> diff --git a/package/libnet/0001-support-musl-libc.patch b/package/libnet/0001-support-musl-libc.patch
> deleted file mode 100644
> index 0704157bb5..0000000000
> --- a/package/libnet/0001-support-musl-libc.patch
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -From ffd7fab744a9ad2893169a8fb6244074604d5d0d Mon Sep 17 00:00:00 2001
> -From: rofl0r <retnyg@gmx.net>
> -Date: Tue, 12 Aug 2014 21:51:39 +0200
> -Subject: [PATCH] Support musl libc, remove support for glibc < 2.1
> -
> -The workarounds for glibc < 2.1 (was released february 1999) break the
> -build with musl libc.
> -
> -It is very unlikely that 2.0 or earlier is still in use, and if so,
> -1) that's a big security hole
> -2) code wouldnt compile anyway since noone tested build in the last decade
> -3) user of it wouldn't expect anyway to get bleeding edge sw built on it,
> - so he would just use the latest version that works for him.
> -
> -Closes #52
> ----
> - libnet/src/libnet_link_linux.c | 11 -----------
> - 1 file changed, 11 deletions(-)
> -
> -diff --git a/libnet/src/libnet_link_linux.c b/libnet/src/libnet_link_linux.c
> -index 054458d..3c6df3c 100644
> ---- a/src/libnet_link_linux.c
> -+++ b/src/libnet_link_linux.c
> -@@ -30,26 +30,15 @@
> - #include <sys/time.h>
> -
> - #include <net/if.h>
> --#if (__GLIBC__)
> - #include <netinet/if_ether.h>
> - #include <net/if_arp.h>
> --#else
> --#include <linux/if_arp.h>
> --#include <linux/if_ether.h>
> --#endif
> -
> - #if (HAVE_PACKET_SOCKET)
> - #ifndef SOL_PACKET
> - #define SOL_PACKET 263
> - #endif /* SOL_PACKET */
> --#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1
> - #include <netpacket/packet.h>
> - #include <net/ethernet.h> /* the L2 protocols */
> --#else
> --#include <asm/types.h>
> --#include <linux/if_packet.h>
> --#include <linux/if_ether.h> /* The L2 protocols */
> --#endif
> - #endif /* HAVE_PACKET_SOCKET */
> -
> - #include "../include/libnet.h"
> diff --git a/package/libnet/Config.in b/package/libnet/Config.in
> index 7186972b7e..135f97e948 100644
> --- a/package/libnet/Config.in
> +++ b/package/libnet/Config.in
> @@ -4,4 +4,4 @@ config BR2_PACKAGE_LIBNET
> libnet provides a portable framework for low-level network
> packet construction.
>
> - http://sourceforge.net/projects/libnet-dev
> + https://github.com/libnet/libnet
> diff --git a/package/libnet/libnet.hash b/package/libnet/libnet.hash
> index 9f62aeda60..1f03d8f983 100644
> --- a/package/libnet/libnet.hash
> +++ b/package/libnet/libnet.hash
> @@ -1,5 +1,5 @@
> -# From https://sourceforge.net/projects/libnet-dev/files/
> -sha1 dffff71c325584fdcf99b80567b60f8ad985e34c libnet-1.1.6.tar.gz
> -md5 710296fe424a49344e5fcc0d09e53317 libnet-1.1.6.tar.gz
> +# From https://github.com/libnet/libnet/releases/download/v1.2/libnet-1.2.tar.gz.md5
> +md5 a36c669e0cdfda6a2aa3adfb1f6fe60a libnet-1.2.tar.gz
> # Locally computed
> -sha256 961355c8bac6de11ecb8f634111986712e80a88272c0bb0954fd1810e6f47cab doc/COPYING
> +sha256 caa4868157d9e5f32e9c7eac9461efeff30cb28357f7f6bf07e73933fb4edaa7 libnet-1.2.tar.gz
> +sha256 a06f600f67f239898d85f083aeed82ce6015b1c57599ab1def00fb68787ef388 LICENSE
> diff --git a/package/libnet/libnet.mk b/package/libnet/libnet.mk
> index 5c5071b9c3..da7d5db3ed 100644
> --- a/package/libnet/libnet.mk
> +++ b/package/libnet/libnet.mk
> @@ -4,13 +4,14 @@
> #
> ################################################################################
>
> -LIBNET_VERSION = 1.1.6
> -LIBNET_SITE = http://sourceforge.net/projects/libnet-dev/files
> +LIBNET_VERSION = 1.2
> +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_LICENSE = BSD-2-Clause, BSD-3-Clause
> -LIBNET_LICENSE_FILES = doc/COPYING
> +LIBNET_LICENSE_FILES = LICENSE
> LIBNET_CPE_ID_VENDOR = libnet_project
>
> $(eval $(autotools-package))
> --
> 2.30.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2021-03-14 15:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-10 19:21 [Buildroot] [PATCH 1/2] package/libnet: add LIBNET_CPE_ID_VENDOR Fabrice Fontaine
2021-03-10 19:21 ` [Buildroot] [PATCH 2/2] package/libnet: bump to version 1.2 Fabrice Fontaine
2021-03-14 15:56 ` Yann E. MORIN [this message]
2021-03-14 15:55 ` [Buildroot] [PATCH 1/2] package/libnet: add LIBNET_CPE_ID_VENDOR Yann E. MORIN
2021-03-20 19:09 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210314155612.GF2737665@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox