|
[-]
[+]
|
Changed |
busybox.spec
|
|
|
|
[-]
[+]
|
Added |
busybox-1.16.0-ash.patch
^
|
| @@ -0,0 +1,35 @@
+diff -urpN busybox-1.16.0/shell/ash.c busybox-1.16.0-ash/shell/ash.c
+--- busybox-1.16.0/shell/ash.c 2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-ash/shell/ash.c 2010-02-21 01:52:22.000000000 +0100
+@@ -4539,7 +4539,7 @@ forkchild(struct job *jp, union node *n,
+ if (mode == FORK_NOJOB /* is it `xxx` ? */
+ && n && n->type == NCMD /* is it single cmd? */
+ /* && n->ncmd.args->type == NARG - always true? */
+- && strcmp(n->ncmd.args->narg.text, "trap") == 0
++ && n->ncmd.args && strcmp(n->ncmd.args->narg.text, "trap") == 0
+ && n->ncmd.args->narg.next == NULL /* "trap" with no arguments */
+ /* && n->ncmd.args->narg.backquote == NULL - do we need to check this? */
+ ) {
+@@ -4627,7 +4627,7 @@ forkchild(struct job *jp, union node *n,
+ }
+ #if JOBS
+ if (n && n->type == NCMD
+- && strcmp(n->ncmd.args->narg.text, "jobs") == 0
++ && n->ncmd.args && strcmp(n->ncmd.args->narg.text, "jobs") == 0
+ ) {
+ TRACE(("Job hack\n"));
+ /* "jobs": we do not want to clear job list for it,
+diff -urpN busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.right busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.right
+--- busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.right 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.right 2010-02-21 01:52:22.000000000 +0100
+@@ -0,0 +1,3 @@
++Test 1
++Test 2
++Done
+diff -urpN busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.tests busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.tests
+--- busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.tests 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.tests 2010-02-21 01:52:22.000000000 +0100
+@@ -0,0 +1,3 @@
++echo Test ` ` 1
++echo Test `</dev/null` 2
++echo Done
|
|
[-]
[+]
|
Added |
busybox-1.16.0-compat.patch
^
|
| @@ -0,0 +1,317 @@
+diff -urpN busybox-1.16.0/coreutils/fsync.c busybox-1.16.0-compat/coreutils/fsync.c
+--- busybox-1.16.0/coreutils/fsync.c 2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-compat/coreutils/fsync.c 2010-02-21 01:54:07.000000000 +0100
+@@ -7,6 +7,9 @@
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+ #include "libbb.h"
++#ifndef O_NOATIME
++# define O_NOATIME 0
++#endif
+
+ /* This is a NOFORK applet. Be very careful! */
+
+diff -urpN busybox-1.16.0/editors/diff.c busybox-1.16.0-compat/editors/diff.c
+--- busybox-1.16.0/editors/diff.c 2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-compat/editors/diff.c 2010-02-21 01:54:07.000000000 +0100
+@@ -227,10 +227,12 @@ struct cand {
+
+ static int search(const int *c, int k, int y, const struct cand *list)
+ {
++ int i, j;
++
+ if (list[c[k]].y < y) /* quick look for typical case */
+ return k + 1;
+
+- for (int i = 0, j = k + 1;;) {
++ for (i = 0, j = k + 1;;) {
+ const int l = (i + j) >> 1;
+ if (l > i) {
+ const int t = list[c[l]].y;
+@@ -265,11 +267,13 @@ static void stone(const int *a, int n, c
+ int clistlen = 100;
+ int k = 0;
+ struct cand *clist = xzalloc(clistlen * sizeof(clist[0]));
++ struct cand cand;
++ struct cand *q;
+ int *klist = xzalloc((n + 2) * sizeof(klist[0]));
+ /*clist[0] = (struct cand){0}; - xzalloc did it */
+ /*klist[0] = 0; */
+
+- for (struct cand cand = {1}; cand.x <= n; cand.x++) {
++ for (cand.x = 1; cand.x <= n; cand.x++) {
+ int j = a[cand.x], oldl = 0;
+ unsigned numtries = 0;
+ if (j == 0)
+@@ -303,7 +307,7 @@ static void stone(const int *a, int n, c
+ } while ((cand.y = b[++j]) > 0 && numtries < bound);
+ }
+ /* Unravel */
+- for (struct cand *q = clist + klist[k]; q->y; q = clist + q->pred)
++ for (q = clist + klist[k]; q->y; q = clist + q->pred)
+ J[q->x + pref] = q->y + pref;
+ free(klist);
+ free(clist);
+@@ -348,10 +352,11 @@ static void equiv(struct line *a, int n,
+
+ static void unsort(const struct line *f, int l, int *b)
+ {
++ int i;
+ int *a = xmalloc((l + 1) * sizeof(a[0]));
+- for (int i = 1; i <= l; i++)
++ for (i = 1; i <= l; i++)
+ a[f[i].serial] = f[i].value;
+- for (int i = 1; i <= l; i++)
++ for (i = 1; i <= l; i++)
+ b[i] = a[i];
+ free(a);
+ }
+@@ -370,12 +375,13 @@ static int line_compar(const void *a, co
+
+ static void fetch(FILE_and_pos_t *ft, const off_t *ix, int a, int b, int ch)
+ {
+- for (int i = a; i <= b; i++) {
++ int i, j, col;
++ for (i = a; i <= b; i++) {
+ seek_ft(ft, ix[i - 1]);
+ putchar(ch);
+ if (option_mask32 & FLAG(T))
+ putchar('\t');
+- for (int j = 0, col = 0; j < ix[i] - ix[i - 1]; j++) {
++ for (j = 0, col = 0; j < ix[i] - ix[i - 1]; j++) {
+ int c = fgetc(ft->ft_fp);
+ if (c == EOF) {
+ printf("\n\\ No newline at end of file\n");
+@@ -410,19 +416,20 @@ static NOINLINE int *create_J(FILE_and_p
+ {
+ int *J, slen[2], *class, *member;
+ struct line *nfile[2], *sfile[2];
+- int pref = 0, suff = 0;
++ int pref = 0, suff = 0, i, j, delta;
+
+ /* Lines of both files are hashed, and in the process
+ * their offsets are stored in the array ix[fileno]
+ * where fileno == 0 points to the old file, and
+ * fileno == 1 points to the new one.
+ */
+- for (int i = 0; i < 2; i++) {
++ for (i = 0; i < 2; i++) {
+ unsigned hash;
+ token_t tok;
+ size_t sz = 100;
+ nfile[i] = xmalloc((sz + 3) * sizeof(nfile[i][0]));
+ /* ft gets here without the correct position, cant use seek_ft */
++ ft[i].ft_pos = 0;
+ fseeko(ft[i].ft_fp, 0, SEEK_SET);
+
+ nlen[i] = 0;
+@@ -460,11 +467,11 @@ start:
+ nlen[i]--;
+ /* Now we copy the line offsets into ix */
+ ix[i] = xmalloc((nlen[i] + 2) * sizeof(ix[i][0]));
+- for (int j = 0; j < nlen[i] + 1; j++)
++ for (j = 0; j < nlen[i] + 1; j++)
+ ix[i][j] = nfile[i][j].offset;
+ }
+
+- /* lenght of prefix and suffix is calculated */
++ /* length of prefix and suffix is calculated */
+ for (; pref < nlen[0] && pref < nlen[1] &&
+ nfile[0][pref + 1].value == nfile[1][pref + 1].value;
+ pref++);
+@@ -475,10 +482,10 @@ start:
+ * the result being sorted and stored in sfile[fileno],
+ * and their sizes are stored in slen[fileno]
+ */
+- for (int j = 0; j < 2; j++) {
++ for (j = 0; j < 2; j++) {
+ sfile[j] = nfile[j] + pref;
+ slen[j] = nlen[j] - pref - suff;
+- for (int i = 0; i <= slen[j]; i++)
++ for (i = 0; i <= slen[j]; i++)
+ sfile[j][i].serial = i;
+ qsort(sfile[j] + 1, slen[j], sizeof(*sfile[j]), line_compar);
+ }
+@@ -494,7 +501,7 @@ start:
+ free(nfile[1]);
+
+ class = xmalloc((slen[0] + 1) * sizeof(class[0]));
+- for (int i = 1; i <= slen[0]; i++) /* Unsorting */
++ for (i = 1; i <= slen[0]; i++) /* Unsorting */
+ class[sfile[0][i].serial] = sfile[0][i].value;
+ free(nfile[0]);
+ #else
+@@ -512,7 +519,7 @@ start:
+ * are initialized with 0 (no matches), so that function stone can
+ * then assign them their right values
+ */
+- for (int i = 0, delta = nlen[1] - nlen[0]; i <= nlen[0]; i++)
++ for (i = 0, delta = nlen[1] - nlen[0]; i <= nlen[0]; i++)
+ J[i] = i <= pref ? i :
+ i > (nlen[0] - suff) ? (i + delta) : 0;
+ /* Here the magic is performed */
+@@ -526,14 +533,14 @@ start:
+ * which, due to limitations intrinsic to any hashing algorithm,
+ * are different but ended up confounded as the same
+ */
+- for (int i = 1; i <= nlen[0]; i++) {
++ for (i = 1; i <= nlen[0]; i++) {
+ if (!J[i])
+ continue;
+
+ seek_ft(&ft[0], ix[0][i - 1]);
+ seek_ft(&ft[1], ix[1][J[i] - 1]);
+
+- for (int j = J[i]; i <= nlen[0] && J[i] == j; i++, j++) {
++ for (j = J[i]; i <= nlen[0] && J[i] == j; i++, j++) {
+ token_t tok0 = 0, tok1 = 0;
+ do {
+ tok0 = read_token(&ft[0], tok0);
+@@ -555,13 +562,18 @@ static bool diff(FILE* fp[2], char *file
+ {
+ int nlen[2];
+ off_t *ix[2];
+- FILE_and_pos_t ft[2] = { { fp[0] }, { fp[1] } };
+- int *J = create_J(ft, nlen, ix);
+-
+- bool anychange = false;
++ FILE_and_pos_t ft[2];
+ typedef struct { int a, b; } vec_t[2];
+ vec_t *vec = NULL;
+- int i = 1, idx = -1;
++ int i = 1, j, k, idx = -1;
++ bool anychange = false;
++ int *J;
++
++ ft[0].ft_fp = fp[0];
++ ft[1].ft_fp = fp[1];
++ /* note that ft[i].ft_pos is unintitalized, create_J()
++ * must not assume otherwise */
++ J = create_J(ft, nlen, ix);
+
+ do {
+ bool nonempty = false;
+@@ -596,8 +608,8 @@ static bool diff(FILE* fp[2], char *file
+ break;
+ }
+
+- for (int j = 0; j < 2; j++)
+- for (int k = v[j].a; k < v[j].b; k++)
|
|
[-]
[+]
|
Added |
busybox-1.16.0-defconfig.patch
^
|
| @@ -0,0 +1,438 @@
+diff -urpN busybox-1.16.0/scripts/defconfig busybox-1.16.0-defconfig/scripts/defconfig
+--- busybox-1.16.0/scripts/defconfig 2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-defconfig/scripts/defconfig 2010-02-21 01:53:15.000000000 +0100
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Busybox version: 1.15.0.svn
+-# Fri Aug 21 00:14:11 2009
++# Busybox version: 1.16.0
++# Wed Jan 27 20:00:00 2010
+ #
+ CONFIG_HAVE_DOT_CONFIG=y
+
+@@ -14,6 +14,8 @@ CONFIG_HAVE_DOT_CONFIG=y
+ #
+ # CONFIG_DESKTOP is not set
+ # CONFIG_EXTRA_COMPAT is not set
++CONFIG_INCLUDE_SUSv2=y
++# CONFIG_USE_PORTABLE_CODE is not set
+ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+ # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+ # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+@@ -22,7 +24,7 @@ CONFIG_FEATURE_VERBOSE_USAGE=y
+ CONFIG_FEATURE_COMPRESS_USAGE=y
+ CONFIG_FEATURE_INSTALLER=y
+ CONFIG_LOCALE_SUPPORT=y
+-# CONFIG_FEATURE_ASSUME_UNICODE is not set
++CONFIG_FEATURE_ASSUME_UNICODE=y
+ # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+ CONFIG_LONG_OPTS=y
+ CONFIG_FEATURE_DEVPTS=y
+@@ -59,7 +61,6 @@ CONFIG_EXTRA_CFLAGS=""
+ CONFIG_NO_DEBUG_LIB=y
+ # CONFIG_DMALLOC is not set
+ # CONFIG_EFENCE is not set
+-CONFIG_INCLUDE_SUSv2=y
+
+ #
+ # Installation Options
+@@ -120,10 +121,11 @@ CONFIG_FEATURE_CPIO_P=y
+ # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+ CONFIG_GUNZIP=y
+ CONFIG_GZIP=y
++CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
+ CONFIG_LZOP=y
+ # CONFIG_LZOP_COMPR_HIGH is not set
+-# CONFIG_RPM2CPIO is not set
+-# CONFIG_RPM is not set
++CONFIG_RPM2CPIO=y
++CONFIG_RPM=y
+ CONFIG_TAR=y
+ CONFIG_FEATURE_TAR_CREATE=y
+ CONFIG_FEATURE_TAR_AUTODETECT=y
+@@ -133,6 +135,7 @@ CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=
+ CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+ CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+ CONFIG_FEATURE_TAR_UNAME_GNAME=y
++CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
+ CONFIG_UNCOMPRESS=y
+ CONFIG_UNLZMA=y
+ CONFIG_FEATURE_LZMA_FAST=y
+@@ -148,15 +151,19 @@ CONFIG_CATV=y
+ CONFIG_CHGRP=y
+ CONFIG_CHMOD=y
+ CONFIG_CHOWN=y
++CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
+ CONFIG_CHROOT=y
+ CONFIG_CKSUM=y
+ CONFIG_COMM=y
+ CONFIG_CP=y
++CONFIG_FEATURE_CP_LONG_OPTIONS=y
+ CONFIG_CUT=y
+ CONFIG_DATE=y
+ CONFIG_FEATURE_DATE_ISOFMT=y
++CONFIG_FEATURE_DATE_COMPAT=y
+ CONFIG_DD=y
+ CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
++CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
+ CONFIG_FEATURE_DD_IBS_OBS=y
+ CONFIG_DF=y
+ CONFIG_FEATURE_DF_FANCY=y
+@@ -271,7 +278,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
+ CONFIG_FEATURE_HUMAN_READABLE=y
+
+ #
+-# Common options for md5sum, sha1sum
++# Common options for md5sum, sha1sum, sha256sum, sha512sum
+ #
+ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+@@ -318,9 +325,8 @@ CONFIG_AWK=y
+ CONFIG_FEATURE_AWK_LIBM=y
+ CONFIG_CMP=y
+ CONFIG_DIFF=y
+-CONFIG_FEATURE_DIFF_BINARY=y
++CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
+ CONFIG_FEATURE_DIFF_DIR=y
+-CONFIG_FEATURE_DIFF_MINIMAL=y
+ CONFIG_ED=y
+ CONFIG_PATCH=y
+ CONFIG_SED=y
+@@ -364,6 +370,7 @@ CONFIG_FEATURE_FIND_DELETE=y
+ CONFIG_FEATURE_FIND_PATH=y
+ CONFIG_FEATURE_FIND_REGEX=y
+ # CONFIG_FEATURE_FIND_CONTEXT is not set
++CONFIG_FEATURE_FIND_LINKS=y
+ CONFIG_GREP=y
+ CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+ CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+@@ -453,6 +460,7 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALRE
+ # Options common to multiple modutils
+ #
+ # CONFIG_FEATURE_2_4_MODULES is not set
++# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+ # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+ # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+ # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+@@ -467,8 +475,8 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+ #
+ # Linux System Utilities
+ #
+-# CONFIG_ACPID is not set
+-# CONFIG_FEATURE_ACPID_COMPAT is not set
++CONFIG_ACPID=y
++CONFIG_FEATURE_ACPID_COMPAT=y
+ CONFIG_BLKID=y
+ CONFIG_DMESG=y
+ CONFIG_FEATURE_DMESG_PRETTY=y
+@@ -488,12 +496,14 @@ CONFIG_FEATURE_FDISK_ADVANCED=y
+ CONFIG_FINDFS=y
+ CONFIG_FREERAMDISK=y
+ CONFIG_FSCK_MINIX=y
++CONFIG_MKFS_EXT2=y
+ CONFIG_MKFS_MINIX=y
+
+ #
+ # Minix filesystem support
+ #
+ CONFIG_FEATURE_MINIX2=y
++# CONFIG_MKFS_REISER is not set
+ CONFIG_MKFS_VFAT=y
+ CONFIG_GETOPT=y
+ CONFIG_FEATURE_GETOPT_LONG=y
+@@ -506,6 +516,8 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+ CONFIG_IPCRM=y
+ CONFIG_IPCS=y
+ CONFIG_LOSETUP=y
++CONFIG_LSPCI=y
++CONFIG_LSUSB=y
+ CONFIG_MDEV=y
+ CONFIG_FEATURE_MDEV_CONF=y
+ CONFIG_FEATURE_MDEV_RENAME=y
+@@ -518,6 +530,7 @@ CONFIG_MORE=y
+ CONFIG_FEATURE_USE_TERMIOS=y
+ CONFIG_VOLUMEID=y
+ CONFIG_FEATURE_VOLUMEID_EXT=y
++CONFIG_FEATURE_VOLUMEID_BTRFS=y
+ CONFIG_FEATURE_VOLUMEID_REISERFS=y
+ CONFIG_FEATURE_VOLUMEID_FAT=y
+ CONFIG_FEATURE_VOLUMEID_HFS=y
+@@ -595,11 +608,12 @@ CONFIG_DEVMEM=y
+ CONFIG_EJECT=y
+ CONFIG_FEATURE_EJECT_SCSI=y
+ CONFIG_FBSPLASH=y
+-# CONFIG_FLASH_LOCK is not set
+-# CONFIG_FLASH_UNLOCK is not set
+-# CONFIG_FLASH_ERASEALL is not set
++CONFIG_FLASHCP=y
++CONFIG_FLASH_LOCK=y
++CONFIG_FLASH_UNLOCK=y
++CONFIG_FLASH_ERASEALL=y
+ CONFIG_IONICE=y
+-# CONFIG_INOTIFYD is not set
++CONFIG_INOTIFYD=y
+ CONFIG_LAST=y
+ # CONFIG_FEATURE_LAST_SMALL is not set
+ CONFIG_FEATURE_LAST_FANCY=y
+@@ -632,8 +646,8 @@ CONFIG_RUNLEVEL=y
+ CONFIG_RX=y
+ CONFIG_SETSID=y
+ CONFIG_STRINGS=y
+-# CONFIG_TASKSET is not set
+-# CONFIG_FEATURE_TASKSET_FANCY is not set
++CONFIG_TASKSET=y
++CONFIG_FEATURE_TASKSET_FANCY=y
+ CONFIG_TIME=y
+ CONFIG_TIMEOUT=y
+ CONFIG_TTYSIZE=y
+@@ -658,6 +672,7 @@ CONFIG_ETHER_WAKE=y
+ CONFIG_FAKEIDENTD=y
+ CONFIG_FTPD=y
+ CONFIG_FEATURE_FTP_WRITE=y
++CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
+ CONFIG_FTPGET=y
+ CONFIG_FTPPUT=y
+ CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
+@@ -723,6 +738,8 @@ CONFIG_NETSTAT=y
+ CONFIG_FEATURE_NETSTAT_WIDE=y
+ CONFIG_FEATURE_NETSTAT_PRG=y
|
|
[-]
[+]
|
Added |
busybox-1.16.0-linux_swap.patch
^
|
| @@ -0,0 +1,16 @@
+diff -urpN busybox-1.16.0/util-linux/volume_id/linux_swap.c busybox-1.16.0-linux_swap/util-linux/volume_id/linux_swap.c
+--- busybox-1.16.0/util-linux/volume_id/linux_swap.c 2010-01-25 01:59:39.000000000 +0100
++++ busybox-1.16.0-linux_swap/util-linux/volume_id/linux_swap.c 2010-02-21 01:53:21.000000000 +0100
+@@ -52,7 +52,11 @@ int FAST_FUNC volume_id_probe_linux_swap
+ goto found;
+ }
+
+- if (memcmp(buf, "SWAPSPACE2", 10) == 0) {
++ if (memcmp(buf, "SWAPSPACE2", 10) == 0
++ || memcmp(buf, "S1SUSPEND", 9) == 0
++ || memcmp(buf, "S2SUSPEND", 9) == 0
++ || memcmp(buf, "ULSUSPEND", 9) == 0
++ ) {
+ sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2));
+ if (sw == NULL)
+ return -1;
|
|
[-]
[+]
|
Added |
busybox-1.16.0-md5_sha_compat.patch
^
|
| @@ -0,0 +1,16 @@
+diff -urpN busybox-1.16.0/coreutils/md5_sha1_sum.c busybox-1.16.0-md5_sha_compat/coreutils/md5_sha1_sum.c
+--- busybox-1.16.0/coreutils/md5_sha1_sum.c 2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-md5_sha_compat/coreutils/md5_sha1_sum.c 2010-02-21 01:53:28.000000000 +0100
+@@ -101,8 +101,10 @@ int md5_sha1_sum_main(int argc UNUSED_PA
+ unsigned flags;
+ /*hash_algo_t hash_algo = applet_name[3];*/
+
+- if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK)
+- flags = getopt32(argv, "scw");
++ if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK) {
++ /* -b "binary", -t "text" are ignored (shaNNNsum compat) */
++ flags = getopt32(argv, "scwbt");
++ }
+ else optind = 1;
+ argv += optind;
+ //argc -= optind;
|
|
[-]
[+]
|
Added |
busybox-1.16.0-syslogd.patch
^
|
| @@ -0,0 +1,12 @@
+diff -urpN busybox-1.16.0/sysklogd/syslogd.c busybox-1.16.0-syslogd/sysklogd/syslogd.c
+--- busybox-1.16.0/sysklogd/syslogd.c 2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-syslogd/sysklogd/syslogd.c 2010-02-21 01:53:33.000000000 +0100
+@@ -698,7 +698,7 @@ int syslogd_main(int argc UNUSED_PARAM,
+ if (!(opts & OPT_nofork)) {
+ bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
+ }
+- umask(0);
++ //umask(0); - why??
+ write_pidfile("/var/run/syslogd.pid");
+ do_syslogd();
+ /* return EXIT_SUCCESS; */
|
|
[-]
[+]
|
Added |
busybox-1.16.0-tftp.patch
^
|
| @@ -0,0 +1,12 @@
+diff -urpN busybox-1.16.0/networking/tftp.c busybox-1.16.0-tftp/networking/tftp.c
+--- busybox-1.16.0/networking/tftp.c 2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-tftp/networking/tftp.c 2010-02-21 01:53:41.000000000 +0100
+@@ -308,7 +308,7 @@ static int tftp_protocol(
+
+ if (!ENABLE_TFTP || our_lsa) { /* tftpd */
+ /* Open file (must be after changing user) */
+- local_fd = open(local_file, open_mode);
++ local_fd = open(local_file, open_mode, 0666);
+ if (local_fd < 0) {
+ error_pkt_reason = ERR_NOFILE;
+ strcpy((char*)error_pkt_str, "can't open file");
|
|
[-]
[+]
|
Added |
busybox-1.16.0-udhcp-services.patch
^
|
| @@ -0,0 +1,24 @@
+--- networking/udhcp/options.c.orig 2009-06-22 00:40:29.000000000 +0200
++++ networking/udhcp/options.c 2009-08-02 13:40:59.000000000 +0200
+@@ -45,6 +45,10 @@
+ { OPTION_STRING , 0x42 }, /* tftp */
+ { OPTION_STRING , 0x43 }, /* bootfile */
+ { OPTION_STRING , 0x4D }, /* userclass */
++ { OPTION_IP | OPTION_LIST , 0x45 }, /* DHCP_SMTP_SERVER */
++ { OPTION_IP | OPTION_LIST , 0x46 }, /* DHCP_POP3_SERVER */
++ { OPTION_IP | OPTION_LIST , 0x4a }, /* DHCP_IRC_SERVER */
++ { OPTION_IP | OPTION_LIST , 0x48 }, /* DHCP_WWW_SERVER */
+ #if ENABLE_FEATURE_UDHCP_RFC3397
+ { OPTION_STR1035 | OPTION_LIST , 0x77 }, /* search */
+ #endif
+@@ -94,6 +98,10 @@
+ "tftp" "\0"
+ "bootfile" "\0"
+ "userclass" "\0"
++ "smtpsrv" "\0" /* DHCP_SMTP_SERVER */
++ "pop3srv" "\0" /* DHCP_POP3_SERVER */
++ "ircsrv" "\0" /* DHCP_IRC_SERVER */
++ "wwwsrv" "\0" /* DHCP_WWW_SERVER */
+ #if ENABLE_FEATURE_UDHCP_RFC3397
+ "search" "\0"
+ #endif
|
|
[-]
[+]
|
Added |
busybox-1.16.0-usage.patch
^
|
| @@ -0,0 +1,1141 @@
+diff -urpN busybox-1.16.0/include/usage.h busybox-1.16.0-usage/include/usage.h
+--- busybox-1.16.0/include/usage.h 2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-usage/include/usage.h 2010-02-21 01:53:47.000000000 +0100
+@@ -16,7 +16,7 @@
+ #define NOUSAGE_STR "\b"
+
+ #define acpid_trivial_usage \
+- "[-d] [-c CONFDIR] [-l LOGFILE] [-e PROC_EVENT_FILE] [EVDEV_EVENT_FILE...]"
++ "[-d] [-c CONFDIR] [-l LOGFILE] [-e PROC_EVENT_FILE] [EVDEV_EVENT_FILE]..."
+ #define acpid_full_usage "\n\n" \
+ "Listen to ACPI events and spawn specific helpers on event arrival\n" \
+ "\nOptions:" \
+@@ -33,7 +33,7 @@
+ "# acpid -d /dev/input/event*\n"
+
+ #define addgroup_trivial_usage \
+- "[-g GID] " IF_FEATURE_ADDUSER_TO_GROUP("[user_name] ") "group_name"
++ "[-g GID] " IF_FEATURE_ADDUSER_TO_GROUP("[USER] ") "GROUP"
+ #define addgroup_full_usage "\n\n" \
+ "Add a group " IF_FEATURE_ADDUSER_TO_GROUP("or add a user to a group") "\n" \
+ "\nOptions:" \
+@@ -41,7 +41,7 @@
+ "\n -S Create a system group" \
+
+ #define adduser_trivial_usage \
+- "[OPTIONS] user_name"
++ "[OPTIONS] USER"
+ #define adduser_full_usage "\n\n" \
+ "Add a user\n" \
+ "\nOptions:" \
+@@ -55,16 +55,16 @@
+ "\n -u UID User id" \
+
+ #define adjtimex_trivial_usage \
+- "[-q] [-o offset] [-f frequency] [-p timeconstant] [-t tick]"
++ "[-q] [-o OFF] [-f FREQ] [-p TCONST] [-t TICK]"
+ #define adjtimex_full_usage "\n\n" \
+- "Read and optionally set system timebase parameters. See adjtimex(2).\n" \
++ "Read and optionally set system timebase parameters. See adjtimex(2)\n" \
+ "\nOptions:" \
+- "\n -q Quiet" \
+- "\n -o offset Time offset, microseconds" \
+- "\n -f frequency Frequency adjust, integer kernel units (65536 is 1ppm)" \
+- "\n (positive values make clock run faster)" \
+- "\n -t tick Microseconds per tick, usually 10000" \
+- "\n -p timeconstant" \
++ "\n -q Quiet" \
++ "\n -o OFF Time offset, microseconds" \
++ "\n -f FREQ Frequency adjust, integer kernel units (65536 is 1ppm)" \
++ "\n (positive values make clock run faster)" \
++ "\n -t TICK Microseconds per tick, usually 10000" \
++ "\n -p TCONST" \
+
+ #define ar_trivial_usage \
+ "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES"
+@@ -78,11 +78,11 @@
+ "\n -v Verbose" \
+
+ #define arp_trivial_usage \
+- "\n[-vn] [-H type] [-i if] -a [hostname]" \
+- "\n[-v] [-i if] -d hostname [pub]" \
+- "\n[-v] [-H type] [-i if] -s hostname hw_addr [temp]" \
+- "\n[-v] [-H type] [-i if] -s hostname hw_addr [netmask nm] pub" \
+- "\n[-v] [-H type] [-i if] -Ds hostname ifa [netmask nm] pub"
++ "\n[-vn] [-H HWTYPE] [-i IF] -a [HOSTNAME]" \
++ "\n[-v] [-i IF] -d HOSTNAME [pub]" \
++ "\n[-v] [-H HWTYPE] [-i IF] -s HOSTNAME HWADDR [temp]" \
++ "\n[-v] [-H HWTYPE] [-i IF] -s HOSTNAME HWADDR [netmask MASK] pub" \
++ "\n[-v] [-H HWTYPE] [-i IF] -Ds HOSTNAME IFACE [netmask MASK] pub"
+ #define arp_full_usage "\n\n" \
+ "Manipulate ARP cache\n" \
+ "\nOptions:" \
+@@ -97,7 +97,7 @@
+ "\n -H HWTYPE Hardware address type" \
+
+ #define arping_trivial_usage \
+- "[-fqbDUA] [-c count] [-w timeout] [-I dev] [-s sender] target"
++ "[-fqbDUA] [-c CNT] [-w TIMEOUT] [-I IFACE] [-s SRC_IP] DST_IP"
+ #define arping_full_usage "\n\n" \
+ "Send ARP requests/replies\n" \
+ "\nOptions:" \
+@@ -108,10 +108,10 @@
+ "\n -U Unsolicited ARP mode, update your neighbors" \
+ "\n -A ARP answer mode, update your neighbors" \
+ "\n -c N Stop after sending N ARP requests" \
+- "\n -w timeout Time to wait for ARP reply, in seconds" \
+- "\n -I dev Interface to use (default eth0)" \
+- "\n -s sender Sender IP address" \
+- "\n target Target IP address" \
++ "\n -w TIMEOUT Time to wait for ARP reply, seconds" \
++ "\n -I IFACE Interface to use (default eth0)" \
++ "\n -s SRC_IP Sender IP address" \
++ "\n DST_IP Target IP address" \
+
+ #define sh_trivial_usage NOUSAGE_STR
+ #define sh_full_usage ""
+@@ -191,19 +191,19 @@
+ ) \
+
+ #define bunzip2_trivial_usage \
+- "[OPTIONS] [FILE]"
++ "[OPTIONS] [FILE]..."
+ #define bunzip2_full_usage "\n\n" \
+- "Uncompress FILE (or standard input)\n" \
++ "Uncompress FILEs (or stdin)\n" \
+ "\nOptions:" \
+- "\n -c Write to standard output" \
++ "\n -c Write to stdout" \
+ "\n -f Force" \
+
+ #define bzip2_trivial_usage \
+ "[OPTIONS] [FILE]..."
+ #define bzip2_full_usage "\n\n" \
+- "Compress FILEs (or standard input) with bzip2 algorithm.\n" \
++ "Compress FILEs (or stdin) with bzip2 algorithm\n" \
+ "\nOptions:" \
+- "\n -c Write to standard output" \
++ "\n -c Write to stdout" \
+ "\n -d Decompress" \
+ "\n -f Force" \
+ "\n -1..-9 Compression level" \
+@@ -214,7 +214,7 @@
+ #define lzop_trivial_usage \
+ "[-cfvd123456789CF] [FILE]..."
+ #define lzop_full_usage "\n\n" \
+- " -c Write to standard output" \
++ " -c Write to stdout" \
+ "\n -f Force" \
+ "\n -v Verbose" \
+ "\n -d Decompress" \
+@@ -231,7 +231,7 @@
+ #define unlzop_trivial_usage \
+ "[-cfvCF] [FILE]..."
+ #define unlzop_full_usage "\n\n" \
+- " -c Write to standard output" \
++ " -c Write to stdout" \
+ "\n -f Force" \
+ "\n -v Verbose" \
+ "\n -F Don't store or verify checksum" \
+@@ -242,11 +242,11 @@
+ "Uncompress to stdout"
+
+ #define unlzma_trivial_usage \
+- "[OPTIONS] [FILE]"
++ "[OPTIONS] [FILE]..."
+ #define unlzma_full_usage "\n\n" \
+- "Uncompress FILE (or standard input)\n" \
++ "Uncompress FILE (or stdin)\n" \
+ "\nOptions:" \
+- "\n -c Write to standard output" \
++ "\n -c Write to stdout" \
+ "\n -f Force" \
+
+ #define lzmacat_trivial_usage \
+@@ -255,7 +255,7 @@
+ "Uncompress to stdout"
+
+ #define cal_trivial_usage \
+- "[-jy] [[month] year]"
++ "[-jy] [[MONTH] YEAR]"
+ #define cal_full_usage "\n\n" \
+ "Display a calendar\n" \
+ "\nOptions:" \
+@@ -436,21 +436,21 @@
+ "\n -c BYTES Limit core file size" \
+ "\n -v Verbose" \
+ "\n -P Create new process group" \
+- "\n -0 Close standard input" \
+- "\n -1 Close standard output" \
+- "\n -2 Close standard error" \
++ "\n -0 Close stdin" \
++ "\n -1 Close stdout" \
++ "\n -2 Close stderr" \
+
+ #define setuidgid_trivial_usage \
+- "account prog args"
++ "USER PROG ARGS"
+ #define setuidgid_full_usage "\n\n" \
+- "Set uid and gid to account's uid and gid, removing all supplementary\n" \
++ "Set uid and gid to USER's uid and gid, removing all supplementary\n" \
+ "groups and run PROG"
+ #define envuidgid_trivial_usage \
+- "account prog args"
++ "USER PROG ARGS"
+ #define envuidgid_full_usage "\n\n" \
+- "Set $UID to account's uid and $GID to account's gid and run PROG"
++ "Set $UID to USER's uid and $GID to USER's gid and run PROG"
+ #define envdir_trivial_usage \
+- "dir prog args"
++ "DIR PROG ARGS"
+ #define envdir_full_usage "\n\n" \
+ "Set various environment variables as specified by files\n" \
+ "in the directory dir and run PROG"
+@@ -477,7 +477,7 @@
+ "\n a SIGXCPU after N seconds" \
+
+ #define chroot_trivial_usage \
+- "NEWROOT [PROG [ARGS]]"
++ "NEWROOT [PROG ARGS]"
|
|
[-]
[+]
|
Added |
busybox-1.16.0-wget.patch
^
|
| @@ -0,0 +1,20 @@
+diff -urpN busybox-1.16.0/networking/wget.c busybox-1.16.0-wget/networking/wget.c
+--- busybox-1.16.0/networking/wget.c 2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-wget/networking/wget.c 2010-02-21 01:53:53.000000000 +0100
+@@ -546,6 +546,8 @@ int wget_main(int argc UNUSED_PARAM, cha
+ "passive-ftp\0" No_argument "\xff"
+ "header\0" Required_argument "\xfe"
+ "post-data\0" Required_argument "\xfd"
++ /* Ignored (we don't do ssl) */
++ "no-check-certificate\0" No_argument "\xfc"
+ ;
+ #endif
+
+@@ -590,6 +592,7 @@ int wget_main(int argc UNUSED_PARAM, cha
+ if (use_proxy) {
+ proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
+ if (proxy && proxy[0]) {
++ server.user = NULL;
+ parse_url(proxy, &server);
+ } else {
+ use_proxy = 0;
|
|
|
Added |
busybox-1.16.0.tar.bz2
^
|
