rpm/busybox
SHA256
1
0
Fork 0
forked from pool/busybox
Code Pull Requests Activity

Accepting request 113102 from home:oertel:branches:openSUSE:Factory

Browse Source 
- busybox-1.19.4-typedef_umode_t.patch:
  fix compile as umode_t is only defined with KERNEL and is
  used in header linux/linux/ext2_fs.h

- update to 1.19.4
  - fix getty, mdev, modinfo and wget
- update to 1.19.3
  - fix chpasswd, crond, inetd, syslogd, tail, tftp
- update to 1.19.2
  - fix ash/hush, cttyhack, find, grep, less, patch, sed, top, 
    uncompress
- update to 1.19.0:
  - countless fixes in all utility programs, please see
    http://www.busybox.net/ for details
- remove obsolete patches previously marked as upstreamed

- busybox-1.19.4-typedef_umode_t.patch:
  fix compile as umode_t is only defined with KERNEL and is
  used in header linux/linux/ext2_fs.h 

- update to 1.19.4
  - fix getty, mdev, modinfo and wget
- update to 1.19.3
  - fix chpasswd, crond, inetd, syslogd, tail, tftp
- update to 1.19.2
  - fix ash/hush, cttyhack, find, grep, less, patch, sed, top,
    uncompress
- update to 1.19.0:
  - countless fixes in all utility programs, please see
    http://www.busybox.net/ for details

OBS-URL: https://build.opensuse.org/request/show/113102
OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=18
This commit is contained in:
Andreas Jaeger 2012-04-11 18:33:48 +00:00 committed by Git OBS Bridge
parent 232780dcf5
commit 95e97af54a
14 changed files with 80 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
busybox-1.18.3-buildsys.patch
View File

@ -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,

10
busybox-1.18.3-cksum.patch
View File

@ -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);

45
busybox-1.18.3-klogd.patch
View File

@ -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);

11
busybox-1.18.3-menuconfig.patch
View File

@ -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;

36
busybox-1.18.3-modutils24.patch
View File

@ -1,36 +0,0 @@
--- busybox-1.18.3/modutils/modutils-24.c
+++ busybox-1.18.3-modutils24/modutils/modutils-24.c
@@ -2474,6 +2474,7 @@ new_process_module_arguments(struct obj_
n = 0;
p = val;
while (*p != 0) {
+ char sv_ch;
char *endp;
if (++n > max)
@@ -2482,14 +2483,17 @@ new_process_module_arguments(struct obj_
switch (*pinfo) {
case 's':
len = strcspn(p, ",");
+ sv_ch = p[len];
p[len] = 0;
obj_string_patch(f, sym->secidx,
loc - contents, p);
loc += tgt_sizeof_char_p;
p += len;
+ *p = sv_ch;
break;
case 'c':
len = strcspn(p, ",");
+ sv_ch = p[len];
p[len] = 0;
if (len >= charssize)
bb_error_msg_and_die("string too long for %s (max %ld)", param,
@@ -2497,6 +2501,7 @@ new_process_module_arguments(struct obj_
strcpy((char *) loc, p);
loc += charssize;
p += len;
+ *p = sv_ch;
break;
case 'b':
*loc++ = strtoul(p, &endp, 0);

128
busybox-1.18.3-wget.patch
View File

@ -1,128 +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;
@@ -455,7 +455,6 @@ static void NOINLINE retrieve_file_data(
polldata.fd = fileno(dfp);
polldata.events = POLLIN | POLLPRI;
- ndelay_on(polldata.fd);
#endif
progress_meter(PROGRESS_START);
@@ -464,6 +463,10 @@ static void NOINLINE retrieve_file_data(
/* Loops only if chunked */
while (1) {
+
+#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
+ ndelay_on(polldata.fd);
+#endif
while (1) {
int n;
unsigned rdsz;
@@ -493,22 +496,46 @@ static void NOINLINE retrieve_file_data(
progress_meter(PROGRESS_BUMP);
}
#endif
+ /* fread internally uses read loop, which in our case
+ * is usually exited when we get EAGAIN.
+ * In this case, libc sets error marker on the stream.
+ * Need to clear it before next fread to avoid possible
+ * rare false positive ferror below. Rare because usually
+ * fread gets more than zero bytes, and we don't fall
+ * into if (n <= 0) ...
+ */
+ clearerr(dfp);
+ errno = 0;
n = safe_fread(buf, rdsz, dfp);
+ /* man fread:
+ * If error occurs, or EOF is reached, the return value
+ * is a short item count (or zero).
+ * fread does not distinguish between EOF and error.
+ */
if (n <= 0) {
- if (ferror(dfp)) {
- /* perror will not work: ferror doesn't set errno */
- bb_error_msg_and_die(bb_msg_read_error);
- }
- break;
+#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
+ if (errno == EAGAIN) /* poll lied, there is no data? */
+ continue; /* yes */
+#endif
+ if (ferror(dfp))
+ bb_perror_msg_and_die(bb_msg_read_error);
+ break; /* EOF, not error */
}
+
xwrite(output_fd, buf, n);
#if ENABLE_FEATURE_WGET_STATUSBAR
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 ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
+ ndelay_off(polldata.fd);
+#endif
if (!G.chunked)
break;
@@ -706,6 +733,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 +751,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);

3
busybox-1.18.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:83f112ee88b7eb85bea1cac0b1af33f61387a1036f1898c5ecd79813191a619b
size 2119251

12
busybox-1.19.4-typedef_umode_t.patch Normal file
View File

@ -0,0 +1,12 @@
--- util-linux/mkfs_ext2.c
+++ util-linux/mkfs_ext2.c
@@ -48,6 +48,9 @@
#include "libbb.h"
#include <linux/fs.h>
+
+typedef unsigned short umode_t;
+
#include <linux/ext2_fs.h>
#define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0

3
busybox-1.19.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee
size 2167516

23
busybox-static.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Tue Apr 10 15:20:58 CEST 2012 - ro@suse.de
- busybox-1.19.4-typedef_umode_t.patch:
fix compile as umode_t is only defined with KERNEL and is
used in header linux/linux/ext2_fs.h
-------------------------------------------------------------------
Tue Apr 10 14:59:02 CEST 2012 - ro@suse.de
- update to 1.19.4
- fix getty, mdev, modinfo and wget
- update to 1.19.3
- fix chpasswd, crond, inetd, syslogd, tail, tftp
- update to 1.19.2
- fix ash/hush, cttyhack, find, grep, less, patch, sed, top,
uncompress
- update to 1.19.0:
- countless fixes in all utility programs, please see
http://www.busybox.net/ for details
- remove obsolete patches previously marked as upstreamed
-------------------------------------------------------------------
Fri Sep 30 14:46:04 UTC 2011 - uli@suse.com

24
busybox-static.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package busybox-static
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,30 +16,23 @@
#
Name: busybox-static
Url: http://www.busybox.net/
Version: 1.18.3
Release: 1
Version: 1.19.4
Release: 0
Summary: The Swiss Army Knife of Embedded Linux
License: GPLv2+
License: GPL-2.0+
Group: System/Base
Source: http://busybox.net/downloads/busybox-%{version}.tar.bz2
Source1: BusyBox.1
Source2: busybox.SuSE.config
Source3: mkinitrd-setup.sh
Source4: mkinitrd-boot.sh
# upstream patches
Patch0: busybox-1.18.3-buildsys.patch
Patch1: busybox-1.18.3-cksum.patch
Patch2: busybox-1.18.3-klogd.patch
Patch3: busybox-1.18.3-menuconfig.patch
Patch4: busybox-1.18.3-modutils24.patch
Patch5: busybox-1.18.3-wget.patch
# other patches
Patch99: busybox.uClibc-build-fix.patch
Patch100: busybox.install.patch
Patch101: busybox-1.18.3-libarchive.patch
Patch102: busybox-1.19.4-typedef_umode_t.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: uClibc-devel
@ -56,15 +49,10 @@ counterparts.
%prep
%setup -q -n busybox-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch99 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p0
%{__cp} -a %{S:1} docs/
%{__cp} -a %{S:2} .config
find -name CVS | xargs rm -rf

23
busybox.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Tue Apr 10 15:19:52 CEST 2012 - ro@suse.de
- busybox-1.19.4-typedef_umode_t.patch:
fix compile as umode_t is only defined with KERNEL and is
used in header linux/linux/ext2_fs.h
-------------------------------------------------------------------
Tue Apr 10 14:49:18 CEST 2012 - ro@suse.de
- update to 1.19.4
- fix getty, mdev, modinfo and wget
- update to 1.19.3
- fix chpasswd, crond, inetd, syslogd, tail, tftp
- update to 1.19.2
- fix ash/hush, cttyhack, find, grep, less, patch, sed, top,
uncompress
- update to 1.19.0:
- countless fixes in all utility programs, please see
http://www.busybox.net/ for details
- remove obsolete patches previously marked as upstreamed
-------------------------------------------------------------------
Fri Sep 30 14:45:39 UTC 2011 - uli@suse.com

18
busybox.install.patch
View File

@ -1,15 +1,11 @@
---
applets/install.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/applets/install.sh
+++ b/applets/install.sh
@@ -8,7 +8,7 @@ if [ -z "$prefix" ]; then
echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--scriptwrapper]"
exit 1;
--- busybox-1.19.4/applets/install.sh
+++ busybox-1.19.4/applets/install.sh
@@ -9,7 +9,7 @@
exit 1
fi
-h=`sort busybox.links | uniq`
+h=`sort /usr/share/busybox/busybox.links | uniq`
linkopts=""
scriptwrapper="n"
cleanup="0"
noclobber="0"

24
busybox.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package busybox
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,29 +16,22 @@
#
Name: busybox
Url: http://www.busybox.net/
Version: 1.18.3
Release: 1
Version: 1.19.4
Release: 0
Summary: The Swiss Army Knife of Embedded Linux
License: GPLv2+
License: GPL-2.0+
Group: System/Base
Source: http://busybox.net/downloads/%{name}-%{version}.tar.bz2
Source1: BusyBox.1
Source2: busybox.SuSE.config
Source3: mkinitrd-setup.sh
Source4: mkinitrd-boot.sh
# upstream patches
Patch0: %{name}-1.18.3-buildsys.patch
Patch1: %{name}-1.18.3-cksum.patch
Patch2: %{name}-1.18.3-klogd.patch
Patch3: %{name}-1.18.3-menuconfig.patch
Patch4: %{name}-1.18.3-modutils24.patch
Patch5: %{name}-1.18.3-wget.patch
# other patches
Patch100: busybox.install.patch
Patch101: %{name}-1.18.3-libarchive.patch
Patch102: busybox-1.19.4-typedef_umode_t.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -54,14 +47,9 @@ counterparts.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p0
%{__cp} -a %{S:1} docs/
%{__cp} -a %{S:2} .config
find -name CVS | xargs rm -rf