* [Buildroot] [PATCH 0/2] musl 1.2.3 @ 2022-05-10 16:32 Petr Vorel 2022-05-10 16:32 ` [Buildroot] [PATCH 1/2] package/musl: bump version to 1.2.3 Petr Vorel 2022-05-10 16:32 ` [Buildroot] [PATCH 2/2] musl: backport netlink macro fix Petr Vorel 0 siblings, 2 replies; 5+ messages in thread From: Petr Vorel @ 2022-05-10 16:32 UTC (permalink / raw) To: buildroot; +Cc: Thomas Petazzoni, Yann E . MORIN 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 -- 2.36.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/2] package/musl: bump version to 1.2.3 2022-05-10 16:32 [Buildroot] [PATCH 0/2] musl 1.2.3 Petr Vorel @ 2022-05-10 16:32 ` Petr Vorel 2022-05-10 16:32 ` [Buildroot] [PATCH 2/2] musl: backport netlink macro fix Petr Vorel 1 sibling, 0 replies; 5+ messages in thread From: Petr Vorel @ 2022-05-10 16:32 UTC (permalink / raw) To: buildroot; +Cc: Thomas Petazzoni, Yann E . MORIN Signed-off-by: Petr Vorel <petr.vorel@gmail.com> --- package/musl/musl.hash | 4 ++-- package/musl/musl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/musl/musl.hash b/package/musl/musl.hash index 4ab18cebd8..e093a5358e 100644 --- a/package/musl/musl.hash +++ b/package/musl/musl.hash @@ -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 diff --git a/package/musl/musl.mk b/package/musl/musl.mk index b89945e3be..44c79da6f7 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -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 -- 2.36.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/2] musl: backport netlink macro fix 2022-05-10 16:32 [Buildroot] [PATCH 0/2] musl 1.2.3 Petr Vorel 2022-05-10 16:32 ` [Buildroot] [PATCH 1/2] package/musl: bump version to 1.2.3 Petr Vorel @ 2022-05-10 16:32 ` Petr Vorel 2022-05-14 9:45 ` Arnout Vandecappelle 1 sibling, 1 reply; 5+ messages in thread From: Petr Vorel @ 2022-05-10 16:32 UTC (permalink / raw) To: buildroot; +Cc: Thomas Petazzoni, Yann E . MORIN 8cf87b30 ("fix incorrect parameter name in internal netlink.h RTA_OK macro") Signed-off-by: Petr Vorel <petr.vorel@gmail.com> --- ...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 diff --git a/dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch b/dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch new file mode 100644 index 0000000000..fa3057ff08 --- /dev/null +++ b/dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch @@ -0,0 +1,33 @@ +From 8cf87b3027009c0acac591d9ae80262dc25daccf Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman <megous@megous.com> +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 <megous@megous.com> +Signed-off-by: Rich Felker <dalias@aerifal.cx> +Signed-off-by: Petr Vorel <petr.vorel@gmail.com> + +[ 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 + -- 2.36.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 2/2] musl: backport netlink macro fix 2022-05-10 16:32 ` [Buildroot] [PATCH 2/2] musl: backport netlink macro fix Petr Vorel @ 2022-05-14 9:45 ` Arnout Vandecappelle 2022-05-14 18:35 ` Petr Vorel 0 siblings, 1 reply; 5+ messages in thread From: Arnout Vandecappelle @ 2022-05-14 9:45 UTC (permalink / raw) To: Petr Vorel, buildroot; +Cc: Thomas Petazzoni, Yann E . MORIN On 10/05/2022 18:32, Petr Vorel wrote: > 8cf87b30 ("fix incorrect parameter name in internal netlink.h RTA_OK macro") > > Signed-off-by: Petr Vorel <petr.vorel@gmail.com> > --- > ...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 > > diff --git a/dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch b/dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch This should be in package/musl, not dl/musl. Also, subject should be package/musl: ... Applied both to master with that fixed. Regards, Arnout > new file mode 100644 > index 0000000000..fa3057ff08 > --- /dev/null > +++ b/dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch > @@ -0,0 +1,33 @@ > +From 8cf87b3027009c0acac591d9ae80262dc25daccf Mon Sep 17 00:00:00 2001 > +From: Ondrej Jirman <megous@megous.com> > +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 <megous@megous.com> > +Signed-off-by: Rich Felker <dalias@aerifal.cx> > +Signed-off-by: Petr Vorel <petr.vorel@gmail.com> > + > +[ 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 > + _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 2/2] musl: backport netlink macro fix 2022-05-14 9:45 ` Arnout Vandecappelle @ 2022-05-14 18:35 ` Petr Vorel 0 siblings, 0 replies; 5+ messages in thread From: Petr Vorel @ 2022-05-14 18:35 UTC (permalink / raw) To: Arnout Vandecappelle; +Cc: Thomas Petazzoni, Yann E . MORIN, buildroot Hi Arnout, > > diff --git a/dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch b/dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch > This should be in package/musl, not dl/musl. Also, subject should be > package/musl: ... Uh. > Applied both to master with that fixed. I'm sorry for silly mistakes, thanks for fixing them. Kind regards, Petr _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-14 18:35 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-05-10 16:32 [Buildroot] [PATCH 0/2] musl 1.2.3 Petr Vorel 2022-05-10 16:32 ` [Buildroot] [PATCH 1/2] package/musl: bump version to 1.2.3 Petr Vorel 2022-05-10 16:32 ` [Buildroot] [PATCH 2/2] musl: backport netlink macro fix Petr Vorel 2022-05-14 9:45 ` Arnout Vandecappelle 2022-05-14 18:35 ` Petr Vorel
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.