commit: 808789583b93149bd38c5ae7f5ac671bfd26c2ba Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Thu Dec 22 18:29:57 2016 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Thu Dec 22 18:31:48 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=80878958
sys-apps/busybox: mark 1.25.1 stable Package-Manager: portage-2.3.0 sys-apps/busybox/Manifest | 4 +- sys-apps/busybox/busybox-1.24.2.ebuild | 312 --------------------------------- sys-apps/busybox/busybox-1.25.1.ebuild | 2 +- 3 files changed, 2 insertions(+), 316 deletions(-) diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index b8af2b0..eea2948 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -17,8 +17,6 @@ AUX syslogd.confd 234 SHA256 65166088cb173582200b8c0d3bc6ea339b5929dbafa816780bf AUX syslogd.initd 278 SHA256 4ed842fa5b5331327ed2deb8de20b186c45796e6b280fc148321dc8bc6ace685 SHA512 1a48a0ca7024d985ae4f4918973a4fd197c9f13bb4447154bf4e20778f7e8a7b9caf7cdc64b8ae5b5479964c94ad1aa2d234e60ad271f55dc91bc8388bfbd544 WHIRLPOOL 587525bc1449cfc606cd99ba5e8824fcf9863fd9ebbfef66810c0a21355ea8bc8d5c6710eac9f966e2886d11d26bfa77886815baab7eab3cf73f98a184dcab7b AUX watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767 AUX watchdog.initd 230 SHA256 ef7f8dc91fe058323336558cb0659f402a45783a69f6c2da80975ec69d785e0e SHA512 262967c00428a6dfb8dfe0d5913ea9bf9202d1a77c0b661d1cc6522650c78333ce89f12ff27a382f21d9928427e12cc677964d78ff5d5c74c17e57ca101d06f2 WHIRLPOOL c247926f5d99a179586286281e34da3dc292973089b450a81e3dd9c0644eb10e7e3989ff47423371c9f7a5780a1be1deb576734dee35dfade439fbd37fca7170 -DIST busybox-1.24.2.tar.bz2 2066822 SHA256 e71ef53ec656f31c42633918d301405d40dea1d97eca12f272217ae4a971c855 SHA512 4d20fb68ee440be2855231c7fd5f3cb9dd9bfcc1a688f0b59cd3f7a55c8819e9cc44bd15f91500713571f2a84e5e44adc0fa8ae0ae3ebf63961dfc9e1c9ef8e0 WHIRLPOOL 2d89e3fded8d61567873acdb1e1e21888a4447e19c1b893543bbe82de52e8e3cf091adb10f34aa155da573994d89ae42f40ecce65ec0d32a641d103c8d8ce053 DIST busybox-1.25.1.tar.bz2 2103070 SHA256 27667e0f2328fdbd79cfd622e4453e5c57e58f781c5da97c9be337d93aa2a02e SHA512 9648877ed11e5a55213cd14fd64f6fc64dbd17013fbfaa4e67f4fd433f59e9231ed78a88e6e8100a4794d833f1d9863bb86f75faae093418866770804bf873cb WHIRLPOOL 4b7bc6d3a88559812797feb4574975b9fdeb6eac6ac7a0fe51e4750a3b05a614ecb8bd9d58547047cdf1e0b66d9bcd189c8a4193fc2f3b491a6268bc06761ad1 -EBUILD busybox-1.24.2.ebuild 9055 SHA256 0bd35ab2b62c5054d28a39cad1dd43439d2c30b890b6dc093e45d9d52474d275 SHA512 3bec13a8ceda6c9b3fc576ea642323fba73457458b908fe064c8b359dca8e3d1b9b60c9b555167d8d2df9ef450198305192bf66f719b0001d4b1e480d4e4f9f2 WHIRLPOOL 5feafb3143dbf2051bb646cdb85fe65429a544f428622a58242a6d042698789efec128cfd7aeecc39c43343b12f296b5dcbea575868b21c0851112542cc60903 -EBUILD busybox-1.25.1.ebuild 8903 SHA256 00da8d5c73d1941b95e853ed1deaf33b41f95d104e4ecdf7441a089d30f323d2 SHA512 29010bf96ec440c256997e97fd46b51e8a9419d51b884bb1887aca8bf08e5324de172f60a5fbb70665749798dcf5e1fbaadf1445e34c0d6c62a3d57274fa9fe2 WHIRLPOOL eb3562830a44c97c538170b5494e94e99e361045d19f74408fbfd10549a486b75eb6edc52ae2e1752b19ed3f2da6cc1627b752e385143564a75c84cefe3fa6d0 +EBUILD busybox-1.25.1.ebuild 8808 SHA256 7e1018cb8319bacad230d2714122a64d6d91cfbad5827fc9dc6a92cd578bcbed SHA512 a22023117d44e2e23529e296e08545372f30f356a3d281ed106c1863782bc495c13f687d427e32bc460eeaae3cce4f7a8f2d7d1898eceb81d52f20ea53559e1d WHIRLPOOL 7a8936c0a02f736e474b4e7e16cd84451058367280633547ede83269d02ce3dfc0bfae08f1cbaab7661f9f2543d60f05f3941cea5148ffdb3ffb47e866e6974c MISC metadata.xml 872 SHA256 1cf483a8d55e8cbe20edb30261276d71e0ba0a1b06d73621f849496d1f6c4a17 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07 WHIRLPOOL 91b126a39ecd6937e6058814b88043e9fbbf7b434854e25a4e4a7ad8e666de37978b8bac0c8dca0255096a42af9afed412bb5bbccdffaf03ba75c2fd2e4b3428 diff --git a/sys-apps/busybox/busybox-1.24.2.ebuild b/sys-apps/busybox/busybox-1.24.2.ebuild deleted file mode 100644 index 8bd7151..0000000 --- a/sys-apps/busybox/busybox-1.24.2.ebuild +++ /dev/null @@ -1,312 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# 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="https://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="https://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" # GPL-2 only -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? ( !<sys-apps/openrc-0.13 )" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*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}"/busybox-1.24.1-trylink-ldflags.patch - epatch "${FILESDIR}"/busybox-1.24.2-ash-recursive-heredocs.patch - epatch "${FILESDIR}"/busybox-1.24.2-CVE-2016-2147.patch - epatch "${FILESDIR}"/busybox-1.24.2-CVE-2016-2148.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 USE_PORTABLE_CODE - busybox_config_option n WERROR - - # These causes trouble with musl. Since we don't really - # depend on busybox for most of the musl work, we'll lazily - # just turn them off. - busybox_config_option n FEATURE_UTMP - busybox_config_option n EXTRA_COMPAT - busybox_config_option n FEATURE_VI_REGEX_SEARCH - - # 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 <linux-2.6.23 - busybox_config_option n FEATURE_MOUNT_NFS - - # default a bunch of uncommon options to off - local opt - for opt in \ - ADD_SHELL \ - BEEP BOOTCHARTD \ - CRONTAB \ - DC DEVFSD DNSD DPKG{,_DEB} \ - FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ - FEATURE_DEVFS \ - HOSTID HUSH \ - INETD INOTIFYD IPCALC \ - LOCALE_SUPPORT LOGNAME LPD \ - MAKEMIME MKFS_MINIX MSH \ - OD \ - RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ - SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ - TASKSET TCPSVD \ - 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 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 -} diff --git a/sys-apps/busybox/busybox-1.25.1.ebuild b/sys-apps/busybox/busybox-1.25.1.ebuild index c710c3e..bbc4c77 100644 --- a/sys-apps/busybox/busybox-1.25.1.ebuild +++ b/sys-apps/busybox/busybox-1.25.1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P=${PN}-${PV/_/-} SRC_URI="https://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" + KEYWORDS="amd64 arm ~mips ppc x86" fi LICENSE="GPL-2" # GPL-2 only
