Version bump; syncing with original baselayout

Package-Manager: portage-2.1_pre4-r1

4 files changed, 434 insertions, 7 deletions

diff --git a/sys-apps/baselayout-vserver/ChangeLog b/sys-apps/baselayout-vserver/ChangeLog
index d6d49d7ea63d..7cff3ecaf4b4 100644
--- a/sys-apps/baselayout-vserver/ChangeLog
+++ b/sys-apps/baselayout-vserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/baselayout-vserver
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.22 2006/02/18 17:53:17 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.23 2006/02/18 17:56:26 phreak Exp $
+
+*baselayout-vserver-1.12.0_pre16 (18 Feb 2006)
+
+  18 Feb 2006; Christian Heim <phreak@gentoo.org>
+  +baselayout-vserver-1.12.0_pre16.ebuild:
+  Version bump; syncing with original baselayout
 
 *baselayout-vserver-1.11.15 (18 Feb 2006)
 
diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest
index 5a379373b1fc..a816cf4d5efc 100644
--- a/sys-apps/baselayout-vserver/Manifest
+++ b/sys-apps/baselayout-vserver/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b923ceec460ae603f127215c1cd180f3 ChangeLog 4350
-RMD160 dbdb26b99db66f3f7fec726f476cf5b03d216f90 ChangeLog 4350
-SHA256 ae0a52ebdd72e64f4ff82cd68ad12b8ebfe4fde01b358f8e7aed24bb6201889c ChangeLog 4350
+MD5 29c4143f6b219512c03a0e176250d78a ChangeLog 4541
+RMD160 6449a4cc5b0a7f0d25ad0a44c62d197a6718c0ac ChangeLog 4541
+SHA256 1859f8378a98cea60c50041b59185fa342db14f419e27fd939f973b5c867402f ChangeLog 4541
 MD5 3154e9763ae2199cddf00a2fa89af3f9 baselayout-vserver-1.11.13-r1.ebuild 13273
 RMD160 0ddc092f0ef5baf7722364cc66c1dbd83fc612c8 baselayout-vserver-1.11.13-r1.ebuild 13273
 SHA256 dc57caa059c3f618b5af74452cfc0ca970f732c9178b1760bc038606de456470 baselayout-vserver-1.11.13-r1.ebuild 13273
@@ -13,6 +13,9 @@ SHA256 c24501625dd556bf46f543db281880d1773c9317cc770e4af1a2a88ee760b13a baselayo
 MD5 e8fd52610ce2e2767ec9b14bdc7be21f baselayout-vserver-1.11.15.ebuild 15690
 RMD160 39e9fb60c184654ad8198a29ece90c1d511179fb baselayout-vserver-1.11.15.ebuild 15690
 SHA256 c08a2093cb67909a74d8f2bb8bf99da3ed4929fa0886b5eb7690ca49ac75e930 baselayout-vserver-1.11.15.ebuild 15690
+MD5 f8f4314afe00de037943e53171b12d48 baselayout-vserver-1.12.0_pre16.ebuild 12515
+RMD160 a78a7db00b11b6173996753d65a5043fffc4dc8a baselayout-vserver-1.12.0_pre16.ebuild 12515
+SHA256 32e485bf21282130ef1cb6d223c35be39cc4d2b02a02b89859e60681409e4615 baselayout-vserver-1.12.0_pre16.ebuild 12515
 MD5 8bbf6c606bd60a3825fd79aaab624805 baselayout-vserver-1.12.0_pre8-r2.ebuild 12601
 RMD160 e7de602a8614ec2a406cfb1e8583392564bc86d6 baselayout-vserver-1.12.0_pre8-r2.ebuild 12601
 SHA256 8017e9a3a4e1cf6233dbfad9fda6c173a3f0b3c864e9c27c8b915e6920ca4dd9 baselayout-vserver-1.12.0_pre8-r2.ebuild 12601
@@ -43,6 +46,9 @@ SHA256 949e1593b90a62939e3a919166fc7789051f2a760574c3f21e89263dd5e68fe8 files/di
 MD5 0ee580482489f7f463d51d0372779135 files/digest-baselayout-vserver-1.11.15 280
 RMD160 9e73c74ee5bbcb8ae65f0490bfef05cb761c9865 files/digest-baselayout-vserver-1.11.15 280
 SHA256 052e60412d5e92240c2002c3a80bd089059b93b32e817369f5f77af570f3f5bd files/digest-baselayout-vserver-1.11.15 280
+MD5 df8b7ff09184684431afa2d74667a3e6 files/digest-baselayout-vserver-1.12.0_pre16 298
+RMD160 7272acfb7faca410ef2d90c5c12c775775608d20 files/digest-baselayout-vserver-1.12.0_pre16 298
+SHA256 89d7211dc57314c1709e05326f364247de371e76df6b10299115362360431414 files/digest-baselayout-vserver-1.12.0_pre16 298
 MD5 f6300fc5175902aa7e634664ac6d96bc files/digest-baselayout-vserver-1.12.0_pre8-r2 295
 RMD160 d1fa69c9a21dae4478179be846da9a1ead707d40 files/digest-baselayout-vserver-1.12.0_pre8-r2 295
 SHA256 0d9ccc11eb84db164243b6be1d1bf6fd6a52a9a626d2b17d7cc3c3db56cd260a files/digest-baselayout-vserver-1.12.0_pre8-r2 295
@@ -58,7 +64,7 @@ SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD918cflZ8QqxhrsMRAhtcAJ9ZHBUlQNOhaDbLgviDYYMi0ZcltwCfce0N
-0EKhHtRfgmyVcZpaTLJXvws=
-=ynjC
+iD8DBQFD91/aflZ8QqxhrsMRAnV/AKCUZRA/KGgr4TmebsfWx5/C8+01XwCdHgi3
+PoFjaP17QBtXnxghf6Uds2c=
+=EANj
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre16.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre16.ebuild
new file mode 100644
index 000000000000..831adb761c99
--- /dev/null
+++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre16.ebuild
@@ -0,0 +1,412 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre16.ebuild,v 1.1 2006/02/18 17:56:26 phreak Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+DESCRIPTION="Filesystem baselayout and init scripts for Linux-VServer"
+HOMEPAGE="http://dev.croup.de/proj/gentoo-vps"
+SRC_URI="http://dev.gentoo.org/~hollow/distfiles/${P}.tar.bz2
+	http://dev.gentoo.org/~phreak/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="bootstrap build static"
+
+# This version of baselayout needs gawk 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=">=sys-apps/sysvinit-2.86-r3
+	!build? ( !bootstrap? (
+		>=sys-libs/readline-5.0-r1
+		>=app-shells/bash-3.1_p7
+		>=sys-apps/coreutils-5.2.1
+	) )"
+DEPEND="virtual/os-headers
+	>=sys-apps/portage-2.0.51"
+PROVIDE="virtual/baselayout"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Use correct path to filefuncs.so on multilib systems
+	sed -i -e "s:/lib/rcscripts:/$(get_libdir)/rcscripts:" \
+		${S}/src/awk/{cachedepends,genenviron}.awk || die
+}
+
+src_compile() {
+	local libdir="lib"
+
+	use static && append-ldflags -static
+
+	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+
+	make -C "${S}"/src \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC) ${LDFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		LIBDIR="${libdir}" || die
+}
+
+# This is a temporary workaround until bug 9849 is completely solved
+# in portage.  We need to create the directories so they're available
+# during src_install, but when src_install is finished, call unkdir
+# to remove any empty directories instead of leaving them around.
+kdir() {
+	typeset -a args
+	typeset d
+
+	# Create the directories for the remainder of src_install, and
+	# remember how to create the directories later.
+	for d in "$@"; do
+		if [[ $d == /* ]]; then
+			install -d "${args[@]}" "${D}/${d}"
+			cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF
+install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
+	|| ewarn "  can't create ${d}"
+touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
+	|| ewarn "  can't create ${d}/.keep"
+EOF
+		else
+			args=("${args[@]}" "${d}")
+		fi
+	done
+}
+
+# Continued from kdir above...  This function removes any empty
+# directories as a temporary workaround for bug 9849.  The directories
+# (and .keep files) are re-created in pkg_postinst, which means they
+# aren't listed in CONTENTS, unfortunately.
+unkdir() {
+	einfo "Running unkdir to workaround bug 9849"
+	find "${D}" -depth -type d -exec rmdir {} \; 2>/dev/null
+	if [[ $? == 127 ]]; then
+		ewarn "Problem running unkdir: find command not found"
+	fi
+}
+
+# Same as kdir above, but for symlinks #103618
+ksym() {
+	echo "ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn '  unable to symlink $2 to $1' " \
+		>> "${D}"/usr/share/baselayout/mklinks.sh
+}
+
+src_install() {
+	local dir libdirs libdirs_env rcscripts_dir
+
+	# This directory is to stash away things that will be used in
+	# pkg_postinst; it's needed first for kdir to function
+	dodir /usr/share/baselayout
+
+	# Jeremy Huddleston <eradicator@gentoo.org>
+	# For multilib, we want to make sure that all our multilibdirs exist
+	# and make lib even if it's not listed as one (like on amd64/ppc64
+	# which sometimes has lib32/lib64 instead of lib/lib64).
+	# lib should NOT be a symlink to one of the other libdirs.
+	# Old systems with symlinks won't be affected by this change, as the
+	# symlinks already exist and won't get removed, but new systems will
+	# be setup properly.
+	#
+	# I'll be making a script to convert existing systems from symlink to
+	# nosymlink and putting it in /usr/portage/scripts.
+	libdirs=$(get_all_libdirs)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	# This should be /lib/rcscripts, but we have to support old profiles too.
+	# <hollow@gentoo.org> We don't support old things anyway
+	rcscripts_dir="/lib/rcscripts"
+
+	einfo "Creating directories..."
+	kdir /usr
+	kdir /usr/local
+	kdir /dev
+	kdir /dev/pts
+	kdir /etc/conf.d
+	kdir /etc/cron.daily
+	kdir /etc/cron.hourly
+	kdir /etc/cron.monthly
+	kdir /etc/cron.weekly
+	kdir /etc/env.d
+	dodir /etc/init.d			# .keep file might mess up init.d stuff
+	kdir /etc/opt
+	kdir /home
+	kdir ${rcscripts_dir}
+	kdir ${rcscripts_dir}/awk
+	kdir ${rcscripts_dir}/sh
+	kdir /opt
+	kdir -o root -g uucp -m0775 /var/lock
+	kdir /proc
+	kdir -m 0700 /root
+	kdir /sbin
+	kdir /usr/bin
+	kdir /usr/include
+	kdir /usr/include/asm
+	kdir /usr/include/linux
+	kdir /usr/local/bin
+	kdir /usr/local/games
+	kdir /usr/local/sbin
+	kdir /usr/local/share
+	kdir /usr/local/share/doc
+	kdir /usr/local/share/man
+	kdir /usr/local/src
+	kdir ${PORTDIR}
+	kdir /usr/sbin
+	kdir /usr/share/doc
+	kdir /usr/share/info
+	kdir /usr/share/man
+	kdir /usr/share/misc
+	kdir /usr/src
+	kdir -m 1777 /tmp
+	kdir /var
+	dodir /var/db/pkg			# .keep file messes up Portage
+	kdir /var/lib/misc
+	kdir /var/lock/subsys
+	kdir /var/log/news
+	kdir /var/run
+	kdir /var/spool
+	kdir /var/state
+	kdir -m 1777 /var/tmp
+
+	for dir in ${libdirs}; do
+		libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
+		[[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue
+		kdir /${dir}
+		kdir /usr/${dir}
+		kdir /usr/local/${dir}
+	done
+
+	# FHS compatibility symlinks stuff
+	ksym /var/tmp /usr/tmp
+	ksym share/man /usr/local/man
+
+	#
+	# Setup files in /etc
+	#
+	insopts -m0644
+	insinto /etc
+	doins -r "${S}"/etc/*
+
+	# Install some files to /usr/share/baselayout instead of /etc to keep from
+	# (1) overwriting the user's settings, (2) screwing things up when
+	# attempting to merge files, (3) accidentally packaging up personal files
+	# with quickpkg
+	fperms 0600 /etc/shadow
+	mv "${D}"/etc/{passwd,shadow,group,hosts} "${D}"/usr/share/baselayout
+
+	# doinitd doesnt respect symlinks
+	dodir /etc/init.d
+	cp -P "${S}"/init.d/* "${D}"/etc/init.d/ || die "doinitd"
+	#doinitd "${S}"/init.d/* || die "doinitd"
+	doconfd "${S}"/etc/conf.d/* || die "doconfd"
+	doenvd "${S}"/etc/env.d/* || die "doenvd"
+
+	# 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
+		echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib
+	fi
+
+	# As of baselayout-1.10-1-r1, sysvinit is its own package again, and
+	# provides the inittab itself
+	# <hollow@gentoo.org> We provide our own though...
+	#rm -f "${D}"/etc/inittab
+
+	# Stash the rc-lists for use during pkg_postinst
+	cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System version ${PV}" > ${D}/etc/gentoo-release
+
+	#
+	# Setup files related to /dev
+	#
+	into /
+	dosbin "${S}"/sbin/MAKEDEV
+	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
+	dosym ../sbin/MAKEDEV /dev/MAKEDEV
+
+	#
+	# Setup files in /bin
+	#
+	cd "${S}"/bin
+	dobin rc-status
+
+	#
+	# Setup files in /sbin
+	#
+	cd "${S}"/sbin
+	into /
+	dosbin rc rc-update
+	# These moved from /etc/init.d/ to /sbin to help newb systems
+	# from breaking
+	dosbin runscript.sh functions.sh
+
+	# Compat symlinks between /etc/init.d and /sbin
+	# (some stuff have hardcoded paths)
+	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
+	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
+	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
+
+	#
+	# Setup files in /lib/rcscripts
+	# These are support files for other things in baselayout that needn't be
+	# under CONFIG_PROTECTed /etc
+	#
+	cd "${S}"/sbin
+	exeinto ${rcscripts_dir}/sh
+	doexe rc-services.sh rc-daemon.sh rc-help.sh
+
+	# We can only install new, fast awk versions of scripts
+	# if 'build' or 'bootstrap' is not in USE.  This will
+	# change if we have sys-apps/gawk-3.1.1-r1 or later in
+	# the build image ...
+	if ! use build; then
+		# This is for new depscan.sh and env-update.sh
+		# written in awk
+		cd "${S}"/sbin
+		into /
+		dosbin depscan.sh
+		dosbin env-update.sh
+		insinto ${rcscripts_dir}/awk
+		doins "${S}"/src/awk/*.awk
+	fi
+
+	#
+	# Install baselayout documentation
+	#
+	if ! use build ; then
+		doman "${S}"/man/*.*
+		docinto /
+		dodoc ${FILESDIR}/copyright
+		dodoc "${S}"/ChangeLog
+		dodoc "${S}"/ChangeLog.vserver
+	fi
+
+	#
+	# Install baselayout utilities
+	#
+	cd "${S}"/src
+	make DESTDIR="${D}" install || die
+
+	# Normal baselayout does this in pkg_postinst, but we keep it here because
+	# (1) devices will show up in CONTENTS
+	# (2) we just create devices if either build or bootstrap is ins USE
+	# (3) it is not likely that anyone uses devfsd or udev inside a vserver
+	#
+	# However the most common cases are that people are either updating
+	# baselayout or installing from scratch.  In both cases there is no difference
+	# to pkg_postinst as we only create devices when build or bootstrap is in USE.
+	if use build || use bootstrap; then
+		cd ${D}/dev || die
+		ebegin "Populating /dev with safe device nodes..."
+		./MAKEDEV generic-vserver
+		eend $? || die
+	fi
+
+	# Hack to fix bug 9849, continued in pkg_postinst
+	unkdir
+}
+
+pkg_postinst() {
+	local x y
+
+	# Reincarnate dirs from kdir/unkdir (hack for bug 9849)
+	einfo "Creating directories and .keep files."
+	einfo "Some of these might fail if they're read-only mounted"
+	einfo "filesystems, for example /dev or /proc.  That's okay!"
+	source "${ROOT}"/usr/share/baselayout/mkdirs.sh
+	source "${ROOT}"/usr/share/baselayout/mklinks.sh
+
+	# Set up default runlevel symlinks
+	# This used to be done in src_install but required knowledge of ${ROOT},
+	# which meant that it was effectively broken for binary installs.
+	if [[ -z $(/bin/ls "${ROOT}"/etc/runlevels 2>/dev/null) ]]; then
+		for x in boot default; do
+			einfo "Creating default runlevel symlinks for ${x}"
+			mkdir -p "${ROOT}"/etc/runlevels/${x}
+			for y in $(<"${ROOT}"/usr/share/baselayout/rc-lists/${x}); do
+				if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then
+					ewarn "init.d/${y} not found -- ignoring"
+				else
+					ln -sfn /etc/init.d/${y} \
+						"${ROOT}"/etc/runlevels/${x}/${y}
+				fi
+			done
+		done
+	fi
+
+	# Create /etc/hosts in pkg_postinst so we don't overwrite an
+	# existing file during bootstrap
+	if [[ ! -e ${ROOT}/etc/hosts ]]; then
+		cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
+	fi
+
+	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
+	# new users do not update them properly...  see src_install() for why they
+	# are in /usr/share/baselayout/
+	for x in passwd shadow group ; do
+		if [[ -e ${ROOT}/etc/${x} ]] ; then
+			touch "${ROOT}/etc/${x}"
+		else
+			cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}"
+		fi
+	done
+
+	# Under what circumstances would mtab be a symlink?  It would be
+	# nice if there were an explanatory comment here
+	if [[ -L ${ROOT}/etc/mtab ]]; then
+		rm -f "${ROOT}/etc/mtab"
+		if [[ ${ROOT} == / ]]; then
+			cp /proc/mounts "${ROOT}/etc/mtab"
+		else
+			touch "${ROOT}/etc/mtab"
+		fi
+	fi
+
+	# We should only install empty files if these files don't already exist.
+	[[ -e ${ROOT}/var/log/lastlog ]] || \
+		touch "${ROOT}/var/log/lastlog"
+	[[ -e ${ROOT}/var/run/utmp ]] || \
+		install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
+	[[ -e ${ROOT}/var/log/wtmp ]] || \
+		install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
+
+	# Reload init to fix unmounting problems of / on next reboot.
+	# This is really needed, as without the new version of init cause init
+	# not to quit properly on reboot, and causes a fsck of / on next reboot.
+	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
+		# Regenerate init.d dependency tree
+		/sbin/depscan.sh &>/dev/null
+	fi
+
+	# Enable shadow groups (we need ROOT=/ here, as grpconv only
+	# operate on / ...).
+	if [[ ${ROOT} == / && \
+	     ! -f /etc/gshadow && -x /usr/sbin/grpck && -x /usr/sbin/grpconv ]]
+	then
+		if /usr/sbin/grpck -r &>/dev/null; then
+			/usr/sbin/grpconv
+		else
+			echo
+			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+			echo
+		fi
+	fi
+
+	# This is also written in src_install (so it's in CONTENTS), but
+	# write it here so that the new version is immediately in the file
+	# (without waiting for the user to do etc-update)
+	rm -f ${ROOT}/etc/._cfg????_gentoo-release
+	echo "Gentoo Base System version ${PV}" > ${ROOT}/etc/gentoo-release
+
+	echo
+	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
+	einfo "else things might break at your next reboot!  You can use 'etc-update'"
+	einfo "to accomplish this:"
+	einfo
+	einfo "  # etc-update"
+	echo
+}
diff --git a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre16 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre16
new file mode 100644
index 000000000000..c8553d4ff2eb
--- /dev/null
+++ b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre16
@@ -0,0 +1,3 @@
+MD5 65a5112191606b6576ea5d0c5c77a8c1 baselayout-vserver-1.12.0_pre16.tar.bz2 199185
+RMD160 1d88e6e75a92e7d0a96a64db4be91f015a632889 baselayout-vserver-1.12.0_pre16.tar.bz2 199185
+SHA256 7cf216c33888c1bc43014195635aa6b0f75824a656bc83616b7d4999c1d4a62f baselayout-vserver-1.12.0_pre16.tar.bz2 199185