Changeset 35710


Ignore:
Timestamp:
2013-02-21T12:45:10+01:00 (5 years ago)
Author:
jogo
Message:

busybox: remove two obsolete patches

They either work around missing implementations in uClibc 0.9.30 and
earlier and add already present functionality.

Closes #11210, #11211.

Signed-off-by: Jonas Gorski <jogo@…>

Location:
trunk/package/busybox/patches
Files:
2 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/busybox/patches/004-upstream-percent_decode_in_place.patch

    r35239 r35710  
    223223        } 
    224224  
    225 @@ -661,12 +666,6 @@ static void download_one_url(const char  
     225@@ -661,12 +666,6 @@ static void download_one_url(const char 
    226226  
    227227 #if ENABLE_FEATURE_WGET_AUTHENTICATION 
  • trunk/package/busybox/patches/007-upstream_mkfs_ext2_fixes.patch

    r33662 r35710  
    576576--- a/e2fsprogs/old_e2fsprogs/e2fsck.c 
    577577+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c 
    578 @@ -11577,7 +11577,7 @@ static void check_resize_inode(e2fsck_t  
     578@@ -11577,7 +11577,7 @@ static void check_resize_inode(e2fsck_t 
    579579         * s_reserved_gdt_blocks must be zero. 
    580580         */ 
     
    585585                        pctx.num = fs->super->s_reserved_gdt_blocks; 
    586586                        if (fix_problem(ctx, PR_0_NONZERO_RESERVED_GDT_BLOCKS, 
    587 @@ -11593,7 +11593,7 @@ static void check_resize_inode(e2fsck_t  
     587@@ -11593,7 +11593,7 @@ static void check_resize_inode(e2fsck_t 
    588588        retval = ext2fs_read_inode(fs, EXT2_RESIZE_INO, &inode); 
    589589        if (retval) { 
     
    594594                return; 
    595595        } 
    596 @@ -11603,7 +11603,7 @@ static void check_resize_inode(e2fsck_t  
     596@@ -11603,7 +11603,7 @@ static void check_resize_inode(e2fsck_t 
    597597         * the resize inode is cleared; then we're done. 
    598598         */ 
  • trunk/package/busybox/patches/244-udhcpc_add_6rd_option.patch

    r33661 r35710  
    1010  
    1111        /* Options below have no match in dhcp_option_strings[], 
    12 @@ -127,6 +129,8 @@ const char dhcp_option_strings[] ALIGN1  
     12@@ -127,6 +129,8 @@ const char dhcp_option_strings[] ALIGN1 
    1313        "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY  */ 
    1414 #endif 
     
    4747        [OPTION_STRING_HOST     ] = 1, 
    4848 #if ENABLE_FEATURE_UDHCP_RFC3397 
    49 @@ -124,6 +125,23 @@ static int sprint_nip(char *dest, const  
     49@@ -124,6 +125,23 @@ static int sprint_nip(char *dest, const 
    5050        return sprintf(dest, "%s%u.%u.%u.%u", pre, ip[0], ip[1], ip[2], ip[3]); 
    5151 } 
     
    7171 static int mton(uint32_t mask) 
    7272 { 
    73 @@ -293,6 +311,70 @@ static NOINLINE char *xmalloc_optname_op 
     73@@ -292,6 +310,70 @@ static NOINLINE char *xmalloc_optname_op 
     74                        } 
    7475  
    7576                        return ret; 
    76                 } 
     77+               } 
    7778+               case OPTION_6RD: { 
    7879+                       /* Option binary format: 
     
    138139+ 
    139140+                       return ret; 
    140 +               } 
     141                } 
    141142 #if ENABLE_FEATURE_UDHCP_RFC3397 
    142143                case OPTION_DNS_STRING: 
    143                         /* unpack option into dest; use ret for prefix (i.e., "optname=") */ 
  • trunk/package/busybox/patches/260-vconfig_proc.patch

    r34872 r35710  
    11--- a/networking/vconfig.c 
    22+++ b/networking/vconfig.c 
    3 @@ -116,8 +116,6 @@ static const char name_types[] ALIGN1 =  
     3@@ -116,8 +116,6 @@ static const char name_types[] ALIGN1 = 
    44        '_', 'N', 'O', '_', 'P', 'A', 'D', 0, 
    55 }; 
  • trunk/package/busybox/patches/310-passwd_access.patch

    r33661 r35710  
    44--- a/networking/httpd.c 
    55+++ b/networking/httpd.c 
    6 @@ -1700,21 +1700,32 @@ static int check_user_passwd(const char  
     6@@ -1700,21 +1700,32 @@ static int check_user_passwd(const char 
    77  
    88                if (ENABLE_FEATURE_HTTPD_AUTH_MD5) { 
  • trunk/package/busybox/patches/340-lock_util.patch

    r33661 r35710  
    11--- a/include/applets.src.h 
    22+++ b/include/applets.src.h 
    3 @@ -218,6 +218,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN,  
     3@@ -218,6 +218,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN, 
    44 IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP)) 
    55 IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP)) 
Note: See TracChangeset for help on using the changeset viewer.