package/libubox: bump version to 5bc0146a
PATCH 1/7 package/libubox: bump version to 5bc0146a
- change download url to https
- update homepage url (the old one returns 404 - No projects found)
- add hash file
- delete 0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch (from upstream [1])
[1] https://git.openwrt.org/?p=project/libubox.git;a=commit;h=eb7eb6393d47a918c420f5b287946dbd6c0d5f57
--- ...x-array-out-of-bounds-GCC-10-warning.patch | 47 ------------------- package/libubox/Config.in | 2 +- package/libubox/libubox.hash | 2 + package/libubox/libubox.mk | 5 +- 4 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 package/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch create mode 100644 package/libubox/libubox.hash
package/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch deleted +0 -47
@@ -1,47 +0,0 @@ -From eb7eb6393d47a918c420f5b287946dbd6c0d5f57 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Petr=20=C5=A0tetiar?= <[email protected]> -Date: Wed, 25 Dec 2019 10:27:59 +0100 -Subject: [PATCH] blobmsg: fix array out of bounds GCC 10 warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Fixes following warning reported by GCC 10.0.0 20191203: - - blobmsg.c:234:2: error: 'strcpy' offset 6 from the object at 'attr' is out of the bounds of referenced subobject 'name' with type 'uint8_t[0]' {aka 'unsigned char[0]'} at offset 6 [-Werror=array-bounds] - 234 | strcpy((char *) hdr->name, (const char *)name); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - In file included from blobmsg.c:16: - blobmsg.h:42:10: note: subobject 'name' declared here - 42 | uint8_t name[]; - | ^~~~ - -Reported-by: Khem Raj <[email protected]> -Signed-off-by: Petr ??tetiar <[email protected]> -[Retrieved from: -https://git.openwrt.org/?p=project/libubox.git;a=commit;h=eb7eb6393d47a918c420f5b287946dbd6c0d5f57] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - blobmsg.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/blobmsg.c b/blobmsg.c -index 48dba81..37821c3 100644 ---- a/blobmsg.c -+++ b/blobmsg.c -@@ -240,7 +240,10 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v - attr->id_len |= be32_to_cpu(BLOB_ATTR_EXTENDED); - hdr = blob_data(attr); - hdr->namelen = cpu_to_be16(namelen); -- strcpy((char *) hdr->name, (const char *)name); -+ -+ memcpy(hdr->name, name, namelen); -+ hdr->name[namelen] = '\0'; -+ - pad_end = *data = blobmsg_data(attr); - pad_start = (char *) &hdr->name[namelen]; - if (pad_start < pad_end) --- -2.20.1 -
package/libubox/Config.in +1 -1
@@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBUBOX also be used for the same purposes in projects other than OpenWrt. - http://nbd.name/gitweb.cgi?p=luci2/libubox.git;a=summary + https://openwrt.org/docs/techref/libubox comment "libubox needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS
package/libubox/libubox.hash new file +2 -0
@@ -0,0 +1,2 @@ +# Locally calculated +sha256 e383caf80a241e9711ab0c58a5e8f4d16479693be1e44ffb6cc716a185e7e303 libubox-5bc0146a1d6474d339c4ade9a227f32cc27a8b93-br1.tar.gz
package/libubox/libubox.mk +3 -2
@@ -4,8 +4,9 @@ # ################################################################################ -LIBUBOX_VERSION = 723730214732862de7e892bae2f7a7889e66bf1b -LIBUBOX_SITE = git://git.openwrt.org/project/libubox.git +LIBUBOX_VERSION = 5bc0146a1d6474d339c4ade9a227f32cc27a8b93 +LIBUBOX_SITE = https://git.openwrt.org/project/libubox.git +LIBUBOX_SITE_METHOD = git LIBUBOX_LICENSE = ISC, BSD-3-Clause LIBUBOX_INSTALL_STAGING = YES LIBUBOX_DEPENDENCIES = $(if $(BR2_PACKAGE_JSON_C),json-c)
Signature · 1 line
2.30.0
PATCH 2/7 package/ubus: bump version to d1d9ddf
- change download url to https
- update homepage url (the old one redirects to legacy read only OpenWrt wiki system)
- update license file hash (ubusd_acl.h - license unrelated source code changes only)
--- package/ubus/Config.in | 2 +- package/ubus/ubus.hash | 4 ++-- package/ubus/ubus.mk | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-)
package/ubus/Config.in +1 -1
@@ -19,7 +19,7 @@ config BR2_PACKAGE_UBUS * Select BR2_PACKAGE_LUA_5_1 if you want to have Lua support. - https://wiki.openwrt.org/doc/techref/ubus + https://openwrt.org/docs/techref/ubus if BR2_PACKAGE_UBUS
package/ubus/ubus.hash +2 -2
@@ -1,3 +1,3 @@ # Locally calculated -sha256 011566b2be426f572d397b44a7c12baa50a9b949232e5a6075eba613e1c3f7ae ubus-34c6e818e431cc53478a0f7c7c1eca07d194d692-br1.tar.gz -sha256 f53187f011575f6ec6c529136fd4658d67e674227c80b7b72c99b3654454ae7f ubusd_acl.h +sha256 0d2abb7212ad1ac0ac641d52f62e212bb090a1bbaeae975a78f44ab08d3e3c23 ubus-d1d9ddf98d39b0bdc055060fb962335439445690-br1.tar.gz +sha256 a3caa6c0e90c87b7c97c2ac3d0c0d416082ef777215faec2e9b24ea6e68f6988 ubusd_acl.h
package/ubus/ubus.mk +3 -2
@@ -4,8 +4,9 @@ # ################################################################################ -UBUS_VERSION = 34c6e818e431cc53478a0f7c7c1eca07d194d692 -UBUS_SITE = git://git.openwrt.org/project/ubus.git +UBUS_VERSION = d1d9ddf98d39b0bdc055060fb962335439445690 +UBUS_SITE = https://git.openwrt.org/project/ubus.git +UBUS_SITE_METHOD = git UBUS_LICENSE = LGPL-2.1 UBUS_LICENSE_FILES = ubusd_acl.h
Signature · 1 line
2.30.0
PATCH 3/7 package/libuci: bump version to 52bbc99
In reply to Peter Seiderer- change download url to https
- update homepage url (the old one redirects to legacy read only OpenWrt wiki system)
--- package/libuci/Config.in | 2 +- package/libuci/libuci.hash | 2 +- package/libuci/libuci.mk | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-)
package/libuci/Config.in +1 -1
@@ -10,7 +10,7 @@ config BR2_PACKAGE_LIBUCI This package will also install CLI tool uci. - http://wiki.openwrt.org/doc/techref/uci + https://openwrt.org/docs/techref/uci comment "libuci needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS
package/libuci/libuci.hash +1 -1
@@ -1,2 +1,2 @@ # Locally computed -sha256 1ee875910bdf751807f10d44f6b6b7f9ec71c12d4c407a80bae5cb654d2ba4cc libuci-49ec6efbdac4819033d34f08927d795f83a3932d-br1.tar.gz +sha256 76ef826df2961420cd7a4f1702bef06c37563d9807a2d8e84557963aab21ac80 libuci-52bbc99f69ea6f67b6fe264f424dac91bde5016c-br1.tar.gz
package/libuci/libuci.mk +3 -2
@@ -4,8 +4,9 @@ # ################################################################################ -LIBUCI_VERSION = 49ec6efbdac4819033d34f08927d795f83a3932d -LIBUCI_SITE = git://git.openwrt.org/project/uci.git +LIBUCI_VERSION = 52bbc99f69ea6f67b6fe264f424dac91bde5016c +LIBUCI_SITE = https://git.openwrt.org/project/uci.git +LIBUCI_SITE_METHOD = git LIBUCI_LICENSE = LGPL-2.1, GPL-2.0 (tools) LIBUCI_INSTALL_STAGING = YES LIBUCI_DEPENDENCIES = libubox
Signature · 1 line
2.30.0
PATCH 4/7 package/odhcp6c: bump version to 53f07e9
In reply to Peter Seiderer--- package/odhcp6c/odhcp6c.hash | 2 +- package/odhcp6c/odhcp6c.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/odhcp6c/odhcp6c.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed -sha256 c3622120b5209d1c14d5ac92884240bf0e4f652633562355e70dbf482f6c37b4 odhcp6c-f575351cbb3defc0bf52680c9082912a6c264374-br1.tar.gz +sha256 7274a304016838483e2da48193309e5f84ca0a8a407647033283d1249eebe986 odhcp6c-53f07e90b7f1da6977143a488dd5cb73a33b233b-br1.tar.gz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING
package/odhcp6c/odhcp6c.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -ODHCP6C_VERSION = f575351cbb3defc0bf52680c9082912a6c264374 +ODHCP6C_VERSION = 53f07e90b7f1da6977143a488dd5cb73a33b233b ODHCP6C_SITE = https://git.openwrt.org/project/odhcp6c.git ODHCP6C_SITE_METHOD = git ODHCP6C_LICENSE = GPL-2.0
Signature · 1 line
2.30.0
PATCH 5/7 package/ustream-ssl: bump version to 68d0924
In reply to Peter Seiderer- change download url to https
--- package/ustream-ssl/ustream-ssl.hash | 2 +- package/ustream-ssl/ustream-ssl.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
package/ustream-ssl/ustream-ssl.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed -sha256 f09474dbe4680b51cc0c6a088807102d64954764ef58c2a1e3231e3a77c4b01f ustream-ssl-23a3f2830341acd1db149175baf7315a33bd0edb-br1.tar.gz +sha256 e77e579b718085c1447339e0fcd5385b85a783d5c92544e48a6b37b1695a7f39 ustream-ssl-68d09243b6fd4473004b27ff6483352e76e6af1a-br1.tar.gz sha256 90dd1590cf400a548438e2575e1ff46d8fb8cebae7d09f544aae7e059e30b6c5 ustream-ssl.h
package/ustream-ssl/ustream-ssl.mk +3 -2
@@ -4,8 +4,9 @@ # ################################################################################ -USTREAM_SSL_VERSION = 23a3f2830341acd1db149175baf7315a33bd0edb -USTREAM_SSL_SITE = git://git.openwrt.org/project/ustream-ssl.git +USTREAM_SSL_VERSION = 68d09243b6fd4473004b27ff6483352e76e6af1a +USTREAM_SSL_SITE = https://git.openwrt.org/project/ustream-ssl.git +USTREAM_SSL_SITE_METHOD = git USTREAM_SSL_LICENSE = ISC USTREAM_SSL_LICENSE_FILES = ustream-ssl.h USTREAM_SSL_INSTALL_STAGING = YES
Signature · 1 line
2.30.0
PATCH 6/7 package/uhttpd: bump version to f53a639
In reply to Peter Seiderer- change download url to https
- update license file hash (uhttpd.h - license unrelated source code changes only)
--- package/uhttpd/uhttpd.hash | 4 ++-- package/uhttpd/uhttpd.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
package/uhttpd/uhttpd.hash +2 -2
@@ -1,3 +1,3 @@ # Locally calculated -sha256 5b81ebf9e419c668de4181cce7b9f5fa358cabb2a4a0d1f1a3a24190eeb21f25 uhttpd-a8bf9c00842224edb394e79909053f7628ee6a82-br1.tar.gz -sha256 2a61a8a690e7646a4bfe4261bf77c49f47588db5fc234b3cc66809dcc0cb3985 uhttpd.h +sha256 8a537a377c8dc1abda147a1e3feb3fe3e3633a9d30e4e37d378cc6309dace2f0 uhttpd-f53a63999784bcb7dc513e221f3f25dd3de2f35e-br1.tar.gz +sha256 ce1803f83f776cc88661e303fede0e5ff52faf1d9f74508fadbecf7705b4c84d uhttpd.h
package/uhttpd/uhttpd.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -UHTTPD_VERSION = a8bf9c00842224edb394e79909053f7628ee6a82 -UHTTPD_SITE = http://git.openwrt.org/project/uhttpd.git +UHTTPD_VERSION = f53a63999784bcb7dc513e221f3f25dd3de2f35e +UHTTPD_SITE = https://git.openwrt.org/project/uhttpd.git UHTTPD_SITE_METHOD = git UHTTPD_LICENSE = ISC UHTTPD_LICENSE_FILES = uhttpd.h
Signature · 1 line
2.30.0
PATCH 7/7 package/dnsmasq: bump version to 2.84
In reply to Peter Seiderer--- package/dnsmasq/dnsmasq.hash | 2 +- package/dnsmasq/dnsmasq.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/dnsmasq/dnsmasq.hash +1 -1
@@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature # https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.83.tar.xz.asc -sha256 ffc1f7e8b05e22d910b9a71d09f1128197292766dc7c54cb7018a1b2c3af4aea dnsmasq-2.83.tar.xz +sha256 603195c64b73137609b07e1024ae0b37f652b2f5fe467dce66985b3d1850050c dnsmasq-2.84.tar.xz # Locally calculated sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3
package/dnsmasq/dnsmasq.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.83 +DNSMASQ_VERSION = 2.84 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
Signature · 1 line
2.30.0
PATCH 7/7 package/dnsmasq: bump version to 2.84
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
Signed-off-by Peter Seiderer <[email protected]>
Looking at the release announcement, this is purely a bugfix fixing a regression in the 2.83 security fix release, so it should go to master (and 2020.02.x / 2020.11.x) and not next!
Did you not look at the release announcement?
http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2021q1/014640.html
I'll commit it to master now.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 7/7 package/dnsmasq: bump version to 2.84
Quoted 11 lines · Peter Korsgaard
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
Signed-off-by Peter Seiderer <[email protected]>Looking at the release announcement, this is purely a bugfix fixing a regression in the 2.83 security fix release, so it should go to master (and 2020.02.x / 2020.11.x) and not next!
Did you not look at the release announcement?
http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2021q1/014640.html
Sorry no, did do the update as part of the libubox/ubus (and dependencies) update series and only take a look at this [1] changelog file (still stuck on 2.83)...., thanks for noticing and fixing...
Regards,
Peter
[1] http://thekelleys.org.uk/dnsmasq/CHANGELOG
Quoted 3 lines
I'll commit it to master now.
PATCH 1/7 package/libubox: bump version to 5bc0146a
In reply to Peter SeidererQuoted 12 lines · On Thu, 11 Feb 2021 00:16:34 +0100 Peter Seiderer <[email protected]> wrote:
- change download url to https
- update homepage url (the old one returns 404 - No projects found)
- add hash file
- delete 0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch (from upstream [1])
[1] https://git.openwrt.org/?p=project/libubox.git;a=commit;h=eb7eb6393d47a918c420f5b287946dbd6c0d5f57
Signed-off-by Peter Seiderer <[email protected]>
Quoted 8 lines
--- ...x-array-out-of-bounds-GCC-10-warning.patch | 47 ------------------- package/libubox/Config.in | 2 +- package/libubox/libubox.hash | 2 + package/libubox/libubox.mk | 5 +- 4 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 package/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch create mode 100644 package/libubox/libubox.hash
Thanks, series applied to next. There was an issue on ustream-ssl
though: the license file had changed, and you had not updated the hash. I fixed that up when applying. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/7 package/libubox: bump version to 5bc0146a
Hello Thomas,
Quoted 24 lines · Thomas Petazzoni
Quoted 12 lines · On Thu, 11 Feb 2021 00:16:34 +0100 Peter Seiderer <[email protected]> wrote:
- change download url to https
- update homepage url (the old one returns 404 - No projects found)
- add hash file
- delete 0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch (from upstream [1])
[1] https://git.openwrt.org/?p=project/libubox.git;a=commit;h=eb7eb6393d47a918c420f5b287946dbd6c0d5f57
Signed-off-by Peter Seiderer <[email protected]>Quoted 8 lines
--- ...x-array-out-of-bounds-GCC-10-warning.patch | 47 ------------------- package/libubox/Config.in | 2 +- package/libubox/libubox.hash | 2 + package/libubox/libubox.mk | 5 +- 4 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 package/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch create mode 100644 package/libubox/libubox.hash
Quoted 3 lines
Thanks, series applied to next. There was an issue on ustream-ssl
though: the license file had changed, and you had not updated the hash. I fixed that up when applying. Thanks!
Thanks for noticing and fixing it (and shame on me for missing it ;-))....
Regards,
Peter
Quoted 2 lines
Thomas