summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-03-13 20:08:26 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-03-13 20:08:26 (GMT)
commit27c152db06d018f120e2da50fa982bbd6dedfd71 (patch)
treedfad66bce266b7fe4587f9e92d3923480ba819f1
parent707dc469aa4f51a85a62b2587ac57ef2a4db7873 (diff)
downloadbuildroot-27c152db06d018f120e2da50fa982bbd6dedfd71.tar.gz
buildroot-27c152db06d018f120e2da50fa982bbd6dedfd71.tar.bz2
busybox: bump 1.18.x stable version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/busybox/Config.in2
-rw-r--r--package/busybox/busybox-1.18.3/busybox-1.18.3-buildsys.patch10
-rw-r--r--package/busybox/busybox-1.18.3/busybox-1.18.3-cksum.patch10
-rw-r--r--package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch45
-rw-r--r--package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch11
-rw-r--r--package/busybox/busybox-1.18.3/busybox-1.18.3-wget.patch69
6 files changed, 1 insertions, 146 deletions
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index ecb3d40..8e43202 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -40,7 +40,7 @@ config BR2_BUSYBOX_VERSION
default "1.15.3" if BR2_BUSYBOX_VERSION_1_15_X
default "1.16.2" if BR2_BUSYBOX_VERSION_1_16_X
default "1.17.4" if BR2_BUSYBOX_VERSION_1_17_X
- default "1.18.3" if BR2_BUSYBOX_VERSION_1_18_X
+ default "1.18.4" if BR2_BUSYBOX_VERSION_1_18_X
config BR2_PACKAGE_BUSYBOX_CONFIG
string "BusyBox configuration file to use?"
diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-buildsys.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-buildsys.patch
deleted file mode 100644
index 330b73f..0000000
--- a/package/busybox/busybox-1.18.3/busybox-1.18.3-buildsys.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- busybox-1.18.3/Config.in
-+++ busybox-1.18.3-buildsys/Config.in
-@@ -126,7 +126,6 @@ config FEATURE_INSTALLER
- config INSTALL_NO_USR
- bool "Don't use /usr"
- default n
-- depends on FEATURE_INSTALLER
- help
- Disable use of /usr. busybox --install and "make install"
- will install applets only to /bin and /sbin,
diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-cksum.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-cksum.patch
deleted file mode 100644
index 97b05a0..0000000
--- a/package/busybox/busybox-1.18.3/busybox-1.18.3-cksum.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- busybox-1.18.3/coreutils/cksum.c
-+++ busybox-1.18.3-cksum/coreutils/cksum.c
-@@ -38,6 +38,7 @@ int cksum_main(int argc UNUSED_PARAM, ch
-
- #define read_buf bb_common_bufsiz1
- while ((bytes_read = safe_read(fd, read_buf, sizeof(read_buf))) > 0) {
-+ length += bytes_read;
- crc = crc32_block_endian1(crc, read_buf, bytes_read, crc32_table);
- }
- close(fd);
diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch
deleted file mode 100644
index 2272cd0..0000000
--- a/package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- busybox-1.18.3/sysklogd/klogd.c
-+++ busybox-1.18.3-klogd/sysklogd/klogd.c
-@@ -150,12 +150,41 @@ int klogd_main(int argc UNUSED_PARAM, ch
- */
- klogd_open();
- openlog("kernel", 0, LOG_KERN);
-+ /*
-+ * glibc problem: for some reason, glibc changes LOG_KERN to LOG_USER
-+ * above. The logic behind this is that standard
-+ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/syslog.html
-+ * says the following about openlog and syslog:
-+ * "LOG_USER
-+ * Messages generated by arbitrary processes.
-+ * This is the default facility identifier if none is specified."
-+ *
-+ * I believe glibc misinterpreted this text as "if openlog's
-+ * third parameter is 0 (=LOG_KERN), treat it as LOG_USER".
-+ * Whereas it was meant to say "if *syslog* is called with facility
-+ * 0 in its 1st parameter without prior call to openlog, then perform
-+ * implicit openlog(LOG_USER)".
-+ *
-+ * As a result of this, eh, feature, standard klogd was forced
-+ * to open-code its own openlog and syslog implementation (!).
-+ *
-+ * Note that prohibiting openlog(LOG_KERN) on libc level does not
-+ * add any security: any process can open a socket to "/dev/log"
-+ * and write a string "<0>Voila, a LOG_KERN + LOG_EMERG message"
-+ *
-+ * Google code search tells me there is no widespread use of
-+ * openlog("foo", 0, 0), thus fixing glibc won't break userspace.
-+ *
-+ * The bug against glibc was filed:
-+ * bugzilla.redhat.com/show_bug.cgi?id=547000
-+ */
-
- if (i)
- klogd_setloglevel(i);
-
-- bb_signals(BB_FATAL_SIGS, record_signo);
- signal(SIGHUP, SIG_IGN);
-+ /* We want klogd_read to not be restarted, thus _norestart: */
-+ bb_signals_recursive_norestart(BB_FATAL_SIGS, record_signo);
-
- syslog(LOG_NOTICE, "klogd started: %s", bb_banner);
-
diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch
deleted file mode 100644
index 3fc3eda..0000000
--- a/package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- busybox-1.18.3/scripts/kconfig/mconf.c
-+++ busybox-1.18.3-menuconfig/scripts/kconfig/mconf.c
-@@ -256,7 +256,7 @@ search_help[] = N_(
- " USB$ => find all CONFIG_ symbols ending with USB\n"
- "\n");
-
--static char buf[4096], *bufptr = buf;
-+static char buf[4096*10], *bufptr = buf;
- static char input_buf[4096];
- static const char filename[] = ".config";
- static char *args[1024], **argptr = args;
diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-wget.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-wget.patch
deleted file mode 100644
index c7ea736..0000000
--- a/package/busybox/busybox-1.18.3/busybox-1.18.3-wget.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- busybox-1.18.3/networking/wget.c
-+++ busybox-1.18.3-wget/networking/wget.c
-@@ -446,7 +446,7 @@ static FILE* prepare_ftp_session(FILE **
-
- static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)
- {
-- char buf[512];
-+ char buf[4*1024]; /* made bigger to speed up local xfers */
- #if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
- # if ENABLE_FEATURE_WGET_TIMEOUT
- unsigned second_cnt;
-@@ -506,8 +506,11 @@ static void NOINLINE retrieve_file_data(
- G.transferred += n;
- progress_meter(PROGRESS_BUMP);
- #endif
-- if (G.got_clen)
-+ if (G.got_clen) {
- G.content_len -= n;
-+ if (G.content_len == 0)
-+ break;
-+ }
- }
-
- if (!G.chunked)
-@@ -706,6 +709,11 @@ int wget_main(int argc UNUSED_PARAM, cha
- fprintf(sfp, "Host: %s\r\nUser-Agent: %s\r\n",
- target.host, user_agent);
-
-+ /* Ask server to close the connection as soon as we are done
-+ * (IOW: we do not intend to send more requests)
-+ */
-+ fprintf(sfp, "Connection: close\r\n");
-+
- #if ENABLE_FEATURE_WGET_AUTHENTICATION
- if (target.user) {
- fprintf(sfp, "Proxy-Authorization: Basic %s\r\n"+6,
-@@ -719,22 +727,25 @@ int wget_main(int argc UNUSED_PARAM, cha
-
- if (G.beg_range)
- fprintf(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range);
-+
- #if ENABLE_FEATURE_WGET_LONG_OPTIONS
- if (extra_headers)
- fputs(extra_headers, sfp);
-
- if (opt & WGET_OPT_POST_DATA) {
- char *estr = URL_escape(post_data);
-- fprintf(sfp, "Content-Type: application/x-www-form-urlencoded\r\n");
-- fprintf(sfp, "Content-Length: %u\r\n" "\r\n" "%s",
-- (int) strlen(estr), estr);
-- /*fprintf(sfp, "Connection: Keep-Alive\r\n\r\n");*/
-- /*fprintf(sfp, "%s\r\n", estr);*/
-+ fprintf(sfp,
-+ "Content-Type: application/x-www-form-urlencoded\r\n"
-+ "Content-Length: %u\r\n"
-+ "\r\n"
-+ "%s",
-+ (int) strlen(estr), estr
-+ );
- free(estr);
- } else
- #endif
-- { /* If "Connection:" is needed, document why */
-- fprintf(sfp, /* "Connection: close\r\n" */ "\r\n");
-+ {
-+ fprintf(sfp, "\r\n");
- }
-
- fflush(sfp);