From edcccca8c759170711d51e70dec68d77855b5e64 Mon Sep 17 00:00:00 2001 From: kaloz Date: Sat, 14 Jan 2006 17:22:39 +0000 Subject: upgrade busybox to 1.1.0 final git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2977 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../busybox/patches/220-http_address_binding.patch | 47 +++++++++++----------- 1 file changed, 23 insertions(+), 24 deletions(-) (limited to 'package/busybox/patches/220-http_address_binding.patch') diff --git a/package/busybox/patches/220-http_address_binding.patch b/package/busybox/patches/220-http_address_binding.patch index b965cb8b6..3958e2f6d 100644 --- a/package/busybox/patches/220-http_address_binding.patch +++ b/package/busybox/patches/220-http_address_binding.patch @@ -1,5 +1,6 @@ ---- busybox-1.1.0-pre1.orig/networking/httpd.c 2005-11-01 00:55:15.000000000 +0100 -+++ busybox-1.1.0-pre1/networking/httpd.c 2006-01-07 00:58:45.000000000 +0100 +diff -ur busybox-1.1.0/networking/httpd.c busybox-1.1.0-owrt/networking/httpd.c +--- busybox-1.1.0/networking/httpd.c 2006-01-11 06:43:51.000000000 +0100 ++++ busybox-1.1.0-owrt/networking/httpd.c 2006-01-14 17:56:53.000000000 +0100 @@ -150,6 +150,7 @@ /* You can use this server as standalone, require libbb.a for linking */ @@ -8,7 +9,7 @@ /* Config options, disable this for do very small module */ //#define CONFIG_FEATURE_HTTPD_CGI -@@ -184,7 +185,7 @@ +@@ -202,7 +203,7 @@ void bb_show_usage(void) { fprintf(stderr, "Usage: %s [-p ] [-c configFile] [-d/-e ] " @@ -17,7 +18,7 @@ exit(1); } #endif -@@ -234,6 +235,7 @@ +@@ -256,6 +257,7 @@ #endif unsigned port; /* server initial port and for set env REMOTE_PORT */ @@ -25,7 +26,7 @@ union HTTPD_FOUND { const char *found_mime_type; const char *found_moved_temporarily; -@@ -826,6 +828,13 @@ +@@ -858,6 +860,13 @@ sprintf(buf, "%u", config->port); addEnv(port_name, "PORT", buf); } @@ -39,7 +40,7 @@ #endif #endif /* CONFIG_FEATURE_HTTPD_CGI */ -@@ -910,7 +919,14 @@ +@@ -942,7 +951,14 @@ /* inet_addr() returns a value that is already in network order */ memset(&lsocket, 0, sizeof(lsocket)); lsocket.sin_family = AF_INET; @@ -55,32 +56,30 @@ lsocket.sin_port = htons(config->port) ; fd = socket(AF_INET, SOCK_STREAM, 0); if (fd >= 0) { -@@ -1943,7 +1959,7 @@ - #define OPT_INC_2 0 - #endif +@@ -1971,7 +1987,7 @@ + #define OPT_INC_3 ENABLE_FEATURE_HTTPD_AUTH_MD5 + #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY -- "p:v" -+ "p:v:l" +- "p:" ++ "p:l" + #endif #ifdef CONFIG_FEATURE_HTTPD_SETUID "u:" - #endif -@@ -1957,8 +1973,9 @@ - #define OPT_REALM (1<<(3+OPT_INC_1)) - #define OPT_MD5 (1<<(4+OPT_INC_1)) - #define OPT_PORT (1<<(3+OPT_INC_1+OPT_INC_2)) --#define OPT_DEBUG (1<<(4+OPT_INC_1+OPT_INC_2)) --#define OPT_SETUID (1<<(5+OPT_INC_1+OPT_INC_2)) -+#define OPT_ADDR (1<<(4+OPT_INC_1+OPT_INC_2)) -+#define OPT_DEBUG (1<<(5+OPT_INC_1+OPT_INC_2)) -+#define OPT_SETUID (1<<(6+OPT_INC_1+OPT_INC_2)) +@@ -1985,6 +2001,7 @@ + #define OPT_REALM (1<<(2+OPT_INC_1+OPT_INC_2)) /* r */ + #define OPT_MD5 (1<<(2+OPT_INC_1+OPT_INC_2+OPT_INC_3)) /* m */ + #define OPT_PORT (1<<(3+OPT_INC_1+OPT_INC_2+OPT_INC_3)) /* p */ ++#define OPT_ADDR (1<<(4+OPT_INC_1+OPT_INC_2+OPT_INC_3)) /* l */ + #define OPT_SETUID (1<<(4+OPT_INC_1+OPT_INC_2+OPT_INC_3)) /* u */ - #ifdef HTTPD_STANDALONE -@@ -2014,6 +2031,7 @@ +@@ -2038,6 +2055,7 @@ #endif #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY , &s_port + , &(config->addr) + #endif #ifdef CONFIG_FEATURE_HTTPD_SETUID , &s_uid - #endif +Only in busybox-1.1.0-owrt/networking: httpd.c.orig +Only in busybox-1.1.0-owrt/networking: httpd.c.rej -- cgit v1.2.3