Skip to contentSkip to conversation

busybox: bump version to 1.29.3

PATCH New Ferdinand van Aartsen 2 participants 5 messages Sep 22, 2018 – Sep 23, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 busybox: bump version to 1.29.3

Remove 0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch It caused a segfault which was fixed in this release.

---
 ...ove-unnecessary-variable-in-xmalloc_.patch | 39 -------------------
 package/busybox/busybox.hash                  |  4 +-
 package/busybox/busybox.mk                    |  2 +-
 3 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 package/busybox/0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch
package/busybox/0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch deleted +0 -39
deleted file mode 100644
index ba2d214c29..0000000000
@@ -1,39 +0,0 @@
-From 0d598ab9f03dbf320f7b81c05e4a94cb303dfbc7 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <[email protected]>
-Date: Sun, 2 Sep 2018 18:35:29 +0200
-Subject: [PATCH] Revert "libbb: remove unnecessary variable in xmalloc_fgets"
-
-The variable is in fact necessary.
-
-    commit 2da9724b56169f00bd7fb6b9a11c9409a7620981
-    Author: Quentin Rameau <[email protected]>
-    Date:   Sun Apr 1 17:05:35 2018 +0200
-        libbb: remove unnecessary variable in xmalloc_fgets
-
-Signed-off-by: Denys Vlasenko <[email protected]>
-[Thomas De Schampheleire: added to unbreak 'head -n -1',
-see http://lists.busybox.net/pipermail/busybox/2018-August/086617.html ]
-Signed-off-by: Thomas De Schampheleire <[email protected]>
-
----
- libbb/get_line_from_file.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
-index f3d6c6203..49ef093c2 100644
---- a/libbb/get_line_from_file.c
-+++ b/libbb/get_line_from_file.c
-@@ -47,7 +47,9 @@ char* FAST_FUNC bb_get_chunk_from_file(FILE *file, size_t *end)
- /* Get line, including trailing \n if any */
- char* FAST_FUNC xmalloc_fgets(FILE *file)
- {
--	return bb_get_chunk_from_file(file, NULL);
-+	int i;
-+
-+	return bb_get_chunk_from_file(file, &i);
- }
- /* Get line.  Remove trailing \n */
- char* FAST_FUNC xmalloc_fgetline(FILE *file)
--- 
-2.16.4
-
package/busybox/busybox.hash +2 -2
index dc7c5613f8..b12bc21293 100644
@@ -1,3 +1,3 @@
-# From https://busybox.net/downloads/busybox-1.29.2.tar.bz2.sha256
-sha256 67d2fa6e147a45875fe972de62d907ef866fe784c495c363bf34756c444a5d61  busybox-1.29.2.tar.bz2
+# From https://busybox.net/downloads/busybox-1.29.3.tar.bz2.sha256
+sha256 97648636e579462296478e0218e65e4bc1e9cd69089a3b1aeb810bff7621efb7  busybox-1.29.3.tar.bz2
 sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548  LICENSE
package/busybox/busybox.mk +1 -1
index ab0930a7fc..757086592f 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BUSYBOX_VERSION = 1.29.2
+BUSYBOX_VERSION = 1.29.3
 BUSYBOX_SITE = http://www.busybox.net/downloads
 BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
 BUSYBOX_LICENSE = GPL-2.0
Signature · 1 line
2.19.0
#1 lore raw

PATCH 1/1 busybox: bump version to 1.29.3

Hello,

Quoted 2 lines · Ferdinand van Aartsen

Remove 0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch It caused a segfault which was fixed in this release.

This doesn't make sense: the *only* commit between 1.29.2 and 1.29.3 is exactly the patch we have in Buildroot for Busybox 1.29.2. So basically, before and after your commit, the Busybox source code is exactly the same.

See:

$ git slog 1_29_2..1_29_3 | cat
b84194b133212aca64605d1cd0cf771720bc0d94 Bump version to 1.29.3
2993551efcb09ace35b40db608ab08159834692b Revert "libbb: remove unnecessary variable in xmalloc_fgets"

Could you clarify which problem you have encountered ?

Best regards,

Thomas

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

PATCH 1/1 busybox: bump version to 1.29.3

Thomas Petazzoni schreef op 2018-09-22 18:42:

Quoted 18 lines

Hello,

Quoted 2 lines · Ferdinand van Aartsen

Remove 0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch It caused a segfault which was fixed in this release.

This doesn't make sense: the *only* commit between 1.29.2 and 1.29.3 is exactly the patch we have in Buildroot for Busybox 1.29.2. So basically, before and after your commit, the Busybox source code is exactly the same.

See:

$ git slog 1_29_2..1_29_3 | cat
b84194b133212aca64605d1cd0cf771720bc0d94 Bump version to 1.29.3
2993551efcb09ace35b40db608ab08159834692b Revert "libbb: remove
unnecessary variable in xmalloc_fgets"
Quoted 5 lines

Could you clarify which problem you have encountered ?

Best regards,

Thomas

Note that the commit you linked is _not_ identical to that patch. The patch has "int i" the commit has "size_t i". You can see the update to the patch in the busybox master commit:
22a99516206b33b7ae124d426319bab03d5c8309

I've tested and the change from int to size_t fixed a segfault.

Ferdinand

#3 lore raw

PATCH 1/1 busybox: bump version to 1.29.3

Hello,

Quoted 6 lines · Ferdinand van Aartsen

Note that the commit you linked is _not_ identical to that patch. The patch has "int i" the commit has "size_t i". You can see the update to the patch in the busybox master commit:
22a99516206b33b7ae124d426319bab03d5c8309

I've tested and the change from int to size_t fixed a segfault.

Indeed, thanks for the additional explanation!

Thomas

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

PATCH 1/1 busybox: bump version to 1.29.3

In reply to Ferdinand van Aartsen

Hello,

Quoted 10 lines · Ferdinand van Aartsen

Remove 0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch It caused a segfault which was fixed in this release.

---
 ...ove-unnecessary-variable-in-xmalloc_.patch | 39 -------------------
 package/busybox/busybox.hash                  |  4 +-
 package/busybox/busybox.mk                    |  2 +-
 3 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 package/busybox/0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch

Applied to master, thanks.

Thomas

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