Mercurial > hg > aboriginal
changeset 1451:2ad7480aa7ca
Upgrade busybox to 1.19.2, which folds in two patches.
author | Rob Landley <rob@landley.net> |
---|---|
date | Thu, 29 Sep 2011 19:26:26 -0500 |
parents | a96e0dd0dc33 |
children | 707beb993e13 |
files | download.sh sources/patches/busybox-1.19.0-less.patch sources/patches/busybox-fixpatch.patch |
diffstat | 3 files changed, 2 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/download.sh Sun Sep 25 22:09:33 2011 -0500 +++ b/download.sh Thu Sep 29 19:26:26 2011 -0500 @@ -56,8 +56,8 @@ # BusyBox. Adding a native toolchain requires binutils and gcc (above) plus # make and bash. -URL=http://www.busybox.net/downloads/busybox-1.19.0.tar.bz2 \ -SHA1=70569f23751640d9ac7fc2aa49b29e6cd274be6d \ +URL=http://www.busybox.net/downloads/busybox-1.19.2.tar.bz2 \ +SHA1=6dedaa62af98a8541901a30c3e400ce9e077ee16 \ #UNSTABLE=http://busybox.net/downloads/busybox-snapshot.tar.bz2 \ maybe_fork "download || dienow"
--- a/sources/patches/busybox-1.19.0-less.patch Sun Sep 25 22:09:33 2011 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ ---- busybox-1.19.0/miscutils/less.c -+++ busybox-1.19.0-less/miscutils/less.c -@@ -990,7 +990,8 @@ static int64_t less_getch(int pos) - */ - if (key >= 0 && key < ' ' && key != 0x0d && key != 8) - goto again; -- return key; -+ -+ return key64; - } - - static char* less_gets(int sz)
--- a/sources/patches/busybox-fixpatch.patch Sun Sep 25 22:09:33 2011 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -I broke patch's ability to create files in November, and nobody noticed in -the ensuing 11 months. Sigh. - -diff --git a/editors/patch.c b/editors/patch.c -index 9c6d967..dd142ec 100644 ---- a/editors/patch.c -+++ b/editors/patch.c -@@ -67,8 +67,7 @@ struct double_list { - - // Free all the elements of a linked list - // Call freeit() on each element before freeing it. --static --void dlist_free(struct double_list *list, void (*freeit)(void *data)) -+static void dlist_free(struct double_list *list, void (*freeit)(void *data)) - { - while (list) { - void *pop = list; -@@ -80,8 +79,7 @@ void dlist_free(struct double_list *list, void (*freeit)(void *data)) - } - - // Add an entry before "list" element in (circular) doubly linked list --static --struct double_list *dlist_add(struct double_list **list, char *data) -+static struct double_list *dlist_add(struct double_list **list, char *data) - { - struct double_list *llist; - struct double_list *line = xmalloc(sizeof(*line)); -@@ -229,7 +227,7 @@ static int apply_one_hunk(void) - else matcheof = 0; - if (PATCH_DEBUG) fdprintf(2, "HUNK:%s\n", plist->data); - } -- matcheof = matcheof < TT.context; -+ matcheof = !matcheof || matcheof < TT.context; - - if (PATCH_DEBUG) fdprintf(2,"MATCHEOF=%c\n", matcheof ? 'Y' : 'N'); -