diff --git a/.checkpackageignore b/.checkpackageignore index 24adeeb70d..7f45b6a808 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1010,7 +1010,6 @@ package/musepack/0004-missing-sys-select.patch Upstream package/musepack/0005-fix-build-with-gcc-10.patch Upstream package/musl/0001-avoid-kernel-if_ether.h.patch Upstream package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch Upstream -package/musl/0003-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch Upstream package/nano/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch Upstream package/nanocom/0001-fix-build-with-gcc-10.patch Upstream package/ncftp/0001-fix-gcc-10.patch Upstream diff --git a/package/musl/0003-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch b/package/musl/0003-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch deleted file mode 100644 index fa3057ff08..0000000000 --- a/package/musl/0003-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8cf87b3027009c0acac591d9ae80262dc25daccf Mon Sep 17 00:00:00 2001 -From: Ondrej Jirman -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 -Signed-off-by: Rich Felker -Signed-off-by: Petr Vorel - -[ 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 - diff --git a/package/musl/Config.in b/package/musl/Config.in index c1a10bdd58..f3210c5119 100644 --- a/package/musl/Config.in +++ b/package/musl/Config.in @@ -37,4 +37,4 @@ config BR2_PACKAGE_MUSL # Compatibility headers: cdefs.h, queue.h select BR2_PACKAGE_MUSL_COMPAT_HEADERS help - https://www.musl-libc.org/ + http://musl.libc.org/ diff --git a/package/musl/musl.hash b/package/musl/musl.hash index e093a5358e..3b5fccc9e2 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.3.tar.gz.asc -sha256 7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4 musl-1.2.3.tar.gz +# http://musl.libc.org/releases/musl-1.2.4.tar.gz.asc +sha256 7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039 musl-1.2.4.tar.gz sha256 f9bc4423732350eb0b3f7ed7e91d530298476f8fec0c6c427a1c04ade22655af COPYRIGHT diff --git a/package/musl/musl.mk b/package/musl/musl.mk index 30c3c2fbc0..08706c139f 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -4,8 +4,8 @@ # ################################################################################ -MUSL_VERSION = 1.2.3 -MUSL_SITE = http://www.musl-libc.org/releases +MUSL_VERSION = 1.2.4 +MUSL_SITE = http://musl.libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT MUSL_CPE_ID_VENDOR = musl-libc