summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2007-12-28 11:09:08 +0000
committerBenedikt Boehm <hollow@gentoo.org>2007-12-28 11:09:08 +0000
commitba64e42ad9d896daabfe89a0b7a5e0fa70e7d5cc (patch)
treeec0c6739c19de66d6b04186add366f5144ee052e /sys-apps
parentTemp. mask until I get all of CM+plugins in the tree. (diff)
downloadhistorical-ba64e42ad9d896daabfe89a0b7a5e0fa70e7d5cc.tar.gz
historical-ba64e42ad9d896daabfe89a0b7a5e0fa70e7d5cc.tar.bz2
historical-ba64e42ad9d896daabfe89a0b7a5e0fa70e7d5cc.zip
fix #199749
Package-Manager: portage-2.1.4_rc11
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/baselayout/ChangeLog9
-rw-r--r--sys-apps/baselayout/Manifest29
-rw-r--r--sys-apps/baselayout/baselayout-2.0.0_rc6-r1.ebuild251
-rw-r--r--sys-apps/baselayout/files/baselayout-2.0.0_rc6-ssd-path.patch33
-rw-r--r--sys-apps/baselayout/files/digest-baselayout-2.0.0_rc6-r13
5 files changed, 320 insertions, 5 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 0d73f4ba115f..5466dee3b3d0 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.448 2007/12/24 16:40:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.449 2007/12/28 11:09:07 hollow 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-r1 (28 Dec 2007)
+
+ 28 Dec 2007; Benedikt Böhm <hollow@gentoo.org>
+ +files/baselayout-2.0.0_rc6-ssd-path.patch,
+ +baselayout-2.0.0_rc6-r1.ebuild:
+ fix #199749
+
24 Dec 2007; Brent Baude <ranger@gentoo.org> baselayout-1.12.10-r5.ebuild:
Marking baselayout-1.12.10-r5 ppc64 for bug 202791
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index b37fe589cebd..44a4a3c70266 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -22,6 +25,10 @@ AUX baselayout-2.0.0_rc4-ssd.patch 406 RMD160 07a26ed885ed730c8db792fa85ebba4df9
MD5 3a0a911bb3a710df539bac156ab37237 files/baselayout-2.0.0_rc4-ssd.patch 406
RMD160 07a26ed885ed730c8db792fa85ebba4df95580ad files/baselayout-2.0.0_rc4-ssd.patch 406
SHA256 4ad8872c2f54b834fb17f08eb71dfddd44ab4005f0fb7f59d97d822f35bfafa5 files/baselayout-2.0.0_rc4-ssd.patch 406
+AUX baselayout-2.0.0_rc6-ssd-path.patch 1049 RMD160 9506a0052d7e448dd4a279ce234181e63d9362c7 SHA1 c05dfa997bdd3d34a59f838ba0f1b1bbfe435af7 SHA256 6746ab2e7a4a369643f9f4b6e42902a0b7a798ea1de153a68c92dc108f0e7ee5
+MD5 fdd91ff03166ad9277b6f11da944fc94 files/baselayout-2.0.0_rc6-ssd-path.patch 1049
+RMD160 9506a0052d7e448dd4a279ce234181e63d9362c7 files/baselayout-2.0.0_rc6-ssd-path.patch 1049
+SHA256 6746ab2e7a4a369643f9f4b6e42902a0b7a798ea1de153a68c92dc108f0e7ee5 files/baselayout-2.0.0_rc6-ssd-path.patch 1049
AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783cc637392429ba2f63d321873fa1526ee SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd
MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099
@@ -59,14 +66,18 @@ EBUILD baselayout-2.0.0_rc4.ebuild 9435 RMD160 615f34d09138fcbb1394362615f5ecaf2
MD5 5a89b33004dd70747f51e4e621a2b801 baselayout-2.0.0_rc4.ebuild 9435
RMD160 615f34d09138fcbb1394362615f5ecaf2fc63f04 baselayout-2.0.0_rc4.ebuild 9435
SHA256 520234906a502a1364c819eb9e48b141e92a11ce1a0e9b745aff8a6ab41c688d baselayout-2.0.0_rc4.ebuild 9435
+EBUILD baselayout-2.0.0_rc6-r1.ebuild 8640 RMD160 2d31797d40791c21bcec068134c9eb13203b4911 SHA1 16c6eef3fb06d9cac6d5821a3381aa66aeb33a27 SHA256 9241532897276134f2111ce48201abc3d4c153302f24a35c5c05141f5daf30ef
+MD5 a685fbe7b65ba564ad5c2944696c3e08 baselayout-2.0.0_rc6-r1.ebuild 8640
+RMD160 2d31797d40791c21bcec068134c9eb13203b4911 baselayout-2.0.0_rc6-r1.ebuild 8640
+SHA256 9241532897276134f2111ce48201abc3d4c153302f24a35c5c05141f5daf30ef baselayout-2.0.0_rc6-r1.ebuild 8640
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 98222 RMD160 040f2e52bfb0aa827882508978b0e98ab63b9d83 SHA1 9d1409fc470e3e8c8fedca069cc3549136183179 SHA256 fbe493b88dfcad2639d030b16b05bcece58f72c65a1285c2c9bc229caa11f0a1
-MD5 cc9cea98a59dc5eeb9044ad1fcee6b68 ChangeLog 98222
-RMD160 040f2e52bfb0aa827882508978b0e98ab63b9d83 ChangeLog 98222
-SHA256 fbe493b88dfcad2639d030b16b05bcece58f72c65a1285c2c9bc229caa11f0a1 ChangeLog 98222
+MISC ChangeLog 98408 RMD160 9eb2c4452b56fb34136e04be4a17a76aa3485848 SHA1 64096808c4bbe5421094036ce8e740b315635c3f SHA256 f4ae3dd3e33b363c9ae9f02e690de369239087982be7dc776bb85952925532ee
+MD5 18a9660e80bd8fb17ca2581e27d9f76b ChangeLog 98408
+RMD160 9eb2c4452b56fb34136e04be4a17a76aa3485848 ChangeLog 98408
+SHA256 f4ae3dd3e33b363c9ae9f02e690de369239087982be7dc776bb85952925532ee ChangeLog 98408
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -95,3 +106,13 @@ SHA256 d7e42ef1e4435ac575689e2fdb8297b6b826db53b560818caec86520cc9912d7 files/di
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
+MD5 3ecc749a95568c9bd7eda0705f12340c files/digest-baselayout-2.0.0_rc6-r1 265
+RMD160 62a548237beb231c76cf662d26c654869740974a files/digest-baselayout-2.0.0_rc6-r1 265
+SHA256 31cac0fef7d8654410bc5fe3ba2b3f165b213cc674ecb76a2513ad6663fc7491 files/digest-baselayout-2.0.0_rc6-r1 265
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHdNldmPFBzbX68WERAtMMAJ0Yy52ezVIhFwR7YY+IPhCGzX6iEQCeIOhA
++V1KbVZk1T1ckON/HXFw2wI=
+=etwd
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout/baselayout-2.0.0_rc6-r1.ebuild b/sys-apps/baselayout/baselayout-2.0.0_rc6-r1.ebuild
new file mode 100644
index 000000000000..881e65f107dd
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.0.0_rc6-r1.ebuild
@@ -0,0 +1,251 @@
+# 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-r1.ebuild,v 1.1 2007/12/28 11:09:07 hollow 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}"
+
+ epatch "${FILESDIR}"/${P}-ssd-path.patch
+
+ # 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/baselayout-2.0.0_rc6-ssd-path.patch b/sys-apps/baselayout/files/baselayout-2.0.0_rc6-ssd-path.patch
new file mode 100644
index 000000000000..0f77c509c784
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-2.0.0_rc6-ssd-path.patch
@@ -0,0 +1,33 @@
+diff --git a/src/start-stop-daemon.c b/src/start-stop-daemon.c
+index 551bad5..31752fb 100644
+--- a/src/start-stop-daemon.c
++++ b/src/start-stop-daemon.c
+@@ -916,6 +916,7 @@ int start_stop_daemon (int argc, char **argv)
+ char *token;
+ char *np;
+ int l;
++ int t;
+
+ p += 5;
+ while ((token = strsep (&p, ":"))) {
+@@ -923,15 +924,17 @@ int start_stop_daemon (int argc, char **argv)
+ strcmp (token, RC_LIBDIR "/sbin") == 0)
+ continue;
+
++ t = strlen (token);
+ if (newpath) {
+ l = strlen (newpath);
+- newpath = xrealloc (newpath, sizeof (char) *
+- (l + strlen (token) + 2));
++ newpath = xrealloc (newpath, sizeof (char) * (l + t + 2));
+ np = newpath + l;
+ *np++ = ':';
+ memcpy (np, token, sizeof (char) * strlen (token));
++ np += t;
++ *np = '\0';
+ } else {
+- l = strlen ("PATH=") + strlen (token) + 1;
++ l = strlen ("PATH=") + t + 1;
+ newpath = xmalloc (sizeof (char) * l);
+ snprintf (newpath, l, "PATH=%s", token);
+ }
diff --git a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc6-r1 b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc6-r1
new file mode 100644
index 000000000000..397ac0a8c460
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc6-r1
@@ -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