From: Christian Heim Date: Mon, 5 Jun 2006 20:19:28 +0000 (+0000) Subject: Another version bump, merging changes from baselayout svn X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=802c4b24185e0142e3c3cfbcdaecaad4c279a093;p=gentoo.git Another version bump, merging changes from baselayout svn Package-Manager: portage-2.1_rc4-r2 --- diff --git a/sys-apps/baselayout-vserver/ChangeLog b/sys-apps/baselayout-vserver/ChangeLog index 38751e49c167..f89ddcc62c76 100644 --- a/sys-apps/baselayout-vserver/ChangeLog +++ b/sys-apps/baselayout-vserver/ChangeLog @@ -1,6 +1,13 @@ # 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.36 2006/05/24 16:37:20 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.37 2006/06/05 20:19:28 phreak Exp $ + +*baselayout-vserver-1.11.15 (05 Jun 2006) +*baselayout-vserver-1.12.1 (05 Jun 2006) + + 05 Jun 2006; Christian Heim + +baselayout-vserver-1.11.15.ebuild, +baselayout-vserver-1.12.1.ebuild: + Another version bump, merging changes from baselayout svn *baselayout-vserver-1.12.0 (24 May 2006) diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest index 009708b6313f..892149462a0a 100644 --- a/sys-apps/baselayout-vserver/Manifest +++ b/sys-apps/baselayout-vserver/Manifest @@ -38,7 +38,9 @@ MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099 SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/copyright 2099 DIST baselayout-vserver-1.12.0.tar.bz2 198921 RMD160 6ee487c9bb5c06c243fd6f92492834821c242710 SHA1 d87d976db04eab10a0b18c676b94931c3f6490a9 SHA256 159b943669338ee122f196f51c121b1d1557187660342ed2c6d6171b1f3eb894 +DIST baselayout-vserver-1.12.1.tar.bz2 200131 RMD160 059dd044f1be59d96499e427a53136f8ef7c30c5 SHA1 cb32fb727aec101e4ecfd6d138ab40eced2d2582 SHA256 0807cc7a84510da6f41e1ca07681d09ce7328977b9ece0f3ce418144cf802c10 DIST rc-scripts-vserver-1.6.14.tar.bz2 142704 RMD160 d4b7002d153116d6bdfb7ae4a1c9828d2f5b2eff SHA1 e238ee8feb4d8bdc4425fba6d2d2b9e0abd9b7f1 SHA256 0c89d5c8ac7fc9d202f20b1494e8e237e37ef11cfa73cc39f5090b2055701406 +DIST rc-scripts-vserver-1.6.15.tar.bz2 145322 RMD160 aed4999dc3f671d391c18069cadd030911c3ee29 SHA1 9739cf3e5d30bb8067de163a228d2ad058727e67 SHA256 2cf8cc9eed778ad48ca15a0ae6562545a85a462a7be37c9ef1bab1ea704f6f86 EBUILD baselayout-vserver-1.11.14-r4.ebuild 15955 RMD160 2da129cdbab3b953b099552d16e68e15b8085f4a SHA1 c997585cdb3270e49ea96bd195f750c3c4805189 SHA256 9b42983666cdf06837bb7ecb53f8bb3b85ab7efc039d23b4974c778e9380384e MD5 6f0c19788c06583d952eb0a384ab105a baselayout-vserver-1.11.14-r4.ebuild 15955 RMD160 2da129cdbab3b953b099552d16e68e15b8085f4a baselayout-vserver-1.11.14-r4.ebuild 15955 @@ -47,14 +49,22 @@ EBUILD baselayout-vserver-1.11.14-r5.ebuild 13726 RMD160 e725ef7f0fd458513edc897 MD5 d9e93a9f8242d01b3d363e3d3adbe5c9 baselayout-vserver-1.11.14-r5.ebuild 13726 RMD160 e725ef7f0fd458513edc897ee84d292d53a36617 baselayout-vserver-1.11.14-r5.ebuild 13726 SHA256 7925681cead66d2d3cf296f02706108e87298abe9c52d4fd117d005630dffe9a baselayout-vserver-1.11.14-r5.ebuild 13726 +EBUILD baselayout-vserver-1.11.15.ebuild 13679 RMD160 1a848ce31b9823f85cd1c4102e54ce7ebb4eca03 SHA1 9ebd3c0aaccbc11abb0b905520be1f6786986fae SHA256 3201a7b99dc187310b8272dc7f5cc4f6947d30f6a9df8bcc4a2542637f646ab5 +MD5 946fd25174e96a23ce04f9734d52f224 baselayout-vserver-1.11.15.ebuild 13679 +RMD160 1a848ce31b9823f85cd1c4102e54ce7ebb4eca03 baselayout-vserver-1.11.15.ebuild 13679 +SHA256 3201a7b99dc187310b8272dc7f5cc4f6947d30f6a9df8bcc4a2542637f646ab5 baselayout-vserver-1.11.15.ebuild 13679 EBUILD baselayout-vserver-1.12.0.ebuild 13540 RMD160 4d5c2104eaab1d74a316ff3c07c61660151cf810 SHA1 67c92ee24903baad161d84dd04d538450573fac7 SHA256 7c30a53ac671169e6fec5f296daf7b14a67bf089066e16a0f604011658207025 MD5 2f6a966452603d89eb4c86fb64162724 baselayout-vserver-1.12.0.ebuild 13540 RMD160 4d5c2104eaab1d74a316ff3c07c61660151cf810 baselayout-vserver-1.12.0.ebuild 13540 SHA256 7c30a53ac671169e6fec5f296daf7b14a67bf089066e16a0f604011658207025 baselayout-vserver-1.12.0.ebuild 13540 -MISC ChangeLog 7819 RMD160 bcff44ae04f0fbd3690f3dc0f4d03a0997ca7a24 SHA1 e7a67b2f195942a2069c2242560bdf8a8c315325 SHA256 fd630e138369ad40f463433d4efd063df8b42210494e7b5b192dc312b117d686 -MD5 058fb9fc580df3cf6bb94072362405e1 ChangeLog 7819 -RMD160 bcff44ae04f0fbd3690f3dc0f4d03a0997ca7a24 ChangeLog 7819 -SHA256 fd630e138369ad40f463433d4efd063df8b42210494e7b5b192dc312b117d686 ChangeLog 7819 +EBUILD baselayout-vserver-1.12.1.ebuild 13540 RMD160 d93997114e69a2d98cb6a24fe8949b724ffbd7cd SHA1 7c0506b1961aa8cfaf56421ff07c0be84e148725 SHA256 e2a3e7d869ca06f2448e9000c6932e97e00e1bbb0aae20b8e42505f6041d83e7 +MD5 fb2f0cbdbc54e587a51940ec8b398730 baselayout-vserver-1.12.1.ebuild 13540 +RMD160 d93997114e69a2d98cb6a24fe8949b724ffbd7cd baselayout-vserver-1.12.1.ebuild 13540 +SHA256 e2a3e7d869ca06f2448e9000c6932e97e00e1bbb0aae20b8e42505f6041d83e7 baselayout-vserver-1.12.1.ebuild 13540 +MISC ChangeLog 8087 RMD160 58f3fc2b4039563fe6055a8d7d7c02ec4ebb35ba SHA1 69d62142a9a32aafc5cb3b69b93c1701a619b241 SHA256 937beac3d2060ce71924eda3cb7857abad68d676e922b5bfcddac826f211e121 +MD5 9e7682ab8aad15e5502ac33ed7a32ee0 ChangeLog 8087 +RMD160 58f3fc2b4039563fe6055a8d7d7c02ec4ebb35ba ChangeLog 8087 +SHA256 937beac3d2060ce71924eda3cb7857abad68d676e922b5bfcddac826f211e121 ChangeLog 8087 MISC metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 SHA1 5e2b3b183660e76e9a8d93b7aeab6ce5857581c1 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231 @@ -65,13 +75,19 @@ SHA256 949e1593b90a62939e3a919166fc7789051f2a760574c3f21e89263dd5e68fe8 files/di MD5 a16bb04391567ba9ce418328ddc53104 files/digest-baselayout-vserver-1.11.14-r5 280 RMD160 1b4837fb57d341c9a7062cd93e73a6febff3be20 files/digest-baselayout-vserver-1.11.14-r5 280 SHA256 949e1593b90a62939e3a919166fc7789051f2a760574c3f21e89263dd5e68fe8 files/digest-baselayout-vserver-1.11.14-r5 280 +MD5 9e9194a9de4ea7bb78cd883f43e23623 files/digest-baselayout-vserver-1.11.15 280 +RMD160 a4be0f08fe70ca4a7fb57d3adb49613bc0d85220 files/digest-baselayout-vserver-1.11.15 280 +SHA256 621d76c71ab73e71eec508884b5ef29ad200ae5d1fb8a54ee366311ffa758cc8 files/digest-baselayout-vserver-1.11.15 280 MD5 dbf5eeab51d2673430071a218c4673ea files/digest-baselayout-vserver-1.12.0 280 RMD160 aa198cd13f3d1bd1295a685f677fae46304f4c0b files/digest-baselayout-vserver-1.12.0 280 SHA256 4ea03fb2bca0b1a077641c7f52f5b3324a684caac22763c6bfbda0e763b3231f files/digest-baselayout-vserver-1.12.0 280 +MD5 d06d4d02ac0ff33dccc8660406a6ba69 files/digest-baselayout-vserver-1.12.1 280 +RMD160 8a4b2b9bf7bec8876cec30d7a87189f27fb98d20 files/digest-baselayout-vserver-1.12.1 280 +SHA256 7feae89922ac9a7eeab0ed8848b35081e144bf1539845b7ef0f5b1e70883699b files/digest-baselayout-vserver-1.12.1 280 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEdKfvflZ8QqxhrsMRAk3LAJ9fiKQrWk7hxAJiZa8X0Hhx74FQVgCeOnPA -urgMtWrK8LzrfB4ag4rSdlU= -=HX2N +iD8DBQFEhK32flZ8QqxhrsMRAkx7AJ4yyNw9oBSpD98coMMilUWjE3Y2hACeLmX8 +aZDrmLWFfKX/kDkgJSwFheo= +=5YV6 -----END PGP SIGNATURE----- diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.15.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.15.ebuild new file mode 100644 index 000000000000..991ce100424f --- /dev/null +++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.15.ebuild @@ -0,0 +1,441 @@ +# 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.11.15.ebuild,v 1.3 2006/06/05 20:19:28 phreak Exp $ + +inherit flag-o-matic eutils toolchain-funcs multilib + +SV=1.6.${PV##*.} + +S="${WORKDIR}/rc-scripts-vserver-${SV}" +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/rc-scripts-vserver-${SV}.tar.bz2 + http://dev.gentoo.org/~phreak/distfiles/rc-scripts-vserver-${SV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +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.0-r10 + >=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}-adsl.patch + epatch "${FILESDIR}"/${P}-essidnet.patch + epatch "${FILESDIR}"/${P}-iwconfig.patch + epatch "${FILESDIR}"/${P}-udhcpc.patch + epatch "${FILESDIR}"/${P}-manuser.patch + epatch "${FILESDIR}"/${P}-iproute.patch + epatch "${FILESDIR}"/${P}-depscan.patch + epatch "${FILESDIR}"/${P}-uniqify.patch +} + +src_compile() { + use static && append-ldflags -static + + make -C "${S}"/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \ + CFLAGS="${CFLAGS}" || 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" </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 "[[ ! -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 + # 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 /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/opt + kdir /home + kdir ${rcscripts_dir} + kdir ${rcscripts_dir}/awk + kdir ${rcscripts_dir}/sh + kdir ${rcscripts_dir}/net.modules.d + kdir ${rcscripts_dir}/net.modules.d/helpers.d + kdir /mnt + 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 + + # 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 + + # 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" + + # 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 + + # 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 ${SV}" > ${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 + + # Original design had these in /etc/net.modules.d but that is too + # problematic with CONFIG_PROTECT + dodir ${rcscripts_dir} + cp -a "${S}"/lib/rcscripts/net.modules.d ${D}${rcscripts_dir} + chown -R root:root ${D}${rcscripts_dir} + + # + # 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 + + # 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 + + # 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 + ${ROOT}/sbin/MAKEDEV generic-vserver + fi + fi + + # 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 --update &>/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 ${SV}" > ${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 + + 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 +} diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.1.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.1.ebuild new file mode 100644 index 000000000000..f2d0f1743fd0 --- /dev/null +++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.1.ebuild @@ -0,0 +1,442 @@ +# 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.1.ebuild,v 1.1 2006/06/05 20:19:28 phreak Exp $ + +inherit flag-o-matic eutils toolchain-funcs multilib + +DESCRIPTION="Filesystem baselayout and init scripts" +HOMEPAGE="http://www.gentoo.org/" +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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +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" </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 + + # Benedikt Boehm + # vserver-devs don't support old stuff + rcscripts_dir="/lib/rcscripts" + + einfo "Creating directories..." + kdir /usr + kdir /usr/local + 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/opt + kdir /home + kdir ${rcscripts_dir} + kdir ${rcscripts_dir}/awk + kdir ${rcscripts_dir}/sh + kdir ${rcscripts_dir}/net + 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" + + # 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 + + # Benedikt Boehm + # baselayout-vserver provides it's own! + #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 + + # 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 + dodoc "${S}"/ChangeLog.vserver + fi + + # + # Install baselayout utilities + # + cd "${S}"/src + make DESTDIR="${D}" LIBDIR="$(get_libdir)" 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 vps + # + # 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. + + # Christian Heim + # use the MAKEDEV in ${D}/sbin, otherwise we'll rely on the hosts MAKEDEV + # which is baad + cd ${D}/dev || die + ebegin "Populating /dev with safe device nodes..." + "${D}"/sbin/MAKEDEV generic-vserver + eend $? || die + + # 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 + echo + + # 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 ; 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 + 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 + + 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-vserver/files/digest-baselayout-vserver-1.11.15 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.15 new file mode 100644 index 000000000000..530bc4a3bee0 --- /dev/null +++ b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.15 @@ -0,0 +1,3 @@ +MD5 47a532ec561f37bd379b1097a29744b5 rc-scripts-vserver-1.6.15.tar.bz2 145322 +RMD160 aed4999dc3f671d391c18069cadd030911c3ee29 rc-scripts-vserver-1.6.15.tar.bz2 145322 +SHA256 2cf8cc9eed778ad48ca15a0ae6562545a85a462a7be37c9ef1bab1ea704f6f86 rc-scripts-vserver-1.6.15.tar.bz2 145322 diff --git a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.1 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.1 new file mode 100644 index 000000000000..32ed2885c204 --- /dev/null +++ b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.1 @@ -0,0 +1,3 @@ +MD5 098380b99b4ff4f65b6f061f3a7bac4c baselayout-vserver-1.12.1.tar.bz2 200131 +RMD160 059dd044f1be59d96499e427a53136f8ef7c30c5 baselayout-vserver-1.12.1.tar.bz2 200131 +SHA256 0807cc7a84510da6f41e1ca07681d09ce7328977b9ece0f3ce418144cf802c10 baselayout-vserver-1.12.1.tar.bz2 200131