Author: pebender
Date: Tue Jul 7 18:08:55 2009
New Revision: 5134
Added:
trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-udhcpd.patch
Modified:
trunk/gar-minimyth/script/lib/bluez/Makefile
trunk/gar-minimyth/script/lib/bluez/checksums
trunk/gar-minimyth/script/utils/busybox/Makefile
trunk/gar-minimyth/script/utils/busybox/checksums
trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-ls.patch
Log:
- Updated busybox fixes.
Modified: trunk/gar-minimyth/script/lib/bluez/Makefile
==============================================================================
--- trunk/gar-minimyth/script/lib/bluez/Makefile (original)
+++ trunk/gar-minimyth/script/lib/bluez/Makefile Tue Jul 7 18:08:55 2009
@@ -1,5 +1,5 @@
GARNAME = bluez
-GARVERSION = 4.44
+GARVERSION = 4.45
CATEGORIES = lib
MASTER_SITES = http://www.kernel.org/pub/linux/bluetooth/
DISTFILES = $(DISTNAME).tar.gz
Modified: trunk/gar-minimyth/script/lib/bluez/checksums
==============================================================================
--- trunk/gar-minimyth/script/lib/bluez/checksums (original)
+++ trunk/gar-minimyth/script/lib/bluez/checksums Tue Jul 7 18:08:55 2009
@@ -1 +1 @@
-d5bb91dc31cf7db3e242f5ae6c1c4c33 download/bluez-4.44.tar.gz
+fb1a02a8008326eabe383dc6fb01b05d download/bluez-4.45.tar.gz
Modified: trunk/gar-minimyth/script/utils/busybox/Makefile
==============================================================================
--- trunk/gar-minimyth/script/utils/busybox/Makefile (original)
+++ trunk/gar-minimyth/script/utils/busybox/Makefile Tue Jul 7 18:08:55
2009
@@ -6,7 +6,8 @@
DISTFILES = $(DISTNAME).tar.bz2 $(CONFIGFILE)
PATCHFILES = \
$(DISTNAME)-df.patch \
- $(DISTNAME)-ls.patch
+ $(DISTNAME)-ls.patch \
+ $(DISTNAME)-udhcpd.patch
PATCHFILES += $(DISTNAME)-dhcp_options.patch
$(DISTNAME)-dhcp_timezone.patch $(DISTNAME)-tftp_timeout.patch
LICENSE = GPL2
Modified: trunk/gar-minimyth/script/utils/busybox/checksums
==============================================================================
--- trunk/gar-minimyth/script/utils/busybox/checksums (original)
+++ trunk/gar-minimyth/script/utils/busybox/checksums Tue Jul 7 18:08:55
2009
@@ -1,6 +1,7 @@
c13b09b4125688d5fca5c95a79bf814a download/busybox-1.14.2.tar.bz2
a34c5e72c3f5308838ddc3bf70642136 download/busybox-1.14.2-df.patch
-9054de7b4c596126792b48d3cf49c96c download/busybox-1.14.2-ls.patch
+b261df2f193bb97d8e3e59e02c957780 download/busybox-1.14.2-ls.patch
+ca9a77bd4f6000d2b031a2cee555fcd6 download/busybox-1.14.2-udhcpd.patch
7a3d426ddd7306d8797a9baca09d0cc4
download/busybox-1.14.2-dhcp_options.patch
1f85acff0a8f831b3c86282d70a44fc5
download/busybox-1.14.2-dhcp_timezone.patch
81b48efb2d8f57b7d053b9d5639ad5d3
download/busybox-1.14.2-tftp_timeout.patch
Modified:
trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-ls.patch
==============================================================================
--- trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-ls.patch
(original)
+++ trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-ls.patch
Tue Jul 7 18:08:55 2009
@@ -1,6 +1,7 @@
---- busybox-1.14.2/coreutils/ls.c Sun Jul 5 22:59:28 2009
-+++ busybox-1.14.2-ls/coreutils/ls.c Sun Jul 5 22:59:14 2009
-@@ -144,8 +144,7 @@
+diff -urpN busybox-1.14.2/coreutils/ls.c busybox-1.14.2-ls/coreutils/ls.c
+--- busybox-1.14.2/coreutils/ls.c 2009-06-22 00:40:29.000000000 +0200
++++ busybox-1.14.2-ls/coreutils/ls.c 2009-07-03 12:46:16.000000000 +0200
+@@ -144,8 +144,7 @@ static const char ls_options[] ALIGN1 =
USE_FEATURE_LS_FOLLOWLINKS("L") /* 1, 24 */
USE_FEATURE_LS_RECURSIVE("R") /* 1, 25 */
USE_FEATURE_HUMAN_READABLE("h") /* 1, 26 */
@@ -10,7 +11,7 @@
USE_FEATURE_AUTOWIDTH("T:w:") /* 2, 30 */
;
enum {
-@@ -162,6 +161,16 @@
+@@ -162,6 +161,16 @@ enum {
OPT_Q = (1 << 10),
//OPT_A = (1 << 11),
//OPT_k = (1 << 12),
@@ -27,7 +28,7 @@
};
enum {
-@@ -889,16 +898,6 @@
+@@ -889,16 +898,6 @@ static int list_single(const struct dnod
}
@@ -44,7 +45,7 @@
int ls_main(int argc UNUSED_PARAM, char **argv)
{
struct dnode **dnd;
-@@ -911,8 +910,25 @@
+@@ -911,8 +910,25 @@ int ls_main(int argc UNUSED_PARAM, char
int dnfiles;
int dndirs;
int i;
@@ -71,7 +72,7 @@
INIT_G();
-@@ -927,7 +943,7 @@
+@@ -927,7 +943,7 @@ int ls_main(int argc UNUSED_PARAM, char
#endif
/* process options */
@@ -80,7 +81,7 @@
#if ENABLE_FEATURE_AUTOWIDTH
opt_complementary = "T+:w+"; /* -T N, -w N */
opt = getopt32(argv, ls_options, &tabstops, &terminal_width
-@@ -966,13 +982,20 @@
+@@ -966,13 +982,20 @@ int ls_main(int argc UNUSED_PARAM, char
if (!p || (p[0] && strcmp(p, "none") != 0))
show_color = 1;
}
@@ -107,8 +108,9 @@
}
#endif
---- busybox-1.14.2/testsuite/ls/ls-1-works Sun Jul 5 22:59:21 2009
-+++ busybox-1.14.2-ls/testsuite/ls/ls-1-works Sun Jul 5 22:59:09 2009
+diff -urpN busybox-1.14.2/testsuite/ls/ls-1-works
busybox-1.14.2-ls/testsuite/ls/ls-1-works
+--- busybox-1.14.2/testsuite/ls/ls-1-works 2009-06-22 00:32:00.000000000
+0200
++++ busybox-1.14.2-ls/testsuite/ls/ls-1-works 2009-07-02
14:28:45.000000000 +0200
@@ -1,4 +1,4 @@
[ -n "$d" ] || d=..
-ls -1 "$d" > logfile.gnu
@@ -117,8 +119,9 @@
+LC_ALL=C ls -1 "$d" > logfile.gnu
+LC_ALL=C busybox ls -1 "$d" > logfile.bb
+diff -ubw logfile.gnu logfile.bb
---- busybox-1.14.2/testsuite/ls/ls-h-works Sun Jul 5 22:59:21 2009
-+++ busybox-1.14.2-ls/testsuite/ls/ls-h-works Sun Jul 5 22:59:09 2009
+diff -urpN busybox-1.14.2/testsuite/ls/ls-h-works
busybox-1.14.2-ls/testsuite/ls/ls-h-works
+--- busybox-1.14.2/testsuite/ls/ls-h-works 2009-06-22 00:32:00.000000000
+0200
++++ busybox-1.14.2-ls/testsuite/ls/ls-h-works 2009-07-02
14:28:45.000000000 +0200
@@ -1,4 +1,4 @@
[ -n "$d" ] || d=..
-ls -h "$d" > logfile.gnu
@@ -127,8 +130,9 @@
+LC_ALL=C ls -h "$d" > logfile.gnu
+LC_ALL=C busybox ls -h "$d" > logfile.bb
+diff -ubw logfile.gnu logfile.bb
---- busybox-1.14.2/testsuite/ls/ls-l-works Sun Jul 5 22:59:21 2009
-+++ busybox-1.14.2-ls/testsuite/ls/ls-l-works Sun Jul 5 22:59:09 2009
+diff -urpN busybox-1.14.2/testsuite/ls/ls-l-works
busybox-1.14.2-ls/testsuite/ls/ls-l-works
+--- busybox-1.14.2/testsuite/ls/ls-l-works 2009-06-22 00:32:00.000000000
+0200
++++ busybox-1.14.2-ls/testsuite/ls/ls-l-works 2009-07-02
14:28:45.000000000 +0200
@@ -1,4 +1,4 @@
[ -n "$d" ] || d=..
LC_ALL=C ls -l "$d" > logfile.gnu
@@ -136,8 +140,9 @@
-diff -w logfile.gnu logfile.bb
+LC_ALL=C busybox ls -l "$d" > logfile.bb
+diff -ubw logfile.gnu logfile.bb
---- busybox-1.14.2/testsuite/ls/ls-s-works Sun Jul 5 22:59:21 2009
-+++ busybox-1.14.2-ls/testsuite/ls/ls-s-works Sun Jul 5 22:59:09 2009
+diff -urpN busybox-1.14.2/testsuite/ls/ls-s-works
busybox-1.14.2-ls/testsuite/ls/ls-s-works
+--- busybox-1.14.2/testsuite/ls/ls-s-works 2009-06-22 00:32:00.000000000
+0200
++++ busybox-1.14.2-ls/testsuite/ls/ls-s-works 2009-07-02
14:28:45.000000000 +0200
@@ -1,4 +1,4 @@
[ -n "$d" ] || d=..
LC_ALL=C ls -1s "$d" > logfile.gnu
Added:
trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-udhcpd.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-udhcpd.patch
Tue Jul 7 18:08:55 2009
@@ -0,0 +1,12 @@
+diff -urpN busybox-1.14.2/networking/udhcp/files.c
busybox-1.14.2-udhcpd/networking/udhcp/files.c
+--- busybox-1.14.2/networking/udhcp/files.c 2009-06-22 00:40:29.000000000
+0200
++++ busybox-1.14.2-udhcpd/networking/udhcp/files.c 2009-07-07
14:58:39.000000000 +0200
+@@ -420,7 +420,7 @@ void FAST_FUNC read_leases(const char *f
+ continue;
+ /* NB: add_lease takes "relative time", IOW,
+ * lease duration, not lease deadline. */
+- if (!(add_lease(lease.chaddr, lease.yiaddr, expires,
lease.hostname)))
{
++ if (!(add_lease(lease.chaddr, lease.yiaddr, expires,
NULL /* was
lease.hostname. bug in add_lease, disabled */ ))) {
+ bb_error_msg("too many leases while loading
%s", file);
+ break;
+ }
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
