New applets: inotify (Vladimir Dronnikov), man (Ivana Varekova), fbsplash (Michele Sanges), depmod (Bernhard Fischer) Changes since previous release: * build system: reinstate CONFIG_CROSS_COMPILE_PREFIX * ash: optional bash compatibility features added; other fixes * hush: lots and lots of fixes * msh: fix the case where the file has exec bit but can't be run directly (runs "$SHELL file" instead) * msh: fix exit codes when command is not found or can't be execed * udhcpc: added workaround for buggy kernels * mount: fix mishandling of proto=tcp/udp * diff: make it work on non-seekable streams * openvt: made more compatible with "standard" one * mdev: fix block/char device detection * ping: add -w, -W support (James Simmons) * crond: add handling of "MAILTO=user" lines * start-stop-daemon: make --exec follow symlinks (Joakim Tjernlund) * date: make it accept ISO date format * echo: fix echo -e -n "msg\n\0" (David Pinedo) * httpd: fix several bugs triggered by relative path in -h DIR * printf: fix printf -%s- foo, printf -- -%s- foo * syslogd: do not error out on missing files to rotate * ls: support Unicode in names * ip: support for the LOWER_UP flag (Natanael Copa) * mktemp: make argument optional (coreutil 6.12 compat) * libiproute: fix option parsing, so that "ip -o link" works again * other fixes and code size reductions in many applets Reproducible: Always Steps to Reproduce:
busybox-1.10.3-tcpudp.patch is included upstream in this release. The following works for me: --- busybox-1.10.3.ebuild 2008-07-03 16:43:28.982579817 +0200 +++ busybox-1.10.4.ebuild 2008-07-03 16:42:26.739036168 +0200 @@ -86,7 +86,6 @@ # patches go here! epatch "${FILESDIR}"/busybox-1.7.0-bb.patch - epatch "${FILESDIR}"/busybox-1.10.3-tcpudp.patch # include this upstream later.. epatch "${FILESDIR}"/busybox-devmem.patch
Bump to 1.11.1 ?
busybox-1.7.0-bb.patch breaks for 1.11.1. Don't exactly understand what it's purpose was, and couldn't find any comment about it... vapier? Do we still need it? Should be easy enough to fix, let me know if I should fiddle with the code. Otherwise this Works For Me™, would be great to get it into portage. --- busybox-1.10.3.ebuild 2008-06-18 03:31:19.000000000 +0200 +++ busybox-1.11.1.ebuild 2008-07-21 11:14:32.003870687 +0200 @@ -84,9 +84,6 @@ unpack ${MY_P}.tar.bz2 cd "${S}" - # patches go here! - epatch "${FILESDIR}"/busybox-1.7.0-bb.patch - epatch "${FILESDIR}"/busybox-1.10.3-tcpudp.patch # include this upstream later.. epatch "${FILESDIR}"/busybox-devmem.patch
(In reply to comment #3) > busybox-1.7.0-bb.patch breaks for 1.11.1. Don't exactly understand what it's > purpose was, and couldn't find any comment about it... vapier? Do we still need > it? Should be easy enough to fix, let me know if I should fiddle with the code. vapier is on vacation. And I just got back from OSCON which is why this bug has sat here. I did try to bump it before I left and also ran into the same error you did, but I had to jump on a place so no time to fwd port it. So yes the bb.patch is required. I believe it is documented in our .xml as being the fallback shell you can use for rescues. On Gentoo the /bin/bb should be the (static) ELF and /bin/busybox is the (dynamic) ELF. The bb's role is to be able to rescue the system to be used such as init=/bin/bb on the boot loaders command line. The ebuild should contain all the logic for this already. Attaching a ready to go patch will likely speed up this bugs progress.
Created attachment 161608 [details, diff] changes from busybox-1.10.3 to busybox-1.11.1 ebuild
Created attachment 161609 [details, diff] busybox-1.11.1-bb.patch the updated bb patch
After merging with USE=-static I get: $ file /bin/{busybox*,bb} /bin/busybox: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), dynamically linked (uses shared libs), stripped /bin/bb: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), for GNU/Linux 2.6.9, statically linked, stripped and with USE=static: $ file /bin/{busybox*,bb} /bin/busybox: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), for GNU/Linux 2.6.9, statically linked, stripped /bin/busybox.static: symbolic link to `bb' /bin/bb: symbolic link to `busybox' Looks about right to me.
Just made some time to commit this. Thanks Christoph Gysin
