From fcf0ff74b4c27e3f791362a1c3cbb0b1fe7a628a Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 22 Jan 2014 08:33:07 +0000
Subject: main/busybox: add patches from upstream for ash and date

---
 main/busybox/APKBUILD                  | 11 ++++++++++-
 main/busybox/busybox-1.22.1-ash.patch  | 20 ++++++++++++++++++++
 main/busybox/busybox-1.22.1-date.patch | 30 ++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 main/busybox/busybox-1.22.1-ash.patch
 create mode 100644 main/busybox/busybox-1.22.1-date.patch

(limited to 'main')

diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 56519c086..7087e8b78 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.22.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
@@ -19,6 +19,9 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 	bb-app-location.patch
 	loginutils-sha512.patch
 
+	busybox-1.22.1-ash.patch
+	busybox-1.22.1-date.patch
+
 	0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 	0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
 	0001-ifupdown-support-link-address-family.patch
@@ -107,6 +110,8 @@ d64b58a30892c558bdbab7f0d0997577  nologin.c
 b5375210f13fd6e1ca61a565e8fabd35  busybox-uname-is-not-gnu.patch
 c5a8dbc8696db6da9c4624b0e11d8fba  bb-app-location.patch
 8c42c9ef0f0419c314c86bcaf7796106  loginutils-sha512.patch
+a2dad16b8d7d29ea8120b6d27cf98529  busybox-1.22.1-ash.patch
+bc381f9ceb3824141c968f5bc4353943  busybox-1.22.1-date.patch
 04eeda8c49d4688e6dec02451f8b6aae  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 e1c183cbe1ca18a0fa0d9597314076c9  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
 b15c67be5ccb3e523f540d8e218d5c85  0001-ifupdown-support-link-address-family.patch
@@ -119,6 +124,8 @@ sha256sums="ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b  bu
 a31ce8bcb8b81b20e80ffa407600a530d085806c6471f4e4249fcb3a491b79ef  busybox-uname-is-not-gnu.patch
 576366b4d50f1078da6c0364ef70415de92d97c93c64f4d790b11d7a34cdccd2  bb-app-location.patch
 57674b20158c0b266ed028b0c65299f9cbcad7d33d19c9fcc403d3967daba493  loginutils-sha512.patch
+9917257771ab715480427a6b744785b035d381e7ec0de381faf945bc7abadb97  busybox-1.22.1-ash.patch
+8502dd7454e948a56fcd8201f4fe9d629d2844b9df2bacff7ee0bb09398d12e8  busybox-1.22.1-date.patch
 2e9d56335ca39e944b9abd9ecc91d0e47a3fe3434f8b7ec3f526bc8fa0895ada  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 53563c6dc4db13004d0b37f7bf1748e861b5a5c4244c1d34f102c23b689420c5  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
 9a41b920dd7ee4746866f9dd4ae42899198cd9b10bfa433f2f5ead8083957da2  0001-ifupdown-support-link-address-family.patch
@@ -131,6 +138,8 @@ eb7cce973bfd53ce3350713437b9e2751becfb8dfb10b14f27c4f812297c403b90f80dc2906179d4
 225c0608972f7daaca672eafdf647eea392e076537287370ca7791931de4803645d4d159385dc2909314028dccba3c64d0c89fa4e1184f856959b17c58459ed1  busybox-uname-is-not-gnu.patch
 5c42b05be69c834c9fd5372c6b0d55a6399c74146a94ea09eae7285dd4fa75d1bde38bf7ab73e98638f65eb72db02115453cbdfe85a0085d742940366f617c7d  bb-app-location.patch
 69af4800fcf765b4ae029daced7ff171b6b04d810c94a987c7ba848e275a27b77b18b38df1b85f4a12c4a47ed42f62e0768260eb1198e2aff1c3cea898b85c61  loginutils-sha512.patch
+000bbc9f1b87b676fab5d86c6f535008f2e99e830af9a48354d669b457998044c1d7ac74090f1d2ae56c14eecf88ae9a15eba61c5347f5a9124b518d0f278051  busybox-1.22.1-ash.patch
+0836ef682e24fc0e6d660d0d835200d5f4cd863691a6b58d071e40d001923664389f61670037140c2f95deb2080a93c989037308c761ac9304165d83cbfd3d34  busybox-1.22.1-date.patch
 f2ed7bf994766a20ceecb28bea8c66307b6b66cdd7099408b1f29a529786ce07e55824b21256321708663e00d6fe9428480b0d3e121b67d6ebd8a8a87b1486d1  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 b1a1cc2ada657a3d3364c8c96853575d73784e769cd8768c170c27a3e59abd2beace75dff6d5047c4391725e961d93149f9c3f45ed75fb1c582bf18b818282c9  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
 2dcda497ba3b7c0a7dc9d85e08efa71e51c57e84967fa1a5f06d48f29c9ee9f14a1931c1c2854e9632a5db785c8e72df10bdfb0735a9ecad7a8d390fff74abd1  0001-ifupdown-support-link-address-family.patch
diff --git a/main/busybox/busybox-1.22.1-ash.patch b/main/busybox/busybox-1.22.1-ash.patch
new file mode 100644
index 000000000..767c3a8c1
--- /dev/null
+++ b/main/busybox/busybox-1.22.1-ash.patch
@@ -0,0 +1,20 @@
+--- busybox-1.22.1/procps/top.c
++++ busybox-1.22.1-ash/procps/top.c
+@@ -917,17 +917,12 @@ enum {
+ #if ENABLE_FEATURE_USE_TERMIOS
+ static unsigned handle_input(unsigned scan_mask, unsigned interval)
+ {
+-	struct pollfd pfd[1];
+-
+ 	if (option_mask32 & OPT_EOF) {
+ 		/* EOF on stdin ("top </dev/null") */
+ 		sleep(interval);
+ 		return scan_mask;
+ 	}
+ 
+-	pfd[0].fd = 0;
+-	pfd[0].events = POLLIN;
+-
+ 	while (1) {
+ 		int32_t c;
+ 
diff --git a/main/busybox/busybox-1.22.1-date.patch b/main/busybox/busybox-1.22.1-date.patch
new file mode 100644
index 000000000..6380d8781
--- /dev/null
+++ b/main/busybox/busybox-1.22.1-date.patch
@@ -0,0 +1,30 @@
+--- busybox-1.22.1/libbb/time.c
++++ busybox-1.22.1-date/libbb/time.c
+@@ -68,15 +68,23 @@ void FAST_FUNC parse_datestr(const char
+ 			/* else end != NUL and we error out */
+ 		}
+ 	} else
+-	/* yyyy-mm-dd HH */
+-	if (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year,
++	if (strchr(date_str, '-')
++	    /* Why strchr('-') check?
++	     * sscanf below will trash ptm->tm_year, this breaks
++	     * if parse_str is "10101010" (iow, "MMddhhmm" form)
++	     * because we destroy year. Do these sscanf
++	     * only if we saw a dash in parse_str.
++	     */
++		/* yyyy-mm-dd HH */
++	 && (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year,
+ 				&ptm->tm_mon, &ptm->tm_mday,
+ 				&ptm->tm_hour,
+ 				&end) >= 4
+-	/* yyyy-mm-dd */
+-	 || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year,
++		/* yyyy-mm-dd */
++	     || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year,
+ 				&ptm->tm_mon, &ptm->tm_mday,
+ 				&end) >= 3
++	    )
+ 	) {
+ 		ptm->tm_year -= 1900; /* Adjust years */
+ 		ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
-- 
cgit v1.2.3