Skip to contentSkip to conversation

busybox: bump to 1.28.0

PATCH New Adam Duskett 4 participants 7 messages Feb 7, 2018 – Feb 8, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 busybox: bump to 1.28.0

Other changes:
- Update 0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch for 1.28.0
- Remove upstream patches 3, 4, and 5.
- Update buxybox.config and busybox-minimal.config

---
 ...ags-strip-non-l-arguments-returned-by-pkg.patch |  4 +-
 ...clude-per-arch-Makefile-before-Makefile.f.patch | 46 -----------
 ...h-sparc-sparc64-Makefile-define-ARCH_FPIC.patch | 79 ------------------
 ...0005-httpd-fix-handling-of-range-requests.patch | 27 -------
 package/busybox/busybox-minimal.config             | 93 +++++++++++++---------
 package/busybox/busybox.config                     | 87 ++++++++++++--------
 package/busybox/busybox.hash                       |  6 +-
 package/busybox/busybox.mk                         |  2 +-
 8 files changed, 116 insertions(+), 228 deletions(-)
 delete mode 100644 package/busybox/0003-Makefile-include-per-arch-Makefile-before-Makefile.f.patch
 delete mode 100644 package/busybox/0004-arch-sparc-sparc64-Makefile-define-ARCH_FPIC.patch
 delete mode 100644 package/busybox/0005-httpd-fix-handling-of-range-requests.patch
package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch +3 -1
index 105626cbe2..4a9881a075 100644
@@ -4,6 +4,8 @@ Date: Mon, 25 Nov 2013 22:51:53 +0100
 Subject: [PATCH] Makefile.flags: strip non -l arguments returned by pkg-config
 
 Signed-off-by: Thomas Petazzoni <[email protected]>
+[Adam Duskett: update for busybox 1.28.0]
+Signed-off-by: Adam Duskett <[email protected]>
 ---
  Makefile.flags | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
@@ -12,7 +14,7 @@ diff --git a/Makefile.flags b/Makefile.flags
 index 307afa7..885e323 100644
 --- a/Makefile.flags
 +++ b/Makefile.flags
-@@ -141,7 +141,9 @@ ifeq ($(CONFIG_SELINUX),y)
+@@ -153,7 +153,9 @@ ifeq ($(CONFIG_SELINUX),y)
  SELINUX_PC_MODULES = libselinux libsepol
  $(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
  CPPFLAGS += $(SELINUX_CFLAGS)
package/busybox/0003-Makefile-include-per-arch-Makefile-before-Makefile.f.patch deleted +0 -46

46 lines not on this page · raw message

package/busybox/0004-arch-sparc-sparc64-Makefile-define-ARCH_FPIC.patch deleted +0 -79

79 lines not on this page · raw message

package/busybox/0005-httpd-fix-handling-of-range-requests.patch deleted +0 -27
deleted file mode 100644
index b3ca32d75c..0000000000
@@ -1,27 +0,0 @@
-From 2b400d9b2b7309d6e479102fc3ce646e893058a5 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <[email protected]>
-Date: Mon, 18 Sep 2017 13:09:11 +0200
-Subject: [PATCH] httpd: fix handling of range requests
-
-Signed-off-by: Denys Vlasenko <[email protected]>
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- networking/httpd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/networking/httpd.c b/networking/httpd.c
-index e072f23c7..5e32fc936 100644
---- a/networking/httpd.c
-+++ b/networking/httpd.c
-@@ -2337,7 +2337,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
- 			if (STRNCASECMP(iobuf, "Range:") == 0) {
- 				/* We know only bytes=NNN-[MMM] */
- 				char *s = skip_whitespace(iobuf + sizeof("Range:")-1);
--				if (is_prefixed_with(s, "bytes=") == 0) {
-+				if (is_prefixed_with(s, "bytes=")) {
- 					s += sizeof("bytes=")-1;
- 					range_start = BB_STRTOOFF(s, &s, 10);
- 					if (s[0] != '-' || range_start < 0) {
--- 
-2.11.0
-
package/busybox/busybox-minimal.config +57 -36

337 lines not on this page · raw message

package/busybox/busybox.config +52 -35

327 lines not on this page · raw message

package/busybox/busybox.hash +3 -3
index 3e1956d0a0..4ca3936ada 100644
@@ -1,5 +1,5 @@
-# From https://busybox.net/downloads/busybox-1.27.2.tar.bz2.sign
-md5	476186f4bab81781dab2369bfd42734e	busybox-1.27.2.tar.bz2
-sha1	11669e223cc38de646ce26080e91ca29b8d42ad9	busybox-1.27.2.tar.bz2
+# From https://busybox.net/downloads/busybox-1.28.0.tar.bz2.sign
+md5	b119b8decda796ab5cee5478dc9c642c	busybox-1.28.0.tar.bz2
+sha1	a25e9a33e830e307c2a446ca234531049dd427f2	busybox-1.28.0.tar.bz2
 # License files, locally calculated
 sha256	bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548	LICENSE
package/busybox/busybox.mk +1 -1
index d0bbd3fd6e..73353baeda 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BUSYBOX_VERSION = 1.27.2
+BUSYBOX_VERSION = 1.28.0
 BUSYBOX_SITE = http://www.busybox.net/downloads
 BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
 BUSYBOX_LICENSE = GPL-2.0
Signature · 1 line
2.14.3
#1 lore raw

PATCH 1/1 busybox: bump to 1.28.0

Hi Adam,

Quoted 5 lines · Adam Duskett

Other changes:
- Update 0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch for 1.28.0
- Remove upstream patches 3, 4, and 5.
- Update buxybox.config and busybox-minimal.config

Also fixes CVE-2017-15873 (upstream commit 0402cb32d), and CVE-2017-15874 (upstream commit 9ac42c500586).

baruch

Quoted 14 lines
---
 ...ags-strip-non-l-arguments-returned-by-pkg.patch |  4 +-
 ...clude-per-arch-Makefile-before-Makefile.f.patch | 46 -----------
 ...h-sparc-sparc64-Makefile-define-ARCH_FPIC.patch | 79 ------------------
 ...0005-httpd-fix-handling-of-range-requests.patch | 27 -------
 package/busybox/busybox-minimal.config             | 93 +++++++++++++---------
 package/busybox/busybox.config                     | 87 ++++++++++++--------
 package/busybox/busybox.hash                       |  6 +-
 package/busybox/busybox.mk                         |  2 +-
 8 files changed, 116 insertions(+), 228 deletions(-)
 delete mode 100644 package/busybox/0003-Makefile-include-per-arch-Makefile-before-Makefile.f.patch
 delete mode 100644 package/busybox/0004-arch-sparc-sparc64-Makefile-define-ARCH_FPIC.patch
 delete mode 100644 package/busybox/0005-httpd-fix-handling-of-range-requests.patch
Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
#2 lore raw

PATCH 1/1 busybox: bump to 1.28.0

Hi Baruch

Quoted 12 lines · Baruch Siach

Hi Adam,

Quoted 5 lines · Adam Duskett

Other changes:
- Update 0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch for 1.28.0
- Remove upstream patches 3, 4, and 5.
- Update buxybox.config and busybox-minimal.config

Also fixes CVE-2017-15873 (upstream commit 0402cb32d), and CVE-2017-15874 (upstream commit 9ac42c500586).

I didn't catch that! Thanks!
Should I resubmit?

Quoted 21 lines

baruch

Quoted 14 lines
---
 ...ags-strip-non-l-arguments-returned-by-pkg.patch |  4 +-
 ...clude-per-arch-Makefile-before-Makefile.f.patch | 46 -----------
 ...h-sparc-sparc64-Makefile-define-ARCH_FPIC.patch | 79 ------------------
 ...0005-httpd-fix-handling-of-range-requests.patch | 27 -------
 package/busybox/busybox-minimal.config             | 93 +++++++++++++---------
 package/busybox/busybox.config                     | 87 ++++++++++++--------
 package/busybox/busybox.hash                       |  6 +-
 package/busybox/busybox.mk                         |  2 +-
 8 files changed, 116 insertions(+), 228 deletions(-)
 delete mode 100644 package/busybox/0003-Makefile-include-per-arch-Makefile-before-Makefile.f.patch
 delete mode 100644 package/busybox/0004-arch-sparc-sparc64-Makefile-define-ARCH_FPIC.patch
 delete mode 100644 package/busybox/0005-httpd-fix-handling-of-range-requests.patch

--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

#3 lore raw

PATCH 1/1 busybox: bump to 1.28.0

Hi Adam,

Quoted 8 lines · Adam Duskett
Quoted 7 lines · Baruch Siach
Quoted 5 lines · Adam Duskett

Other changes:
- Update 0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch for 1.28.0
- Remove upstream patches 3, 4, and 5.
- Update buxybox.config and busybox-minimal.config

Quoted 5 lines
Quoted 2 lines

Also fixes CVE-2017-15873 (upstream commit 0402cb32d), and CVE-2017-15874 (upstream commit 9ac42c500586).

I didn't catch that! Thanks!
Should I resubmit?

I don't think so. The maintainers would probably fix that while applying.

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#4 lore raw

PATCH 1/1 busybox: bump to 1.28.0

Quoted 11 lines · Baruch Siach

Hi Adam,

Quoted 8 lines · Adam Duskett
Quoted 7 lines · Baruch Siach
Quoted 5 lines · Adam Duskett

Other changes:
- Update 0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch for 1.28.0
- Remove upstream patches 3, 4, and 5.
- Update buxybox.config and busybox-minimal.config

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Also fixes CVE-2017-15873 (upstream commit 0402cb32d), and CVE-2017-15874 (upstream commit 9ac42c500586).

I didn't catch that! Thanks!
Should I resubmit?

I don't think so. The maintainers would probably fix that while applying.

On the other hand, if you *do* resubmit, that will save the maintainers a
little time.

Bottom line: it's fine if you don't, it's nice if you do.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#5 lore raw

PATCH 1/1 busybox: bump to 1.28.0

In reply to Adam Duskett

Hello,

package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch Date: Mon, 25 Nov 2013 22:51:53 +0100 · line 8

Quoted 10 lines · Adam Duskett
package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch +2 -0
index 105626cbe2..4a9881a075 100644
@@ -4,6 +4,8 @@ Date: Mon, 25 Nov 2013 22:51:53 +0100
 Subject: [PATCH] Makefile.flags: strip non -l arguments returned by pkg-config
 
 Signed-off-by: Thomas Petazzoni <[email protected]>
+[Adam Duskett: update for busybox 1.28.0]
+Signed-off-by: Adam Duskett <[email protected]>

Can I ask that you refrain from adding such lines when the patch is simply refreshed? If you're doing some real changes in the patch to fix some conflicts, then it's fine to add that. But you seem to be adding these lines whenever a patch is preserved, even if it has just been refreshed in terms of line offsets. To me, re-adding a comment + SoB in such a situation is useless noise.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com
#6 lore raw

PATCH 1/1 busybox: bump to 1.28.0

In reply to Adam Duskett

Hello,

Quoted 7 lines · Adam Duskett

Other changes:
- Update 0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch for 1.28.0
- Remove upstream patches 3, 4, and 5.
- Update buxybox.config and busybox-minimal.config

Quoted 13 lines
---
 ...ags-strip-non-l-arguments-returned-by-pkg.patch |  4 +-
 ...clude-per-arch-Makefile-before-Makefile.f.patch | 46 -----------
 ...h-sparc-sparc64-Makefile-define-ARCH_FPIC.patch | 79 ------------------
 ...0005-httpd-fix-handling-of-range-requests.patch | 27 -------
 package/busybox/busybox-minimal.config             | 93 +++++++++++++---------
 package/busybox/busybox.config                     | 87 ++++++++++++--------
 package/busybox/busybox.hash                       |  6 +-
 package/busybox/busybox.mk                         |  2 +-
 8 files changed, 116 insertions(+), 228 deletions(-)
 delete mode 100644 package/busybox/0003-Makefile-include-per-arch-Makefile-before-Makefile.f.patch
 delete mode 100644 package/busybox/0004-arch-sparc-sparc64-Makefile-define-ARCH_FPIC.patch
 delete mode 100644 package/busybox/0005-httpd-fix-handling-of-range-requests.patch

Applied to next, thanks.

Thomas

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