musl 1.2.3
cover musl 1.2.3
Hi,
tested local build with LTP, iproute2 and iputils.
Added a single fix which is IMHO worth of backporting.
Kind regards,
Petr
Petr Vorel (2):
package/musl: bump version to 1.2.3
musl: backport netlink macro fix
...rameter-name-in-internal-netlink.h-R.patch | 33 +++++++++++++++++++ package/musl/musl.hash | 4 +-- package/musl/musl.mk | 2 +- 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch
Signature · 6 lines
2.36.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 1/2 package/musl: bump version to 1.2.3
--- package/musl/musl.hash | 4 ++-- package/musl/musl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/musl/musl.hash +2 -2
@@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# https://musl.libc.org/releases/musl-1.2.2.tar.gz.asc -sha256 9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd musl-1.2.2.tar.gz +# https://musl.libc.org/releases/musl-1.2.3.tar.gz.asc +sha256 7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4 musl-1.2.3.tar.gz sha256 f9bc4423732350eb0b3f7ed7e91d530298476f8fec0c6c427a1c04ade22655af COPYRIGHT
package/musl/musl.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -MUSL_VERSION = 1.2.2 +MUSL_VERSION = 1.2.3 MUSL_SITE = http://www.musl-libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT
Signature · 6 lines
2.36.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 2/2 musl: backport netlink macro fix
In reply to Petr Vorel8cf87b30 ("fix incorrect parameter name in internal netlink.h RTA_OK macro")
--- ...rameter-name-in-internal-netlink.h-R.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch
dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 8cf87b3027009c0acac591d9ae80262dc25daccf Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman <[email protected]> +Date: Wed, 21 Nov 2018 17:29:21 +0100 +Subject: [PATCH] fix incorrect parameter name in internal netlink.h RTA_OK + macro + +the wrong name works only by accident. + +Signed-off-by: Ondrej Jirman <[email protected]> +Signed-off-by: Rich Felker <[email protected]> +Signed-off-by: Petr Vorel <[email protected]> + +[ upstream status: 8cf87b3027009c0acac591d9ae80262dc25daccf ] +--- + src/network/netlink.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/network/netlink.h b/src/network/netlink.h +index 38acb178..873fabe2 100644 +--- a/src/network/netlink.h ++++ b/src/network/netlink.h +@@ -86,7 +86,7 @@ struct ifaddrmsg { + #define RTA_DATALEN(rta) ((rta)->rta_len-sizeof(struct rtattr)) + #define RTA_DATAEND(rta) ((char*)(rta)+(rta)->rta_len) + #define RTA_NEXT(rta) (struct rtattr*)((char*)(rta)+NETLINK_ALIGN((rta)->rta_len)) +-#define RTA_OK(nlh,end) ((char*)(end)-(char*)(rta) >= sizeof(struct rtattr)) ++#define RTA_OK(rta,end) ((char*)(end)-(char*)(rta) >= sizeof(struct rtattr)) + + #define NLMSG_RTA(nlh,len) ((void*)((char*)(nlh)+sizeof(struct nlmsghdr)+NETLINK_ALIGN(len))) + #define NLMSG_RTAOK(rta,nlh) RTA_OK(rta,NLMSG_DATAEND(nlh)) +-- +2.36.0 +
Signature · 6 lines
2.36.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Arnout Vandecappelle
AppliedRe: [Buildroot] [PATCH 2/2] musl: backport netlink macro fix
dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch
Quoted 9 lines · Petr Vorel
8cf87b30("fix incorrect parameter name in internalnetlink.hRTA_OKmacro")Signed-off-by Petr Vorel <[email protected]>--- ...rameter-name-in-internal-netlink.h-R.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+)create mode 100644
dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patchdl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch +0
-0
This should be in package/musl, not dl/musl. Also, subject should be
package/musl: ...
Applied both to master with that fixed.
Regards,
Arnout
Quoted 28 lines
new file mode 100644
index 0000000000..fa3057ff08dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch new file +23
-0@@ -0,0 +1,33 @@ +From 8cf87b3027009c0acac591d9ae80262dc25daccf Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman <[email protected]> +Date: Wed, 21 Nov 2018 17:29:21 +0100 +Subject: [PATCH] fix incorrect parameter name in internal netlink.h RTA_OK + macro + +the wrong name works only by accident. + +Signed-off-by: Ondrej Jirman <[email protected]> +Signed-off-by: Rich Felker <[email protected]> +Signed-off-by: Petr Vorel <[email protected]> + +[ upstream status: 8cf87b3027009c0acac591d9ae80262dc25daccf ] +--- + src/network/netlink.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/network/netlink.h b/src/network/netlink.h +index 38acb178..873fabe2 100644 +--- a/src/network/netlink.h ++++ b/src/network/netlink.h +@@ -86,7 +86,7 @@ struct ifaddrmsg { + #define RTA_DATALEN(rta) ((rta)->rta_len-sizeof(struct rtattr))
dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch line 33
Quoted 10 lines
dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch new file +10
-0+ #define RTA_DATAEND(rta) ((char*)(rta)+(rta)->rta_len) + #define RTA_NEXT(rta) (struct rtattr*)((char*)(rta)+NETLINK_ALIGN((rta)->rta_len)) +-#define RTA_OK(nlh,end) ((char*)(end)-(char*)(rta) >= sizeof(struct rtattr)) ++#define RTA_OK(rta,end) ((char*)(end)-(char*)(rta) >= sizeof(struct rtattr)) + + #define NLMSG_RTA(nlh,len) ((void*)((char*)(nlh)+sizeof(struct nlmsghdr)+NETLINK_ALIGN(len))) + #define NLMSG_RTAOK(rta,nlh) RTA_OK(rta,NLMSG_DATAEND(nlh)) +-- +2.36.0 +
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH 2/2] musl: backport netlink macro fix
Hi Arnout,
Quoted 4 lines
dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch
Quoted 1 line
dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch +0
-0This should be in package/musl, not dl/musl. Also, subject should be
package/musl: ...
Uh.
Quoted 1 line
Applied both to master with that fixed.
I'm sorry for silly mistakes, thanks for fixing them.
Kind regards,
Petr
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot