Fix some depscan and mtime issues.
authorRoy Marples <uberlord@gentoo.org>
Thu, 11 Jan 2007 21:15:07 +0000 (21:15 +0000)
committerRoy Marples <uberlord@gentoo.org>
Thu, 11 Jan 2007 21:15:07 +0000 (21:15 +0000)
Package-Manager: portage-2.1.2_rc4-r8

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

index b0aa11c8ac4b45a8b432530986c4d850507b6234..740608d3e2d3d62ba96dc0f66ac66079dd4a12c0 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.394 2007/01/11 15:11:04 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.395 2007/01/11 21:15:07 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-r2 (11 Jan 2007)
+
+  11 Jan 2007; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.13.0_alpha11-depscan.patch,
+  +baselayout-1.13.0_alpha11-r2.ebuild:
+  Fix some depscan and mtime issues.
+
   11 Jan 2007; Roy Marples <uberlord@gentoo.org>
   baselayout-1.13.0_alpha11-r1.ebuild:
   Use depscan.sh --force
index a7ef37252b6e33d0e588194f651e7a25c5f573cd..c2d14ef5719cc172a5aad757333dcc8f353dffd1 100644 (file)
@@ -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
@@ -73,6 +70,10 @@ AUX baselayout-1.13.0_alpha10-r2440.patch 2511 RMD160 7681a687c35fd000ee13e2b1e0
 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
@@ -124,10 +125,14 @@ EBUILD baselayout-1.13.0_alpha11-r1.ebuild 10571 RMD160 0f7b3946eb3626c4699b9765
 MD5 039569b696c155a61315eeb4cf34b579 baselayout-1.13.0_alpha11-r1.ebuild 10571
 RMD160 0f7b3946eb3626c4699b9765497197eb57a61bbc baselayout-1.13.0_alpha11-r1.ebuild 10571
 SHA256 b0ac4c9ded17bb284815a17f2493bc44ae3678ebbaa774517593ab47942faea4 baselayout-1.13.0_alpha11-r1.ebuild 10571
-MISC ChangeLog 89153 RMD160 47fe7a1954f715d7e9ef1628ceb77d88fdbc977b SHA1 699e1941fca4c6177c017bcd2926a23d9447ac37 SHA256 d831d30805f30654773ed1567f6382e9a70190be73d86cb3c68ea0b807e0d986
-MD5 cfa3a03f085499a3de5bf82ae0586d8f ChangeLog 89153
-RMD160 47fe7a1954f715d7e9ef1628ceb77d88fdbc977b ChangeLog 89153
-SHA256 d831d30805f30654773ed1567f6382e9a70190be73d86cb3c68ea0b807e0d986 ChangeLog 89153
+EBUILD baselayout-1.13.0_alpha11-r2.ebuild 10612 RMD160 856832d3baa97bec1a4faace2a9453733247d288 SHA1 2c5a4e07f2e0a68d88d0b60eadf92cf51d8b0fda SHA256 09788dd3421a845285df8873c96baa93a8666178fe6baa60971d8f40fc8472e0
+MD5 1ee70c462f6526e7b660a197ec96ec6d baselayout-1.13.0_alpha11-r2.ebuild 10612
+RMD160 856832d3baa97bec1a4faace2a9453733247d288 baselayout-1.13.0_alpha11-r2.ebuild 10612
+SHA256 09788dd3421a845285df8873c96baa93a8666178fe6baa60971d8f40fc8472e0 baselayout-1.13.0_alpha11-r2.ebuild 10612
+MISC ChangeLog 89375 RMD160 057b908385f84a05cb1a34ced64c931542e00517 SHA1 884d92703ddaad4cc043c08849d0a15836d93cd6 SHA256 b9b9fe5f88d6ba04c97aaf622d3a646814557adc1d1c5b5553f4f79c93fcc069
+MD5 21c0121bcd07825b1220d4eaabb0d607 ChangeLog 89375
+RMD160 057b908385f84a05cb1a34ced64c931542e00517 ChangeLog 89375
+SHA256 b9b9fe5f88d6ba04c97aaf622d3a646814557adc1d1c5b5553f4f79c93fcc069 ChangeLog 89375
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -159,10 +164,6 @@ SHA256 2aff7adae59490722f3880d409166e61514c4dd90043c810f172776627f80505 files/di
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFpoPkI1lqEGTUzyQRAqM4AJ99sDWIPnZEd5f0hyErolDKEVVgcQCg2F7r
-kBw+RT3Y3d+NQwnKj7fJV0Q=
-=fx53
------END PGP SIGNATURE-----
+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
diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha11-r2.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha11-r2.ebuild
new file mode 100644 (file)
index 0000000..87f2345
--- /dev/null
@@ -0,0 +1,297 @@
+# 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.1 2007/01/11 21:15:07 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}"
+
+       epatch "${FILESDIR}/${P}-r2484.patch"
+       epatch "${FILESDIR}/${P}-depscan.patch"
+
+       # 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
+               umount "${ROOT}${svcdir}" 2>/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 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/baselayout-1.13.0_alpha11-depscan.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha11-depscan.patch
new file mode 100644 (file)
index 0000000..961bec4
--- /dev/null
@@ -0,0 +1,50 @@
+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/digest-baselayout-1.13.0_alpha11-r2 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha11-r2
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