From cbc0a3f6dfced3a6d7f654a23d8c2dd6accad061 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 3 Sep 2011 19:49:15 +0200 Subject: [PATCH] busybox: update to busybox-1.19.1 Signed-off-by: Stephan Raue --- packages/sysutils/busybox/meta | 2 +- ...h => busybox-1.19.1-00_halt_no_init.patch} | 0 ...patch => busybox-1.19.1-01_check_cc.patch} | 0 ...x-1.19.1-02_user_modprobe.d_dir-0.1.patch} | 0 .../busybox-1.19.1-match_fstype_fix.patch | 16 ++++++++++ .../patches/busybox-1.19.1-patch.patch | 31 +++++++++++++++++++ 6 files changed, 48 insertions(+), 1 deletion(-) rename packages/sysutils/busybox/patches/{busybox-1.19.0-00_halt_no_init.patch => busybox-1.19.1-00_halt_no_init.patch} (100%) rename packages/sysutils/busybox/patches/{busybox-1.19.0-01_check_cc.patch => busybox-1.19.1-01_check_cc.patch} (100%) rename packages/sysutils/busybox/patches/{busybox-1.19.0-02_user_modprobe.d_dir-0.1.patch => busybox-1.19.1-02_user_modprobe.d_dir-0.1.patch} (100%) create mode 100644 packages/sysutils/busybox/patches/busybox-1.19.1-match_fstype_fix.patch create mode 100644 packages/sysutils/busybox/patches/busybox-1.19.1-patch.patch diff --git a/packages/sysutils/busybox/meta b/packages/sysutils/busybox/meta index c4bf759b56..1d8c6e06db 100644 --- a/packages/sysutils/busybox/meta +++ b/packages/sysutils/busybox/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="busybox" -PKG_VERSION="1.19.0" +PKG_VERSION="1.19.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/busybox/patches/busybox-1.19.0-00_halt_no_init.patch b/packages/sysutils/busybox/patches/busybox-1.19.1-00_halt_no_init.patch similarity index 100% rename from packages/sysutils/busybox/patches/busybox-1.19.0-00_halt_no_init.patch rename to packages/sysutils/busybox/patches/busybox-1.19.1-00_halt_no_init.patch diff --git a/packages/sysutils/busybox/patches/busybox-1.19.0-01_check_cc.patch b/packages/sysutils/busybox/patches/busybox-1.19.1-01_check_cc.patch similarity index 100% rename from packages/sysutils/busybox/patches/busybox-1.19.0-01_check_cc.patch rename to packages/sysutils/busybox/patches/busybox-1.19.1-01_check_cc.patch diff --git a/packages/sysutils/busybox/patches/busybox-1.19.0-02_user_modprobe.d_dir-0.1.patch b/packages/sysutils/busybox/patches/busybox-1.19.1-02_user_modprobe.d_dir-0.1.patch similarity index 100% rename from packages/sysutils/busybox/patches/busybox-1.19.0-02_user_modprobe.d_dir-0.1.patch rename to packages/sysutils/busybox/patches/busybox-1.19.1-02_user_modprobe.d_dir-0.1.patch diff --git a/packages/sysutils/busybox/patches/busybox-1.19.1-match_fstype_fix.patch b/packages/sysutils/busybox/patches/busybox-1.19.1-match_fstype_fix.patch new file mode 100644 index 0000000000..ebdadee15e --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.19.1-match_fstype_fix.patch @@ -0,0 +1,16 @@ +diff -Naur busybox-1.19.1/libbb/match_fstype.c busybox-1.19.1.patch/libbb/match_fstype.c +--- busybox-1.19.1/libbb/match_fstype.c 2011-08-28 12:59:56.000000000 +0200 ++++ busybox-1.19.1.patch/libbb/match_fstype.c 2011-09-03 02:10:51.480283260 +0200 +@@ -10,10 +10,10 @@ + * Licensed under GPLv2 or later, see file LICENSE in this source tree. + */ + +-#ifdef HAVE_MNTENT_H +- + #include "libbb.h" + ++#ifdef HAVE_MNTENT_H ++ + int FAST_FUNC match_fstype(const struct mntent *mt, const char *t_fstype) + { + int match = 1; diff --git a/packages/sysutils/busybox/patches/busybox-1.19.1-patch.patch b/packages/sysutils/busybox/patches/busybox-1.19.1-patch.patch new file mode 100644 index 0000000000..853e20fa4c --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.19.1-patch.patch @@ -0,0 +1,31 @@ +--- busybox-1.19.1/editors/patch.c ++++ busybox-1.19.1-patch/editors/patch.c +@@ -70,8 +70,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; +@@ -83,8 +82,7 @@ void dlist_free(struct double_list *list + } + + // 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)); +@@ -232,7 +230,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'); +