From: lemmi <lemmi@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] iproute2: update to 5.19.0.
Date: Sun, 11 Sep 2022 15:27:04 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39229@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
There is a new pull request by lemmi against master on the void-packages repository
https://github.com/lemmi/void-packages iproute2
https://github.com/void-linux/void-packages/pull/39229
iproute2: update to 5.19.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39229.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iproute2-39229.patch --]
[-- Type: text/x-diff, Size: 3576 bytes --]
From 501f87e98ee54c057b5ac34f37bf074417e3b637 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sun, 11 Sep 2022 15:24:17 +0200
Subject: [PATCH] iproute2: update to 5.19.0.
---
.../0001-ipstats-include-sys-param.h.patch | 25 +++++++++++++
...0001-lib-fix-ax25.h-include-for-musl.patch | 36 -------------------
srcpkgs/iproute2/template | 4 +--
3 files changed, 27 insertions(+), 38 deletions(-)
create mode 100644 srcpkgs/iproute2/patches/0001-ipstats-include-sys-param.h.patch
delete mode 100644 srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
diff --git a/srcpkgs/iproute2/patches/0001-ipstats-include-sys-param.h.patch b/srcpkgs/iproute2/patches/0001-ipstats-include-sys-param.h.patch
new file mode 100644
index 000000000000..74ea4b018ed8
--- /dev/null
+++ b/srcpkgs/iproute2/patches/0001-ipstats-include-sys-param.h.patch
@@ -0,0 +1,25 @@
+From 204b59ccd76442007ac0350de78acccb5530302c Mon Sep 17 00:00:00 2001
+From: lemmi <lemmi@nerd2nerd.org>
+Date: Sun, 11 Sep 2022 15:08:22 +0200
+Subject: [PATCH] ipstats: include sys/param.h
+
+Required on musl for the MIN macro used in IPSTATS_RTA_PAYLOAD.
+---
+ ip/ipstats.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ip/ipstats.c b/ip/ipstats.c
+index 5cdd15ae..1ac275bd 100644
+--- a/ip/ipstats.c
++++ b/ip/ipstats.c
+@@ -1,6 +1,7 @@
+ // SPDX-License-Identifier: GPL-2.0+
+ #include <assert.h>
+ #include <errno.h>
++#include <sys/param.h>
+
+ #include "list.h"
+ #include "utils.h"
+--
+2.37.3
+
diff --git a/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch b/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
deleted file mode 100644
index 401965b0a348..000000000000
--- a/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 13 Jan 2022 08:14:13 +0000
-Subject: [PATCH] lib: fix ax25.h include for musl
-
-ax25.h isn't guaranteed to be avilable in netax25/*;
-it's dependent on our choice of libc (it's not available
-on musl at least) [0].
-
-Let's use the version from linux-headers.
-
-[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers
-Bug: https://bugs.gentoo.org/831102
-
-Signed-off-by: Sam James <sam@gentoo.org>
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
----
- lib/ax25_ntop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c
-index cfd0e04b06f9..3a72a43e9b77 100644
---- a/lib/ax25_ntop.c
-+++ b/lib/ax25_ntop.c
-@@ -2,7 +2,7 @@
-
- #include <errno.h>
- #include <sys/socket.h>
--#include <netax25/ax25.h>
-+#include <linux/ax25.h>
-
- #include "utils.h"
-
---
-2.35.1
-
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 9dbba00b6fe0..4e4beeed7be8 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,6 +1,6 @@
# Template file for 'iproute2'
pkgname=iproute2
-version=5.16.0
+version=5.19.0
revision=1
build_style=configure
make_install_args="SBINDIR=/usr/bin"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://wiki.linuxfoundation.org/networking/iproute2"
distfiles="${KERNEL_SITE}/utils/net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f
+checksum=26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791
conf_files="
/etc/iproute2/ematch_map
next reply other threads:[~2022-09-11 13:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-11 13:27 lemmi [this message]
2022-09-11 13:56 ` [PR PATCH] [Updated] " lemmi
2022-09-20 15:37 ` [PR PATCH] [Merged]: " leahneukirchen
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39229@inbox.vuxu.org \
--to=lemmi@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/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;
as well as URLs for NNTP newsgroup(s).