Skip to contentSkip to conversation

package/runc: bump to version 1.0.0-rc92

PATCH New Christian Stewart 3 participants 16 messages Sep 13, 2020 – Sep 19, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 package/runc: bump to version 1.0.0-rc92

---
 package/runc/runc.hash | 2 +-
 package/runc/runc.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/runc/runc.hash +1 -1
index b895f6fccb..d792947d5f 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256	6b44985023347fb9c5a2cc6f761df8c41cc2c84a7a68a6e6acf834dff6653a9a  runc-1.0.0-rc10.tar.gz
+sha256	28378df983a3c586ed3ec8c76a774a9b10f36a0c323590a284b801cce95cc61f  runc-1.0.0-rc92.tar.gz
 sha256  552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243  LICENSE
package/runc/runc.mk +1 -1
index aedfb5ef9e..3d177d23d5 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RUNC_VERSION = 1.0.0-rc10
+RUNC_VERSION = 1.0.0-rc92
 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION))
 RUNC_LICENSE = Apache-2.0
 RUNC_LICENSE_FILES = LICENSE
Signature · 1 line
2.28.0
#1 lore raw

PATCH 2/5 package/docker-containerd: bump to version 1.4.0

---
 package/docker-containerd/docker-containerd.hash | 4 ++--
 package/docker-containerd/docker-containerd.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/docker-containerd/docker-containerd.hash +2 -2
index 95288be58b..4b32d62649 100644
@@ -1,3 +1,3 @@
 # Computed locally
-sha256	0811057ab67b78ce911416e793edaeb14b3f1e105d67b8e67b6302e0eab572e4  docker-containerd-1.2.13.tar.gz
-sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4  LICENSE
+sha256	d6284c69e1933e4c05fe285feebef461efe8cd2030634dcf1cbdcde46abe86be  docker-containerd-1.4.0.tar.gz
+sha256	4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4  LICENSE
package/docker-containerd/docker-containerd.mk +1 -1
index 904fa424b8..67060e3ff6 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_CONTAINERD_VERSION = 1.2.13
+DOCKER_CONTAINERD_VERSION = 1.4.0
 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION))
 DOCKER_CONTAINERD_LICENSE = Apache-2.0
 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
Signature · 1 line
2.28.0
#2 lore raw

PATCH 2/5 package/docker-containerd: bump to version 1.4.0

Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Christian" == Christian Stewart <[email protected]> writes:

Is this a dependency for the docker-cli / docker-engine bumps? From the looks of it, it isn't?

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/5 package/docker-containerd: bump to version 1.4.0

Hi Peter,

Quoted 7 lines · Peter Korsgaard
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Christian" == Christian Stewart <[email protected]> writes:

Is this a dependency for the docker-cli / docker-engine bumps? From the looks of it, it isn't?

It's not necessarily a dependency but I cannot understand why you would chose to not update it at the same time.

Best,
Christian
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200915/381fd688/attachment.html>

#4 lore raw

PATCH 2/5 package/docker-containerd: bump to version 1.4.0

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Christian" == Christian Stewart <[email protected]> writes:

Hi Peter,

Quoted 2 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Christian" == Christian Stewart <[email protected]> writes:

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

Is this a dependency for the docker-cli / docker-engine bumps? From the looks of it, it isn't?

It's not necessarily a dependency but I cannot understand why you would chose to not update it at the same time.

Ehh, containerd 1.2.x -> 1.4.0 brings quite a lot of changes and new code:

https://github.com/containerd/containerd/releases/tag/v1.4.0

So this is normally not something we do for the stable branches.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 3/5 package/docker-cli: bump to version 19.03.12

In reply to Christian Stewart
---
 package/docker-cli/docker-cli.hash | 2 +-
 package/docker-cli/docker-cli.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/docker-cli/docker-cli.hash +1 -1
index 8868a60e38..8f9e69e593 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	a5b1d6c5766f77896273e864a448a7f0ea4055bb52f50f884f14ad6ef0d5fdb4  docker-cli-19.03.11.tar.gz
+sha256	00801d6b7e9777cf2cf54255ca5afb7b58b3d35c14bb0f60bb9f07d031883223  docker-cli-19.03.12.tar.gz
 sha256	2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0  LICENSE
package/docker-cli/docker-cli.mk +1 -1
index 577e92c502..e17f3186ba 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_CLI_VERSION = 19.03.11
+DOCKER_CLI_VERSION = 19.03.12
 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION))
 
 DOCKER_CLI_LICENSE = Apache-2.0
Signature · 1 line
2.28.0
#7 lore raw

PATCH 4/5 package/docker-engine: bump to version 19.03.12

In reply to Christian Stewart
---
 package/docker-engine/docker-engine.hash | 2 +-
 package/docker-engine/docker-engine.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/docker-engine/docker-engine.hash +1 -1
index 99159f9376..3283e4eb48 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	5ff62d7b3638a275b2c459e53a4d1a7a8fb03dde8305defcd55e05e059e5618d  docker-engine-19.03.11.tar.gz
+sha256	858e4e74ee0097bcbdb71d737e268dfcfd1970efa4a1600354253b02fd403e39  docker-engine-19.03.12.tar.gz
 sha256	7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8  LICENSE
package/docker-engine/docker-engine.mk +1 -1
index 2119a883bc..2d92570b94 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_ENGINE_VERSION = 19.03.11
+DOCKER_ENGINE_VERSION = 19.03.12
 DOCKER_ENGINE_SITE = $(call github,docker,engine,v$(DOCKER_ENGINE_VERSION))
 
 DOCKER_ENGINE_LICENSE = Apache-2.0
Signature · 1 line
2.28.0
#9 lore raw

PATCH 5/5 package/docker-proxy: bump to latest commit hash 6d6f28

In reply to Christian Stewart

docker network library has not published a release, take the latest master branch commit hash.

---
 package/docker-proxy/docker-proxy.hash | 4 ++--
 package/docker-proxy/docker-proxy.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/docker-proxy/docker-proxy.hash +2 -2
index 4fa9541bed..9f63fa2834 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  0fffcd438b9a87a7ff8315364ff4631d2241ac0cf9f9f83871aeafcb2a383fd1  docker-proxy-feeff4f0a3fd2a2bb19cf67c826082c66ffaaed9.tar.gz
-sha256  cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14	LICENSE
+sha256	c68d09e47dc1dbe27c93e121959be5f0c6cfe47940efe81e3465cb438e9ef625  docker-proxy-6d6f28a1b61b6dd0ad562277d19592125428ed4e.tar.gz
+sha256	cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14  LICENSE
package/docker-proxy/docker-proxy.mk +1 -1
index bd8a3d0f17..392e5f1b59 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_PROXY_VERSION = feeff4f0a3fd2a2bb19cf67c826082c66ffaaed9
+DOCKER_PROXY_VERSION = 6d6f28a1b61b6dd0ad562277d19592125428ed4e
 DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION))
 
 DOCKER_PROXY_LICENSE = Apache-2.0
Signature · 1 line
2.28.0
#10 lore raw

PATCH 5/5 package/docker-proxy: bump to latest commit hash 6d6f28

Hello Christian,

Quoted 4 lines · On Sat, 12 Sep 2020 17:16:58 -0700 Christian Stewart <[email protected]> wrote:

docker network library has not published a release, take the latest master branch commit hash.

I have not applied this patch, because it doesn't apply to master. Your "previous" version of docker-proxy doesn't match the one we have in master. Of course, I could have fixed up the trivial conflict myself, but rather than blindly doing that I wanted to make sure we haven't missed something.

Could you double check this?

Thanks !

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#11 lore raw

PATCH 5/5 package/docker-proxy: bump to latest commit hash 6d6f28

Hi Thomas,

We are bumping to latest, the previous doesn't matter.

Quoted 6 lines · Thomas Petazzoni

I have not applied this patch, because it doesn't apply to master. Your "previous" version of docker-proxy doesn't match the one we have in master. Of course, I could have fixed up the trivial conflict myself, but rather than blindly doing that I wanted to make sure we haven't missed something.

I'll submit another revision of this patch if needed.

Best,
Christian
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200914/fdc8c5be/attachment.html>

#12 lore raw

PATCH v2 1/1 package/rtl8821au: fix build against 5.8.x kernel

In reply to Christian Stewart

---

v1 -> v2:

- added patch by @lwfinger to disable rtw_mgmt_frame_register
- wrote patch for change to proc_ops in 5.6.x from file_operations

---
 ...ate-to-rtl_sha256_state-to-avoid-nam.patch |  79 +++++++++++++
 ..._mgmt_frame_register-on-kernel-5.8.0.patch |  47 ++++++++
 ...-file_operations-to-proc_ops-for-5.6.patch | 109 ++++++++++++++++++
 3 files changed, 235 insertions(+)
 create mode 100644 package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch
 create mode 100644 package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch
 create mode 100644 package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch
package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch new file +79 -0
new file mode 100644
index 0000000000..41cee2b247
@@ -0,0 +1,79 @@
+From 19aee91e45788d594615a9be58fa5d0879ec816a Mon Sep 17 00:00:00 2001
+From: youcai <[email protected]>
+Date: Tue, 18 Aug 2020 00:43:16 +0800
+Subject: [PATCH] rename sha256_state to rtl_sha256_state to avoid name
+ conflict with crypto
+
+[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/pull/338/commits/af6f6c1578f16145478326a939bb7593bbcdb4e7.patch]
+Signed-off-by: Coleman <[email protected]>
+Signed-off-by: Christian Stewart <[email protected]>
+---
+ core/rtw_security.c    | 10 +++++-----
+ include/rtw_security.h |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/core/rtw_security.c b/core/rtw_security.c
+index d54e6af..de2d91f 100644
+--- a/core/rtw_security.c
++++ b/core/rtw_security.c
+@@ -2200,7 +2200,7 @@ BIP_exit:
+ 
+ #ifndef PLATFORM_FREEBSD
+ /* compress 512-bits */
+-static int sha256_compress(struct sha256_state *md, unsigned char *buf)
++static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
+ {
+ 	u32 S[8], W[64], t0, t1;
+ 	u32 t;
+@@ -2249,7 +2249,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
+ }
+ 
+ /* Initialize the hash state */
+-static void sha256_init(struct sha256_state *md)
++static void sha256_init(struct rtl_sha256_state *md)
+ {
+ 	md->curlen = 0;
+ 	md->length = 0;
+@@ -2270,7 +2270,7 @@ static void sha256_init(struct sha256_state *md)
+    @param inlen  The length of the data (octets)
+    @return CRYPT_OK if successful
+ */
+-static int sha256_process(struct sha256_state *md, unsigned char *in,
++static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
+                           unsigned long inlen)
+ {
+ 	unsigned long n;
+@@ -2311,7 +2311,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
+    @param out [out] The destination of the hash (32 bytes)
+    @return CRYPT_OK if successful
+ */
+-static int sha256_done(struct sha256_state *md, unsigned char *out)
++static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
+ {
+ 	int i;
+ 
+@@ -2363,7 +2363,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
+ static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
+                          u8 *mac)
+ {
+-	struct sha256_state ctx;
++	struct rtl_sha256_state ctx;
+ 	size_t i;
+ 
+ 	sha256_init(&ctx);
+diff --git a/include/rtw_security.h b/include/rtw_security.h
+index d41014e..98feb69 100644
+--- a/include/rtw_security.h
++++ b/include/rtw_security.h
+@@ -233,7 +233,7 @@ struct security_priv {
+ #endif /* DBG_SW_SEC_CNT */
+ };
+ 
+-struct sha256_state {
++struct rtl_sha256_state {
+ 	u64 length;
+ 	u32 state[8], curlen;
+ 	u8 buf[64];
+-- 
+2.28.0
+
package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch new file +47 -0

47 lines not on this page · raw message

package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch new file +109 -0

109 lines not on this page · raw message

Signature · 1 line
2.28.0
#13 lore raw

PATCH v2 1/1 package/rtl8821au: fix build against 5.8.x kernel

Quoted 3 lines · On Sat, 12 Sep 2020 17:16:59 -0700 Christian Stewart <[email protected]> wrote:

---

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#14 lore raw

PATCH 1/5 package/runc: bump to version 1.0.0-rc92

In reply to Christian Stewart
Quoted 5 lines · On Sat, 12 Sep 2020 17:16:54 -0700 Christian Stewart <[email protected]> wrote:
---
 package/runc/runc.hash | 2 +-
 package/runc/runc.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

I have applied patches 1 to 4 of this series to master. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#15 lore raw

PATCH 1/5 package/runc: bump to version 1.0.0-rc92

In reply to Christian Stewart
Quoted 22 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Christian" == Christian Stewart <[email protected]> writes:

---
 package/runc/runc.hash | 2 +-
 package/runc/runc.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/runc/runc.hash +1 -1
index b895f6fccb..d792947d5f 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256	6b44985023347fb9c5a2cc6f761df8c41cc2c84a7a68a6e6acf834dff6653a9a  runc-1.0.0-rc10.tar.gz
+sha256	28378df983a3c586ed3ec8c76a774a9b10f36a0c323590a284b801cce95cc61f  runc-1.0.0-rc92.tar.gz
 sha256  552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243  LICENSE
package/runc/runc.mk +0 -0
index aedfb5ef9e..3d177d23d5 100644

package/runc/runc.mk line 7

Quoted 5 lines
package/runc/runc.mk +1 -1
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RUNC_VERSION = 1.0.0-rc10
+RUNC_VERSION = 1.0.0-rc92

rc91 contained a (low severity) security fix:
https://github.com/opencontainers/runc/security/advisories/GHSA-g54h-m393-cpwq

and rc92 contained a fix for a regression introduced in rc91, so I've adjusted the commit message to make this clear and committed to 2020.02.x, 2020.05.x and 2020.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard