Changeset 47288


Ignore:
Timestamp:
2015-10-30T16:18:17+01:00 (2 years ago)
Author:
nbd
Message:

busybox: update to version 1.24.1

Patches applied upstream and dropped:
280-fix_find_regression.patch
300-ip-addr-improvements.patch

Fixed upstream:
290-ash-fix-a-regression-in-handling-local-variables.patch (see thread: http://lists.busybox.net/pipermail/busybox/2015-April/082783.html)

Signed-off-by: Magnus Kroken <mkroken@…>

Location:
trunk/package/utils/busybox
Files:
3 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/utils/busybox/Makefile

    r46833 r47288  
    99 
    1010PKG_NAME:=busybox 
    11 PKG_VERSION:=1.23.2 
    12 PKG_RELEASE:=3 
     11PKG_VERSION:=1.24.1 
     12PKG_RELEASE:=1 
    1313PKG_FLAGS:=essential 
    1414 
     
    1616PKG_SOURCE_URL:=http://www.busybox.net/downloads \ 
    1717                http://distfiles.gentoo.org/distfiles/ 
    18 PKG_MD5SUM:=7925683d7dd105aabe9b6b618d48cc73 
     18PKG_MD5SUM:=be98a40cadf84ce2d6b05fa41a275c6a 
    1919 
    2020PKG_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc BUSYBOX_CONFIG_PAM:libpam 
  • trunk/package/utils/busybox/patches/120-remove_uclibc_rpc_check.patch

    r40852 r47288  
    11--- a/util-linux/mount.c 
    22+++ b/util-linux/mount.c 
    3 @@ -138,9 +138,6 @@ 
     3@@ -236,9 +236,6 @@ 
    44 #if ENABLE_FEATURE_MOUNT_NFS 
    55 /* This is just a warning of a common mistake.  Possibly this should be a 
  • trunk/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch

    r45272 r47288  
    11--- a/networking/udhcp/dhcpc.c 
    22+++ b/networking/udhcp/dhcpc.c 
    3 @@ -685,6 +685,7 @@ static int bcast_or_ucast(struct dhcp_pa 
     3@@ -695,6 +695,7 @@ static int bcast_or_ucast(struct dhcp_pa 
    44 static NOINLINE int send_discover(uint32_t xid, uint32_t requested) 
    55 { 
     
    99        /* Fill in: op, htype, hlen, cookie, chaddr fields, 
    1010         * random xid field (we override it below), 
    11 @@ -702,6 +703,7 @@ static NOINLINE int send_discover(uint32 
     11@@ -712,6 +713,7 @@ static NOINLINE int send_discover(uint32 
    1212         */ 
    1313        add_client_options(&packet); 
  • trunk/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch

    r45272 r47288  
    11--- a/networking/udhcp/dhcpc.c 
    22+++ b/networking/udhcp/dhcpc.c 
    3 @@ -1410,6 +1410,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
     3@@ -1418,6 +1418,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
    44                /* silence "uninitialized!" warning */ 
    55                unsigned timestamp_before_wait = timestamp_before_wait; 
  • trunk/package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch

    r45272 r47288  
    11--- a/networking/udhcp/dhcpc.c 
    22+++ b/networking/udhcp/dhcpc.c 
    3 @@ -1093,7 +1093,6 @@ static void perform_renew(void) 
     3@@ -1101,7 +1101,6 @@ static void perform_renew(void) 
    44                state = RENEW_REQUESTED; 
    55                break; 
  • trunk/package/utils/busybox/patches/204-udhcpc_src_ip_rebind.patch

    r45272 r47288  
    11--- a/networking/udhcp/dhcpc.c 
    22+++ b/networking/udhcp/dhcpc.c 
    3 @@ -663,10 +663,10 @@ static void add_client_options(struct dh 
     3@@ -673,10 +673,10 @@ static void add_client_options(struct dh 
    44  * client reverts to using the IP broadcast address. 
    55  */ 
     
    1414                client_config.ifindex); 
    1515 } 
    16 @@ -677,7 +677,7 @@ static int bcast_or_ucast(struct dhcp_pa 
     16@@ -687,7 +687,7 @@ static int bcast_or_ucast(struct dhcp_pa 
    1717                return udhcp_send_kernel_packet(packet, 
    1818                        ciaddr, CLIENT_PORT, 
     
    2323  
    2424 /* Broadcast a DHCP discover packet to the network, with an optionally requested IP */ 
    25 @@ -705,7 +705,7 @@ static NOINLINE int send_discover(uint32 
     25@@ -715,7 +715,7 @@ static NOINLINE int send_discover(uint32 
    2626  
    2727        if (msgs++ < 3) 
     
    3232  
    3333 /* Broadcast a DHCP request message */ 
    34 @@ -749,7 +749,7 @@ static NOINLINE int send_select(uint32_t 
     34@@ -759,7 +759,7 @@ static NOINLINE int send_select(uint32_t 
    3535  
    3636        addr.s_addr = requested; 
     
    4141  
    4242 /* Unicast or broadcast a DHCP renew message */ 
    43 @@ -817,7 +817,7 @@ static NOINLINE int send_decline(/*uint3 
     43@@ -827,7 +827,7 @@ static NOINLINE int send_decline(/*uint3 
    4444        udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server); 
    4545  
  • trunk/package/utils/busybox/patches/210-add_netmsg_util.patch

    r45272 r47288  
    1111--- a/networking/Config.src 
    1212+++ b/networking/Config.src 
    13 @@ -619,6 +619,12 @@ config FEATURE_IPCALC_LONG_OPTIONS 
     13@@ -626,6 +626,12 @@ config FEATURE_IPCALC_LONG_OPTIONS 
    1414        help 
    1515          Support long options for the ipcalc applet. 
  • trunk/package/utils/busybox/patches/230-ntpd_delayed_resolve.patch

    r45272 r47288  
    11--- a/networking/ntpd.c 
    22+++ b/networking/ntpd.c 
    3 @@ -251,6 +251,7 @@ typedef struct { 
     3@@ -265,6 +265,7 @@ typedef struct { 
    44 typedef struct { 
    55        len_and_sockaddr *p_lsa; 
     
    99        int              datapoint_idx; 
    1010        uint32_t         lastpkt_refid; 
    11 @@ -756,8 +757,9 @@ add_peers(const char *s) 
     11@@ -766,8 +767,9 @@ add_peers(const char *s) 
    1212        peer_t *p; 
    1313  
     
    2121        p->p_xmt_msg.m_status = MODE_CLIENT | (NTP_VERSION << 3); 
    2222        p->next_action_time = G.cur_time; /* = set_next(p, 0); */ 
    23 @@ -806,6 +808,25 @@ send_query_to_peer(peer_t *p) 
     23@@ -816,6 +818,25 @@ send_query_to_peer(peer_t *p) 
    2424         * 
    2525         * Uncomment this and use strace to see it in action: 
  • trunk/package/utils/busybox/patches/270-libbb_make_unicode_printable.patch

    r43084 r47288  
    11--- a/libbb/printable_string.c 
    22+++ b/libbb/printable_string.c 
    3 @@ -31,8 +31,6 @@ const char* FAST_FUNC printable_string(u 
     3@@ -28,8 +28,6 @@ const char* FAST_FUNC printable_string(u 
    44                } 
    55                if (c < ' ') 
     
    1010        } 
    1111  
    12 @@ -45,7 +43,7 @@ const char* FAST_FUNC printable_string(u 
     12@@ -42,7 +40,7 @@ const char* FAST_FUNC printable_string(u 
    1313                        unsigned char c = *d; 
    1414                        if (c == '\0') 
Note: See TracChangeset for help on using the changeset viewer.