rc6 fixed a few things and introduces a logger daemon and a new posix array structure as discussed on -dev.

Package-Manager: portage-2.1.3.16

5 files changed, 279 insertions, 12 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 18688650bc43..baa89e7e3ab0 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -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.440 2007/10/22 20:45:13 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.441 2007/10/31 23:26:25 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+*baselayout-2.0.0_rc6 (31 Oct 2007)
+
+  31 Oct 2007; Roy Marples <uberlord@gentoo.org>
+  +baselayout-2.0.0_rc6.ebuild:
+  rc6 fixed a few things and introduces a logger daemon and a new posix array
+  structure as discussed on -dev.
+
   22 Oct 2007; Roy Marples <uberlord@gentoo.org>
   baselayout-2.0.0_rc5.ebuild:
   Fix upgrade/downgrade paths.
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 5d23616364f3..8af21b79b14e 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -29,7 +29,8 @@ SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/co
 DIST baselayout-1.12.10.tar.bz2 218940 RMD160 e499c08af4d73d43c2e354febbf09e48916ac24c SHA1 306090e733eaf059d0849291d6327f7ea9bae5cc SHA256 1d64cdb9cc42bca7a8eec4045ad0e7e8cafba1d6c3f92b377bc7f6f7ee668674
 DIST baselayout-1.12.9.tar.bz2 218939 RMD160 c80a3e4434bd8ce58c89ab1b988b64c012741d00 SHA1 0e5745d95412db3427961c5f796827f7867aa35b SHA256 ab89a131d0a12fa8b411189fb51b15216c3f27a422ff539767eb0d134e40dd94
 DIST baselayout-2.0.0_rc4.tar.bz2 137154 RMD160 d257f6a6340ea46f56e3e975b096e9a2133ba27b SHA1 8f73a0ccb17bba13be8408f0803260cda376025c SHA256 2c00b8141d6188eec223484453508efceb12afa3a1427994ca823eb594746a92
-DIST baselayout-2.0.0_rc5.tar.bz2 208625 RMD160 88faa4ff9aa87e8f2b11f12dceda087f947f0991 SHA1 37004a91ebc7e02e914f1d8b44998d38b92c0c53 SHA256 4edf447441049c77e30962c69a024fb258c4ef549525aa02a20a4b272939af22
+DIST baselayout-2.0.0_rc5.tar.bz2 208576 RMD160 d69cbb5a1c91d201b699fff653f96930b0ad055f SHA1 9226b8d4e8dfb0e263069b7516e48dbbcf9d722d SHA256 a5e2bac58160b023a727da1681630cf6bebd297e9826847148af6f42c99b2468
+DIST baselayout-2.0.0_rc6.tar.bz2 148193 RMD160 8adde70811f685aa5e294adf4037c12686f14d34 SHA1 9749a3382147c6d8e72e53fa64e6c926d19e0bf7 SHA256 0d4c06176ad8e435c88983417349e081824b6b2c387bc7a2624ce7ccb0165767
 DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a
 EBUILD baselayout-1.11.15-r3.ebuild 18811 RMD160 53374dd4f21d0cec96852c5a346a5f791ad9e3a8 SHA1 722ec91ba2dbe8b80d5c1194d779e1d3450dc7d9 SHA256 427b2761578b65293daa82a81d8a4163c8ab11b540df2cd5f98f397f1b864b49
 MD5 bdc7d2ba0408e6f80f62464f3c87d32a baselayout-1.11.15-r3.ebuild 18811
@@ -63,10 +64,14 @@ EBUILD baselayout-2.0.0_rc5.ebuild 10472 RMD160 fab13ff6c4f678110d322c8999c98dc9
 MD5 67c8c0e173a4cf65348a381577833f68 baselayout-2.0.0_rc5.ebuild 10472
 RMD160 fab13ff6c4f678110d322c8999c98dc9bd930389 baselayout-2.0.0_rc5.ebuild 10472
 SHA256 1846205cbf094b7a4e4b85dc537c737a26938006eec5db35b9bf00a8d07733d6 baselayout-2.0.0_rc5.ebuild 10472
-MISC ChangeLog 97129 RMD160 a6563387b572bce039790ff42080718f3eaf6189 SHA1 82a2e035a382a1647e3a1c2a7bbbeb66cc0a8378 SHA256 6e1631d48dfa7ee5fdedc96b4af4fe54c4ba3052caa647e355db0022882f28d9
-MD5 6b4caa883a11a2f68648570ef05ed198 ChangeLog 97129
-RMD160 a6563387b572bce039790ff42080718f3eaf6189 ChangeLog 97129
-SHA256 6e1631d48dfa7ee5fdedc96b4af4fe54c4ba3052caa647e355db0022882f28d9 ChangeLog 97129
+EBUILD baselayout-2.0.0_rc6.ebuild 8596 RMD160 44336860a01018aa68dd209f02bc15dcbe3913c2 SHA1 5a90098b0ead3dc7e2526aadbf0d0ac02b01d0f6 SHA256 4c8b58ccfd6bc51b68fde19483ae4e15191765cbb8fb2b44d88225352bfd4ef1
+MD5 5586a1dc23f7e2282140052601ad628a baselayout-2.0.0_rc6.ebuild 8596
+RMD160 44336860a01018aa68dd209f02bc15dcbe3913c2 baselayout-2.0.0_rc6.ebuild 8596
+SHA256 4c8b58ccfd6bc51b68fde19483ae4e15191765cbb8fb2b44d88225352bfd4ef1 baselayout-2.0.0_rc6.ebuild 8596
+MISC ChangeLog 97360 RMD160 d96a1533472c5d875ad09ea24fa01581bdf89933 SHA1 b1b26293848e41ac5412d5294cbd47d422f3ab7e SHA256 adf67ac6c32eb6f554e987427282bae959c278c713e28517e1bffc1b0b862cc5
+MD5 2ce329907d26ce91908f235722288d26 ChangeLog 97360
+RMD160 d96a1533472c5d875ad09ea24fa01581bdf89933 ChangeLog 97360
+SHA256 adf67ac6c32eb6f554e987427282bae959c278c713e28517e1bffc1b0b862cc5 ChangeLog 97360
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -92,6 +97,9 @@ SHA256 d7e42ef1e4435ac575689e2fdb8297b6b826db53b560818caec86520cc9912d7 files/di
 MD5 f1d98e9596ba0fa2c88bc6c2b5d9d3a5 files/digest-baselayout-2.0.0_rc4-r1 265
 RMD160 285c61e9e4a33c9b6fa99e53f003466825089553 files/digest-baselayout-2.0.0_rc4-r1 265
 SHA256 d7e42ef1e4435ac575689e2fdb8297b6b826db53b560818caec86520cc9912d7 files/digest-baselayout-2.0.0_rc4-r1 265
-MD5 c3c739e91e74b53217467abeb34ddda9 files/digest-baselayout-2.0.0_rc5 265
-RMD160 35534138acab9c0c20ed2a40323e1a328ef3350e files/digest-baselayout-2.0.0_rc5 265
-SHA256 f8cd79e9eb1683cbf6d8ba9fedcf833764c9f359ec6a80a7fdffdd7ddcd7913a files/digest-baselayout-2.0.0_rc5 265
+MD5 6114fdc5a42893bf73df6198d5c027b2 files/digest-baselayout-2.0.0_rc5 265
+RMD160 be5d31c475f32abd56614f1e722c4857c3acd2eb files/digest-baselayout-2.0.0_rc5 265
+SHA256 c77d7ca53b8a196bb8cdcf115f0a4610044d69c868d29fd4ebb2780e5cdcf14d files/digest-baselayout-2.0.0_rc5 265
+MD5 3ecc749a95568c9bd7eda0705f12340c files/digest-baselayout-2.0.0_rc6 265
+RMD160 62a548237beb231c76cf662d26c654869740974a files/digest-baselayout-2.0.0_rc6 265
+SHA256 31cac0fef7d8654410bc5fe3ba2b3f165b213cc674ecb76a2513ad6663fc7491 files/digest-baselayout-2.0.0_rc6 265
diff --git a/sys-apps/baselayout/baselayout-2.0.0_rc6.ebuild b/sys-apps/baselayout/baselayout-2.0.0_rc6.ebuild
new file mode 100644
index 000000000000..84f1bf9d98f3
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.0.0_rc6.ebuild
@@ -0,0 +1,249 @@
+# 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-2.0.0_rc6.ebuild,v 1.1 2007/10/31 23:26:25 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="bootstrap build pam static unicode kernel_linux kernel_FreeBSD"
+
+RDEPEND="virtual/init
+		!build? (
+			!bootstrap? (
+				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
+}
+
+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} PAM=pam"
+
+	echo "${opts}"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	emake $(make_opts) ARCH=$(tc-arch) CC=$(tc-getCC) || die
+}
+
+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} 2>/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
+
+		emake -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
+	fi
+}
+
+src_install() {
+	emake $(make_opts) DESTDIR="${D}" install || die
+	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" -o -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 -o -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*
+
+	gen_usr_ldscript libeinfo.so librc.so
+}
+
+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
+		(
+		. "${ROOT}etc/conf.d/rc"
+		svcdir="${svcdir:-/var/lib/init.d}"
+		einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rc/init.d"
+		cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rc/init.d
+		rm -rf "${ROOT}"lib/rc/init.d/daemons \
+			"${ROOT}"lib/rc/init.d/console
+		umount "${ROOT}${svcdir}" 2>/dev/null
+		rm -rf "${ROOT}${svcdir}"
+		)
+	elif has_version "<sys-apps/${PN}-2.0.0_rc5" ; then
+		if [ -d "${ROOT}"lib/rcscripts/init.d ] ; then
+			einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}lib/rc/init.d"
+			cp -RPp "${ROOT}"lib/rcscripts/init.d/* "${ROOT}"lib/rc/init.d
+			umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null
+			rm -rf "${ROOT}"lib/rcscripts/init.d
+			[ -d "${ROOT}"lib/rcscripts/console ] && \
+				mv  "${ROOT}"lib/rcscripts/console "${ROOT}"lib/rc
+		fi
+	fi
+
+	if [ "${ROOT}" = / ] && ! use build && ! use bootstrap; then
+		/$(get_libdir)/rc/bin/rc-depend --update
+	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
+	local release="${PV}"
+	[ "${PR}" != r0 ] && release="${release}-${PR}"
+	echo "Gentoo Base System release ${release}" > "${ROOT}"/etc/gentoo-release
+
+	echo
+	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
+	einfo "else things might break at your next reboot!	 You can use 'etc-update'"
+	einfo "to accomplish this:"
+	einfo
+	einfo "	 # etc-update"
+
+	echo
+	ewarn "WARNING: The way we contruct posix shell arrays has changed in rc6"
+	elog "You are advised to read the new method in /etc/conf.d/net.example"
+
+	local lo="net.lo0"
+	use kernel_linux && lo="net.lo"
+	for f in "${ROOT}"etc/init.d/net.*; do
+		[ -L "${f}" -o "${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
+
+	# whine about users that lack passwords #193541
+	if [ -e "${ROOT}"/etc/shadow ]; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${ROOT}"/etc/shadow)
+		if [ -n "${bad_users}" ] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+}
+
+# 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
+		(
+		. "${ROOT}etc/conf.d/rc"
+		svcdir="${svcdir:-/var/lib/init.d}"
+		einfo "Moving state from ${ROOT}lib/rc/init.d to ${ROOT}${svcdir}"
+		mkdir -p "${ROOT}${svcdir}"
+		cp -RPp "${ROOT}lib/rc/init.d"/* "${ROOT}${svcdir}"
+		rm -rf "${ROOT}${svcdir}"/daemons
+		umount "${ROOT}lib/rc/init.d" 2>/dev/null
+		rm -rf "${ROOT}lib/rc/init.d" "${ROOT}lib/rc/console"
+		rmdir "${ROOT}lib/rc" 2>/dev/null
+		)
+	elif has_version "<sys-apps/${PN}-2.0.0_rc5" ; then
+		einfo "Moving state from ${ROOT}lib/rc/init.d to ${ROOT}lib/rcscripts/init.d"
+		mkdir -p "${ROOT}"lib/rcscripts/init.d
+		cp -RPp "${ROOT}"lib/rc/init.d/* "${ROOT}"lib/rcscripts/init.d
+		umount "${ROOT}"lib/rc/init.d 2>/dev/null
+		rm -rf "${ROOT}"lib/rc/init.d
+		[ -d "${ROOT}"/lib/rc/console ] && \
+			mv "${ROOT}"lib/rc/console "${ROOT}"lib/rcscripts
+		rmdir "${ROOT}"lib/rc 2>/dev/null
+	fi
+}
diff --git a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc5 b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc5
index 711422bb813e..e8a29560c9b6 100644
--- a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc5
+++ b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc5
@@ -1,3 +1,3 @@
-MD5 00659018912fcec8d1d7fd6c34b3505d baselayout-2.0.0_rc5.tar.bz2 208625
-RMD160 88faa4ff9aa87e8f2b11f12dceda087f947f0991 baselayout-2.0.0_rc5.tar.bz2 208625
-SHA256 4edf447441049c77e30962c69a024fb258c4ef549525aa02a20a4b272939af22 baselayout-2.0.0_rc5.tar.bz2 208625
+MD5 abadae383227396373b14912d4d874fb baselayout-2.0.0_rc5.tar.bz2 208576
+RMD160 d69cbb5a1c91d201b699fff653f96930b0ad055f baselayout-2.0.0_rc5.tar.bz2 208576
+SHA256 a5e2bac58160b023a727da1681630cf6bebd297e9826847148af6f42c99b2468 baselayout-2.0.0_rc5.tar.bz2 208576
diff --git a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc6 b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc6
new file mode 100644
index 000000000000..397ac0a8c460
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc6
@@ -0,0 +1,3 @@
+MD5 705a0da7b80d169e257c914338f83ade baselayout-2.0.0_rc6.tar.bz2 148193
+RMD160 8adde70811f685aa5e294adf4037c12686f14d34 baselayout-2.0.0_rc6.tar.bz2 148193
+SHA256 0d4c06176ad8e435c88983417349e081824b6b2c387bc7a2624ce7ccb0165767 baselayout-2.0.0_rc6.tar.bz2 148193