From 5ab13b678ca93d3de7f3b6e858a58c8c088ef85b Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 18 Nov 2016 22:26:21 +0000 Subject: [PATCH] busybox: update to busybox-1.25.1 --- packages/sysutils/busybox/package.mk | 2 +- ...4-default-to-universe-scope-fix-9141.patch | 28 ------------------- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 packages/sysutils/busybox/patches/busybox-04-default-to-universe-scope-fix-9141.patch diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index ed4569902c..4a76478274 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="busybox" -PKG_VERSION="1.25.0" +PKG_VERSION="1.25.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/busybox/patches/busybox-04-default-to-universe-scope-fix-9141.patch b/packages/sysutils/busybox/patches/busybox-04-default-to-universe-scope-fix-9141.patch deleted file mode 100644 index 746a514d67..0000000000 --- a/packages/sysutils/busybox/patches/busybox-04-default-to-universe-scope-fix-9141.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d4bdbe4f63e57a1a0954dd35c71bbef56dda8f50 Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Sat, 6 Aug 2016 19:41:06 +0100 -Subject: [PATCH] iproute: scope is left undefined if not passed on command - line - default to UNIVERSE - -See https://bugs.busybox.net/show_bug.cgi?id=9141 ---- - networking/libiproute/iproute.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c -index e674e9a..2b430a4 100644 ---- a/networking/libiproute/iproute.c -+++ b/networking/libiproute/iproute.c -@@ -364,8 +364,7 @@ IF_FEATURE_IP_RULE(ARG_table,) - if (cmd != RTM_DELROUTE) { - if (RTPROT_BOOT != 0) - req.r.rtm_protocol = RTPROT_BOOT; -- if (RT_SCOPE_UNIVERSE != 0) -- req.r.rtm_scope = RT_SCOPE_UNIVERSE; -+ req.r.rtm_scope = RT_SCOPE_UNIVERSE; - if (RTN_UNICAST != 0) - req.r.rtm_type = RTN_UNICAST; - } --- -2.7.4 -