Add fixes for dhclient #130670 thanks to Petr Svoboda.

  Fix frequency parsing and add channel parsing to iwconfig, partially #143698.
(Portage version: 2.1.1_pre5)

6 files changed, 809 insertions, 4 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index dba6768fb4f2..632a35e9c1ac 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,18 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.338 2006/08/11 15:51:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.339 2006/08/13 23:15:32 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+*baselayout-1.12.4-r3 (13 Aug 2006)
+
+  13 Aug 2006; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.12.4-dhcp.patch,
+  +files/baselayout-1.12.4-madwifi.patch, +baselayout-1.12.4-r3.ebuild:
+  Add fixes for dhclient #130670 thanks to Petr Svoboda.
+  Fix frequency parsing and add channel parsing to iwconfig, partially #143698.
+
   11 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   baselayout-1.12.1.ebuild, baselayout-1.12.4-r2.ebuild:
   Stable on alpha/amd64/hppa/ia64/mips/ppc/ppc64/sparc/x86 wrt bug #143583.
diff --git a/sys-apps/baselayout/baselayout-1.12.4-r3.ebuild b/sys-apps/baselayout/baselayout-1.12.4-r3.ebuild
new file mode 100644
index 000000000000..c173043138d5
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-1.12.4-r3.ebuild
@@ -0,0 +1,618 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.4-r3.ebuild,v 1.1 2006/08/13 23:15:32 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 x86"
+IUSE="bootstrap build static unicode"
+
+# 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}"
+
+	epatch "${FILESDIR}/${P}-bootchart.patch"
+	epatch "${FILESDIR}/${P}-clock-bootmisc.patch"
+	epatch "${FILESDIR}/${P}-dhcp.patch"
+	epatch "${FILESDIR}/${P}-madwifi.patch"
+
+	# Setup unicode defaults for silly unicode users
+	if use unicode ; then
+		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
+	fi
+
+	# Tweak arch-specific details
+	cd "${S}"
+
+	case $(tc-arch) in
+	sparc)
+		sed -i -e '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die
+		# Disable interactive boot on sparc due to stty calls, #104067
+		sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
+		;;
+	esac
+
+	# 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
+}
+
+# ${PATH} should include where to get MAKEDEV when calling this
+# function
+create_dev_nodes() {
+	case $(tc-arch) in
+		# amd64 must use generic-i386 because amd64/x86_64 does not have
+		# a generic option at this time, and the default 'generic' ends
+		# up erroring out, because MAKEDEV internally doesn't know what
+		# to use
+		arm*)    suffix=-arm ;;
+		alpha)   suffix=-alpha ;;
+		amd64)   suffix=-i386 ;;
+		hppa)    suffix=-hppa ;;
+		ia64)    suffix=-ia64 ;;
+		m68k)    suffix=-m68k ;;
+		mips*)   suffix=-mips ;;
+		ppc*)    suffix=-powerpc ;;
+		s390*)   suffix=-s390 ;;
+		sh*)     suffix=-sh ;;
+		sparc*)  suffix=-sparc ;;
+		x86)     suffix=-i386 ;;
+	esac
+
+	einfo "Using generic${suffix} to make $(tc-arch) device nodes..."
+	MAKEDEV generic${suffix}
+	MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
+}
+
+# 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
+if [ ! -d "\${ROOT}/${d}" ] ; then \\
+	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"
+fi
+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 "[[ ! -e ${ROOT}/$2 ]] && { 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.
+	if [[ ${SYMLINK_LIB} == "yes" ]]; then
+		rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts"
+	else
+		rcscripts_dir="/lib/rcscripts"
+	fi
+
+	einfo "Creating directories..."
+	kdir /usr
+	kdir /usr/local
+	kdir /boot
+	kdir /dev
+	kdir /dev/pts
+	kdir /dev/shm
+	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/modules.autoload.d
+	kdir /etc/modules.d
+	kdir /etc/opt
+	kdir /home
+	kdir ${rcscripts_dir}
+	kdir ${rcscripts_dir}/awk
+	kdir ${rcscripts_dir}/sh
+	kdir ${rcscripts_dir}/net
+	# Only install /mnt stuff at bootstrap time #88835 / #90022
+	if use build ; then
+		kdir /mnt
+		kdir -m 0700 /mnt/cdrom
+		kdir -m 0700 /mnt/floppy
+	fi
+	kdir /opt
+	kdir -o root -g uucp -m0775 /var/lock
+	kdir /proc
+	kdir -m 0700 /root
+	kdir /sbin
+	kdir /sys	# for 2.6 kernels
+	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
+
+	# Ugly compatibility with stupid ebuilds and old profiles symlinks
+	if [[ ${SYMLINK_LIB} == "yes" ]] ; then
+		rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
+	fi
+
+	kdir /$(get_libdir)/dev-state
+	kdir /$(get_libdir)/udev-state
+
+	# 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/*
+	fperms 0640 /etc/sysctl.conf
+
+	# 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,fstab,hosts,issue.devfix} "${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"
+	insinto /etc/modules.autoload.d
+	doins "${S}"/etc/modules.autoload.d/*
+	insinto /etc/modules.d
+	doins "${S}"/etc/modules.d/*
+
+	# 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 /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
+		libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
+	fi
+
+	# 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
+	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
+	# Need this in /sbin, as it could be run before
+	# /usr is mounted.
+	dosbin modules-update
+	# Compat symlinks until I can get things synced.
+	dosym modules-update /sbin/update-modules
+	dosym ../../sbin/modules-update /usr/sbin/update-modules
+	# 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
+
+	# Original design had these in /etc/net.modules.d but that is too
+	# problematic with CONFIG_PROTECT
+	dodir ${rcscripts_dir}
+	cp -pPR "${S}"/lib/rcscripts/net ${D}${rcscripts_dir}
+	chown -R root:0 ${D}${rcscripts_dir}
+
+	#
+	# Install baselayout documentation
+	#
+	if ! use build ; then
+		doman "${S}"/man/*.*
+		docinto /
+		dodoc ${FILESDIR}/copyright
+		dodoc "${S}"/ChangeLog
+	fi
+
+	#
+	# Install baselayout utilities
+	#
+	local libdir="lib"
+	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+
+	cd "${S}"/src
+	make DESTDIR="${D}" LIBDIR="${libdir}" install || die
+
+	# Hack to fix bug 9849, continued in pkg_postinst
+	unkdir
+}
+
+# Support function for remapping old wireless dns vars
+remap_dns_vars() {
+	local f="$1"
+
+	if [[ -f ${ROOT}/etc/conf.d/${f} ]]; 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/${f} > ${IMAGE}/etc/conf.d/${f}
+	fi
+}
+
+pkg_preinst() {
+	if [[ -f ${ROOT}/etc/modules.autoload && \
+			! -d ${ROOT}/etc/modules.autoload.d ]]; then
+		mkdir -p ${ROOT}/etc/modules.autoload.d
+		mv -f ${ROOT}/etc/modules.autoload \
+			${ROOT}/etc/modules.autoload.d/kernel-2.4
+		ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
+	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
+}
+
+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
+	echo
+
+	# This could be done in src_install, which would have the benefit of
+	# (1) devices.tar.bz2 would show up in CONTENTS
+	# (2) binary installations would be faster... just untar the devices tarball
+	#     instead of needing to run MAKEDEV
+	# However the most common cases are that people are either updating
+	# baselayout or installing from scratch.  In the installation case, it's no
+	# different to have here instead of src_install.  In the update case, we
+	# save a couple minutes time by refraining from building the unnecessary
+	# tarball.
+	if [[ ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]]; then
+		# Create a directory in which to work
+		x=$(emktemp -d ${ROOT}/tmp/devnodes.XXXXXXXXX) \
+			&& cd "${x}" || die 'mktemp failed'
+
+		# Create temp device nodes
+		echo
+		einfo "Making device node tarball (this could take a couple minutes)"
+		PATH=${ROOT}/sbin:${PATH} create_dev_nodes
+
+		# Now create tarball that can also be used for udev.
+		# Need GNU tar for -j so call it by absolute path.
+		/bin/tar --one-file-system -cjpf "${ROOT}/lib/udev-state/devices.tar.bz2" *
+		rm -r *
+		cd ..
+		rmdir "${x}"
+	fi
+
+	# We don't want to create devices if this is not a bootstrap and devfs
+	# is used, as this was the cause for all the devfs problems we had
+	if use build || use bootstrap; then
+		if [[ ! -e "${ROOT}/dev/.devfsd" && ! -e "${ROOT}/dev/.udev" ]]; then
+			einfo "Populating /dev with device nodes..."
+			cd ${ROOT}/dev || die
+			tar xjpf "${ROOT}/lib/udev-state/devices.tar.bz2" || die
+		fi
+	fi
+
+	# Create /boot/boot symlink in pkg_postinst because sometimes
+	# /boot is a FAT filesystem.  When that is the case, then the
+	# symlink will fail.  Consequently, if we create it in
+	# src_install, then merge will fail.  AFAIK there is no point to
+	# this symlink except for misconfigured grubs.  See bug 50108
+	# (05 May 2004 agriffis)
+	ln -sn . "${ROOT}"/boot/boot 2>/dev/null
+
+	# 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 nonetwork single; 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 fstab ; 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 --update &>/dev/null
+
+		# Regenerate /etc/modules.conf, else it will fail at next boot
+		einfo "Updating module dependencies..."
+		/sbin/modules-update force &>/dev/null
+	else
+		rm -f ${ROOT}/etc/modules.conf
+	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
+
+	for f in /etc/init.d/net.eth*; do
+		[[ -L ${f} ]] && continue
+		echo
+		einfo "WARNING: You have older net.eth* files in ${ROOT}/etc/init.d/"
+		einfo "They need to be converted to symlinks to net.lo.  If you haven't"
+		einfo "made personal changes to those files, you can update with the"
+		einfo "following command:"
+		einfo
+		einfo "  # /bin/ls /etc/init.d/net.eth* | xargs -n1 ln -sfvn net.lo"
+		echo
+		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'"
+			echo
+	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."
+			echo
+	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/init.d/domainname
+		rm -f "${ROOT}"/etc/runlevels/*/domainname
+		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
+}
diff --git a/sys-apps/baselayout/files/baselayout-1.12.4-dhcp.patch b/sys-apps/baselayout/files/baselayout-1.12.4-dhcp.patch
new file mode 100644
index 000000000000..e7c3efa6d11d
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-1.12.4-dhcp.patch
@@ -0,0 +1,44 @@
+Index: lib/rcscripts/net/dhcpcd.sh
+===================================================================
+--- lib/rcscripts/net/dhcpcd.sh	(revision 2184)
++++ lib/rcscripts/net/dhcpcd.sh	(working copy)
+@@ -23,15 +23,7 @@
+ #
+ # Returns 1 if dhcpcd is installed, otherwise 0
+ dhcpcd_check_installed() {
+-	if [[ -x /sbin/dhcpcd ]]; then
+-		if dhcpcd -h 2>&1 | grep -q "etcDir" ; then
+-			return 0
+-		else
+-			${1:-false} && eerror "We require dhcpcd-2.0.0 or newer"
+-			return 1
+-		fi
+-	fi
+-
++	[[ -x /sbin/dhcpcd ]] && return 0
+ 	${1:-false} && eerror "For DHCP (dhcpcd) support, emerge net-misc/dhcpcd"
+ 	return 1
+ }
+@@ -93,9 +85,6 @@
+ 			&& opts="-h \"${hname}\" ${opts}"
+ 	fi
+ 
+-	# Stop dhcpcd from bringing the interface down when we exit
+-	opts="${opts} -o"
+-
+ 	# Add our route metric
+ 	metric="metric_${ifvar}"
+ 	[[ -n ${!metric} && ${!metric} != "0" ]] && opts="${opts} -m ${!metric}"
+Index: lib/rcscripts/net/dhclient.sh
+===================================================================
+--- lib/rcscripts/net/dhclient.sh	(revision 2184)
++++ lib/rcscripts/net/dhclient.sh	(working copy)
+@@ -106,7 +106,7 @@
+ 	# Bring up DHCP for this interface (or alias)
+ 	ebegin "Running dhclient"
+ 	echo -e "${dhconf}" | start-stop-daemon --start --exec /sbin/dhclient \
+-		--pidfile "${pidfile}" -- ${opts} -q -1 -pf "${pidfile}"
++		--pidfile "${pidfile}" -- ${opts} -q -1 -pf "${pidfile}" "${iface}"
+ 	eend $? || return 1 
+ 
+ 	# DHCP succeeded, show address retrieved
diff --git a/sys-apps/baselayout/files/baselayout-1.12.4-madwifi.patch b/sys-apps/baselayout/files/baselayout-1.12.4-madwifi.patch
new file mode 100644
index 000000000000..4b3595a53e1f
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-1.12.4-madwifi.patch
@@ -0,0 +1,132 @@
+Index: lib/rcscripts/net/iwconfig.sh
+===================================================================
+--- lib/rcscripts/net/iwconfig.sh	(revision 2184)
++++ lib/rcscripts/net/iwconfig.sh	(working copy)
+@@ -347,7 +347,7 @@
+ # so we can fail gracefully without even trying to connect
+ iwconfig_associate() {
+ 	local iface="$1" mode="${2:-managed}"
+-	local mac="$3" wep_required="$4" freq="$5" w="(WEP Disabled)"
++	local mac="$3" wep_required="$4" freq="$5" chan="$6" w="(WEP Disabled)"
+ 	local dessid="${ESSID//\\\\/\\\\}" key=
+ 
+ 	iwconfig_set_mode "${iface}" "${mode}"
+@@ -378,7 +378,12 @@
+ 		[[ ${key} != "off" ]] && w=$(iwconfig_get_wep_status "${iface}")
+ 	fi
+ 
+-	[[ -n ${freq} ]] && iwconfig "${iface}" freq "${freq}"
++	# Only use channel or frequency
++	if [[ -n ${chan} ]] ; then
++		iwconfig "${iface}" channel "${chan}"
++	elif [[ -n ${freq} ]] ; then
++		iwconfig "${iface}" freq "${freq}"
++	fi
+ 	[[ -n ${mac} ]] && iwconfig "${iface}" ap "${mac}"
+ 
+ 	if ! iwconfig "${iface}" essid "${ESSID}" ; then
+@@ -453,7 +458,7 @@
+ 	[[ -z ${!x} || ${!x} -gt 0 ]] && sleep "${!x:-1}"
+ 
+ 	local error=true i=-1 line=
+-	local -a mac=() essid=() enc=() qual=() mode=()
++	local -a mac=() essid=() enc=() qual=() mode=() freq=() chan=()
+ 
+ 	while read line; do
+ 		error=false
+@@ -476,7 +481,12 @@
+ 				;;
+ 			*Frequency:*)
+ 				freq[i]="${line#*:}"
++				freq[i]="${freq[i]%% *}"
+ 				;;
++			*Channel:*)
++				chan[i]="${line#*:}"
++				chan[i]="${chan[i]%% *}"
++				;;
+ 			*Quality*)
+ 				qual[i]="${line#*:}"
+ 				qual[i]="${qual[i]%/*}"
+@@ -533,6 +543,7 @@
+ 				unset mode[y]
+ 				unset enc[y]
+ 				unset freq[y]
++				unset chan[y]
+ 			fi
+ 		done
+ 	done
+@@ -542,6 +553,7 @@
+ 	mode=( "${mode[@]}" )
+ 	enc=( "${enc[@]}" )
+ 	freq=( "${freq[@]}" )
++	chan=( "${chan[@]}" )
+ 
+ 	for (( i=0; i<${#mac[@]}; i++ )); do
+ 		# Don't like ad-hoc nodes by default
+@@ -557,6 +569,7 @@
+ 		mode_APs[i]="${mode[${sortline[x]}]}"
+ 		enc_APs[i]="${enc[${sortline[x]}]}"
+ 		freq_APs[i]="${freq[${sortline[x]}]}"
++		chan_APs[i]="${chan[${sortline[x]}]}"
+ 	done
+ 
+ 	return 0
+@@ -629,6 +642,7 @@
+ 		unset mac_APs[i]
+ 		unset enc_APs[i]
+ 		unset freq_APs[i]
++		unset chan_APs[i]
+ 	done
+ 
+ 	# We need to squash our arrays so indexes work again
+@@ -637,6 +651,7 @@
+ 	mac_APs=( "${mac_APs[@]}" )
+ 	enc_APs=( "${enc_APs[@]}" )
+ 	freq_APs=( "${freq_APs[@]}" )
++	chan_APs=( "${chan_APs[@]}" )
+ }
+ 
+ # bool iwconfig_force_preferred(char *iface)
+@@ -679,7 +694,7 @@
+ 			if [[ ${essid} == "${essid_APs[i]}" ]]; then
+ 				ESSID="${essid}"
+ 				iwconfig_associate "${iface}" "${mode_APs[i]}" "${mac_APs[i]}" \
+-					"${enc_APs[i]}" "${freq_APs[i]}" && return 0
++					"${enc_APs[i]}" "${freq_APs[i]}" "${chan_APs[i]}" && return 0
+ 				break
+ 			fi
+ 		done
+@@ -706,7 +721,7 @@
+ 		if ! ${has_preferred} ; then
+ 			ESSID="${essid_APs[i]}"
+ 			iwconfig_associate "${iface}" "${mode_APs[i]}" "${mac_APs[i]}" \
+-				"${enc_APs[i]}" "${freq_APs[i]}" && return 0
++				"${enc_APs[i]}" "${freq_APs[i]}" "${chan_APs[i]}" && return 0
+ 		fi
+ 	done
+ 
+@@ -751,12 +766,14 @@
+ 				unset mac_APs[j]
+ 				unset enc_APs[j]
+ 				unset freq_APs[j]
++				unset chan_APs[j]
+ 				# We need to squash our arrays so that indexes work
+ 				essid_APs=( "${essid_APs[@]}" )
+ 				mode_APs=( "${mode_APs[@]}" )
+ 				mac_APs=( "${mac_APs[@]}" )
+ 				enc_APs=( "${enc_APs[@]}" )
+ 				freq_APs=( "${freq_APs[@]}" )
++				chan_APs=( "${chan_APs[@]}" )
+ 				break
+ 			fi
+ 		done
+@@ -780,7 +797,8 @@
+ # variables for the ESSID
+ iwconfig_configure() {
+ 	local iface="$1" e= x= ifvar=$(bash_variable "$1")
+-	local -a essid_APs=() mac_APs=() mode_APs=() enc_APs=() freq_APs=()
++	local -a essid_APs=() mac_APs=() mode_APs=()
++	local -a enc_APs=() freq_APs=() chan_APs=()
+ 
+ 	ESSID="essid_${ifvar}"
+ 	ESSID="${!ESSID}"
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.1 b/sys-apps/baselayout/files/digest-baselayout-1.12.1
index a84e8c27e3e3..80e34bba3fee 100644
--- a/sys-apps/baselayout/files/digest-baselayout-1.12.1
+++ b/sys-apps/baselayout/files/digest-baselayout-1.12.1
@@ -1,3 +1,3 @@
-MD5 b7b750362e4f67209604620f321bc546 baselayout-1.12.1.tar.bz2 217878
-RMD160 bf29b30435c1a82f693472f2b011d6bf74b9194c baselayout-1.12.1.tar.bz2 217878
-SHA256 63bb66086aab5bd94068dda7b571f9dbb59cf0cbbeb563b418780690614cb75c baselayout-1.12.1.tar.bz2 217878
+MD5 f9f6b189e7e0c30f49ca643a4b5c4846 baselayout-1.12.1.tar.bz2 217006
+RMD160 28b8ab53428dbde1f928f0bb1c796738fdf9b3fb baselayout-1.12.1.tar.bz2 217006
+SHA256 750a7d5b36175acbde212cc6068502f4f9586068ec7bffb69a4653f729f415b2 baselayout-1.12.1.tar.bz2 217006
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.4-r3 b/sys-apps/baselayout/files/digest-baselayout-1.12.4-r3
new file mode 100644
index 000000000000..f91a25b99a66
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-1.12.4-r3
@@ -0,0 +1,3 @@
+MD5 a417e02c148e8c63b60a2df0e11996c0 baselayout-1.12.4.tar.bz2 216448
+RMD160 125e0b8c0f02266fa72ce95d4d3ba93311871d57 baselayout-1.12.4.tar.bz2 216448
+SHA256 f09ae36d84ff7f52baf44494dedafcb26a1cbb4e5a0f9ba5ef5f553bc21373da baselayout-1.12.4.tar.bz2 216448