diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-12-27 06:16:22 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2008-12-27 06:16:22 +0000 |
commit | ce151f4f1451ae88107b5f023e6278fcd7c21d8f (patch) | |
tree | 495a02a06c9195721029dd0e4c6aad10fef7d0d5 /sys-apps | |
parent | add ~amd64 keyword, reporter Andrew Savchenko (bug #252644) (diff) | |
download | historical-ce151f4f1451ae88107b5f023e6278fcd7c21d8f.tar.gz historical-ce151f4f1451ae88107b5f023e6278fcd7c21d8f.tar.bz2 historical-ce151f4f1451ae88107b5f023e6278fcd7c21d8f.zip |
Version bump.
Package-Manager: portage-2.2_rc18/cvs/Linux 2.6.28 x86_64
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/busybox/ChangeLog | 11 | ||||
-rw-r--r-- | sys-apps/busybox/Manifest | 15 | ||||
-rw-r--r-- | sys-apps/busybox/busybox-1.13.1.ebuild | 251 | ||||
-rw-r--r-- | sys-apps/busybox/files/busybox-1.13.1-bindtodevice.patch | 86 | ||||
-rw-r--r-- | sys-apps/busybox/files/busybox-1.13.1-crond.patch | 20 | ||||
-rw-r--r-- | sys-apps/busybox/files/busybox-1.13.1-init.patch | 28 | ||||
-rw-r--r-- | sys-apps/busybox/files/busybox-1.13.1-ip.patch | 11 | ||||
-rw-r--r-- | sys-apps/busybox/files/busybox-1.13.1-printf.patch | 19 |
8 files changed, 436 insertions, 5 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index 224be72fb7e4..cd51701398c3 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.208 2008/11/27 22:07:50 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.209 2008/12/27 06:16:22 vapier Exp $ + +*busybox-1.13.1 (27 Dec 2008) + + 27 Dec 2008; Mike Frysinger <vapier@gentoo.org> + +files/busybox-1.13.1-bindtodevice.patch, + +files/busybox-1.13.1-crond.patch, +files/busybox-1.13.1-init.patch, + +files/busybox-1.13.1-ip.patch, +files/busybox-1.13.1-printf.patch, + +busybox-1.13.1.ebuild: + Version bump. 27 Nov 2008; Raúl Porcel <armin76@gentoo.org> busybox-1.11.3.ebuild: alpha/arm/ia64/sparc/x86 stable diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 01e10c5ab238..7dd422664baf 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -10,6 +10,11 @@ AUX busybox-1.12.1-modprobe.patch 1407 RMD160 575c8fdd86836d01fac75482bfb076d1bf AUX busybox-1.12.1-standalone.patch 7585 RMD160 0bf39b7183ae9e66bbb2b4b4b9b4861874cd192f SHA1 cd509e3b327ad85d2adbdd3e3b4e0d6b332ea790 SHA256 70f1da468db9dba23cb73dee58a01baf3497d9d44ba52102c5abec2641a34c5a AUX busybox-1.12.2-getopt.patch 639 RMD160 bfa79b576d704bb2102514ff41edac69607dd9de SHA1 8961e854042bcea29a0a92cc06f055192d7a32ab SHA256 039d76d7a8e3ee77fcb6cf879a311c7a2c64a6996da480a11aa90cadc749a524 AUX busybox-1.12.2-lineedit.patch 461 RMD160 7e378845f8dde9b04148a076e08246cde9012552 SHA1 9a92d463241ad6c7ab3c9999ed44603c47b86b10 SHA256 5446f034e99ed66d6111d2d3b0735256d90d98cb1c6c20e2aa29a287d8ee69c6 +AUX busybox-1.13.1-bindtodevice.patch 3282 RMD160 c277b3cd39356cf561ecb1ea31e9a8384987540e SHA1 97ccbb7d468690aa6a41e08c5d4b56b5b2ef2377 SHA256 d0447f74b64fadc8fc711c21063139a274f52cb5855764b952220679e5474b50 +AUX busybox-1.13.1-crond.patch 788 RMD160 b7d9467b5af283ed7ec9fca69e36bf0c4f766912 SHA1 d70cae1b53ae50f9a4ecaec815cd0c7f0213f793 SHA256 ef3576f7decba7a797d9ab7793b4222459c14a267d9af8550dc04e93bb9258a5 +AUX busybox-1.13.1-init.patch 839 RMD160 13cc740e9e3419d0a4a26f74f59e61d9ef4db1f6 SHA1 3066a766c9385505130149dcf31cbe84e15665fe SHA256 19e1c279c97f92c304585342b2af87f580dad61c0c2159584c7480f8c68b9428 +AUX busybox-1.13.1-ip.patch 313 RMD160 39ccb070c04269ea9f5b721ad7e502d5482af109 SHA1 b8e551deecfae9f14e98ac39df23369187f1eae6 SHA256 54ce7c20d7fd865fe0441a21c488d470a4038c42437670b22633ada8d1931242 +AUX busybox-1.13.1-printf.patch 532 RMD160 e0eb868bf4b2c0c12c431607b948f3d6565297a1 SHA1 a153af9b3e3272d15c9369e159e033676ad84980 SHA256 bb769cbc526c751d13258d567f61ec46c99654fb4b18f1822ea89814f5386f6f AUX busybox-devmem.patch 4623 RMD160 3a9c0a4eba57b18308b3a75d05a7eb1804c8e8ee SHA1 77fe59da168f6d4b1a0508816683c2887084673f SHA256 9ef56cb12d3d566a54ccdbe225a996eae9263efcddbb68c258121f75ece2b7f8 AUX mdev-start.sh 2758 RMD160 c177aac4940b177bd857bc98ff2ac031e0489bbc SHA1 5a5b95da36c489cd12820513434a7a17ac3bffd1 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 DIST busybox-1.11.1.tar.bz2 1924234 RMD160 8047748a4be0990f2bab61fdeefac1400e8cfa9d SHA1 73b041364d377125949dd8f5c191bcbb3daee6e9 SHA256 bf2fb5be14cb509af1153af15b8a14c143d61fc46fb50cfbcf3cf10764f3740f @@ -17,18 +22,20 @@ DIST busybox-1.11.3.tar.bz2 1924832 RMD160 1f2fd6dad3199ecc7de79ff7ad5ed84bae48d DIST busybox-1.12.0.tar.bz2 2017989 RMD160 b5e991bdbc1481a649f963b9e949777707412fd3 SHA1 0c174c69e7b7244a3936ebfdc245fa37b73ce633 SHA256 c5b5c6d89e22c975d160e9dd9bb767521f6c478b9c356cab06a9328da5e4a2e6 DIST busybox-1.12.1.tar.bz2 2022321 RMD160 075092f73e03c4b36de7426c35b1bfb6568fc884 SHA1 e405e2d6587714626c8eb7d181f63208f3997845 SHA256 80829f38d719879dcf01db6251015c8aea2567a382dad463f65d2299447e949b DIST busybox-1.12.2.tar.bz2 2021304 RMD160 b716a8742411954845b0aed8e12754e3aed8c7c6 SHA1 49c715a4adb8f6f3d4103dfe04b050479fe43e56 SHA256 49a33023399b1378ef905f382e59581f1b139faf68247321f5abd8c591a24335 +DIST busybox-1.13.1.tar.bz2 2045965 RMD160 ddf55e1caa75dd875ce08ec59709cb8e22b5d279 SHA1 9380c7ab81013b7b242daf02696c0aa1fec74b28 SHA256 011923a661351fa862911c9729f20524c7798435e6787fbc371c92a6db2eaa1e EBUILD busybox-1.11.1.ebuild 7312 RMD160 b924ef0d00d2ec9b9f42cd10136834c777046e02 SHA1 4630529c82555e87228e4b643482b723cd4978da SHA256 e70a4a13f000a3f2a18f4d975d430d1dd26cd4a5e8499031a932172f101017f7 EBUILD busybox-1.11.3.ebuild 7265 RMD160 3a07d587b7122402a97e0c4bd7ba4d9dcdd88f0f SHA1 afff8cfced7c259cf8c033c7ac6b12b982603f89 SHA256 21a12d6bb04edbb6da7c1375dcbb38c655ae1a6a62fafda9e65a30b3f6d6c774 EBUILD busybox-1.12.0.ebuild 7270 RMD160 364726e02c3b6847e983f11a0d2205b15d02ed61 SHA1 4207919c0116ad69c0bf2f5cf786f9b3b9c065ed SHA256 a185c1386756fc5f7eff8de00ca2a02e9ad17176226a8da6cb2254d7bbdc9d73 EBUILD busybox-1.12.1.ebuild 7315 RMD160 e079459231a544b2307e0f4b40639f8a03e945be SHA1 94b911c9e02aa37b588f2f634d5a06f92ecaccad SHA256 02d4d20a8164f58892ce38ec710241d04642a69f24ce967429f1a384b18888e0 EBUILD busybox-1.12.2-r1.ebuild 7464 RMD160 50713f105511df6c4a5af7718c5052a764baba68 SHA1 5b7c7083702319162a816439f0dae198a8f90def SHA256 931eb6ebef5743b4a4e779f3420f0d3687df312f9b6f14bec7b25d25351a476a EBUILD busybox-1.12.2.ebuild 7314 RMD160 696bc4ad6399aa222edbe27ce7e40521a5e52a09 SHA1 520a3821c8852d2aca8d8f9c375b1363e44cd464 SHA256 35d0d084d4465fa7b04c65216e83fffb0ba3d5c7fb51943e28045ae3624d9c5d -MISC ChangeLog 31156 RMD160 9a7f802efda8f1e40c5355745da6481ca9efd253 SHA1 50ca4700fbf1b553017b4a32c8389bc809b45d1c SHA256 a27bab2dd03491d6a6ac1a3a0304df038b2ec657c9eacdccf6babfce06c80b33 +EBUILD busybox-1.13.1.ebuild 7334 RMD160 7fa9f7dc63f2a4c4615cabb8b806e2fc37d890bb SHA1 11b0e42e07aff1383b60e236b03f617c0e7913a6 SHA256 1fd5f51f5271ff3ce9abb198656c0ca2da987b50d29d19b2a31d0c391c548831 +MISC ChangeLog 31464 RMD160 349c3c4deeb30db41c239469998ccc5029f6086e SHA1 fd31bcdcfac9734c79a5da71d2dff57c9930af85 SHA256 be54649a7d2de48615a1d58a4c7be40088922d79a116dd8b48ec0cf8c168ab20 MISC metadata.xml 261 RMD160 3a3402cbd18d14e4f10e1bb0a4d94a0c3b29b44d SHA1 7bc1c61bf44ae90dfce0f668ea0dcfe0460afe77 SHA256 d45ec36c64c958afd2de0777e77292c4e2908e32c5417c952dd63d920f82990a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkk7omsACgkQ67wieSYcaxeQSACghlhRYJWX5IPgqaXDpGHZyzve -aIMAoM8xhT3aHWNOITs8/+oi+thRyzjv -=JkNs +iEYEARECAAYFAklVyD0ACgkQn/5bYzqsSmHTlQCfUxZymPJ2jqHpsxdpEkdvn2xs +fewAn3H7dKQiTq8kcLkghP51JoGOwn2f +=Fac+ -----END PGP SIGNATURE----- diff --git a/sys-apps/busybox/busybox-1.13.1.ebuild b/sys-apps/busybox/busybox-1.13.1.ebuild new file mode 100644 index 000000000000..8b35669ac5d3 --- /dev/null +++ b/sys-apps/busybox/busybox-1.13.1.ebuild @@ -0,0 +1,251 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.13.1.ebuild,v 1.1 2008/12/27 06:16:22 vapier Exp $ + +inherit eutils flag-o-matic savedconfig toolchain-funcs + +################################################################################ +# BUSYBOX ALTERNATE CONFIG MINI-HOWTO +# +# Busybox can be modified in many different ways. Here's a few ways to do it: +# +# (1) Emerge busybox with FEATURES=keepwork so the work directory won't +# get erased afterwards. Add a definition like ROOT=/my/root/path to the +# start of the line if you're installing to somewhere else than the root +# directory. This command will save the default configuration to +# ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not +# defined), and it will tell you that it has done this. Note the location +# where the config file was saved. +# +# FEATURES=keepwork USE=savedconfig emerge busybox +# +# (2) Go to the work directory and change the configuration of busybox using its +# menuconfig feature. +# +# cd /var/tmp/portage/busybox*/work/busybox-* +# make menuconfig +# +# (3) Save your configuration to the default location and copy it to the +# one of the locations listed in /usr/portage/eclass/savedconfig.eclass +# +# (4) Emerge busybox with USE=savedconfig to use the configuration file you +# just generated. +# +################################################################################ +# +# (1) Alternatively skip the above steps and simply emerge busybox without +# USE=savedconfig. +# +# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF} +# +# (3) Remerge busybox as using USE=savedconfig. +# +################################################################################ + +#SNAPSHOT=20040726 +SNAPSHOT="" + +DESCRIPTION="Utilities for rescue and embedded systems" +HOMEPAGE="http://www.busybox.net/" +if [[ -n ${SNAPSHOT} ]] ; then + MY_P=${PN} + SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2" +else + MY_P=${PN}-${PV/_/-} + SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" +fi +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="debug make-symlinks pam selinux static" +RESTRICT="test" + +DEPEND="selinux? ( sys-libs/libselinux ) + pam? ( sys-libs/pam )" + +S=${WORKDIR}/${MY_P} + +busybox_config_option() { + case $1 in + y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;; + n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;; + *) use $1 \ + && busybox_config_option y $2 \ + || busybox_config_option n $2 + return 0 + ;; + esac + einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...) +} + +src_unpack() { + unset KBUILD_OUTPUT #88088 + + unpack ${MY_P}.tar.bz2 + cd "${S}" + + # patches go here! + epatch "${FILESDIR}"/busybox-1.11.1-bb.patch + epatch "${FILESDIR}"/busybox-${PV}-*.patch + + epatch "${FILESDIR}"/busybox-1.12.0-mdev-exec.patch + + # work around broken ass powerpc compilers + use ppc64 && append-flags -mminimal-toc + # flag cleanup + sed -i -r \ + -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ + Makefile.flags || die + sed -i '/^#error Aborting compilation./d' applets/applets.c || die + use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile + sed -i \ + -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + Makefile || die + + # check for a busybox config before making one of our own. + # if one exist lets return and use it. + + restore_config .config + if [ -f .config ]; then + yes "" | emake -j1 oldconfig > /dev/null + return 0 + else + ewarn "Could not locate user configfile, so we will save a default one" + fi + + # setup the config file + emake -j1 allyesconfig > /dev/null + busybox_config_option n DMALLOC + busybox_config_option n FEATURE_SUID_CONFIG + busybox_config_option n BUILD_AT_ONCE + busybox_config_option n BUILD_LIBBUSYBOX + busybox_config_option n NOMMU + busybox_config_option n MONOTONIC_SYSCALL + + # If these are not set and we are using a uclibc/busybox setup + # all calls to system() will fail. + busybox_config_option y FEATURE_SH_IS_ASH + busybox_config_option n FEATURE_SH_IS_NONE + + if use static && use pam ; then + ewarn "You cannot have USE='static pam'. Assuming static is more important." + fi + use static \ + && busybox_config_option n PAM \ + || busybox_config_option pam PAM + busybox_config_option static STATIC + busybox_config_option debug DEBUG + use debug \ + && busybox_config_option y NO_DEBUG_LIB \ + && busybox_config_option n DMALLOC \ + && busybox_config_option n EFENCE + + busybox_config_option selinux SELINUX + + # default a bunch of uncommon options to off + local opt + for opt in \ + APP_UDHCPD \ + CRONTAB \ + DC DPKG \ + FAKEIDENTD FBSPLASH FOLD FTP{GET,PUT} \ + HTTPD HUSH \ + INETD INOTIFYD IPCALC \ + LASH LOCALE_SUPPORT LOGNAME \ + MSH \ + OD \ + SULOGIN \ + TASKSET TFTP{,D} \ + RPM RPM2CPIO \ + UDPSVD UUDECODE UUENCODE + do + busybox_config_option n ${opt} + done + + emake -j1 oldconfig > /dev/null +} + +src_compile() { + unset KBUILD_OUTPUT #88088 + export SKIP_STRIP=y + + emake busybox || die "build failed" + if ! use static && ! use pam ; then + mv busybox_unstripped{,.bak} + emake CONFIG_STATIC=y busybox || die "static build failed" + mv busybox_unstripped bb + mv busybox_unstripped{.bak,} + fi +} + +src_install() { + unset KBUILD_OUTPUT #88088 + save_config .config + + into / + newbin busybox_unstripped busybox || die + if use static || use pam ; then + dosym busybox /bin/bb || die + dosym bb /bin/busybox.static || die + else + dobin bb || die + fi + + insinto /$(get_libdir)/rcscripts/addons + doins "${FILESDIR}"/mdev-start.sh || die + + # bundle up the symlink files for use later + emake install || die + rm _install/bin/busybox + tar cf busybox-links.tar -C _install . || : #;die + insinto /usr/share/${PN} + doins busybox-links.tar || die + newins .config ${PF}.config || die + + dodoc AUTHORS README TODO + + cd docs || die + docinto txt + dodoc *.txt + docinto pod + dodoc *.pod + dohtml *.html *.sgml + + cd ../examples || die + docinto examples + dodoc inittab depmod.pl *.conf *.script undeb unrpm + + cd bootfloppy || die + docinto bootfloppy + dodoc $(find . -type f) +} + +pkg_preinst() { + if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then + ewarn "setting USE=make-symlinks and emerging to / is very dangerous." + ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." + ewarn "If you are creating a binary only and not merging this is probably ok." + ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is realy what you want." + die "silly options will destroy your system" + fi + + if use make-symlinks ; then + mv "${D}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die + fi +} + +pkg_postinst() { + if use make-symlinks ; then + cd "${T}" || die + mkdir _install + tar xf busybox-links.tar -C _install || die + cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" + fi + + echo + einfo "This ebuild has support for user defined configs" + einfo "Please read this ebuild for more details and re-emerge as needed" + einfo "if you want to add or remove functionality for ${PN}" + echo +} diff --git a/sys-apps/busybox/files/busybox-1.13.1-bindtodevice.patch b/sys-apps/busybox/files/busybox-1.13.1-bindtodevice.patch new file mode 100644 index 000000000000..1894145292c5 --- /dev/null +++ b/sys-apps/busybox/files/busybox-1.13.1-bindtodevice.patch @@ -0,0 +1,86 @@ +--- busybox-1.13.1/include/libbb.h Sun Nov 9 18:28:17 2008 ++++ busybox-1.13.1-bindtodevice/include/libbb.h Wed Dec 10 12:10:30 2008 +@@ -437,6 +437,7 @@ + * Turn it on before you call bind(). */ + void setsockopt_reuseaddr(int fd) FAST_FUNC; /* On Linux this never fails. */ + int setsockopt_broadcast(int fd) FAST_FUNC; ++int setsockopt_bindtodevice(int fd, const char *iface) FAST_FUNC; + /* NB: returns port in host byte order */ + unsigned bb_lookup_port(const char *port, const char *protocol, unsigned default_port) FAST_FUNC; + typedef struct len_and_sockaddr { +--- busybox-1.13.1/libbb/xconnect.c Sun Nov 9 18:28:09 2008 ++++ busybox-1.13.1-bindtodevice/libbb/xconnect.c Wed Dec 10 23:20:29 2008 +@@ -7,6 +7,7 @@ + */ + + #include <netinet/in.h> ++#include <net/if.h> + #include "libbb.h" + + void FAST_FUNC setsockopt_reuseaddr(int fd) +@@ -17,6 +18,20 @@ + { + return setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &const_int_1, sizeof(const_int_1)); + } ++int FAST_FUNC setsockopt_bindtodevice(int fd, const char *iface) ++{ ++ int r; ++ struct ifreq ifr; ++ strncpy(ifr.ifr_name, iface, IFNAMSIZ); ++ /* Actually, ifr_name is at offset 0, and in practice ++ * just giving char[IFNAMSIZ] instead of struct ifreq works too. ++ * But just in case it's not true on some obscure arch... */ ++ r = setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)); ++ if (r) ++ bb_perror_msg("can't bind to interface %s", iface); ++ return r; ++} ++ + + void FAST_FUNC xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen) + { +--- busybox-1.13.1/networking/arping.c Sun Nov 9 18:27:59 2008 ++++ busybox-1.13.1-bindtodevice/networking/arping.c Wed Dec 10 12:10:30 2008 +@@ -322,8 +322,7 @@ + struct sockaddr_in saddr; + int probe_fd = xsocket(AF_INET, SOCK_DGRAM, 0); + +- if (setsockopt(probe_fd, SOL_SOCKET, SO_BINDTODEVICE, device, strlen(device) + 1) == -1) +- bb_perror_msg("cannot bind to device %s", device); ++ setsockopt_bindtodevice(probe_fd, device); + memset(&saddr, 0, sizeof(saddr)); + saddr.sin_family = AF_INET; + if (src.s_addr) { +--- busybox-1.13.1/networking/ping.c Sun Nov 9 18:27:59 2008 ++++ busybox-1.13.1-bindtodevice/networking/ping.c Wed Dec 10 12:10:30 2008 +@@ -572,7 +572,7 @@ + xbind(pingsock, &source_lsa->u.sa, source_lsa->len); + } + if (str_I) +- setsockopt(pingsock, SOL_SOCKET, SO_BINDTODEVICE, str_I, strlen(str_I) + 1); ++ setsockopt_bindtodevice(pingsock, str_I); + + /* enable broadcast pings */ + setsockopt_broadcast(pingsock); +@@ -622,7 +622,7 @@ + if (source_lsa) + xbind(pingsock, &source_lsa->u.sa, source_lsa->len); + if (str_I) +- setsockopt(pingsock, SOL_SOCKET, SO_BINDTODEVICE, str_I, strlen(str_I) + 1); ++ setsockopt_bindtodevice(pingsock, str_I); + + #ifdef ICMP6_FILTER + { +--- busybox-1.13.1/networking/udhcp/socket.c Sun Nov 9 18:27:58 2008 ++++ busybox-1.13.1-bindtodevice/networking/udhcp/socket.c Wed Dec 10 12:10:30 2008 +@@ -98,8 +98,8 @@ + bb_perror_msg_and_die("SO_BROADCAST"); + + /* NB: bug 1032 says this doesn't work on ethernet aliases (ethN:M) */ +- if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &inf, strlen(inf) + 1) == -1) +- bb_perror_msg_and_die("SO_BINDTODEVICE"); ++ if (setsockopt_bindtodevice(fd, inf)) ++ xfunc_die(); /* warning is already printed */ + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; diff --git a/sys-apps/busybox/files/busybox-1.13.1-crond.patch b/sys-apps/busybox/files/busybox-1.13.1-crond.patch new file mode 100644 index 000000000000..ca7e79c44b85 --- /dev/null +++ b/sys-apps/busybox/files/busybox-1.13.1-crond.patch @@ -0,0 +1,20 @@ +--- busybox-1.13.1/miscutils/crond.c Sun Nov 9 18:28:17 2008 ++++ busybox-1.13.1-crond/miscutils/crond.c Thu Dec 4 14:56:10 2008 +@@ -779,6 +779,8 @@ + xmove_fd(mailFd, mail_filename ? 1 : 0); + dup2(1, 2); + } ++ /* crond 3.0pl1-100 puts tasks in separate process groups */ ++ bb_setpgrp(); + execlp(prog, prog, cmd, arg, NULL); + crondlog(ERR20 "can't exec, user %s cmd %s %s %s", user, prog, cmd, arg); + if (mail_filename) { +@@ -914,6 +916,8 @@ + if (DebugOpt) { + crondlog(LVL5 "child running %s", DEFAULT_SHELL); + } ++ /* crond 3.0pl1-100 puts tasks in separate process groups */ ++ bb_setpgrp(); + execl(DEFAULT_SHELL, DEFAULT_SHELL, "-c", line->cl_Shell, NULL); + crondlog(ERR20 "can't exec, user %s cmd %s %s %s", user, + DEFAULT_SHELL, "-c", line->cl_Shell); diff --git a/sys-apps/busybox/files/busybox-1.13.1-init.patch b/sys-apps/busybox/files/busybox-1.13.1-init.patch new file mode 100644 index 000000000000..23187720fc8e --- /dev/null +++ b/sys-apps/busybox/files/busybox-1.13.1-init.patch @@ -0,0 +1,28 @@ +--- busybox-1.13.1/init/init.c Sat Nov 29 07:48:56 2008 ++++ busybox-1.13.1-init/init/init.c Tue Dec 9 22:17:43 2008 +@@ -118,18 +118,18 @@ + + msg[0] = '\r'; + va_start(arguments, fmt); +- l = vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments); +- if (l > sizeof(msg) - 2) +- l = sizeof(msg) - 2; ++ l = 1 + vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments); ++ if (l > sizeof(msg) - 1) ++ l = sizeof(msg) - 1; + msg[l] = '\0'; + va_end(arguments); + + if (ENABLE_FEATURE_INIT_SYSLOG) { +- /* Log the message to syslogd */ + if (where & L_LOG) { +- /* don't print out "\r" */ +- openlog(applet_name, 0, LOG_DAEMON); +- syslog(LOG_INFO, "init: %s", msg + 1); ++ /* Log the message to syslogd */ ++ openlog("init", 0, LOG_DAEMON); ++ /* don't print "\r" */ ++ syslog(LOG_INFO, "%s", msg + 1); + closelog(); + } + msg[l++] = '\n'; diff --git a/sys-apps/busybox/files/busybox-1.13.1-ip.patch b/sys-apps/busybox/files/busybox-1.13.1-ip.patch new file mode 100644 index 000000000000..50a9b270170a --- /dev/null +++ b/sys-apps/busybox/files/busybox-1.13.1-ip.patch @@ -0,0 +1,11 @@ +--- busybox-1.13.1/networking/ip.c Sun Nov 9 18:27:59 2008 ++++ busybox-1.13.1-ip/networking/ip.c Thu Dec 4 13:16:29 2008 +@@ -31,7 +31,7 @@ + + static int ip_do(int (*ip_func)(char **argv), char **argv) + { +- argv = ip_parse_common_args(argv); ++ argv = ip_parse_common_args(argv + 1); + return ip_func(argv); + } + diff --git a/sys-apps/busybox/files/busybox-1.13.1-printf.patch b/sys-apps/busybox/files/busybox-1.13.1-printf.patch new file mode 100644 index 000000000000..43f4135b688c --- /dev/null +++ b/sys-apps/busybox/files/busybox-1.13.1-printf.patch @@ -0,0 +1,19 @@ +--- busybox-1.13.1/coreutils/printf.c Sun Nov 9 18:28:07 2008 ++++ busybox-1.13.1-printf/coreutils/printf.c Wed Dec 10 12:50:55 2008 +@@ -359,8 +359,15 @@ + * We will mimic coreutils. */ + if (argv[1] && argv[1][0] == '-' && argv[1][1] == '-' && !argv[1][2]) + argv++; +- if (!argv[1]) ++ if (!argv[1]) { ++ if (ENABLE_ASH_BUILTIN_PRINTF ++ && applet_name[0] != 'p' ++ ) { ++ bb_error_msg("usage: printf FORMAT [ARGUMENT...]"); ++ return 2; /* bash compat */ ++ } + bb_show_usage(); ++ } + + format = argv[1]; + argv2 = argv + 2; |