Changeset 3578


Ignore:
Timestamp:
2006-04-02T17:16:27+02:00 (12 years ago)
Author:
kaloz
Message:

upgrade busybox to v1.1.1

Location:
trunk/openwrt/package/busybox
Files:
1 added
6 edited

Legend:

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

    r2977 r3578  
    1414PKG_MD5SUM:=x 
    1515else 
    16 PKG_VERSION:=1.1.0 
     16PKG_VERSION:=1.1.1 
    1717PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
    1818PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1919PKG_SOURCE_URL:=http://www.busybox.net/downloads 
    20 PKG_MD5SUM:=855e12c7c9dc90e16b014a788925e4cb 
     20PKG_MD5SUM:=ff1ade47255c643b68c9113c267ce712 
    2121endif 
    2222PKG_CAT:=bzcat 
  • trunk/openwrt/package/busybox/patches/100-killall5.patch

    r213 r3578  
    1 diff -urN busybox-dist/include/applets.h busybox/include/applets.h 
    2 --- busybox-dist/include/applets.h      2004-03-13 02:33:09.000000000 -0600 
    3 +++ busybox/include/applets.h   2004-03-16 09:45:29.000000000 -0600 
    4 @@ -313,6 +313,9 @@ 
    5  #ifdef CONFIG_KILLALL 
    6         APPLET(killall, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) 
    7  #endif 
    8 +#ifdef CONFIG_KILLALL5 
    9 +       APPLET(killall5, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) 
    10 +#endif 
    11  #ifdef CONFIG_KLOGD 
    12         APPLET(klogd, klogd_main, _BB_DIR_SBIN, _BB_SUID_NEVER) 
    13  #endif 
    14 diff -urN busybox-dist/include/usage.h busybox/include/usage.h 
    15 --- busybox-dist/include/usage.h        2004-03-13 02:33:09.000000000 -0600 
    16 +++ busybox/include/usage.h     2004-03-16 09:45:29.000000000 -0600 
    17 @@ -1389,6 +1389,13 @@ 
     1diff -Nur busybox-1.1.1/include/applets.h busybox-1.1.1-owrt/include/applets.h 
     2--- busybox-1.1.1/include/applets.h     2006-03-22 22:16:24.000000000 +0100 
     3+++ busybox-1.1.1-owrt/include/applets.h        2006-04-01 18:23:43.000000000 +0200 
     4@@ -154,6 +154,7 @@ 
     5 USE_IPTUNNEL(APPLET(iptunnel, iptunnel_main, _BB_DIR_BIN, _BB_SUID_NEVER)) 
     6 USE_KILL(APPLET(kill, kill_main, _BB_DIR_BIN, _BB_SUID_NEVER)) 
     7 USE_KILLALL(APPLET(killall, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) 
     8+USE_KILLALL5(APPLET(killall5, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) 
     9 USE_KLOGD(APPLET(klogd, klogd_main, _BB_DIR_SBIN, _BB_SUID_NEVER)) 
     10 USE_LASH(APPLET(lash, lash_main, _BB_DIR_BIN, _BB_SUID_NEVER)) 
     11 USE_LAST(APPLET(last, last_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) 
     12diff -Nur busybox-1.1.1/include/usage.h busybox-1.1.1-owrt/include/usage.h 
     13--- busybox-1.1.1/include/usage.h       2006-03-22 22:16:24.000000000 +0100 
     14+++ busybox-1.1.1-owrt/include/usage.h  2006-04-01 18:22:53.000000000 +0200 
     15@@ -1598,6 +1598,13 @@ 
    1816 #define killall_example_usage \ 
    1917        "$ killall apache\n" 
     
    2927        "[-c n] [-n]" 
    3028 #define klogd_full_usage \ 
    31 diff -urN busybox-dist/procps/Config.in busybox/procps/Config.in 
    32 --- busybox-dist/procps/Config.in       2003-12-24 00:02:11.000000000 -0600 
    33 +++ busybox/procps/Config.in    2004-03-16 09:45:29.000000000 -0600 
    34 @@ -30,6 +30,11 @@ 
     29diff -Nur busybox-1.1.1/procps/Config.in busybox-1.1.1-owrt/procps/Config.in 
     30--- busybox-1.1.1/procps/Config.in      2006-03-22 22:16:25.000000000 +0100 
     31+++ busybox-1.1.1-owrt/procps/Config.in 2006-04-01 18:22:53.000000000 +0200 
     32@@ -38,6 +38,11 @@ 
    3533          specified commands.  If no signal name is specified, SIGTERM is 
    3634          sent. 
     
    4442        bool "pidof" 
    4543        default n 
    46 diff -urN busybox-dist/procps/kill.c busybox/procps/kill.c 
    47 --- busybox-dist/procps/kill.c  2004-03-15 02:29:03.000000000 -0600 
    48 +++ busybox/procps/kill.c       2004-03-16 09:45:29.000000000 -0600 
     44diff -Nur busybox-1.1.1/procps/kill.c busybox-1.1.1-owrt/procps/kill.c 
     45--- busybox-1.1.1/procps/kill.c 2006-03-22 22:16:25.000000000 +0100 
     46+++ busybox-1.1.1-owrt/procps/kill.c    2006-04-01 18:22:53.000000000 +0200 
    4947@@ -34,6 +34,7 @@ 
    5048  
     
    5351+#define KILLALL5 2 
    5452  
    55  extern int kill_main(int argc, char **argv) 
     53 int kill_main(int argc, char **argv) 
    5654 { 
    57 @@ -47,6 +48,9 @@ 
     55@@ -48,6 +49,9 @@ 
    5856 #else 
    5957        whichApp = KILL; 
     
    6563        /* Parse any options */ 
    6664        if (argc < 2) 
    67 @@ -119,6 +123,20 @@ 
     65@@ -126,6 +130,20 @@ 
    6866                } 
    6967  
  • trunk/openwrt/package/busybox/patches/150-udhcp-release.patch

    r2687 r3578  
    1 diff -Nur busybox-1.1.0-pre1/include/usage.h busybox-1.1.0-pre1.openwrt/include/usage.h 
    2 --- busybox-1.1.0-pre1/include/usage.h  2005-11-01 00:55:34.000000000 +0100 
    3 +++ busybox-1.1.0-pre1.openwrt/include/usage.h  2005-11-30 11:10:24.000000000 +0100 
    4 @@ -3119,6 +3119,7 @@ 
     1diff -Nur busybox-1.1.1/include/usage.h busybox-1.1.1-owrt/include/usage.h 
     2--- busybox-1.1.1/include/usage.h       2006-04-01 18:26:21.000000000 +0200 
     3+++ busybox-1.1.1-owrt/include/usage.h  2006-04-01 18:27:45.000000000 +0200 
     4@@ -3268,6 +3268,7 @@ 
    55        "\t-n,\t--now\tExit with failure if lease cannot be immediately negotiated\n" \ 
    66        "\t-p,\t--pidfile=file\tStore process ID of daemon in file\n" \ 
     
    99        "\t-r,\t--request=IP\tIP address to request (default: none)\n" \ 
    1010        "\t-s,\t--script=file\tRun file at dhcp events (default: /usr/share/udhcpc/default.script)\n" \ 
    11         "\t-v,\t--version\tDisplay version" 
    12 diff -Nur busybox-1.1.0-pre1/networking/udhcp/dhcpc.c busybox-1.1.0-pre1.openwrt/networking/udhcp/dhcpc.c 
    13 --- busybox-1.1.0-pre1/networking/udhcp/dhcpc.c 2005-11-01 00:55:15.000000000 +0100 
    14 +++ busybox-1.1.0-pre1.openwrt/networking/udhcp/dhcpc.c 2005-11-30 11:17:22.000000000 +0100 
    15 @@ -61,6 +61,7 @@ 
     11        "\t-t,\t--retries=NUM\tSend up to NUM request packets\n"\ 
     12diff -Nur busybox-1.1.1/networking/udhcp/dhcpc.c busybox-1.1.1-owrt/networking/udhcp/dhcpc.c 
     13--- busybox-1.1.1/networking/udhcp/dhcpc.c      2006-03-22 22:16:19.000000000 +0100 
     14+++ busybox-1.1.1-owrt/networking/udhcp/dhcpc.c 2006-04-01 18:28:19.000000000 +0200 
     15@@ -49,6 +49,7 @@ 
    1616        .abort_if_no_lease = 0, 
    1717        .foreground = 0, 
     
    2121        .interface = "eth0", 
    2222        .pidfile = NULL, 
    23 @@ -92,6 +93,7 @@ 
     23@@ -82,6 +83,7 @@ 
    2424 "                                  immediately negotiated.\n" 
    2525 "  -p, --pidfile=file              Store process ID of daemon in file\n" 
     
    2929 "  -s, --script=file               Run file at dhcp events (default:\n" 
    3030 "                                  " DEFAULT_SCRIPT ")\n" 
    31 @@ -211,6 +213,7 @@ 
    32                 {"now",         no_argument,            0, 'n'}, 
     31@@ -203,6 +205,7 @@ 
     32                {"now",         no_argument,            0, 'n'}, 
    3333                {"pidfile",     required_argument,      0, 'p'}, 
    3434                {"quit",        no_argument,            0, 'q'}, 
     
    3636                {"request",     required_argument,      0, 'r'}, 
    3737                {"script",      required_argument,      0, 's'}, 
    38                 {"version",     no_argument,            0, 'v'}, 
    39 @@ -220,7 +223,7 @@ 
     38                {"timeout",     required_argument,      0, 'T'}, 
     39@@ -214,7 +217,7 @@ 
    4040        /* get options */ 
    4141        while (1) { 
    4242                int option_index = 0; 
    43 -               c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:v", arg_options, &option_index); 
    44 +               c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qRr:s:v", arg_options, &option_index); 
     43-               c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:T:t:v", arg_options, &option_index); 
     44+               c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:v", arg_options, &option_index); 
    4545                if (c == -1) break; 
    4646  
    4747                switch (c) { 
    48 @@ -290,6 +293,9 @@ 
     48@@ -284,6 +287,9 @@ 
    4949                case 'q': 
    5050                        client_config.quit_after_lease = 1; 
     
    8686                } else if (retval == -1 && errno == EINTR) { 
    8787                        /* a signal was caught */ 
    88 diff -Nur busybox-1.1.0-pre1/networking/udhcp/dhcpc.h busybox-1.1.0-pre1.openwrt/networking/udhcp/dhcpc.h 
    89 --- busybox-1.1.0-pre1/networking/udhcp/dhcpc.h 2005-11-01 00:55:15.000000000 +0100 
    90 +++ busybox-1.1.0-pre1.openwrt/networking/udhcp/dhcpc.h 2005-11-30 11:18:00.000000000 +0100 
     88diff -Nur busybox-1.1.1/networking/udhcp/dhcpc.h busybox-1.1.1-owrt/networking/udhcp/dhcpc.h 
     89--- busybox-1.1.1/networking/udhcp/dhcpc.h      2006-03-22 22:16:19.000000000 +0100 
     90+++ busybox-1.1.1-owrt/networking/udhcp/dhcpc.h 2006-04-01 18:27:45.000000000 +0200 
    9191@@ -19,6 +19,7 @@ 
    9292 struct client_config_t { 
  • trunk/openwrt/package/busybox/patches/300-netmsg.patch

    r2967 r3578  
    1 diff -urN busybox.old/include/applets.h busybox.dev/include/applets.h 
    2 --- busybox.old/include/applets.h       2006-01-11 01:32:47.302791000 +0100 
    3 +++ busybox.dev/include/applets.h       2006-01-11 01:33:18.744756250 +0100 
    4 @@ -475,6 +475,9 @@ 
    5  #ifdef CONFIG_NC 
    6         APPLET(nc, nc_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) 
    7  #endif 
    8 +#ifdef CONFIG_NETMSG 
    9 +       APPLET_NOUSAGE("netmsg", netmsg_main, _BB_DIR_BIN, _BB_SUID_ALWAYS) 
    10 +#endif 
    11  #ifdef CONFIG_NETSTAT 
    12         APPLET(netstat, netstat_main, _BB_DIR_BIN, _BB_SUID_NEVER) 
    13  #endif 
    14 diff -urN busybox.old/networking/Config.in busybox.dev/networking/Config.in 
    15 --- busybox.old/networking/Config.in    2005-11-01 00:55:15.000000000 +0100 
    16 +++ busybox.dev/networking/Config.in    2006-01-11 01:33:18.744756250 +0100 
    17 @@ -435,6 +435,12 @@ 
     1diff -Nur busybox-1.1.1/include/applets.h busybox-1.1.1-owrt/include/applets.h 
     2--- busybox-1.1.1/include/applets.h     2006-04-01 18:26:21.000000000 +0200 
     3+++ busybox-1.1.1-owrt/include/applets.h        2006-04-01 18:36:28.000000000 +0200 
     4@@ -197,6 +197,7 @@ 
     5 USE_MV(APPLET(mv, mv_main, _BB_DIR_BIN, _BB_SUID_NEVER)) 
     6 USE_NAMEIF(APPLET(nameif, nameif_main, _BB_DIR_SBIN, _BB_SUID_NEVER)) 
     7 USE_NC(APPLET(nc, nc_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) 
     8+USE_NETMSG(APPLET_NOUSAGE("netmsg", netmsg_main, _BB_DIR_BIN, _BB_SUID_ALWAYS)) 
     9 USE_NETSTAT(APPLET(netstat, netstat_main, _BB_DIR_BIN, _BB_SUID_NEVER)) 
     10 USE_NICE(APPLET(nice, nice_main, _BB_DIR_BIN, _BB_SUID_NEVER)) 
     11 USE_NOHUP(APPLET(nohup, nohup_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) 
     12diff -Nur busybox-1.1.1/networking/Config.in busybox-1.1.1-owrt/networking/Config.in 
     13--- busybox-1.1.1/networking/Config.in  2006-03-22 22:16:19.000000000 +0100 
     14+++ busybox-1.1.1-owrt/networking/Config.in     2006-04-01 18:35:32.000000000 +0200 
     15@@ -451,6 +451,12 @@ 
    1816        help 
    1917          A simple Unix utility which reads and writes data across network 
     
    2826 config CONFIG_NC_GAPING_SECURITY_HOLE 
    2927        bool "gaping security hole" 
    30 diff -urN busybox.old/networking/Makefile.in busybox.dev/networking/Makefile.in 
    31 --- busybox.old/networking/Makefile.in  2005-11-01 00:55:15.000000000 +0100 
    32 +++ busybox.dev/networking/Makefile.in  2006-01-11 01:34:02.939518250 +0100 
    33 @@ -28,6 +28,7 @@ 
     28diff -Nur busybox-1.1.1/networking/Makefile.in busybox-1.1.1-owrt/networking/Makefile.in 
     29--- busybox-1.1.1/networking/Makefile.in        2006-03-22 22:16:19.000000000 +0100 
     30+++ busybox-1.1.1-owrt/networking/Makefile.in   2006-04-01 18:35:32.000000000 +0200 
     31@@ -30,6 +30,7 @@ 
    3432 NETWORKING-$(CONFIG_IPTUNNEL)     += iptunnel.o 
    3533 NETWORKING-$(CONFIG_NAMEIF)       += nameif.o 
     
    3937 NETWORKING-$(CONFIG_NSLOOKUP)     += nslookup.o 
    4038 NETWORKING-$(CONFIG_PING)         += ping.o 
    41 diff -urN busybox.old/networking/netmsg.c busybox.dev/networking/netmsg.c 
    42 --- busybox.old/networking/netmsg.c     1970-01-01 01:00:00.000000000 +0100 
    43 +++ busybox.dev/networking/netmsg.c     2006-01-11 01:33:18.748756500 +0100 
     39diff -Nur busybox-1.1.1/networking/netmsg.c busybox-1.1.1-owrt/networking/netmsg.c 
     40--- busybox-1.1.1/networking/netmsg.c   1970-01-01 01:00:00.000000000 +0100 
     41+++ busybox-1.1.1-owrt/networking/netmsg.c      2006-04-01 18:35:32.000000000 +0200 
    4442@@ -0,0 +1,58 @@ 
    4543+#include <sys/types.h> 
  • trunk/openwrt/package/busybox/patches/320-httpd_address_binding.patch

    r3165 r3578  
    1 --- busybox-1.1.0.orig/networking/httpd.c       2006-02-06 16:02:30.000000000 +0100 
    2 +++ busybox-1.1.0/networking/httpd.c    2006-02-06 16:25:34.000000000 +0100 
    3 @@ -109,6 +109,7 @@ 
     1--- busybox-1.1.1/networking/httpd.c    2006-03-22 22:16:19.000000000 +0100 
     2+++ busybox-1.1.1.new/networking/httpd.c        2006-04-01 19:41:42.150744624 +0200 
     3@@ -110,6 +110,7 @@ 
    44 #include <sys/types.h> 
    55 #include <sys/socket.h>    /* for connect and socket*/ 
    66 #include <netinet/in.h>    /* for sockaddr_in       */ 
    7 +#include <arpa/inet.h>    /* for inet_aton         */ 
     7+#include <arpa/inet.h> 
    88 #include <sys/time.h> 
    99 #include <sys/stat.h> 
    1010 #include <sys/wait.h> 
    11 @@ -201,8 +202,8 @@ 
     11@@ -204,8 +205,8 @@ 
    1212  
    1313 void bb_show_usage(void) 
     
    2020 } 
    2121 #endif 
    22 @@ -256,6 +257,7 @@ 
     22@@ -255,6 +256,7 @@ 
    2323 #endif 
    2424   unsigned port;           /* server initial port and for 
    2525                              set env REMOTE_PORT */ 
    26 +  char *address;          /* server initial address */ 
     26+  char *address; 
    2727   union HTTPD_FOUND { 
    2828        const char *found_mime_type; 
    2929        const char *found_moved_temporarily; 
    30 @@ -942,7 +944,10 @@ 
     30@@ -958,7 +960,10 @@ 
    3131   /* inet_addr() returns a value that is already in network order */ 
    3232   memset(&lsocket, 0, sizeof(lsocket)); 
     
    4040   fd = socket(AF_INET, SOCK_STREAM, 0); 
    4141   if (fd >= 0) { 
    42 @@ -1985,7 +1990,7 @@ 
    43  #define OPT_INC_3 ENABLE_FEATURE_HTTPD_AUTH_MD5 
     42@@ -1996,6 +2001,7 @@ 
     43        USE_FEATURE_HTTPD_AUTH_MD5(m_opt_md5,) 
     44        USE_FEATURE_HTTPD_SETUID(u_opt_setuid,) 
     45        SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(p_opt_port,) 
     46+       SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(l_opt_addr,) 
     47 }; 
    4448  
    45  #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY 
    46 -                               "p:" 
    47 +                               "p:l:" 
    48  #endif 
    49  #ifdef CONFIG_FEATURE_HTTPD_SETUID 
    50                                 "u:" 
    51 @@ -1999,7 +2004,8 @@ 
    52  #define OPT_REALM       (1<<(2+OPT_INC_1+OPT_INC_2))              /* r */ 
    53  #define OPT_MD5         (1<<(2+OPT_INC_1+OPT_INC_2+OPT_INC_3))    /* m */ 
    54  #define OPT_PORT        (1<<(3+OPT_INC_1+OPT_INC_2+OPT_INC_3))    /* p */ 
    55 -#define OPT_SETUID      (1<<(4+OPT_INC_1+OPT_INC_2+OPT_INC_3))    /* u */ 
    56 +#define OPT_ADDRESS    (1<<(4+OPT_INC_1+OPT_INC_2+OPT_INC_3))    /* l */ 
    57 +#define OPT_SETUID      (1<<(5+OPT_INC_1+OPT_INC_2+OPT_INC_3))    /* u */ 
     49 static const char httpd_opts[]="c:d:h:" 
     50@@ -2003,7 +2009,7 @@ 
     51        USE_FEATURE_HTTPD_BASIC_AUTH("r:") 
     52        USE_FEATURE_HTTPD_AUTH_MD5("m:") 
     53        USE_FEATURE_HTTPD_SETUID("u:") 
     54-       SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY("p:"); 
     55+       SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY("p:l:"); 
    5856  
     57 #define OPT_CONFIG_FILE (1<<c_opt_config_file) 
     58 #define OPT_DECODE_URL  (1<<d_opt_decode_url) 
     59@@ -2024,6 +2030,8 @@ 
     60 #define OPT_PORT        SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY((1<<p_opt_port)) \ 
     61                        USE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(0) 
     62  
     63+#define OPT_ADDRESS     SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY((1<<l_opt_addr)) \ 
     64+                       USE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(0) 
    5965  
    6066 #ifdef HTTPD_STANDALONE 
    61 @@ -2016,6 +2022,7 @@ 
    62  #endif 
    63  #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY 
    64    const char *s_port; 
    65 +  const char *s_addr; 
    66    int server; 
    67  #endif 
     67 int main(int argc, char *argv[]) 
     68@@ -2036,6 +2044,7 @@ 
     69   char *url_for_decode; 
     70   USE_FEATURE_HTTPD_ENCODE_URL_STR(const char *url_for_encode;) 
     71   SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(const char *s_port;) 
     72+  SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(const char *s_addr;) 
     73   SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(int server;) 
    6874  
    69 @@ -2035,6 +2042,7 @@ 
     75   USE_FEATURE_HTTPD_SETUID(const char *s_uid;) 
     76@@ -2050,6 +2059,7 @@ 
    7077  
    7178 #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY 
     
    7582  
    7683   config->ContentLength = -1; 
    77 @@ -2052,6 +2060,7 @@ 
    78  #endif 
    79  #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY 
    80                         , &s_port 
    81 +                       , &s_addr 
    82  #endif 
    83  #ifdef CONFIG_FEATURE_HTTPD_SETUID 
    84                         , &s_uid 
    85 @@ -2077,6 +2086,8 @@ 
     84@@ -2061,6 +2071,7 @@ 
     85                        USE_FEATURE_HTTPD_AUTH_MD5(, &pass) 
     86                        USE_FEATURE_HTTPD_SETUID(, &s_uid) 
     87                        SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(, &s_port) 
     88+                       SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(, &s_addr) 
     89        ); 
     90  
     91   if(opt & OPT_DECODE_URL) { 
     92@@ -2082,6 +2093,8 @@ 
    8693 #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY 
    8794     if(opt & OPT_PORT) 
  • trunk/openwrt/package/busybox/patches/330-httpd_user_agent.patch

    r3165 r3578  
    1 --- busybox-1.1.0.orig/networking/httpd.c       2006-02-06 16:41:57.000000000 +0100 
    2 +++ busybox-1.1.0/networking/httpd.c    2006-02-06 16:41:26.000000000 +0100 
     1diff -Nur busybox-1.1.1/networking/httpd.c busybox-1.1.1-owrt/networking/httpd.c 
     2--- busybox-1.1.1/networking/httpd.c    2006-04-01 19:42:36.000000000 +0200 
     3+++ busybox-1.1.1-owrt/networking/httpd.c       2006-04-01 19:43:59.000000000 +0200 
    34@@ -247,6 +247,7 @@ 
     5   const char *query; 
    46  
    5  #ifdef CONFIG_FEATURE_HTTPD_CGI 
    6    char *referer; 
    7 +  char *user_agent; 
    8  #endif 
     7   USE_FEATURE_HTTPD_CGI(char *referer;) 
     8+  USE_FEATURE_HTTPD_CGI(char *user_agent;) 
    99  
    1010   const char *configFile; 
    11 @@ -1192,6 +1193,7 @@ 
     11  
     12@@ -1208,6 +1209,7 @@ 
    1213       addEnv("SERVER",         "PROTOCOL", "HTTP/1.0"); 
    1314       addEnv("GATEWAY_INTERFACE", "",      "CGI/1.1"); 
     
    1718       addEnvPort("REMOTE"); 
    1819 #endif 
    19 @@ -1737,6 +1739,10 @@ 
     20@@ -1771,6 +1773,10 @@ 
    2021                  for(test = buf + 8; isspace(*test); test++) 
    2122                          ; 
Note: See TracChangeset for help on using the changeset viewer.