Skip to contentSkip to conversation

package/busybox: version bump to 1.30.1

PATCH New jared.bents at rockwellcollins.com 2 participants 2 messages Mar 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/busybox: version bump to 1.30.1

From: Jared Bents <[email protected]>

Update from version 1.29.3 to 1.30.1. The new version includes the removed patches.

---
 ...l.sh-don-t-clobber-dangling-symlinks.patch |  38 -----
 ...tions-are-indeed-4-byte-closes-11506.patch | 137 ------------------
 ...HCP_SUBNET-ensure-it-is-4-bytes-long.patch |  58 --------
 package/busybox/busybox.hash                  |   4 +-
 package/busybox/busybox.mk                    |   2 +-
 5 files changed, 3 insertions(+), 236 deletions(-)
 delete mode 100644 package/busybox/0003-install.sh-don-t-clobber-dangling-symlinks.patch
 delete mode 100644 package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch
 delete mode 100644 package/busybox/0005-udhcpc-when-decoding-DHCP_SUBNET-ensure-it-is-4-bytes-long.patch
package/busybox/0003-install.sh-don-t-clobber-dangling-symlinks.patch deleted +0 -38
deleted file mode 100644
index b6fb5b9236..0000000000
@@ -1,38 +0,0 @@
-From c9f1a877f1b9e2602913600d769edb17ee41d15d Mon Sep 17 00:00:00 2001
-From: Baruch Siach <[email protected]>
-Date: Tue, 17 Jul 2018 13:18:09 +0300
-Subject: [PATCH] install.sh: don't clobber dangling symlinks
-
-Symlinks in a subdirectory that is to become target rootfs are sometimes
-dangling because they link to canonical file names that are not present
-on the host, but are present relative to the target rootfs root. Don't
-copy over dangling symlinks when noclobber is enabled
-
-The -e test treats dangling symlinks as non-existent files. Add -h test
-that returns true for all symlinks.
-
-Cc: Yann E. MORIN <[email protected]>
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status: 
-http://lists.busybox.net/pipermail/busybox/2018-July/086555.html
-
- applets/install.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/applets/install.sh b/applets/install.sh
-index 9aede0f530e2..415896893e86 100755
---- a/applets/install.sh
-+++ b/applets/install.sh
-@@ -83,7 +83,7 @@ install -m 755 busybox "$prefix/bin/busybox" || exit 1
- for i in $h; do
- 	appdir=`dirname "$i"`
- 	app=`basename "$i"`
--	if [ x"$noclobber" = x"1" ] && [ -e "$prefix/$i" ]; then
-+	if [ x"$noclobber" = x"1" ] && ([ -e "$prefix/$i" ] || [ -h "$prefix/$i" ]); then
- 		echo "  $prefix/$i already exists"
- 		continue
- 	fi
--- 
-2.18.0
-
package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch deleted +0 -137

137 lines not on this page · raw message

package/busybox/0005-udhcpc-when-decoding-DHCP_SUBNET-ensure-it-is-4-bytes-long.patch deleted +0 -58

58 lines not on this page · raw message

package/busybox/busybox.hash +2 -2
index b12bc21293..c6804dc1fe 100644
@@ -1,3 +1,3 @@
-# From https://busybox.net/downloads/busybox-1.29.3.tar.bz2.sha256
-sha256 97648636e579462296478e0218e65e4bc1e9cd69089a3b1aeb810bff7621efb7  busybox-1.29.3.tar.bz2
+# From https://busybox.net/downloads/busybox-1.30.1.tar.bz2.sha256
+sha256 3d1d04a4dbd34048f4794815a5c48ebb9eb53c5277e09ffffc060323b95dfbdc  busybox-1.30.1.tar.bz2
 sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548  LICENSE
package/busybox/busybox.mk +1 -1
index 5c5a8ea839..67b91500e9 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BUSYBOX_VERSION = 1.29.3
+BUSYBOX_VERSION = 1.30.1
 BUSYBOX_SITE = http://www.busybox.net/downloads
 BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
 BUSYBOX_LICENSE = GPL-2.0
Signature · 1 line
2.18.0
#1 lore raw

PATCH 1/1 package/busybox: version bump to 1.30.1

Quoted 6 lines · On Mon, 25 Mar 2019 11:28:19 -0500 jared.bents at rockwellcollins.com wrote:

From: Jared Bents <[email protected]>

Update from version 1.29.3 to 1.30.1. The new version includes the removed patches.

Quoted 10 lines
---
 ...l.sh-don-t-clobber-dangling-symlinks.patch |  38 -----
 ...tions-are-indeed-4-byte-closes-11506.patch | 137 ------------------
 ...HCP_SUBNET-ensure-it-is-4-bytes-long.patch |  58 --------
 package/busybox/busybox.hash                  |   4 +-
 package/busybox/busybox.mk                    |   2 +-
 5 files changed, 3 insertions(+), 236 deletions(-)
 delete mode 100644 package/busybox/0003-install.sh-don-t-clobber-dangling-symlinks.patch
 delete mode 100644 package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch
 delete mode 100644 package/busybox/0005-udhcpc-when-decoding-DHCP_SUBNET-ensure-it-is-4-bytes-long.patch

Applied to master, thanks.

Thomas

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