From 09a7606b2d87cdb0b1f34e10b4b1e283ec00f803 Mon Sep 17 00:00:00 2001 From: Ned Ludd Date: Sat, 27 Jan 2007 00:39:23 +0000 Subject: [PATCH] - fix bin2hex code. http://busybox.net/lists/busybox/2007-January/026040.html Package-Manager: portage-2.1.2_pre1 --- sys-apps/busybox/Manifest | 36 ++- sys-apps/busybox/busybox-1.4.1.ebuild | 262 -------------------- sys-apps/busybox/files/digest-busybox-1.4.1 | 3 - 3 files changed, 15 insertions(+), 286 deletions(-) delete mode 100644 sys-apps/busybox/busybox-1.4.1.ebuild delete mode 100644 sys-apps/busybox/files/digest-busybox-1.4.1 diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index f4e7d5fc1865..d8dac9f99545 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 1.2.0/bb.patch 1160 RMD160 fbee612ec7aea6ab9564bcd569e3ae69a553fceb SHA1 f88e645606a52f1192dea7e1509f30ec5c1d4c79 SHA256 5c0ee3389ae1b505c7dbf509bfc5d35279edf968ac2c1db25e9771c7e26754a2 MD5 26cfb25027beabeb14d99db5a8c4afd0 files/1.2.0/bb.patch 1160 RMD160 fbee612ec7aea6ab9564bcd569e3ae69a553fceb files/1.2.0/bb.patch 1160 @@ -21,6 +18,10 @@ AUX 1.4.0/bb.patch 866 RMD160 f1cce542de0814d6dbcf5f23cfad8d3249bf8839 SHA1 257b MD5 3d19b371b9686743428acdae5c3dd9e4 files/1.4.0/bb.patch 866 RMD160 f1cce542de0814d6dbcf5f23cfad8d3249bf8839 files/1.4.0/bb.patch 866 SHA256 5e4ca94e7f5914d0e525bec1d661b978fd2e3d356cb1d1014701c6e486f4d7f8 files/1.4.0/bb.patch 866 +AUX 1.4.0/bin2hex.patch 432 RMD160 5435664813aed4a15c9cf100e04506bbdf60c8b6 SHA1 66561e8c14f25a0b20d743941466bd9b445ee5c3 SHA256 7535703dffb63dd6a0331fce82d542c786758dfe52f7c97491369dde3d35fd1a +MD5 f3dab8cf3fca7abb3561dbe7739e5ae2 files/1.4.0/bin2hex.patch 432 +RMD160 5435664813aed4a15c9cf100e04506bbdf60c8b6 files/1.4.0/bin2hex.patch 432 +SHA256 7535703dffb63dd6a0331fce82d542c786758dfe52f7c97491369dde3d35fd1a files/1.4.0/bin2hex.patch 432 AUX config-netboot 9853 RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 SHA1 0dc911793cd298a1e6f61073c2e37ba1c107f5f9 SHA256 75cae861b7bae144ca86998cb90dae9bcb0f54e09ed0c36d1ed81ad79a401e3d MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853 RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 files/config-netboot 9853 @@ -37,14 +38,14 @@ EBUILD busybox-1.3.1.ebuild 8290 RMD160 0f057d4b203789a701d69a122bd82630c7ac2ee4 MD5 d5bd2e71ec5f8e32b910e908fa90d402 busybox-1.3.1.ebuild 8290 RMD160 0f057d4b203789a701d69a122bd82630c7ac2ee4 busybox-1.3.1.ebuild 8290 SHA256 db194013ce1a991c48c07e3538264264a89ccb165e71e238d32edb11b1e3fe2a busybox-1.3.1.ebuild 8290 -EBUILD busybox-1.4.1.ebuild 8156 RMD160 9da4800e419e35432f3669a8a20d34277ec6474d SHA1 8399aa0e598554d22cd8f7a1b370377827d7e97a SHA256 f4bb27606a4e62d5fb208159d7133f2861b628638ec6af7a2e3072de39844282 -MD5 7ee1a3e46ad6fa83eb7cc6adff004832 busybox-1.4.1.ebuild 8156 -RMD160 9da4800e419e35432f3669a8a20d34277ec6474d busybox-1.4.1.ebuild 8156 -SHA256 f4bb27606a4e62d5fb208159d7133f2861b628638ec6af7a2e3072de39844282 busybox-1.4.1.ebuild 8156 -MISC ChangeLog 19951 RMD160 b2fd075d17e2b214967d0e0e73db626735d18d02 SHA1 297252adfe478cc9c09cfef075e45b4d1f3d6aa2 SHA256 806696b4d93d84d71bb6e78f5e30c61c593047fab1c484ecd3d8f796b6c06572 -MD5 c75de6ee40e0d4f7b393dafa92aa9bbe ChangeLog 19951 -RMD160 b2fd075d17e2b214967d0e0e73db626735d18d02 ChangeLog 19951 -SHA256 806696b4d93d84d71bb6e78f5e30c61c593047fab1c484ecd3d8f796b6c06572 ChangeLog 19951 +EBUILD busybox-1.4.1-r1.ebuild 8200 RMD160 36396f65b8e3b760b6db769b83806878ba98ffce SHA1 2db6eb15f5f28d9240cb77877728c96bc797362c SHA256 291af62755ff55df4c97033f755ffc4e6112a38390b1cf526edf31f594450682 +MD5 f6c3b03690a32ecca96ac7b4421e9154 busybox-1.4.1-r1.ebuild 8200 +RMD160 36396f65b8e3b760b6db769b83806878ba98ffce busybox-1.4.1-r1.ebuild 8200 +SHA256 291af62755ff55df4c97033f755ffc4e6112a38390b1cf526edf31f594450682 busybox-1.4.1-r1.ebuild 8200 +MISC ChangeLog 20177 RMD160 fce0c5e4dca748d28bd64764d042b9a7384fa674 SHA1 e9104163721365fdb8469dfaced345a393f39ae3 SHA256 b3390b2c74ad5a477f1673ee3ff9aca375870a91a9d6820bc4b495c04ef45ce9 +MD5 939cfa79a2e44e4ba846b91c2fc2afb9 ChangeLog 20177 +RMD160 fce0c5e4dca748d28bd64764d042b9a7384fa674 ChangeLog 20177 +SHA256 b3390b2c74ad5a477f1673ee3ff9aca375870a91a9d6820bc4b495c04ef45ce9 ChangeLog 20177 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161 @@ -55,13 +56,6 @@ SHA256 7334648f93857477ce8a8b8d36c2dadbdd6a32b58ad6d15644ed4fdbceafb0dd files/di MD5 e3c1ff69996208807c431e77b8c82b6e files/digest-busybox-1.3.1 500 RMD160 1c80c9921b3587cec0403fe3b42298b5e81644fd files/digest-busybox-1.3.1 500 SHA256 c4f8d0daf45f3cbcc2214257e7413c453fd28656722045c6709f591df9f95912 files/digest-busybox-1.3.1 500 -MD5 a5150ef066e89f3b358fa27acad7e932 files/digest-busybox-1.4.1 247 -RMD160 bc8a40b9b31f95d7bdc81173a67d5ce67b6f082b files/digest-busybox-1.4.1 247 -SHA256 2669a53173c0714675b01a7293172ce8eaf36319abcd8ca389a9cd35b21f5b55 files/digest-busybox-1.4.1 247 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFua4N8bi6rjpTunYRAshmAJ9UbAD2XcKOzsP3dR5i25sx10zIDACgtoNy -4a/+9UA3fdUt11dYdC99C7o= -=j2oE ------END PGP SIGNATURE----- +MD5 a5150ef066e89f3b358fa27acad7e932 files/digest-busybox-1.4.1-r1 247 +RMD160 bc8a40b9b31f95d7bdc81173a67d5ce67b6f082b files/digest-busybox-1.4.1-r1 247 +SHA256 2669a53173c0714675b01a7293172ce8eaf36319abcd8ca389a9cd35b21f5b55 files/digest-busybox-1.4.1-r1 247 diff --git a/sys-apps/busybox/busybox-1.4.1.ebuild b/sys-apps/busybox/busybox-1.4.1.ebuild deleted file mode 100644 index bb74c254daa5..000000000000 --- a/sys-apps/busybox/busybox-1.4.1.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.1.ebuild,v 1.1 2007/01/26 07:29:36 vapier Exp $ - -inherit eutils flag-o-matic - -################################################################################ -# 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 -# make menuconfig -# -# -# (3) Save your configuration to the default location and copy it to the -# savedconfig location as follows. Replace X.X.X by the version of -# busybox, and change the path if you're overriding ${ROOT} or -# ${PORTAGE_CONFIGROOT}. The file should overwrite the default config -# file that was written by the ebuild during step 1. -# -# cp .config /etc/portage/savedconfig/busybox-X.X.X.config -# -# (4) Execute the same command as in step 1 to build the new busybox config; -# the FEATURES=keepwork option is probably no longer necessary unless you -# want to modify the configuration further. -# -################################################################################ -# -# (1) Alternatively skip the above steps and simply emerge busybox with -# USE=savedconfig and edit the file it saves by hand. Then remerge bb as -# needed. -# -################################################################################ - - -#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 static savedconfig make-symlinks" -RESTRICT="test" - -DEPEND="" - -S=${WORKDIR}/${MY_P} - -# then eventually turning on selinux would mean -# adding a dep: selinux? ( sys-libs/libselinux ) - -pkg_setup() { - # Catch most people for now #159497 ... delete this check - # once we move to stable for releases - if [[ $(LC_ALL="C" date +%Z) == "Local time zone must be set--see zic manual page" ]] ; then - eerror "You forgot to set up your /etc/localtime." - eerror "You should do so now." - die "forgetful admin detected" - fi -} - -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) -} - -src_unpack() { - unset KBUILD_OUTPUT #88088 - - unpack ${MY_P}.tar.bz2 - cd "${S}" - - # patches go here! - epatch "${FILESDIR}"/1.4.0/bb.patch - - # work around broken ass powerpc compilers - use ppc64 && append-flags -mminimal-toc - # flag cleanup - sed -i \ - -e 's: -Werror : :' \ - -e 's:-Os -falign-functions=1 -falign-jumps=1 -falign-loops=1::' \ - -e 's:-fomit-frame-pointer::' \ - Makefile.flags - sed -i "/^CFLAGS.*:=/s:$: ${CFLAGS}:" Makefile - echo "CROSS_COMPILE := ${CHOST}-" >> Makefile.flags - - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - # fine grained config control for user defined busybox configs. - # [package]-[version]-[revision].config - # [package]-[version].config - # [package].config - - if use savedconfig ; then - local conf root - [[ -r .config ]] && rm .config - for conf in {${PF},${P},${PN}}{,-${CHOST}} ; do - for root in "${PORTAGE_CONFIGROOT}" "${ROOT}" / ; do - configfile=${root}etc/portage/savedconfig/${conf}.config - if [[ -r ${configfile} ]] ; then - einfo "Found your ${configfile} and using it." - cp ${configfile} "${S}"/.config - yes "" | make oldconfig > /dev/null - return 0 - fi - done - done - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - make 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 - - # 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 - - 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 - for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \ - LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \ - UUDECODE UUENCODE SULOGIN DC DEBUG_YANK_SUSv2 DEBUG_INIT \ - DEBUG_CROND_OPTION FEATURE_UDHCP_DEBUG TASKSET - do - busybox_config_option n ${opt} - done - - make oldconfig > /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - - emake busybox || die "build failed" - if ! use static ; then - mv busybox_unstripped{,.bak} - LDFLAGS="${LDFLAGS} -static" emake busybox || die "static build failed" - mv busybox_unstripped bb - mv busybox_unstripped{.bak,} - fi -} - -src_install() { - unset KBUILD_OUTPUT #88088 - - into / - newbin busybox_unstripped busybox || die - use static \ - && dosym busybox /bin/bb \ - || dobin bb - dosym bb /bin/busybox.static - - # 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 * etc/* etc/init.d/* 2>/dev/null -} - -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 - if use savedconfig ; then - mv "${D}"/usr/share/${PN}/${PF}.config "${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 - - if use savedconfig ; then - local config_dir="${PORTAGE_CONFIGROOT:-${ROOT}}/etc/portage/savedconfig" - einfo "Saving this build config to ${config_dir}/${PF}.config" - einfo "Read this ebuild for more info on how to take advantage of this option" - mkdir -p "${config_dir}" - cp "${T}"/${PF}.config "${config_dir}"/${PF}.config - return 0 - 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/digest-busybox-1.4.1 b/sys-apps/busybox/files/digest-busybox-1.4.1 deleted file mode 100644 index cfce130998b1..000000000000 --- a/sys-apps/busybox/files/digest-busybox-1.4.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5728403bce309cdabcffa414e2e64052 busybox-1.4.1.tar.bz2 1510432 -RMD160 6ea5461718fae52b9ee3b966e49a226a0685fd28 busybox-1.4.1.tar.bz2 1510432 -SHA256 2936318008322392716a9d3566bcff071cf5c97cb1df1f5953ec5b5a8a1701bb busybox-1.4.1.tar.bz2 1510432 -- 2.26.2