From: Roy Marples Date: Thu, 2 Nov 2006 16:45:49 +0000 (+0000) Subject: New version that works with bash-3.2, fixes #151128 and #151108. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a7b283f5aa89dc3267c435a11ee203e2c97af26e;p=gentoo.git New version that works with bash-3.2, fixes #151128 and #151108. Package-Manager: portage-2.1.2_rc1-r2 --- diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index fff4e9777186..638f7d8f2d44 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,16 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.359 2006/11/02 10:29:25 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.360 2006/11/02 16:45:49 uberlord Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog +*baselayout-1.13.0_alpha5 (02 Nov 2006) + + 02 Nov 2006; Roy Marples + +baselayout-1.13.0_alpha5.ebuild: + New version that works with bash-3.2, fixes #151128 and #151108. + *baselayout-1.12.6 (02 Nov 2006) 02 Nov 2006; Roy Marples +baselayout-1.12.6.ebuild: diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 3513a4b4ad2d..90a05a86dfbd 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -96,6 +96,7 @@ DIST baselayout-1.12.6.tar.bz2 221279 RMD160 4a9b6a0b3855e36a4b0214615d578e8d17d DIST baselayout-1.13.0_alpha2.tar.bz2 249320 RMD160 ae8a9acd02461d025d3d0751053bdd697ea5538d SHA1 766e8ca36a52161500b2e681da42b8398cd3cd79 SHA256 62a61de646650662ffc0e19d0f7cb409320cc633aa36d25a2127f140948aea54 DIST baselayout-1.13.0_alpha3.tar.bz2 252705 RMD160 75cbdde44990ffe0d5191fcecf6ca8e7660bd1cf SHA1 06895b9333512dceb0acf8fc32413b5b27e7db92 SHA256 a7eacb2efe17eae01933258902635d53ae544da59d5341cbe6a241318c038103 DIST baselayout-1.13.0_alpha4.tar.bz2 253009 RMD160 6d5516a3946d8c426d9b6d3e354622d172e11754 SHA1 99607eeeef1a569a4d6dbe7796c1935361e54526 SHA256 dda6700d365109b59f6fd2ddbeeebab479357a534f4c994f49ed4e203ced0deb +DIST baselayout-1.13.0_alpha5.tar.bz2 255507 RMD160 bd0d391abd8cee745dfdce502d3ca78bdb7013f3 SHA1 ec76c840cd4f53757de750446ca1eefee997a390 SHA256 987e378072608480f956ff32a6c5851e98ac7c2c6653d18148bd66681592a23e DIST rc-scripts-1.6.13.tar.bz2 156148 RMD160 c267e0862ffb0af4e7b016332e962ad3fb54723e SHA256 89f924fffbe4b9f84970a2fa559262d24714ee5c15c3d3bf6ebd6d95e25484c0 DIST rc-scripts-1.6.14.tar.bz2 159580 RMD160 564997e6d116ce9d24fd5dcdb885504bce14809e SHA1 428f5971116b1c8d6465e6b826c5cc89621d84db SHA256 d269f2e7749e4034adc5d87bb618901348f6869939a40dba79ba763ea76633ee DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a @@ -135,10 +136,14 @@ EBUILD baselayout-1.13.0_alpha4.ebuild 9086 RMD160 0748d0c35c7296e154138478254ed MD5 89fe580a63cdf58624f048520d6408b2 baselayout-1.13.0_alpha4.ebuild 9086 RMD160 0748d0c35c7296e154138478254edfdaf501556b baselayout-1.13.0_alpha4.ebuild 9086 SHA256 0c4b5f1fd4fc75a29741a8d2bb872a75a4a8aa93fffc31ec8d68d713d8cd1483 baselayout-1.13.0_alpha4.ebuild 9086 -MISC ChangeLog 81431 RMD160 9b8bf238c748d15ae639eea1363a49bf64408f3f SHA1 95afe98c9c5662582c10a338c02387d7bdb1102c SHA256 568947b018c82e6b6674e89fbc65136ac25949f9afff1f144aafad1d02e69e11 -MD5 ca727c40e23d2b052cfe41a334f1a4d3 ChangeLog 81431 -RMD160 9b8bf238c748d15ae639eea1363a49bf64408f3f ChangeLog 81431 -SHA256 568947b018c82e6b6674e89fbc65136ac25949f9afff1f144aafad1d02e69e11 ChangeLog 81431 +EBUILD baselayout-1.13.0_alpha5.ebuild 9089 RMD160 1b12e9c963e219edeac3d736e10cb7530104fe7a SHA1 6b217a09866f6223c7e0894eb18d997d1d56bd7d SHA256 d30fb2f1d79a88b4f71e85a0184532080e2f1b7b61ace28b10eca866e802897f +MD5 db8c9169bf375ba0ea2d0c3c496a2606 baselayout-1.13.0_alpha5.ebuild 9089 +RMD160 1b12e9c963e219edeac3d736e10cb7530104fe7a baselayout-1.13.0_alpha5.ebuild 9089 +SHA256 d30fb2f1d79a88b4f71e85a0184532080e2f1b7b61ace28b10eca866e802897f baselayout-1.13.0_alpha5.ebuild 9089 +MISC ChangeLog 81625 RMD160 8ba5f2a34bcf104197eaf67f1627706b0b12199e SHA1 f1d48e4a00aa1ae5b639995bf33815ac30cdff52 SHA256 eaa6ca7187d22d1189ad1b56dee59eeccd23afb2735e9847386e91c873a2b60b +MD5 a8a3e2e294df71f8c6b1f1b6554d7fcd ChangeLog 81625 +RMD160 8ba5f2a34bcf104197eaf67f1627706b0b12199e ChangeLog 81625 +SHA256 eaa6ca7187d22d1189ad1b56dee59eeccd23afb2735e9847386e91c873a2b60b ChangeLog 81625 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -170,3 +175,6 @@ SHA256 f3905ce4d33ac745c159cd336464e674e923bde59ba80a1ac6b4d75a4aa3ee4c files/di MD5 a40776c770f86150d5b33b4b0a637807 files/digest-baselayout-1.13.0_alpha4 277 RMD160 5028b88defd3012ef82dd9946905edb26a7b46e6 files/digest-baselayout-1.13.0_alpha4 277 SHA256 e52a8b9a85ec4e43c953e049af003a16c75a32b356fb405c5fc72c41e992fc44 files/digest-baselayout-1.13.0_alpha4 277 +MD5 efde442d3cc9833ca1767c882e52c2c5 files/digest-baselayout-1.13.0_alpha5 277 +RMD160 817f36d15a293973a46ffd6a0fd48fc07f904d58 files/digest-baselayout-1.13.0_alpha5 277 +SHA256 ef10f75c32a61411af0ed5b62d18257b1c34752776dbdec49c5479a6dda07ce2 files/digest-baselayout-1.13.0_alpha5 277 diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha5.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha5.ebuild new file mode 100644 index 000000000000..f49b9ff2a0eb --- /dev/null +++ b/sys-apps/baselayout/baselayout-1.13.0_alpha5.ebuild @@ -0,0 +1,270 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.13.0_alpha5.ebuild,v 1.1 2006/11/02 16:45:49 uberlord Exp $ + +inherit flag-o-matic eutils toolchain-funcs multilib + +DESCRIPTION="Filesystem baselayout and init scripts" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2 + http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2 + http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="bootstrap build pam static unicode kernel_linux kernel_FreeBSD" + +# This version of baselayout needs awk in /bin, but as we do not have +# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" +# or "build" are in USE. +RDEPEND="kernel_linux? ( >=sys-apps/sysvinit-2.86-r3 ) + !build? ( + !bootstrap? ( + >=sys-libs/readline-5.0-r1 + >=app-shells/bash-3.2_p3-r1 + kernel_linux? ( + >=sys-apps/coreutils-5.2.1 + ) + kernel_FreeBSD? ( + sys-process/fuser-bsd + sys-process/pidof-bsd + ) + ) + ) + pam? ( virtual/pam ) + ! "${IMAGE}/etc/conf.d/$1" + fi +} + +pkg_preinst() { + # Move our makefiles to a temporay location + mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}" + + # Change some vars introduced in baselayout-1.11.0 before we go stable + # The new names make more sense and allow nis_domain + # for use in baselayout-1.12.0 + remap_dns_vars net + remap_dns_vars wireless +} + +src_install() { + make $(make_opts) DESTDIR="${D}" install + dodoc ChangeLog COPYRIGHT + + # Should this belong in another ebuild? Like say binutils? + # List all the multilib libdirs in /etc/env/04multilib (only if they're + # actually different from the normal + if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then + local libdirs="$(get_all_libdirs)" libdirs_env= + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + for dir in ${libdirs}; do + libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir} + done + + # Special-case uglyness... For people updating from lib32 -> lib amd64 + # profiles, keep lib32 in the search path while it's around + if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then + libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" + fi + echo "LDPATH=\"${libdirs_env}\"" > "${D}"/etc/env.d/04multilib + fi + + # rc-scripts version for testing of features that *should* be present + echo "Gentoo Base System version ${PV}" > "${D}"/etc/gentoo-release + + # Remove the installed runlevels, as we don't know about $ROOT yet + rm -rf "${D}/etc/runlevels" + + # Copy the make files to /usr/share/baselayout so we can re-use them in + # postinst, otherwise binpkg will break. + insinto /usr/share/baselayout + doins -r Makefile default.mk runlevels* +} + +pkg_postinst() { + # We need to install directories and maybe some dev nodes when building + # stages, but they cannot be in CONTENTS. + # Also, we cannot reference $S as binpkg will break so we do this. + if use build || use bootstrap ; then + make -C "${T}" $(make_opts) layout || die "failed to layout filesystem" + fi + + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}etc/runlevels ]] ; then + einfo "Making default runlevels" + make -C "${T}" $(make_opts) runlevels_install >/dev/null + fi + + if use kernel_linux ; then + if use build || use bootstrap ; then + # Create base directories + if [[ ! -e ${ROOT}/dev/.udev && ! -e ${ROOT}/dev/.devfsd ]] ; then + einfo "Creating dev nodes" + PATH="${ROOT}"/sbin:${PATH} make -C "${T}" $(make_opts) \ + dev || die "failed to create /dev nodes" + fi + fi + fi + + # We installed some files to /usr/share/baselayout instead of /etc to stop + # (1) overwriting the user's settings + # (2) screwing things up when attempting to merge files + # (3) accidentally packaging up personal files with quickpkg + # If they don't exist then we install them + for x in master.passwd passwd shadow group fstab ; do + [[ -e "${ROOT}etc/${x}" ]] && continue + [[ -e "${ROOT}usr/share/baselayout/${x}" ]] || continue + cp -p "${ROOT}usr/share/baselayout/${x}" ${ROOT}etc + done + + # Reload init to fix unmounting problems of / on next reboot. + # This is really needed, as without the new version of init cause init + # not to quit properly on reboot, and causes a fsck of / on next reboot. + if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then + # We need to copy svcdir if it's empty + if [[ ! -e ${ROOT}lib/rcscripts/init.d/deptree ]] ; then + ( + source "${ROOT}etc/conf.d/rc" + svcdir="${svcdir:-/var/lib/init.d}" + if [[ -e ${ROOT}${svcdir}/deptree ]] ; then + cp -RPp "${ROOT}${svcdir}"/* ${ROOT}lib/rcscripts/init.d + fi + ) + fi + + # Regenerate init.d dependency tree + /sbin/depscan.sh --update >/dev/null + + # Regenerate /etc/modules.conf, else it will fail at next boot + if [[ -x /sbin/modules-update ]] ; then + einfo "Updating module dependencies..." + /sbin/modules-update force >/dev/null + fi + else + rm -f "${ROOT}"/etc/modules.conf + fi + + # This is also written in src_install (so it's in CONTENTS), but + # write it here so that the new version is immediately in the file + # (without waiting for the user to do etc-update) + rm -f "${ROOT}"/etc/._cfg????_gentoo-release + echo "Gentoo Base System version ${PV}" > "${ROOT}"/etc/gentoo-release + + echo + einfo "Please be sure to update all pending '._cfg*' files in /etc," + einfo "else things might break at your next reboot! You can use 'etc-update'" + einfo "to accomplish this:" + einfo + einfo " # etc-update" + echo + + local lo="net.lo0" + use kernel_linux && lo="net.lo" + for f in ${ROOT}etc/init.d/net.*; do + [[ -L ${f} ]] && continue + echo + einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/" + einfo "They need to be converted to symlinks to ${lo}. If you haven't" + einfo "made personal changes to those files, you can update with the" + einfo "following command:" + einfo + einfo " /bin/ls ${ROOT}etc/init.d/net.* | grep -v '/${lo}$' | xargs -n1 ln -sfvn ${lo}" + echo + break + done + + if sed -e 's/#.*//' "${ROOT}"etc/conf.d/{net,wireless} 2>/dev/null \ + | egrep -q '\<(domain|nameservers|searchdomains)_' ; then + echo + ewarn "You have depreciated variables in ${ROOT}etc/conf.d/net" + ewarn "or ${ROOT}etc/conf.d/wireless" + ewarn + ewarn "domain_* -> dns_domain_*" + ewarn "nameservers_* -> dns_servers_*" + ewarn "searchdomains_* -> dns_search_domains_*" + ewarn + ewarn "They have been converted for you - ensure that you" + ewarn "update them via 'etc-update'" + echo + fi + + if sed -e 's/#.*//' "${ROOT}"etc/conf.d/net 2>/dev/null \ + | egrep -q '\<(ifconfig|aliases|broadcasts|netmasks|inet6|ipaddr|iproute)_'; then + echo + ewarn "You are using deprecated variables in ${ROOT}etc/conf.d/net" + ewarn + ewarn "You are advised to review the new configuration variables as" + ewarn "found in ${ROOT}etc/conf.d/net.example as there is no" + ewarn "guarantee that they will work in future versions." + echo + fi + + # Remove old stuff that may cause problems. + if [[ -e "${ROOT}"/etc/env.d/01hostname ]] ; then + rm -f "${ROOT}"/etc/env.d/01hostname + fi + if [[ -e "${ROOT}"/etc/init.d/domainname ]] ; then + rm -f "${ROOT}"/etc/{conf.d,init.d}/domainname \ + "${ROOT}"/etc/runlevels/*/domainname + ewarn "The domainname init script has been removed in this version." + ewarn "Consult ${ROOT}etc/conf.d/net.example for details about how" + ewarn "to apply dns/nis information to the loopback interface." + fi +} diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5 new file mode 100644 index 000000000000..1cb36c05fbb1 --- /dev/null +++ b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5 @@ -0,0 +1,3 @@ +MD5 2e6ef285409b00b435121f9326eab2d1 baselayout-1.13.0_alpha5.tar.bz2 255507 +RMD160 bd0d391abd8cee745dfdce502d3ca78bdb7013f3 baselayout-1.13.0_alpha5.tar.bz2 255507 +SHA256 987e378072608480f956ff32a6c5851e98ac7c2c6653d18148bd66681592a23e baselayout-1.13.0_alpha5.tar.bz2 255507