From: Roy Marples Date: Sun, 11 Mar 2007 01:44:31 +0000 (+0000) Subject: Punt old versions X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=690b802e03430931e4d8bde4398f6c67baa0ff04;p=gentoo.git Punt old versions Package-Manager: portage-2.1.2.2 --- diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index fa38837bfce1..157298814400 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX baselayout-1.11.14-man.patch 768 RMD160 b1743f52d71b6ff2bd0d8cb8106112d8fad9d5b7 SHA1 f61b8f985a27dc9f2dd834001602b008030e79ce SHA256 7c12d6ee90b14b3152c2256df5983d3e6d102ca53b5da3ca6505b8925a86a80a MD5 dff93a6f0914f6969d21482d2f36e75e files/baselayout-1.11.14-man.patch 768 RMD160 b1743f52d71b6ff2bd0d8cb8106112d8fad9d5b7 files/baselayout-1.11.14-man.patch 768 @@ -65,22 +62,6 @@ AUX baselayout-1.12.8-r2440.patch 1779 RMD160 eeda0b3883163b8d8184812aadee8525d0 MD5 322d665a75ef5cc1db64ab02242c634e files/baselayout-1.12.8-r2440.patch 1779 RMD160 eeda0b3883163b8d8184812aadee8525d0be0b54 files/baselayout-1.12.8-r2440.patch 1779 SHA256 31f0936868430bd06a161372b0030fadc086121f71fabc40b9588575360fa202 files/baselayout-1.12.8-r2440.patch 1779 -AUX baselayout-1.13.0_alpha10-pidfile.patch 420 RMD160 24d7171fcb717b2866d80ae09e9160cd88fb309d SHA1 6dfa3386fc9fc3c931e9d8a061b287e690dd3704 SHA256 4b0f2e2ccf05f95b287b487988717e98c06856091d446e220ce2210d8177269e -MD5 902f750996bea188164b3c9bd40f20d7 files/baselayout-1.13.0_alpha10-pidfile.patch 420 -RMD160 24d7171fcb717b2866d80ae09e9160cd88fb309d files/baselayout-1.13.0_alpha10-pidfile.patch 420 -SHA256 4b0f2e2ccf05f95b287b487988717e98c06856091d446e220ce2210d8177269e files/baselayout-1.13.0_alpha10-pidfile.patch 420 -AUX baselayout-1.13.0_alpha10-r2440.patch 2511 RMD160 7681a687c35fd000ee13e2b1e074e3b8b8258784 SHA1 db374e5af1cd2d885dad953d2916fb62117f0b4a SHA256 8bc7ff0ec1d14d7891304d53d215cb9effb219c26a28a9658b9a00c5f0eee026 -MD5 418a78aac276fda7361114f0b4ea9a39 files/baselayout-1.13.0_alpha10-r2440.patch 2511 -RMD160 7681a687c35fd000ee13e2b1e074e3b8b8258784 files/baselayout-1.13.0_alpha10-r2440.patch 2511 -SHA256 8bc7ff0ec1d14d7891304d53d215cb9effb219c26a28a9658b9a00c5f0eee026 files/baselayout-1.13.0_alpha10-r2440.patch 2511 -AUX baselayout-1.13.0_alpha11-depscan.patch 1519 RMD160 0f4c77ecb0d03b2419235ca78e390a8907cc9818 SHA1 656dbaef9bb79d22306f8cf63677022e696c76b2 SHA256 ce2bb5d6821ad09be13ad41b3b3e31023df95fff8ce03398d0100cd43b124b70 -MD5 0ebce5cc31d17003b39f41c67a4fb923 files/baselayout-1.13.0_alpha11-depscan.patch 1519 -RMD160 0f4c77ecb0d03b2419235ca78e390a8907cc9818 files/baselayout-1.13.0_alpha11-depscan.patch 1519 -SHA256 ce2bb5d6821ad09be13ad41b3b3e31023df95fff8ce03398d0100cd43b124b70 files/baselayout-1.13.0_alpha11-depscan.patch 1519 -AUX baselayout-1.13.0_alpha11-r2484.patch 10821 RMD160 846363e9abb7d59fea68e105a7e11620eb31eaf2 SHA1 7543e0f5000f3e3d32b12576d2a798e163f75003 SHA256 ef1ea52850e563ef3e42b1424ab90dbd00b4e14e67aa66c155b711d7ef63bda4 -MD5 b98b9ac10133477f5dd2522c7778e0a1 files/baselayout-1.13.0_alpha11-r2484.patch 10821 -RMD160 846363e9abb7d59fea68e105a7e11620eb31eaf2 files/baselayout-1.13.0_alpha11-r2484.patch 10821 -SHA256 ef1ea52850e563ef3e42b1424ab90dbd00b4e14e67aa66c155b711d7ef63bda4 files/baselayout-1.13.0_alpha11-r2484.patch 10821 AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783cc637392429ba2f63d321873fa1526ee SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099 @@ -90,8 +71,6 @@ DIST baselayout-1.12.5.tar.bz2 220693 RMD160 85f03fe3b0ff0521ec4226a1b6788575052 DIST baselayout-1.12.6.tar.bz2 221279 RMD160 4a9b6a0b3855e36a4b0214615d578e8d17dcabae SHA1 8164fe1923ccdf9d9e38ac0884e2bdd2061681e7 SHA256 c244469fa582c7733d2cf1b51865fac818beb8b2af60ec452ad147cb50eb8862 DIST baselayout-1.12.8.tar.bz2 218298 RMD160 2a47bf00db9c1e15ad2dd90e02dc55a896e3e01f SHA1 5d7274e64b8d17a77519e73303390f4d63f958ee SHA256 c05e126ee1b5bd63462db133c4e39ca45b0a999696f637f2a80d9c7b616eeeea DIST baselayout-1.12.9.tar.bz2 218939 RMD160 c80a3e4434bd8ce58c89ab1b988b64c012741d00 SHA1 0e5745d95412db3427961c5f796827f7867aa35b SHA256 ab89a131d0a12fa8b411189fb51b15216c3f27a422ff539767eb0d134e40dd94 -DIST baselayout-1.13.0_alpha10.tar.bz2 255190 RMD160 930065e8fd850ad1247c639293ab05ff499409d1 SHA1 ae5f9e403610335a8e9e6e7ec4eed9a1ab62bd7f SHA256 ea78f92f45801c306458bc66a076d566893cac11e3dac429810629aea0738ef4 -DIST baselayout-1.13.0_alpha11.tar.bz2 229777 RMD160 4b34817bff86699077304a17e118e060e078615d SHA1 d20a86ad03f063b9e07860ecf549a71dadb68ab7 SHA256 993ca18543d74f33e9b6d570d4f5ecdb40940e34e2b5fd97bcdc31321a87a1c6 DIST baselayout-1.13.0_alpha12.tar.bz2 230982 RMD160 6401629eeb92b13eb2bfbdc7f268d45ee7ed2f51 SHA1 a565b934427e0ba8eb41869fb6b30f294198a2b2 SHA256 3b6214eb02e2549a19f2e40a71eee65981c9c9758a327d6bef128e734c47e054 DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a EBUILD baselayout-1.11.15-r3.ebuild 18810 RMD160 c2d9d4fc7aee7a26615f37b370871ab3accdf43d SHA1 9821697e7473e1e1f6d54d56237c3546310dc898 SHA256 7b98c19332ebbf4e23ca9800d3bdbbee4e03aeb92663ec4c21b7270a8ddb1c0f @@ -126,18 +105,6 @@ EBUILD baselayout-1.12.9.ebuild 18553 RMD160 e4b14d6340994f8557f846935876805a83e MD5 ed3bda6690bbf16c5be4f4e5d1097f7d baselayout-1.12.9.ebuild 18553 RMD160 e4b14d6340994f8557f846935876805a83ece731 baselayout-1.12.9.ebuild 18553 SHA256 2a22054ec998969544d2629b4f33aef9560bbf60053719fb9cc5375fd5f44631 baselayout-1.12.9.ebuild 18553 -EBUILD baselayout-1.13.0_alpha10-r2.ebuild 10930 RMD160 09fdf6118a10c7c70ac47ff450e2bb4788d8d8be SHA1 b948a6a0fae3a735a55a8291b9ede3e62594c5e9 SHA256 703eb95aef3cf3f89b233f90a6eb789a075f8c3a17317ce9de57fb388e60c667 -MD5 4195e0905ef00fb47d586ebb89bf9bc3 baselayout-1.13.0_alpha10-r2.ebuild 10930 -RMD160 09fdf6118a10c7c70ac47ff450e2bb4788d8d8be baselayout-1.13.0_alpha10-r2.ebuild 10930 -SHA256 703eb95aef3cf3f89b233f90a6eb789a075f8c3a17317ce9de57fb388e60c667 baselayout-1.13.0_alpha10-r2.ebuild 10930 -EBUILD baselayout-1.13.0_alpha11-r1.ebuild 10565 RMD160 04f7dd4f0ba93d56ed1eab6853b11ca5c84249d8 SHA1 37101e05c51b61fe38cdb28174f391e5d53050a3 SHA256 2e8269ddb092da5d6891e5dbe8acb77a662d23d970a339cb321e26153607086e -MD5 1b13515ba983c38025be5cdcbb0212fb baselayout-1.13.0_alpha11-r1.ebuild 10565 -RMD160 04f7dd4f0ba93d56ed1eab6853b11ca5c84249d8 baselayout-1.13.0_alpha11-r1.ebuild 10565 -SHA256 2e8269ddb092da5d6891e5dbe8acb77a662d23d970a339cb321e26153607086e baselayout-1.13.0_alpha11-r1.ebuild 10565 -EBUILD baselayout-1.13.0_alpha11-r2.ebuild 10606 RMD160 bf0847eac7c1db210575169d81c57c5bd061c465 SHA1 8db63d8b4b8d385eaaef3c55fc677abc3a9fd563 SHA256 ab4f49739f3b042bf122ec6f3a61b789c7281a94937f1cf9254abae2c4d2fe4f -MD5 cb095a490f49cbb509e059d935017a92 baselayout-1.13.0_alpha11-r2.ebuild 10606 -RMD160 bf0847eac7c1db210575169d81c57c5bd061c465 baselayout-1.13.0_alpha11-r2.ebuild 10606 -SHA256 ab4f49739f3b042bf122ec6f3a61b789c7281a94937f1cf9254abae2c4d2fe4f baselayout-1.13.0_alpha11-r2.ebuild 10606 EBUILD baselayout-1.13.0_alpha12.ebuild 9881 RMD160 2716fce3c6541ea90c4ee1ad498a247220ae8de7 SHA1 ffca27ed1d86488341237bbfc19b70fe0ad25ee8 SHA256 28d57d9b59c9b319a4f8e3908409525caabb3ec81f0283d655c29c692adbbee5 MD5 dbb85e42b337c2486b5f6a8573516dc4 baselayout-1.13.0_alpha12.ebuild 9881 RMD160 2716fce3c6541ea90c4ee1ad498a247220ae8de7 baselayout-1.13.0_alpha12.ebuild 9881 @@ -174,22 +141,6 @@ SHA256 d5d0b95861bb7a1549bf4ac58d623bc24aa07e6887ecc31d1210c92b66901765 files/di MD5 0739a7f44d72e74a1f977dcd81030c18 files/digest-baselayout-1.12.9 256 RMD160 0aaebaf00ed5d13cb4eaeb420ac7859ccc666503 files/digest-baselayout-1.12.9 256 SHA256 d975250968cfce2250369add8355bc47cc2e3c8ae2ae5d606c6f69086535f510 files/digest-baselayout-1.12.9 256 -MD5 a906c725ad1f2a7363333865e410227c files/digest-baselayout-1.13.0_alpha10-r2 280 -RMD160 4f16b9967ebd8f5133edcbd9eee430020b4094ea files/digest-baselayout-1.13.0_alpha10-r2 280 -SHA256 2aff7adae59490722f3880d409166e61514c4dd90043c810f172776627f80505 files/digest-baselayout-1.13.0_alpha10-r2 280 -MD5 4a006d4e3be6f90b2c3c79f1776b1aea files/digest-baselayout-1.13.0_alpha11-r1 280 -RMD160 98dea4cb5f5b9ead0e0f9b3499a62bf5d60d9bdd files/digest-baselayout-1.13.0_alpha11-r1 280 -SHA256 43fd9d1cfeacfd464916cb9011db751d238122f899172a0cc69a56bc8ccabca8 files/digest-baselayout-1.13.0_alpha11-r1 280 -MD5 4a006d4e3be6f90b2c3c79f1776b1aea files/digest-baselayout-1.13.0_alpha11-r2 280 -RMD160 98dea4cb5f5b9ead0e0f9b3499a62bf5d60d9bdd files/digest-baselayout-1.13.0_alpha11-r2 280 -SHA256 43fd9d1cfeacfd464916cb9011db751d238122f899172a0cc69a56bc8ccabca8 files/digest-baselayout-1.13.0_alpha11-r2 280 MD5 73d1269ba801eb1a113e55b5679be37f files/digest-baselayout-1.13.0_alpha12 280 RMD160 82ba1b5b86ef5f414bf202d8cfd1275e7e21bf97 files/digest-baselayout-1.13.0_alpha12 280 SHA256 4e5b7e0884373590a6b434976433e8d06a3fb4d52282f416d5a25dc2d265bd8a files/digest-baselayout-1.13.0_alpha12 280 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD4DBQFF8sE28bi6rjpTunYRAtAjAKCmJgYS7ECRPJFRUIKlwFmj9QA73QCSAiJg -XtgJsqOKUoQMF1fAlN1fmQ== -=92/G ------END PGP SIGNATURE----- diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild deleted file mode 100644 index 92e16319d40e..000000000000 --- a/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild +++ /dev/null @@ -1,312 +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/baselayout/baselayout-1.13.0_alpha10-r2.ebuild,v 1.7 2007/03/10 14:30:57 vapier 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="virtual/init - !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 ) - ! "${D}/etc/conf.d/$1" - fi -} - -pkg_preinst() { - # Move our makefiles to a temporay location - mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}" - - # 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 - local libdirs="$(get_all_libdirs)" dir= - # Create our multilib dirs - the Makefile has no knowledge of this - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... - for dir in ${libdirs}; do - mkdir -p "${ROOT}${dir}" - touch "${ROOT}${dir}"/.keep - mkdir -p "${ROOT}usr/${dir}" - touch "${ROOT}usr/${dir}"/.keep - mkdir -p "${ROOT}usr/local/${dir}" - touch "${ROOT}usr/local/${dir}"/.keep - done - - # Ugly compatibility with stupid ebuilds and old profiles symlinks - if [[ ${SYMLINK_LIB} == "yes" ]] ; then - rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null - local lib=$(get_abi_LIBDIR ${DEFAULT_ABI}) - ln -s "${lib}" "${ROOT}lib" - ln -s "${lib}" "${ROOT}usr/lib" - ln -s "${lib}" "${ROOT}usr/local/lib" - fi - - make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem" - fi - - # 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= dir= - : ${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 ${ROOT}lib32 || -d ${ROOT}lib32 ]] && ! hasq lib32 ${libdirs}; then - libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" - fi - echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib - doenvd "${T}"/04multilib - fi - - # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System release ${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() { - # Punt this when MAKEDEV does this - 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) \ - DESTDIR="${ROOT}" dev || die "failed to create /dev nodes" - fi - fi - fi - - # Make our runlevels if they don't exist - if [[ ! -e ${ROOT}etc/runlevels ]] ; then - einfo "Making default runlevels" - make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null - 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 - - # We need to copy svcdir if upgrading - if has_version "/dev/null - 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 release ${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" - - 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}" - 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'" - 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." - 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 - echo - 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 - - echo - einfo "baselayout-1.13 and higher have dropped the RC_STRICT_NET_CHECKING" - einfo "variable from /etc/conf.d/rc. ${lo} now provides \"net\" and so does" - einfo "each net script linked to it." - einfo "The net dependency is now satisfied by any net.* scripts in the default" - einfo "runlevel, otherwise it's the last net.* script running which includes" - einfo "${lo}. So if you need to restart a net script that is listed in the" - einfo "runlevel you are in and not restart anything that needs it then you" - einfo "will need to use the --nodeps command line option." -} - -# Handle our downgraders -# We should remove this when <1.13 has been removed from the tree -pkg_postrm() { - # Remove dir if downgrading - if has_version "/dev/null - rm -rf "${ROOT}lib/rcscripts/init.d" - ) - fi -} diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha11-r1.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha11-r1.ebuild deleted file mode 100644 index 1b9bbe8c4653..000000000000 --- a/sys-apps/baselayout/baselayout-1.13.0_alpha11-r1.ebuild +++ /dev/null @@ -1,296 +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/baselayout/baselayout-1.13.0_alpha11-r1.ebuild,v 1.4 2007/03/10 14:30:57 vapier 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="virtual/init - !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 ) - ) - ) - pam? ( virtual/pam ) - ! "${D}/etc/conf.d/$1" - fi -} - -pkg_preinst() { - # Move our makefiles to a temporay location - mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}" - - # 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 - local libdirs="$(get_all_libdirs)" dir= - # Create our multilib dirs - the Makefile has no knowledge of this - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... - for dir in ${libdirs}; do - mkdir -p "${ROOT}${dir}" - touch "${ROOT}${dir}"/.keep - mkdir -p "${ROOT}usr/${dir}" - touch "${ROOT}usr/${dir}"/.keep - mkdir -p "${ROOT}usr/local/${dir}" - touch "${ROOT}usr/local/${dir}"/.keep - done - - # Ugly compatibility with stupid ebuilds and old profiles symlinks - if [[ ${SYMLINK_LIB} == "yes" ]] ; then - rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null - local lib=$(get_abi_LIBDIR ${DEFAULT_ABI}) - ln -s "${lib}" "${ROOT}lib" - ln -s "${lib}" "${ROOT}usr/lib" - ln -s "${lib}" "${ROOT}usr/local/lib" - fi - - make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem" - fi - - # 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= dir= - : ${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 ${ROOT}lib32 || -d ${ROOT}lib32 ]] && ! hasq lib32 ${libdirs}; then - libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" - fi - echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib - doenvd "${T}"/04multilib - fi - - # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System release ${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() { - # Make our runlevels if they don't exist - if [[ ! -e ${ROOT}etc/runlevels ]] ; then - einfo "Making default runlevels" - make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null - 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 - - # We need to copy svcdir if upgrading - if has_version "/dev/null - rm -rf "${ROOT}${svcdir}" - ) - # Install our new init script and mark it started - if use kernel_linux ; then - ln -snf ../../init.d/volumes "${ROOT}"etc/runlevels/boot - ln -snf /etc/init.d/volumes "${ROOT}"lib/rcscripts/init.d/started - fi - fi - - if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then - /sbin/depscan.sh --force >/dev/null - 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 release ${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" - - local lo="net.lo0" - use kernel_linux && lo="net.lo" - for f in ${ROOT}etc/init.d/net.*; do - [[ -L ${f} || ${f} == "${ROOT}etc/init.d/${lo}" ]] && 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}" - 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'" - 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." - 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 - echo - 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 - - echo - einfo "baselayout-1.13 and higher have dropped the RC_STRICT_NET_CHECKING" - einfo "variable from /etc/conf.d/rc. ${lo} now provides \"net\" and so does" - einfo "each net script linked to it." - einfo "The net dependency is now satisfied by any net.* scripts in the default" - einfo "runlevel, otherwise it's the last net.* script running which includes" - einfo "${lo}. So if you need to restart a net script that is listed in the" - einfo "runlevel you are in and not restart anything that needs it then you" - einfo "will need to use the --nodeps command line option." -} - -# Handle our downgraders -# We should remove this when <1.13 has been removed from the tree -pkg_postrm() { - # Remove dir if downgrading - if has_version "/dev/null - rm -rf "${ROOT}lib/rcscripts/init.d" - ) - fi -} diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha11-r2.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha11-r2.ebuild deleted file mode 100644 index da9ca2472a0f..000000000000 --- a/sys-apps/baselayout/baselayout-1.13.0_alpha11-r2.ebuild +++ /dev/null @@ -1,297 +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/baselayout/baselayout-1.13.0_alpha11-r2.ebuild,v 1.3 2007/03/10 14:30:57 vapier 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="virtual/init - !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 ) - ) - ) - pam? ( virtual/pam ) - ! "${D}/etc/conf.d/$1" - fi -} - -pkg_preinst() { - # Move our makefiles to a temporay location - mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}" - - # 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 - local libdirs="$(get_all_libdirs)" dir= - # Create our multilib dirs - the Makefile has no knowledge of this - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... - for dir in ${libdirs}; do - mkdir -p "${ROOT}${dir}" - touch "${ROOT}${dir}"/.keep - mkdir -p "${ROOT}usr/${dir}" - touch "${ROOT}usr/${dir}"/.keep - mkdir -p "${ROOT}usr/local/${dir}" - touch "${ROOT}usr/local/${dir}"/.keep - done - - # Ugly compatibility with stupid ebuilds and old profiles symlinks - if [[ ${SYMLINK_LIB} == "yes" ]] ; then - rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null - local lib=$(get_abi_LIBDIR ${DEFAULT_ABI}) - ln -s "${lib}" "${ROOT}lib" - ln -s "${lib}" "${ROOT}usr/lib" - ln -s "${lib}" "${ROOT}usr/local/lib" - fi - - make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem" - fi - - # 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= dir= - : ${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 ${ROOT}lib32 || -d ${ROOT}lib32 ]] && ! hasq lib32 ${libdirs}; then - libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" - fi - echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib - doenvd "${T}"/04multilib - fi - - # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System release ${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() { - # Make our runlevels if they don't exist - if [[ ! -e ${ROOT}etc/runlevels ]] ; then - einfo "Making default runlevels" - make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null - 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 - - # We need to copy svcdir if upgrading - if has_version "/dev/null - rm -rf "${ROOT}${svcdir}" - ) - # Install our new init script and mark it started - if use kernel_linux ; then - ln -snf ../../init.d/volumes "${ROOT}"etc/runlevels/boot - ln -snf /etc/init.d/volumes "${ROOT}"lib/rcscripts/init.d/started - fi - fi - - if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then - /sbin/depscan.sh --force >/dev/null - 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 release ${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" - - local lo="net.lo0" - use kernel_linux && lo="net.lo" - for f in ${ROOT}etc/init.d/net.*; do - [[ -L ${f} || ${f} == "${ROOT}etc/init.d/${lo}" ]] && 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}" - 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'" - 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." - 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 - echo - 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 - - echo - einfo "baselayout-1.13 and higher have dropped the RC_STRICT_NET_CHECKING" - einfo "variable from /etc/conf.d/rc. ${lo} now provides \"net\" and so does" - einfo "each net script linked to it." - einfo "The net dependency is now satisfied by any net.* scripts in the default" - einfo "runlevel, otherwise it's the last net.* script running which includes" - einfo "${lo}. So if you need to restart a net script that is listed in the" - einfo "runlevel you are in and not restart anything that needs it then you" - einfo "will need to use the --nodeps command line option." -} - -# Handle our downgraders -# We should remove this when <1.13 has been removed from the tree -pkg_postrm() { - # Remove dir if downgrading - if has_version "/dev/null - rm -rf "${ROOT}lib/rcscripts/init.d" - ) - fi -} diff --git a/sys-apps/baselayout/files/baselayout-1.13.0_alpha10-pidfile.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha10-pidfile.patch deleted file mode 100644 index 173bcf6293f1..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.13.0_alpha10-pidfile.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: sh/rc-daemon.sh -=================================================================== ---- sh/rc-daemon.sh (revision 2440) -+++ sh/rc-daemon.sh (working copy) -@@ -166,8 +166,8 @@ - return $? - fi - -- pid=$(cat "${pidfile}" 2>/dev/null) -- [[ -n ${pid} && " ${pids} " == *" ${pid} "* ]] -+ pid=$(sed '1q' "${pidfile}" 2>/dev/null) -+ [[ -n ${pid} && " ${pids} " == *" ${pid%% *} "* ]] - } - - # int rc_start_daemon(void) diff --git a/sys-apps/baselayout/files/baselayout-1.13.0_alpha10-r2440.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha10-r2440.patch deleted file mode 100644 index a690bf4f938f..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.13.0_alpha10-r2440.patch +++ /dev/null @@ -1,79 +0,0 @@ -Index: net.Linux/pppd.sh -=================================================================== ---- net.Linux/pppd.sh (revision 2437) -+++ net.Linux/pppd.sh (working copy) -@@ -110,8 +110,9 @@ - opts="linkname ${iface} ${opts}" - - # Setup auth info -- [[ -n ${!username} ]] && opts="user '"${!username}"' ${opts}" -- opts="remotename ${iface} ${opts}" -+ if [[ -n ${!username} ]] ; then -+ opts="user '"${!username}"' remotename ${iface} ${opts}" -+ fi - - # Load a custom interface configuration file if it exists - [[ -f "/etc/ppp/options.${iface}" ]] \ -Index: sbin/functions.sh -=================================================================== ---- sbin/functions.sh (revision 2437) -+++ sbin/functions.sh (working copy) -@@ -898,11 +898,10 @@ - shift - - for x in "$@" ; do -- if [[ -d ${x} ]] ; then -- is_older_than "${ref}" "${x}"/* && return 0 -- elif [[ ${x} -nt ${ref} ]] ; then -- return 0 -- fi -+ # We need to check the mtime if it's a directory too as the -+ # contents may have changed. -+ [[ ${x} -nt ${ref} ]] && return 0 -+ [[ -d ${x} ]] && is_older_than "${ref}" "${x}"/* && return 0 - done - - return 1 -Index: sbin/rc -=================================================================== ---- sbin/rc (revision 2437) -+++ sbin/rc (working copy) -@@ -351,10 +351,12 @@ - - if [[ ${SOFTLEVEL} == "single" ]] ; then - rm -rf "${svcdir}/softscripts" "${svcdir}/softscripts.new" -- if is_vps_sys ; then -- halt -f -- elif [[ -x /sbin/sulogin ]] ; then -- /sbin/sulogin "${CONSOLE}" -+ if [[ ${RUNLEVEL} == "S" ]] ; then -+ if is_vps_sys ; then -+ halt -f -+ elif [[ -x /sbin/sulogin ]] ; then -+ /sbin/sulogin "${CONSOLE}" -+ fi - fi - exit 0 - fi -Index: sbin/depscan.sh -=================================================================== ---- sbin/depscan.sh (revision 2437) -+++ sbin/depscan.sh (working copy) -@@ -123,7 +123,7 @@ - - [[ -e "${mysvcdir}/deptree" ]] || update=true - if ! ${update} ; then -- check_files "${mysvcdir}/depcache" /etc/conf.d/* /etc/init.d/* \ -+ check_files "${mysvcdir}/depcache" /etc/conf.d /etc/init.d \ - /etc/rc.conf || update=true - if ${!update} ; then - if ! bash -n "${mysvcdir}/deptree" ; then -@@ -167,7 +167,7 @@ - - [[ -e "${mysvcdir}/netdeptree" ]] || nupdate=true - if ! ${nupdate} ; then -- check_files "${mysvcdir}/netdepcache" "${svclib}"/net/* || nupdate=true -+ check_files "${mysvcdir}/netdepcache" "${svclib}"/net || nupdate=true - if ${!nupdate} ; then - if ! bash -n "${mysvcdir}/netdeptree" ; then - eerror "${mysvcdir}/netdeptree is not valid - recreating it" diff --git a/sys-apps/baselayout/files/baselayout-1.13.0_alpha11-depscan.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha11-depscan.patch deleted file mode 100644 index 961bec4fc942..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.13.0_alpha11-depscan.patch +++ /dev/null @@ -1,50 +0,0 @@ -Index: sbin/depscan.sh -=================================================================== ---- sbin/depscan.sh (revision 2484) -+++ sbin/depscan.sh (working copy) -@@ -32,6 +32,9 @@ - exit 1 - } - -+# This makes is_older_than fix future mtimes -+RC_FIX_FUTURE=${RC_FIX_FUTURE:-yes} -+ - mysvcdir=${svcdir} - force=false - force_net=false -@@ -92,9 +95,6 @@ - SVCLIB="${svclib}" - export SVCDIR SVCLIB - --# This makes is_older_than fix future mtimes --RC_FIX_FUTURE=${RC_FIX_FUTURE:-yes} -- - [[ -e "${mysvcdir}/deptree" ]] || force=true - if ! ${force} ; then - is_older_than "${mysvcdir}/depcache" /etc/conf.d /etc/init.d \ -Index: sh/init-common-post.sh -=================================================================== ---- sh/init-common-post.sh (revision 2484) -+++ sh/init-common-post.sh (working copy) -@@ -15,7 +15,7 @@ - fi - - # Update init dependencies if needed --depscan.sh -+RC_FIX_FUTURE="no" depscan.sh - - # We set the forced softlevel from the kernel command line - # It needs to be run right after proc is mounted for the -Index: sh/rc-services.sh -=================================================================== ---- sh/rc-services.sh (revision 2484) -+++ sh/rc-services.sh (working copy) -@@ -6,7 +6,7 @@ - RC_GOT_SERVICES="yes" - if [[ ${EUID} == "0" && $0 != "/etc/init.d/halt.sh" ]] ; then - # If the clock service hasn't started, don't fix future mtimes -- if [[ -e "${svcdir}/started/clock" ]] ; then -+ if [[ -L "${svcdir}"/started/clock && -w /etc ]] ; then - depscan.sh - else - RC_FIX_FUTURE="no" depscan.sh diff --git a/sys-apps/baselayout/files/baselayout-1.13.0_alpha11-r2484.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha11-r2484.patch deleted file mode 100644 index 10e1c8091f81..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.13.0_alpha11-r2484.patch +++ /dev/null @@ -1,408 +0,0 @@ -Index: src/start-stop-daemon.c -=================================================================== ---- src/start-stop-daemon.c (revision 2481) -+++ src/start-stop-daemon.c (working copy) -@@ -795,7 +795,7 @@ - check(pid); - fclose(f); - } else if (errno != ENOENT || (stop != 0 && anykilled == 0)) -- errx(2, "open pidfile %s: %s", name, strerror(errno)); -+ errx(exitnodo, "open pidfile %s: %s", name, strerror(errno)); - - } - -Index: sbin/runscript.sh -=================================================================== ---- sbin/runscript.sh (revision 2481) -+++ sbin/runscript.sh (working copy) -@@ -7,7 +7,7 @@ - if [[ $1 == "/"* ]] ; then - myscript="$1" - else -- myscript="$(pwd)/$1" -+ myscript="${PWD}/$1" - fi - cd / - -@@ -113,24 +113,22 @@ - conf=$(add_suffix /etc/rc.conf) - [[ -e ${conf} ]] && . "${conf}" - --mylevel="${SOFTLEVEL}" --[[ ${SOFTLEVEL} == "${BOOTLEVEL}" \ -- || ${SOFTLEVEL} == "reboot" || ${SOFTLEVEL} == "shutdown" ]] \ -- && mylevel="${DEFAULTLEVEL}" -- - svc_quit() { - eerror $"ERROR:" " ${SVCNAME}" $"caught an interrupt" - eflush -- svc_in_control || exit 1 -+ svc_in_control -+ local in_control=$? - rm -rf "${svcdir}/snapshot/$$" "${svcdir}/exclusive/${SVCNAME}.$$" -- if service_wasinactive "${SVCNAME}" ; then -- mark_service_inactive "${SVCNAME}" -- elif [[ ${svcstarted} == "0" ]] ; then -- mark_service_started "${SVCNAME}" -- else -- mark_service_stopped "${SVCNAME}" -+ if [[ ${in_control} == 0 ]] ; then -+ if service_wasinactive "${SVCNAME}" ; then -+ mark_service_inactive "${SVCNAME}" -+ elif [[ ${svcstarted} == "0" ]] ; then -+ mark_service_started "${SVCNAME}" -+ else -+ mark_service_stopped "${SVCNAME}" -+ fi -+ end_service "${SVCNAME}" - fi -- end_service "${SVCNAME}" - exit 1 - } - -@@ -277,30 +275,30 @@ - fi - service_list=( "${service_list[@]}" "${x}" ) - done -- fi - -- for x in "${service_list[@]}" ; do -- local retry=3 -- while [[ ${retry} -gt 0 ]] ; do -- service_stopped "${x}" && break -- wait_service "${x}" -- ((retry--)) -+ for x in "${service_list[@]}" ; do -+ local retry=3 -+ while [[ ${retry} -gt 0 ]] ; do -+ service_stopped "${x}" && break -+ wait_service "${x}" -+ ((retry--)) -+ done -+ if ! service_stopped "${x}" ; then -+ eerror $"ERROR:" $"cannot stop" "${SVCNAME}" $"as" "${x}" $"is still up." -+ retval=1 -+ break -+ fi - done -- if ! service_stopped "${x}" ; then -- eerror $"ERROR:" $"cannot stop" "${SVCNAME}" $"as" "${x}" $"is still up." -- retval=1 -- break -- fi -- done - -- # Work with uses, before and after deps too, but as they are not needed -- # we cannot explicitly stop them. -- # We use -needsme with -usesme so we get the full dep list. -- # We use --notrace with -ibefore to stop circular deps. -- for x in $(rc-depend -needsme -usesme "${SVCNAME}") \ -- $(rc-depend --notrace -ibefore "${SVCNAME}"); do -- service_stopping "${x}" && wait_service "${x}" -- done -+ # Work with uses, before and after deps too, but as they are not needed -+ # we cannot explicitly stop them. -+ # We use -needsme with -usesme so we get the full dep list. -+ # We use --notrace with -ibefore to stop circular deps. -+ for x in $(rc-depend -needsme -usesme "${SVCNAME}") \ -+ $(rc-depend --notrace -ibefore "${SVCNAME}"); do -+ service_stopping "${x}" && wait_service "${x}" -+ done -+ fi - - IN_BACKGROUND="${ib_save}" - -@@ -317,7 +315,7 @@ - } - stop - ) -- retval="$?" -+ retval=$? - - # Don't trust init scripts to reset indentation properly - # Needed for ebuffer -@@ -339,15 +337,18 @@ - is_runlevel_stop && mark_service_failed "${SVCNAME}" - - # If we are halting the system, do it as cleanly as possible -- if [[ ${SOFTLEVEL} == "reboot" || ${SOFTLEVEL} == "shutdown" ]] ; then -- mark_service_stopped "${SVCNAME}" -- else -- if svc_wasinactive "${SVCNAME}" ; then -- mark_service_inactive "${SVCNAME}" -- else -- mark_service_started "${SVCNAME}" -- fi -- fi -+ case ${SOFTLEVEL} in -+ reboot|shutdown|single) -+ mark_service_stopped "${SVCNAME}" -+ ;; -+ *) -+ if service_wasinactive "${SVCNAME}" ; then -+ mark_service_inactive "${SVCNAME}" -+ else -+ mark_service_started "${SVCNAME}" -+ fi -+ ;; -+ esac - - eerror $"ERROR:" " ${SVCNAME}" $"failed to stop" - else -@@ -381,18 +382,18 @@ - ewarn $"WARNING:" " ${SVCNAME}" $"has already been started." - return 0 - elif service_inactive "${SVCNAME}" ; then -- aminactive=0 - if [[ ${IN_BACKGROUND} != "true" \ - && ${IN_BACKGROUND} != "1" ]] ; then - ewarn $"WARNING:" " ${SVCNAME}" $"has already been started." - return 0 - fi -- elif [[ ${SOFTLEVEL} == "shutdown" || ${SOFTLEVEL} == "reboot" ]] ; then -- ewarn $"WARNING: system shutting down, will not start" "${SVCNAME}" -- return 1 -- elif [[ ${SOFTLEVEL} == "single" ]] ; then -- eerror $"ERROR: system is in single user mode, will not start" "${SVCNAME}" -- return 1 -+ else -+ case ${SOFTLEVEL} in -+ reboot|shutdown|single) -+ ewarn $"WARNING: system shutting down, will not start" "${SVCNAME}" -+ return 1 -+ ;; -+ esac - fi - - if ! mark_service_starting "${SVCNAME}" ; then -@@ -457,7 +458,10 @@ - continue 2 - fi - service_stopped "${x}" && break -- -+ -+ # Small pause before trying again as it should be starting -+ # if we get here -+ sleep 1 - ((timeout--)) - done - -@@ -494,7 +498,7 @@ - - start - ) -- retval="$?" -+ retval=$? - - # Don't trust init scripts to reset indentation properly - # Needed for ebuffer -@@ -545,18 +549,17 @@ - } - - svc_restart() { -- if [[ ${SOFTLEVEL} == "shutdown" || ${SOFTLEVEL} == "reboot" ]] ; then -- ewarn $"WARNING: system shutting down, will not restart" "${SVCNAME}" -- return 1 -- elif [[ ${SOFTLEVEL} == "single" ]] ; then -- eerror $"ERROR: system is in single user mode, will not restart" "${SVCNAME}" -- return 1 -- fi -+ case ${SOFTLEVEL} in -+ reboot|shutdown|single) -+ ewarn $"WARNING: system shutting down, will not restart" "${SVCNAME}" -+ return 1 -+ ;; -+ esac - - # Create a snapshot of started services - rm -rf "${svcdir}/snapshot/$$" - mkdir -p "${svcdir}/snapshot/$$" -- cp -pP "${svcdir}"/started/* "${svcdir}"/inactive/* \ -+ cp -pPR "${svcdir}"/started/* "${svcdir}"/inactive/* \ - "${svcdir}/snapshot/$$/" 2>/dev/null - rm -f "${svcdir}/snapshot/$$/${SVCNAME}" - -@@ -690,7 +693,7 @@ - exit 1 - fi - for arg in "$@" ; do -- case "${arg}" in -+ case ${arg} in - --quiet) - RC_QUIET="yes" - RC_QUIET_STDOUT="yes" -@@ -710,7 +713,7 @@ - - retval=0 - for arg in "$@" ; do -- case "${arg}" in -+ case ${arg} in - stop) - if [[ -e "${svcdir}/scheduled/${SVCNAME}" ]] ; then - rm -Rf "${svcdir}/scheduled/${SVCNAME}" -@@ -721,13 +724,13 @@ - if [[ ${IN_BACKGROUND} == "true" || ${IN_BACKGROUND} == "1" ]] ; then - rm -rf "${svcdir}/snapshot/$$" - mkdir -p "${svcdir}/snapshot/$$" -- cp -pP "${svcdir}"/started/* "${svcdir}"/inactive/* \ -+ cp -pPR "${svcdir}"/started/* "${svcdir}"/inactive/* \ - "${svcdir}/snapshot/$$/" 2>/dev/null - rm -f "${svcdir}/snapshot/$$/${SVCNAME}" - fi - - svc_stop -- retval="$?" -+ retval=$? - - if [[ ${IN_BACKGROUND} == "true" || ${IN_BACKGROUND} == "1" ]] ; then - for x in $(dolisting "${svcdir}/snapshot/$$/") ; do -@@ -746,7 +749,7 @@ - ;; - start) - svc_start -- retval="$?" -+ retval=$? - service_started "${SVCNAME}" && svc_start_scheduled - ;; - needsme|ineed|usesme|iuse|broken|iafter|iprovide) -@@ -762,18 +765,18 @@ - ;; - restart) - svc_restart -- retval="$?" -+ retval=$? - ;; - condrestart|conditionalrestart) - if service_started "${SVCNAME}" ; then - svc_restart - fi -- retval="$?" -+ retval=$? - ;; - pause) - svcpause="yes" - svc_stop -- retval="$?" -+ retval=$? - svcpause="no" - ;; - --quiet|--nocolor|--nocolour|--nodeps|--verbose|--debug) -@@ -788,11 +791,11 @@ - *) - # Allow for homegrown functions - svc_homegrown ${arg} -- retval="$?" -+ retval=$? - ;; - esac - done - --exit "${retval}" -+exit ${retval} - - # vim: set ts=4 : -Index: sbin/depscan.sh -=================================================================== ---- sbin/depscan.sh (revision 2481) -+++ sbin/depscan.sh (working copy) -@@ -22,7 +22,7 @@ - Options: - -d, --debug Turn on debug output - -s, --svcdir Specify svcdir (default: ${svcdir}) -- -u, --update Force update even if mtimes are OK -+ -f, --force Force update even if mtimes are OK - -v, --verbose Show which files are being touched to fix future mtimes - -h, --help Show this help cruft - EOF -@@ -33,8 +33,8 @@ - } - - mysvcdir=${svcdir} --update=false --nupdate=false -+force=false -+force_net=false - - while [[ -n $1 ]] ; do - case "$1" in -@@ -49,9 +49,9 @@ - mysvcdir="$1" - fi - ;; -- --update|-u) -- update=true -- nupdate=true -+ --force|-f) -+ force=true -+ force_net=true - ;; - --verbose|-v) - RC_VERBOSE="yes" -@@ -95,19 +95,19 @@ - # This makes is_older_than fix future mtimes - RC_FIX_FUTURE=${RC_FIX_FUTURE:-yes} - --[[ -e "${mysvcdir}/deptree" ]] || update=true --if ! ${update} ; then -+[[ -e "${mysvcdir}/deptree" ]] || force=true -+if ! ${force} ; then - is_older_than "${mysvcdir}/depcache" /etc/conf.d /etc/init.d \ -- /etc/rc.conf && update=true -- if ${!update} ; then -+ /etc/rc.conf && force=true -+ if ${!force} ; then - if ! bash -n "${mysvcdir}/deptree" ; then - eerror "${mysvcdir}/deptree is not valid - recreating it" -- update=true -+ force=true - fi - fi - fi - --if ${update} ; then -+if ${force} ; then - ebegin "Caching service dependencies" - - # Clean out the non volatile directories ... -@@ -139,17 +139,17 @@ - [[ ${retval} != "0" ]] && exit ${retval} - fi - --[[ -e "${mysvcdir}/netdeptree" ]] || nupdate=true --if ! ${nupdate} ; then -- is_older_than "${mysvcdir}/netdepcache" "${svclib}"/net && nupdate=true -- if ${!nupdate} ; then -+[[ -e "${mysvcdir}/netdeptree" ]] || force_net=true -+if ! ${force_net} ; then -+ is_older_than "${mysvcdir}/netdepcache" "${svclib}"/net && force_net=true -+ if ${!force_net} ; then - if ! bash -n "${mysvcdir}/netdeptree" ; then - eerror "${mysvcdir}/netdeptree is not valid - recreating it" -- nupdate=true -+ force_net=true - fi - fi - fi --if ${nupdate} ; then -+if ${force_net} ; then - ebegin "Caching network dependencies" - retval=0 - -Index: sh/rc-daemon.sh -=================================================================== ---- sh/rc-daemon.sh (revision 2481) -+++ sh/rc-daemon.sh (working copy) -@@ -155,10 +155,10 @@ - # If we are successful, then we clean up the pidfile if the daemon didn't. - rc_stop_daemon() { - local retryargs= -- [[ -z ${retry} && ${RC_wAIT_ON_STOP:-5} -gt 0 ]] \ -- && retryargs="--retry ${signal:--TERM}/${RC_WAIT_ON_STOP:-5}" -+ [[ -z ${retry} && ${RC_WAIT_ON_STOP} -gt 0 ]] \ -+ && retryargs="--retry ${signal:--TERM}/${RC_WAIT_ON_STOP}" - -- eval /sbin/start-stop-daemon ${retryargs} "${args}" -+ eval /sbin/start-stop-daemon --oknodo ${retryargs} "${args}" - local retval=$? - [[ ${retval} != 0 ]] && return ${retval} - diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha10-r2 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha10-r2 deleted file mode 100644 index 479e418898f4..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha10-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 75464388b25fb3a9f9a092bc56c2e2ac baselayout-1.13.0_alpha10.tar.bz2 255190 -RMD160 930065e8fd850ad1247c639293ab05ff499409d1 baselayout-1.13.0_alpha10.tar.bz2 255190 -SHA256 ea78f92f45801c306458bc66a076d566893cac11e3dac429810629aea0738ef4 baselayout-1.13.0_alpha10.tar.bz2 255190 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha11-r1 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha11-r1 deleted file mode 100644 index ee4883377111..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha11-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 20f8050a0fc52c6857a14bb627da1405 baselayout-1.13.0_alpha11.tar.bz2 229777 -RMD160 4b34817bff86699077304a17e118e060e078615d baselayout-1.13.0_alpha11.tar.bz2 229777 -SHA256 993ca18543d74f33e9b6d570d4f5ecdb40940e34e2b5fd97bcdc31321a87a1c6 baselayout-1.13.0_alpha11.tar.bz2 229777 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha11-r2 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha11-r2 deleted file mode 100644 index ee4883377111..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha11-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 20f8050a0fc52c6857a14bb627da1405 baselayout-1.13.0_alpha11.tar.bz2 229777 -RMD160 4b34817bff86699077304a17e118e060e078615d baselayout-1.13.0_alpha11.tar.bz2 229777 -SHA256 993ca18543d74f33e9b6d570d4f5ecdb40940e34e2b5fd97bcdc31321a87a1c6 baselayout-1.13.0_alpha11.tar.bz2 229777