Revision: 5439 Author: pebender Date: Tue Sep 8 17:49:57 2009 Log: - Updated busybox fixes.
http://code.google.com/p/minimyth/source/detail?r=5439 Added: /trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.3-httpd.patch /trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.3-modprobe.patch Modified: /trunk/gar-minimyth/script/utils/busybox/Makefile /trunk/gar-minimyth/script/utils/busybox/checksums /trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.3-trylink-gc-sections.patch ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.3-httpd.patch Tue Sep 8 17:49:57 2009 @@ -0,0 +1,61 @@ +diff -urpN busybox-1.14.3/networking/httpd.c busybox-1.14.3-httpd/networking/httpd.c +--- busybox-1.14.3/networking/httpd.c 2009-08-02 20:16:36.000000000 +0200 ++++ busybox-1.14.3-httpd/networking/httpd.c 2009-09-09 01:54:40.000000000 +0200 +@@ -2101,8 +2101,12 @@ static void handle_incoming_and_exit(con + } + send_cgi_and_exit(urlcopy, prequest, length, cookie, content_type); + } ++#endif ++ ++ if (urlp[-1] == '/') ++ strcpy(urlp, index_page); ++ if (stat(tptr, &sb) == 0) { + #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR +- { + char *suffix = strrchr(tptr, '.'); + if (suffix) { + Htaccess *cur; +@@ -2112,16 +2116,7 @@ static void handle_incoming_and_exit(con + } + } + } +- } + #endif +- if (prequest != request_GET && prequest != request_HEAD) { +- send_headers_and_exit(HTTP_NOT_IMPLEMENTED); +- } +-#endif /* FEATURE_HTTPD_CGI */ +- +- if (urlp[-1] == '/') +- strcpy(urlp, index_page); +- if (stat(tptr, &sb) == 0) { + file_size = sb.st_size; + last_mod = sb.st_mtime; + } +@@ -2135,19 +2130,18 @@ static void handle_incoming_and_exit(con + send_cgi_and_exit("/cgi-bin/index.cgi", prequest, length, cookie, content_type); + } + } +-#endif +- /* else { +- * fall through to send_file, it errors out if open fails +- * } +- */ ++ /* else fall through to send_file, it errors out if open fails: */ + ++ if (prequest != request_GET && prequest != request_HEAD) { ++ /* POST for files does not make sense */ ++ send_headers_and_exit(HTTP_NOT_IMPLEMENTED); ++ } + send_file_and_exit(tptr, +-#if ENABLE_FEATURE_HTTPD_CGI + (prequest != request_HEAD ? SEND_HEADERS_AND_BODY : SEND_HEADERS) ++ ); + #else +- SEND_HEADERS_AND_BODY ++ send_file_and_exit(tptr, SEND_HEADERS_AND_BODY); + #endif +- ); + } + + /* ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.3-modprobe.patch Tue Sep 8 17:49:57 2009 @@ -0,0 +1,11 @@ +diff -urpN busybox-1.14.3/modutils/modprobe-small.c busybox-1.14.3-modprobe/modutils/modprobe-small.c +--- busybox-1.14.3/modutils/modprobe-small.c 2009-08-02 20:16:36.000000000 +0200 ++++ busybox-1.14.3-modprobe/modutils/modprobe-small.c 2009-09-09 01:55:27.000000000 +0200 +@@ -218,6 +218,7 @@ static void parse_module(module_info *in + bksp(); /* remove last ' ' */ + appendc('\0'); + info->aliases = copy_stringbuf(); ++ replace(info->aliases, '-', '_'); + + /* "dependency1 depandency2" */ + reset_stringbuf(); ======================================= --- /trunk/gar-minimyth/script/utils/busybox/Makefile Thu Aug 20 20:40:14 2009 +++ /trunk/gar-minimyth/script/utils/busybox/Makefile Tue Sep 8 17:49:57 2009 @@ -5,6 +5,8 @@ CONFIGFILE = $(DISTNAME).config DISTFILES = $(DISTNAME).tar.bz2 $(CONFIGFILE) PATCHFILES = \ + $(DISTNAME)-httpd.patch \ + $(DISTNAME)-modprobe.patch \ $(DISTNAME)-trylink-gc-sections.patch PATCHFILES += $(DISTNAME)-dhcp_options.patch $(DISTNAME)-dhcp_timezone.patch $(DISTNAME)-tftp_timeout.patch LICENSE = GPL2 ======================================= --- /trunk/gar-minimyth/script/utils/busybox/checksums Thu Aug 20 20:40:14 2009 +++ /trunk/gar-minimyth/script/utils/busybox/checksums Tue Sep 8 17:49:57 2009 @@ -1,5 +1,7 @@ d170bf5f97a41aec3a505eab690d5699 download/busybox-1.14.3.tar.bz2 -51aba4e79aafcd587732248ce644b076 download/busybox-1.14.3-trylink-gc-sections.patch +53d4b89c6dcd0694ec0ecd382048a7e0 download/busybox-1.14.3-httpd.patch +e79af3c7ecd74d2939d8e91266dc928f download/busybox-1.14.3-modprobe.patch +6d79f60153caf89c224441d4199b2376 download/busybox-1.14.3-trylink-gc-sections.patch 9b974b33ff72febcc6fc802a5d4e641b download/busybox-1.14.3-dhcp_options.patch 14f33701d4e85d3fa2a231de402c3bd0 download/busybox-1.14.3-dhcp_timezone.patch f8ae96f072ca8012ffd54b755865e964 download/busybox-1.14.3-tftp_timeout.patch ======================================= --- /trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.3-trylink-gc-sections.patch Thu Aug 20 20:40:14 2009 +++ /trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.3-trylink-gc-sections.patch Tue Sep 8 17:49:57 2009 @@ -1,19 +1,6 @@ -From f5d4bddfbee4d9a5af479e20f4e17b5e2fb4a3ed Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko <[email protected]> -Date: Sat, 27 Jun 2009 00:24:35 +0200 -Subject: [PATCH] trylink: don't use ld --gc-sections if ld doesn't support it - -Signed-off-by: Ian Abbott <[email protected]> -Signed-off-by: Denys Vlasenko <[email protected]> -Signed-off-by: Mike Frysinger <[email protected]> ---- - scripts/trylink | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/scripts/trylink b/scripts/trylink -index 7ea1d5c..8c88546 100755 ---- a/scripts/trylink -+++ b/scripts/trylink +diff -urpN busybox-1.14.3/scripts/trylink busybox-1.14.3-trylink-gc-sections/scripts/trylink +--- busybox-1.14.3/scripts/trylink 2009-08-02 20:16:36.000000000 +0200 ++++ busybox-1.14.3-trylink-gc-sections/scripts/trylink 2009-09-09 01:53:45.000000000 +0200 @@ -99,6 +99,11 @@ else fi )` @@ -26,6 +13,3 @@ # Sanitize lib list (dups, extra spaces etc) LDLIBS=`echo "$LDLIBS" | xargs -n1 | sort | uniq | xargs` --- -1.6.3.3 - --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
