From: William Hubbs Date: Fri, 6 Feb 2015 05:58:44 +0000 (+0000) Subject: Disable start-stop-daemon for bug #468914 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0d9681c54eb116f4d71866416fd620ba3340f039;p=gentoo.git Disable start-stop-daemon for bug #468914 Package-Manager: portage-2.2.15/cvs/Linux x86_64 RepoMan-Options: --force Manifest-Sign-Key: 0x30C46538 --- diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index aa694cc5c75d..fe9813cfecda 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.382 2015/02/05 11:29:41 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.383 2015/02/06 05:58:29 williamh Exp $ + +*busybox-1.23.1-r1 (06 Feb 2015) + + 06 Feb 2015; William Hubbs +busybox-1.23.1-r1.ebuild: + Disable start-stop-daemon for bug #468914 05 Feb 2015; Jeroen Roovers busybox-1.23.1.ebuild: Stable for HPPA (bug #537978). diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 62fb23d21c3a..2e0f19fe5498 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -50,14 +50,15 @@ EBUILD busybox-1.22.0.ebuild 8506 SHA256 409a8606aacc2292e12fea917d25d15e91e0307 EBUILD busybox-1.22.1-r1.ebuild 8611 SHA256 f6d7d70facd2d74146f4bbc6115b542a734c3e76ef290a8d2d53f478f480d6e7 SHA512 77050af4651358b9a9accc3ff1e0c48b9936ed0b5a9a89d9e0438031bb89bf8034f4469a52280617b2bcde10ea76c75b34d2f42eaa291b1672ed01dd26a21aea WHIRLPOOL 22ed631429879a312c0a32021475aa94f21768a6834a4f058dc678d0c66e317ed1bd8c2c308aaed7fb909e19443ee8780c5dc29a98b9167cf64757d7f91a349a EBUILD busybox-1.22.1.ebuild 8514 SHA256 46a33d9cc0b202130435b0e5439d5f09b52fe746ef6dbbf099f735c2d3452dbf SHA512 bea8bbae90aa1120db826e942baf26cb971df6c61b550928d7428dfee9ba046b50f7210b929377549d0bcacee00848e1d942069f06c8b411bc18dfdc192da188 WHIRLPOOL 42991983892dca8e7228334856ffb0a8d79a82eca26749ef98f5f39102fc2625826c083f8e7452789d4c58bb6b76351d673d8d8de1171336a6e28582ce59c300 EBUILD busybox-1.23.0-r1.ebuild 8684 SHA256 636cf388337828edc8a63adbc6b1e06b51c006e67b42537a0c10b3098126d3a2 SHA512 2b96f461ce8be2edc810eb006c7b19e6e7724e8ae1dc4bb807e3b5c7dc97fc2de2df6f825e968dcb7c7fb3b5922ae25b1625ba8e47ffcda682a8fb309123c42d WHIRLPOOL 4ffb659bd15e381c8f08834a0d4a779a8c7b62fd6d46fbf313328f4a215a0178cf62c4e921ce4e78a8cf6680a4d3fae73047a3627879587d69960aece69c4add +EBUILD busybox-1.23.1-r1.ebuild 8732 SHA256 a2246c8ad97ccc43f7b5df898d7b09123be51d8557a1f708b86ec514416c5df0 SHA512 294595a17e77e24bb9a0fdcd26f87cabb8635f1ffdd7f39adbaa91bb039e81e2e7d0c170cb966113988086b3d0afec3817634987cf7929b00bde278d3961a316 WHIRLPOOL 559c1ac0ef9b7bf2d8e1bc8c02c106d31548435ac5e93f0f0f4314d4a7eb998fc8a30984bb4821671b3082202e44399637ede3e5ae06302a31800a8121c223c4 EBUILD busybox-1.23.1.ebuild 8681 SHA256 ca80df5a851432a4db7b34511978f3abde3937d05a8a6b25a45864f961cb8202 SHA512 ec38c73e963d783c952aecdd0b57eca0ab5ddd79e09287ca01b6204f2bb2ec91a972d58fc46d7c8b1e0cbc6896efb19ba39075018dc296d8ad2a3aba5168f6d7 WHIRLPOOL 272ba956e8e595800544e9bc94bb387eb1f1c4919ed77de31461b748139020a53a998f74adc0844befdda4a7bc7d34fd1e1c5f0e27401ac69e40dd5d8c23b9c0 EBUILD busybox-9999.ebuild 8686 SHA256 91fd13fc4d310b99dda74a6acdbf0ec611f1929c90c0e1faf8c4156c704808df SHA512 9948081e3eb5968c2ca23c19ace77b5fe384bd81552dc60b9ee63c6f10da1b9e04a2f18b6dee7ef1a6c5f24b751bd12ec2c00f10fed7d9c02f20002ad2fb804e WHIRLPOOL 53f1a6f16a916cfc387bc3ce07c09ffddb3cdc43f0f04634f96ab554a51c2f84e6e180493b1040a212abf04e12355efb8180b0340f9a99aef2bcd97a35c96419 -MISC ChangeLog 58478 SHA256 5e77780d73f19ee2456b47e50cd125f8b7c11251182823560c547c9bb6cc3aa3 SHA512 b906c5eb492c1383801153e264340b922a0dcb636d391a968bfec678c17efb8bc58143036ab7c1f83806ca7e60587959413855739bb26f7a8a2e8d0f3e58e530 WHIRLPOOL fc08dea36397d7c5dcb5ad44fc335c00d55c5da6e56b9cf4c36e74bbbfdb1fb9e75b84be124f9cbd9e9ab41f443bee19b85d7f8c60e5e1d5d16c91450767248f +MISC ChangeLog 58640 SHA256 3fe1746180efc248db406ea92d0ce488ca4a0bae05a9a42e3ae625b468c3bbe1 SHA512 a65326262f5c431fd352880bc090e5b9a0ff3205741c12ac5b87c53723739d0d896886279ede4269fe1d686a9de1ab8f490aa36e56cae813d6c4ab41e0090949 WHIRLPOOL 0f697d3ec7db7a5133f0c9f7de389f326aed5954c60cd169fea1c2038786d36c43334e9b9b4f343d7c0cf5df78bb17c7a6be6bcefaf6d114a4976009664c5be0 MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlTTVCYACgkQVWmRsqeSphNOVQCfSHYS82Iy6UEAHyzYoMIak4rV -WYoAnjb1nMs3U/v/uZszSwSNknbdVnCz -=Em0W +iEYEAREIAAYFAlTUWBMACgkQblQW9DDEZTgYkgCgnkJJ5vNeqN69W8In0M+a0Twy +FhcAn2mTpTPwyvBZlSBsqn86qUow2cA6 +=m9sq -----END PGP SIGNATURE----- diff --git a/sys-apps/busybox/busybox-1.23.1-r1.ebuild b/sys-apps/busybox/busybox-1.23.1-r1.ebuild new file mode 100644 index 000000000000..bba09103025a --- /dev/null +++ b/sys-apps/busybox/busybox-1.23.1-r1.ebuild @@ -0,0 +1,303 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.23.1-r1.ebuild,v 1.1 2015/02/06 05:58:29 williamh Exp $ + +# See `man savedconfig.eclass` for info on how to use USE=savedconfig. + +EAPI="4" +inherit eutils flag-o-matic savedconfig toolchain-funcs multilib + +DESCRIPTION="Utilities for rescue and embedded systems" +HOMEPAGE="http://www.busybox.net/" +if [[ ${PV} == "9999" ]] ; then + MY_P=${PN} + EGIT_REPO_URI="git://busybox.net/busybox.git" + inherit git-2 +else + MY_P=${PN}-${PV/_/-} + SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" +RESTRICT="test" + +COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) + pam? ( sys-libs/pam )" +DEPEND="${COMMON_DEPEND} + static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) + >=sys-kernel/linux-headers-2.6.39" +RDEPEND="${COMMON_DEPEND} +mdev? ( !.*set:CONFIG_$1=y:g" .config + else + sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config + fi + einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...) + shift + done +} + +busybox_config_enabled() { + local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) + case ${val} in + "") return 1 ;; + y) return 0 ;; + *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; + esac +} + +src_prepare() { + unset KBUILD_OUTPUT #88088 + append-flags -fno-strict-aliasing #310413 + use ppc64 && append-flags -mminimal-toc #130943 + + # patches go here! + epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch +# epatch "${FILESDIR}"/${P}-*.patch + cp "${FILESDIR}"/ginit.c init/ || die + + # 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 '/bbsh/s:^//::' include/applets.h + 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 "/^AR\>/s:=.*:= $(tc-getAR):" \ + -e "/^CC\>/s:=.*:= $(tc-getCC):" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ + Makefile || die + sed -i \ + -e 's:-static-libgcc::' \ + Makefile.flags || die +} + +src_configure() { + # 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 -s 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 -s allyesconfig >/dev/null + # nommu forces a bunch of things off which we want on #387555 + busybox_config_option n NOMMU + sed -i '/^#/d' .config + yes "" | emake -j1 -s oldconfig >/dev/null + + # now turn off stuff we really don't want + 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 FEATURE_CLEAN_UP + busybox_config_option n MONOTONIC_SYSCALL + busybox_config_option n START_STOP_DAEMON + busybox_config_option n USE_PORTABLE_CODE + busybox_config_option n WERROR + + # If these are not set and we are using a uclibc/busybox setup + # all calls to system() will fail. + busybox_config_option y ASH + busybox_config_option n HUSH + + # disable ipv6 applets + if ! use ipv6; then + busybox_config_option n FEATURE_IPV6 + busybox_config_option n TRACEROUTE6 + busybox_config_option n PING6 + busybox_config_option n UDHCPC6 + fi + + if use static && use pam ; then + ewarn "You cannot have USE='static pam'. Assuming static is more important." + fi + busybox_config_option $(usex static n pam) PAM + busybox_config_option static STATIC + busybox_config_option syslog {K,SYS}LOGD LOGGER + busybox_config_option systemd FEATURE_SYSTEMD + busybox_config_option math FEATURE_AWK_LIBM + + # all the debug options are compiler related, so punt them + busybox_config_option n DEBUG + busybox_config_option y NO_DEBUG_LIB + busybox_config_option n DMALLOC + busybox_config_option n EFENCE + busybox_config_option $(usex debug y n) TFTP_DEBUG + + busybox_config_option selinux SELINUX + + # this opt only controls mounting with /dev/null +} + +src_compile() { + unset KBUILD_OUTPUT #88088 + export SKIP_STRIP=y + + emake V=1 busybox +} + +src_install() { + unset KBUILD_OUTPUT #88088 + save_config .config + + into / + dodir /bin + if use sep-usr ; then + # install /ginit to take care of mounting stuff + exeinto / + newexe busybox_unstripped ginit + dosym /ginit /bin/bb + dosym bb /bin/busybox + else + newbin busybox_unstripped busybox + dosym busybox /bin/bb + fi + if use mdev ; then + dodir /$(get_libdir)/mdev/ + use make-symlinks || dosym /bin/bb /sbin/mdev + cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf + + exeinto /$(get_libdir)/mdev/ + doexe "${FILESDIR}"/mdev/* + + newinitd "${FILESDIR}"/mdev.initd mdev + fi + if use livecd ; then + dosym busybox /bin/vi + fi + + # add busybox daemon's, bug #444718 + if busybox_config_enabled FEATURE_NTPD_SERVER; then + newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" + newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" + fi + if busybox_config_enabled SYSLOGD; then + newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" + newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" + fi + if busybox_config_enabled KLOGD; then + newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" + newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" + fi + if busybox_config_enabled WATCHDOG; then + newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" + newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" + fi + if busybox_config_enabled UDHCPC; then + local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) + exeinto "${path%/*}" + newexe examples/udhcp/simple.script "${path##*/}" + fi + if busybox_config_enabled UDHCPD; then + insinto /etc + doins examples/udhcp/udhcpd.conf + fi + + # bundle up the symlink files for use later + emake DESTDIR="${ED}" install + rm _install/bin/busybox + # for compatibility, provide /usr/bin/env + mkdir -p _install/usr/bin + ln -s /bin/env _install/usr/bin/env + tar cf busybox-links.tar -C _install . || : #;die + insinto /usr/share/${PN} + use make-symlinks && doins busybox-links.tar + + dodoc AUTHORS README TODO + + cd docs + docinto txt + dodoc *.txt + docinto pod + dodoc *.pod + dohtml *.html + + cd ../examples + docinto examples + dodoc inittab depmod.pl *.conf *.script undeb unrpm +} + +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 really what you want." + die "silly options will destroy your system" + fi + + if use make-symlinks ; then + mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die + fi +} + +pkg_postinst() { + savedconfig_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 + + if use sep-usr ; then + elog "In order to use the sep-usr support, you have to update your" + elog "kernel command line. Add the option:" + elog " init=/ginit" + elog "To launch a different init than /sbin/init, use:" + elog " init=/ginit /sbin/yourinit" + elog "To get a rescue shell, you may boot with:" + elog " init=/ginit bb" + fi +}