New release - nfs users may need to re-emerge nfs-utils to get a fixed init
authorRoy Marples <uberlord@gentoo.org>
Wed, 10 Jan 2007 12:00:29 +0000 (12:00 +0000)
committerRoy Marples <uberlord@gentoo.org>
Wed, 10 Jan 2007 12:00:29 +0000 (12:00 +0000)
  script.

Package-Manager: portage-2.1.2_rc4-r7

sys-apps/baselayout/ChangeLog
sys-apps/baselayout/Manifest
sys-apps/baselayout/baselayout-1.13.0_alpha11.ebuild [new file with mode: 0644]
sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha11 [new file with mode: 0644]

index 3e0ffcfe75d30f7aa9e6c6347aed00c9926bba36..9719bff1c5301c9074086c85dd9d73ac6302c5bc 100644 (file)
@@ -1,10 +1,17 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.390 2007/01/10 09:43:21 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.391 2007/01/10 12:00:29 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_alpha11 (10 Jan 2007)
+
+  10 Jan 2007; Roy Marples <uberlord@gentoo.org>
+  +baselayout-1.13.0_alpha11.ebuild:
+  New release - nfs users may need to re-emerge nfs-utils to get a fixed init
+  script.
+
 *baselayout-1.12.8-r4 (10 Jan 2007)
 
   10 Jan 2007; Roy Marples <uberlord@gentoo.org>
index 2ad3cd6f69c6ff716013ac7fc004df74a268d0fd..d4778213eb554830d379964997c03eadedb0d969 100644 (file)
@@ -79,6 +79,7 @@ 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.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 rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a
 EBUILD baselayout-1.11.15-r3.ebuild 18814 RMD160 3477a96752088ec670ba87c8cc5a825e504374a9 SHA1 dffb788310268b4bbccc21dc55e8ce247b0100f5 SHA256 6568e5b5762128fdfd353dd359581cf6f7aafc60e5ffb2194a675df2aeeb6fda
 MD5 c13ac4da7c024396714a0f52c15bcb58 baselayout-1.11.15-r3.ebuild 18814
@@ -128,10 +129,14 @@ EBUILD baselayout-1.13.0_alpha10.ebuild 9979 RMD160 a6cd64566591832f7a27ceed9865
 MD5 3142bbab3c121b88c30c92eef33acbba baselayout-1.13.0_alpha10.ebuild 9979
 RMD160 a6cd64566591832f7a27ceed9865c5243c0f55d3 baselayout-1.13.0_alpha10.ebuild 9979
 SHA256 426ef12358ae0ff7bd6e112fbea601bbf263f605b7c7ccd2e0858a837f6a9bd6 baselayout-1.13.0_alpha10.ebuild 9979
-MISC ChangeLog 88373 RMD160 523a46c55f5ed0999107e99fc28d0f0e383cdf58 SHA1 a0027c68bfaf5aa9a2dcc100371cef0824ca0507 SHA256 ca217277bb926428d41b7a9d84f5645af35725b45011e3db5667f0dede1f9459
-MD5 1e4af5074493835ecf8b499c14982849 ChangeLog 88373
-RMD160 523a46c55f5ed0999107e99fc28d0f0e383cdf58 ChangeLog 88373
-SHA256 ca217277bb926428d41b7a9d84f5645af35725b45011e3db5667f0dede1f9459 ChangeLog 88373
+EBUILD baselayout-1.13.0_alpha11.ebuild 10489 RMD160 dff64cdaef3410614faf5ecc81f3fa6a2869bb1a SHA1 1ea19d9cb207179dce601e5968837267150d3dcc SHA256 aa003f591b3f8d70d0f451b03d083c7ec80d3b4db1e649c425382b370d44c06c
+MD5 6f81353d272b5da2298de3bcd5c9ec2b baselayout-1.13.0_alpha11.ebuild 10489
+RMD160 dff64cdaef3410614faf5ecc81f3fa6a2869bb1a baselayout-1.13.0_alpha11.ebuild 10489
+SHA256 aa003f591b3f8d70d0f451b03d083c7ec80d3b4db1e649c425382b370d44c06c baselayout-1.13.0_alpha11.ebuild 10489
+MISC ChangeLog 88590 RMD160 36143db4693be5ba6ba20bc7dee476bbc2692ebd SHA1 0112c5d7d0d32879c48d3f20790cf1d02158dc15 SHA256 28e367a82095e0ed282865c61fb535ffa0297348942772ce2182920bf42eccba
+MD5 3afd1d318e04125a10a4155841f07e89 ChangeLog 88590
+RMD160 36143db4693be5ba6ba20bc7dee476bbc2692ebd ChangeLog 88590
+SHA256 28e367a82095e0ed282865c61fb535ffa0297348942772ce2182920bf42eccba ChangeLog 88590
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -172,3 +177,6 @@ SHA256 2aff7adae59490722f3880d409166e61514c4dd90043c810f172776627f80505 files/di
 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 280
+RMD160 98dea4cb5f5b9ead0e0f9b3499a62bf5d60d9bdd files/digest-baselayout-1.13.0_alpha11 280
+SHA256 43fd9d1cfeacfd464916cb9011db751d238122f899172a0cc69a56bc8ccabca8 files/digest-baselayout-1.13.0_alpha11 280
diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha11.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha11.ebuild
new file mode 100644 (file)
index 0000000..d44cc0d
--- /dev/null
@@ -0,0 +1,293 @@
+# 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.ebuild,v 1.1 2007/01/10 12:00:29 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="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 )
+               !<net-misc/dhcpcd-2.0.0"
+DEPEND="virtual/os-headers"
+PDEPEND="virtual/init
+       !build? ( !bootstrap? (
+               kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 sys-apps/makedev )
+       ) )"
+
+PROVIDE="virtual/baselayout"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # Setup unicode defaults for silly unicode users
+       if use unicode ; then
+               sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
+       fi
+
+       # SPARC does not like stty, so we disable RC_INTERACTIVE which requires it
+       # see Gentoo bug #104067.
+       if use sparc ; then \
+               sed -i -e  '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die
+               sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
+       fi
+}
+
+make_opts() {
+       local libdir="lib"
+       [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+       local opts="${opts} LIB=${libdir}"
+
+       if use kernel_linux ; then
+               opts="${opts} OS=Linux"
+       else
+               opts="${opts} OS=BSD"
+       fi
+       use pam && opts="${opts} HAVE_PAM=1"
+
+       echo "${opts}"
+}
+
+src_compile() {
+       use static && append-ldflags -static
+       emake $(make_opts) ARCH=$(tc-arch) CC=$(tc-getCC) || die
+}
+
+# Support function for remapping old wireless dns vars
+remap_dns_vars() {
+       if [[ -f "${ROOT}/etc/conf.d/$1" ]]; then
+               sed -e 's/\<domain_/dns_domain_/g' \
+                       -e 's/\<mac_domain_/mac_dns_domain_/g' \
+                       -e 's/\<nameservers_/dns_servers_/g' \
+                       -e 's/\<mac_nameservers_/mac_dns_servers_/g' \
+                       -e 's/\<searchdomains_/dns_search_domains_/g' \
+                       -e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
+                       "${ROOT}/etc/conf.d/$1" > "${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}"
+
+       # 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 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() {
+       # 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 "<sys-apps/${PN}-1.13.0_alpha" ; then
+               (
+               source "${ROOT}etc/conf.d/rc"
+               svcdir="${svcdir:-/var/lib/init.d}"
+               einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rcscripts/init.d"
+               cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rcscripts/init.d
+               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 --update >/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 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"
+
+       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 "<sys-apps/${PN}-1.13.0_alpha" ; then
+               (
+               source "${ROOT}etc/conf.d/rc"
+               svcdir="${svcdir:-/var/lib/init.d}"
+               einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}"
+               mkdir -p "${ROOT}${svcdir}"
+               cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}"
+               umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null
+               rm -rf "${ROOT}lib/rcscripts/init.d"
+               )
+       fi
+}
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha11 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha11
new file mode 100644 (file)
index 0000000..ee48833
--- /dev/null
@@ -0,0 +1,3 @@
+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