diff --git a/packages/sysutils/busybox/meta b/packages/sysutils/busybox/meta index 1d8c6e06db..cf04c2411c 100644 --- a/packages/sysutils/busybox/meta +++ b/packages/sysutils/busybox/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="busybox" -PKG_VERSION="1.19.1" +PKG_VERSION="1.19.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" 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 deleted file mode 100644 index ebdadee15e..0000000000 --- a/packages/sysutils/busybox/patches/busybox-1.19.1-match_fstype_fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index 853e20fa4c..0000000000 --- a/packages/sysutils/busybox/patches/busybox-1.19.1-patch.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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'); - diff --git a/packages/sysutils/busybox/patches/busybox-1.19.1-00_halt_no_init.patch b/packages/sysutils/busybox/patches/busybox-1.19.2-00_halt_no_init.patch similarity index 100% rename from packages/sysutils/busybox/patches/busybox-1.19.1-00_halt_no_init.patch rename to packages/sysutils/busybox/patches/busybox-1.19.2-00_halt_no_init.patch diff --git a/packages/sysutils/busybox/patches/busybox-1.19.1-01_check_cc.patch b/packages/sysutils/busybox/patches/busybox-1.19.2-01_check_cc.patch similarity index 100% rename from packages/sysutils/busybox/patches/busybox-1.19.1-01_check_cc.patch rename to packages/sysutils/busybox/patches/busybox-1.19.2-01_check_cc.patch diff --git a/packages/sysutils/busybox/patches/busybox-1.19.1-02_user_modprobe.d_dir-0.1.patch b/packages/sysutils/busybox/patches/busybox-1.19.2-02_user_modprobe.d_dir-0.1.patch similarity index 100% rename from packages/sysutils/busybox/patches/busybox-1.19.1-02_user_modprobe.d_dir-0.1.patch rename to packages/sysutils/busybox/patches/busybox-1.19.2-02_user_modprobe.d_dir-0.1.patch