diff options
author | Roy Marples <uberlord@gentoo.org> | 2006-01-04 08:16:18 +0000 |
---|---|---|
committer | Roy Marples <uberlord@gentoo.org> | 2006-01-04 08:16:18 +0000 |
commit | 7378e25e245d7f11755cc13062619f412b0f66ac (patch) | |
tree | a0a6da0008492fbbe50445b3f8e61b2479425d6d /sys-apps | |
parent | Version bump to work with bash-3.1-r2, #116352. (diff) | |
download | gentoo-2-7378e25e245d7f11755cc13062619f412b0f66ac.tar.gz gentoo-2-7378e25e245d7f11755cc13062619f412b0f66ac.tar.bz2 gentoo-2-7378e25e245d7f11755cc13062619f412b0f66ac.zip |
Punted old versions.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'sys-apps')
7 files changed, 0 insertions, 1560 deletions
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre11-r3.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre11-r3.ebuild deleted file mode 100644 index c6bc3ef6d771..000000000000 --- a/sys-apps/baselayout/baselayout-1.12.0_pre11-r3.ebuild +++ /dev/null @@ -1,614 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre11-r3.ebuild,v 1.3 2005/12/22 04:07:40 vapier 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.84 - !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}" - - # Critical network fixes - epatch "${FILESDIR}/${P}-net.patch" - epatch "${FILESDIR}/${P}-net2.patch" - epatch "${FILESDIR}/${P}-net3.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 - ;; - 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 ;; - 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 /lib/dev-state - kdir /lib/udev-state - 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 - # 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 - - # 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.modules.d ${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 - # - cd "${S}"/src - make DESTDIR="${D}" 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 - - # 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 - /bin/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 &>/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 - - # 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 - - 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 -} diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre12.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre12.ebuild deleted file mode 100644 index 44ae82532af5..000000000000 --- a/sys-apps/baselayout/baselayout-1.12.0_pre12.ebuild +++ /dev/null @@ -1,609 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre12.ebuild,v 1.2 2005/12/22 04:07:40 vapier 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.84 - !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}" - - # 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 - ;; - 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 ;; - 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 /lib/dev-state - kdir /lib/udev-state - 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 - # 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 - - # 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.modules.d ${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 - # - cd "${S}"/src - make DESTDIR="${D}" 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 - - # 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 - /bin/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 &>/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 - - # 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 - - 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 -} diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_pre11-net.patch b/sys-apps/baselayout/files/baselayout-1.12.0_pre11-net.patch deleted file mode 100644 index e99d17c3f2eb..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.12.0_pre11-net.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: lib/rcscripts/net.modules.d/arping -=================================================================== ---- lib/rcscripts/net.modules.d/arping (revision 1626) -+++ lib/rcscripts/net.modules.d/arping (working copy) -@@ -63,7 +63,7 @@ - - einfo "Pinging gateways on ${iface} for configuration" - -- gateways="gateways_${ifvar}" -+ gateways="gateways_${ifvar}[@]" - if [[ -z ${!gateways} ]]; then - eerror "No gateways have been defined (gateways_${ifvar}=\"...\")" - return 1 -@@ -71,7 +71,7 @@ - - eindent - -- for x in "${!gateways}"; do -+ for x in ${!gateways}; do - vebegin "${x}" - if arping_address_exists "${iface}" "${x}" ; then - for i in ${x//./ } ; do -Index: lib/rcscripts/net.modules.d/helpers.d/functions -=================================================================== ---- lib/rcscripts/net.modules.d/helpers.d/functions (revision 1626) -+++ lib/rcscripts/net.modules.d/helpers.d/functions (working copy) -@@ -568,7 +568,7 @@ - x="" - [[ -n ${option2} ]] && x="${v}_${option2}[@]" - [[ -z ${!x} ]] && x="${v}_${option1}[@]" -- [[ -n ${!x} ]] && eval "${v}_${ifvar}=( "${!x}" )" -+ [[ -n ${!x} ]] && eval "${v}_${ifvar}=( \"${!x}\" )" - done - done - -Index: lib/rcscripts/net.modules.d/ifconfig -=================================================================== ---- lib/rcscripts/net.modules.d/ifconfig (revision 1626) -+++ lib/rcscripts/net.modules.d/ifconfig (working copy) -@@ -175,7 +175,7 @@ - ifconfig_get_old_config() { - local iface="$1" ifvar=$( bash_variable "$1" ) i inet6 - -- config="ifconfig_${ifvar}[@\]" -+ config="ifconfig_${ifvar}[@]" - config=( "${!config}" ) - config_fallback="ifconfig_fallback_${ifvar}[@]" - config_fallback=( "${!config_fallback}" ) -@@ -312,7 +312,7 @@ - fi - - # Add a metric if we don't have one -- [[ ${x} != *" metric "* ]] && x="${x} metric ${metric}" -+ [[ ${x} != *" metric "* ]] && x="${x} metric ${!metric}" - - route add ${x} dev "${iface}" - eend $? -Index: etc/conf.d/net.example -=================================================================== ---- etc/conf.d/net.example (revision 1626) -+++ etc/conf.d/net.example (working copy) -@@ -283,7 +283,7 @@ - # simply ensure that each ocet is zero padded and the dots are removed. - # Below is an example. - # --#arping_eth0="192.168.0.1 10.0.0.1" -+#gateways_eth0="192.168.0.1 10.0.0.1" - #config_192168000001=( "192.168.0.2/24" ) - #routes_192168000001=( "default via 192.168.0.1" ) - #dns_servers_192168000001=( "192.168.0.1" ) diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_pre11-net2.patch b/sys-apps/baselayout/files/baselayout-1.12.0_pre11-net2.patch deleted file mode 100644 index 0066d3e8752f..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.12.0_pre11-net2.patch +++ /dev/null @@ -1,252 +0,0 @@ -Index: bin/rc-status -=================================================================== ---- bin/rc-status (revision 1628) -+++ bin/rc-status (working copy) -@@ -206,6 +206,7 @@ - boot_crit="checkroot hostname modules checkfs localmount clock" - fi - -+broken="" - for level in ${runlevelidxs} ; do - echo "Runlevel: ${HILITE}${level}${NORMAL}" - for service in ${runlevels[${arridx}]} ; do -@@ -214,6 +215,7 @@ - ]] && [[ ${level} != "${BOOTLEVEL}" \ - || " ${boot_crit} " != *" ${service} "* ]]; then - print_msg "${service}" "${BAD}" 'broken ' -+ broken="${broken} ${service}" - elif [[ -n ${inactive} && $(in_list "${inactive}" "${service}") -eq 1 ]] ; then - print_msg "${service}" "${WARN}" 'inactive' - elif [[ $(in_list "${started}" "${service}") -eq 1 ]] ; then -@@ -229,3 +231,9 @@ - let "arridx += 1" - [ -n "${UNUSED}" ] && exit 0 - done -+ -+if [[ -n ${broken} ]]; then -+ eerror "You have some broken symbolic links as reported by the broken" -+ eerror "status above. This can be fixed by removing the broken service" -+ eerror "from its runlevel and re-adding it back using rc-update." -+fi -Index: lib/rcscripts/net.modules.d/pump -=================================================================== ---- lib/rcscripts/net.modules.d/pump (revision 1628) -+++ lib/rcscripts/net.modules.d/pump (working copy) -@@ -82,7 +82,7 @@ - [[ ! -d "${statedir}/${iface}" ]] && mkdir -m 0755 -p "${statedir}/${iface}" - - opts="${opts} --win-client-ident --etc-dir=${statedir}/${iface}" -- opts="${opts} --script /lib/rcscripts/net.modules.d/helpers.d/pump-wrapper" -+ opts="${opts} --script \"${svclib}/net.modules.d/helpers.d/pump-wrapper\"" - opts="${opts} --keep-up --interface ${iface}" - - # Bring up DHCP for this interface (or alias) -Index: lib/rcscripts/net.modules.d/dhcpcd -=================================================================== ---- lib/rcscripts/net.modules.d/dhcpcd (revision 1628) -+++ lib/rcscripts/net.modules.d/dhcpcd (working copy) -@@ -111,7 +111,7 @@ - [[ -n ${!metric} && ${!metric} != "0" ]] && opts="${opts} -m ${!metric}" - - # Instruct dhcpcd to use our wrapper -- opts="${opts} -c \"/lib/rcscripts/net.modules.d/helpers.d/dhcpcd-wrapper\"" -+ opts="${opts} -c \"${svclib}/net.modules.d/helpers.d/dhcpcd-wrapper\"" - - # Instruct dhcpcd to create it's files in our state dir - opts="${opts} -e \"${statedir}/${iface}\"" -Index: lib/rcscripts/net.modules.d/iwconfig -=================================================================== ---- lib/rcscripts/net.modules.d/iwconfig (revision 1628) -+++ lib/rcscripts/net.modules.d/iwconfig (working copy) -@@ -130,7 +130,7 @@ - local mode=$( iwconfig_get_mode "${iface}" ) - if [[ ${mode} == "master" ]]; then - m="as" -- else -+ elif [[ ${mode} != "ad-hoc" ]]; then - mac=$( iwconfig_get_ap_mac_address "${iface}" ) - [[ -n ${mac} ]] && mac=" at ${mac}" - fi -@@ -752,7 +752,7 @@ - - # Setup ad-hoc mode? - x="mode_${ifvar}" -- x=$( echo "${!mode:-managed}" | tr '[:upper:]' '[:lower:]' ) -+ x=$( echo "${!x:-managed}" | tr '[:upper:]' '[:lower:]' ) - if [[ ${x} == "ad-hoc" || ${x} == "master" ]]; then - iwconfig_setup_specific "${iface}" "${x}" - return $? -Index: lib/rcscripts/net.modules.d/iproute2 -=================================================================== ---- lib/rcscripts/net.modules.d/iproute2 (revision 1628) -+++ lib/rcscripts/net.modules.d/iproute2 (working copy) -@@ -72,7 +72,7 @@ - iproute2_is_up() { - local check="\<UP\>" addr="${2:-false}" - ${addr} && check="${check}.*inet " -- ip addr show "$1" | grep -Eq "${check}" && return 0 -+ ip addr show "$1" | xargs | grep -Eq "${check}" && return 0 - return 1 - } - -Index: lib/rcscripts/net.modules.d/helpers.d/pump-wrapper -=================================================================== ---- lib/rcscripts/net.modules.d/helpers.d/pump-wrapper (revision 1628) -+++ lib/rcscripts/net.modules.d/helpers.d/pump-wrapper (working copy) -@@ -9,8 +9,10 @@ - action="$1" - interface="$2" - -+. /sbin/functions.sh -+ - if [[ ${action} == "up" ]]; then -- . /lib/rcscripts/net.modules.d/helpers.d/module-loader -+ . "${svclib}/net.modules.d/helpers.d/module-loader" - - # Map MAC address variables to interface variables - macnet_pre_start "${interface}" 1>/dev/null -@@ -25,6 +27,6 @@ - system_dns_extra "${interface}" "${statedir}/${interface}/resolv.conf" - fi - --. /lib/rcscripts/net.modules.d/helpers.d/dhcp-state -+. "${svclib}/net.modules.d/helpers.d/dhcp-state" - - # vim:ts=4 -Index: lib/rcscripts/net.modules.d/helpers.d/pppd-wrapper -=================================================================== ---- lib/rcscripts/net.modules.d/helpers.d/pppd-wrapper (revision 1628) -+++ lib/rcscripts/net.modules.d/helpers.d/pppd-wrapper (working copy) -@@ -7,7 +7,8 @@ - action="$1" - interface="$2" - export IN_BACKGROUND="true" --. /lib/rcscripts/net.modules.d/helpers.d/module-loader -+. /sbin/functions.sh -+. "${svclib}/net.modules.d/helpers.d/module-loader" - resolv="${statedir}/${interface}/resolv.conf" - - if [[ ${action} == "up" ]]; then -Index: lib/rcscripts/net.modules.d/helpers.d/dhcpcd-wrapper -=================================================================== ---- lib/rcscripts/net.modules.d/helpers.d/dhcpcd-wrapper (revision 1628) -+++ lib/rcscripts/net.modules.d/helpers.d/dhcpcd-wrapper (working copy) -@@ -13,7 +13,8 @@ - action="up" - fi - --. /lib/rcscripts/net.modules.d/helpers.d/module-loader -+. /sbin/functions.sh -+. "${svclib}/net.modules.d/helpers.d/module-loader" - - # Map MAC address variables to interface variables - macnet_pre_start "${interface}" 1>/dev/null -@@ -55,6 +56,6 @@ - fi - [[ -x ${exe} ]] && ( ${exe} "$@" 1>/dev/null ) - --. /lib/rcscripts/net.modules.d/helpers.d/dhcp-state -+. "${svclib}/net.modules.d/helpers.d/dhcp-state" - - # vim:ts=4 -Index: lib/rcscripts/net.modules.d/helpers.d/udhcpc-wrapper -=================================================================== ---- lib/rcscripts/net.modules.d/helpers.d/udhcpc-wrapper (revision 1628) -+++ lib/rcscripts/net.modules.d/helpers.d/udhcpc-wrapper (working copy) -@@ -15,6 +15,7 @@ - export nis_domain_${interface}="${nisdomain}" - export nis_servers_${interface}="${nissrv}" - --/lib/rcscripts/net.modules.d/helpers.d/dhcp "$@" -+. /sbin/functions.sh -+"${svclib}/net.modules.d/helpers.d/dhcp" "$@" - - # vim:ts=4 -Index: lib/rcscripts/net.modules.d/helpers.d/dhclient-wrapper -=================================================================== ---- lib/rcscripts/net.modules.d/helpers.d/dhclient-wrapper (revision 1628) -+++ lib/rcscripts/net.modules.d/helpers.d/dhclient-wrapper (working copy) -@@ -34,7 +34,8 @@ - export nis_domain_${interface}="${new_nis_domain}" - export nis_servers_${interface}="${new_nis_servers}" - --/lib/rcscripts/net.modules.d/helpers.d/dhcp "${action}" -+. /sbin/functions.sh -+"${svclib}/net.modules.d/helpers.d/dhcp" "${action}" - result="$?" - - [[ -e /etc/dhcp/dhclient-exit-hooks ]] \ -Index: lib/rcscripts/net.modules.d/helpers.d/module-loader -=================================================================== ---- lib/rcscripts/net.modules.d/helpers.d/module-loader (revision 1628) -+++ lib/rcscripts/net.modules.d/helpers.d/module-loader (working copy) -@@ -4,10 +4,12 @@ - - # Contributed by Roy Marples (uberlord@gentoo.org) - --[[ -z ${MODULES_DIR} ]] && MODULES_DIR="/lib/rcscripts/net.modules.d" -+. "${svclib}/sh/rc-services.sh" -+ -+MODULES_DIR="${svclib}/net.modules.d" - . "${MODULES_DIR}/system" --. /lib/rcscripts/sh/rc-services.sh - . "${MODULES_DIR}/helpers.d/functions" -+ - conf=$(add_suffix "/etc/conf.d/net") - [[ -e ${conf} ]] && source "${conf}" - -Index: lib/rcscripts/net.modules.d/helpers.d/dhcp-state -=================================================================== ---- lib/rcscripts/net.modules.d/helpers.d/dhcp-state (revision 1628) -+++ lib/rcscripts/net.modules.d/helpers.d/dhcp-state (working copy) -@@ -4,9 +4,8 @@ - - # Contributed by Roy Marples (uberlord@gentoo.org) - --MODULES_DIR="/lib/rcscripts/net.modules.d" --. /lib/rcscripts/sh/rc-services.sh --. "${MODULES_DIR}/helpers.d/functions" -+. "${svclib}/sh/rc-services.sh" -+. "${svclib}/net.modules.d/helpers.d/functions" - conf=$(add_suffix "/etc/conf.d/net") - [[ -e ${conf} ]] && source "${conf}" - -Index: lib/rcscripts/net.modules.d/helpers.d/dhcp -=================================================================== ---- lib/rcscripts/net.modules.d/helpers.d/dhcp (revision 1628) -+++ lib/rcscripts/net.modules.d/helpers.d/dhcp (working copy) -@@ -7,7 +7,8 @@ - action="$1" - service="net.${interface}" - --. /lib/rcscripts/net.modules.d/helpers.d/module-loader -+. /sbin/functions.sh -+. "${svclib}/net.modules.d/helpers.d/module-loader" - - # Bring the interface up - interface_is_up "${interface}" || interface_up "${interface}" -Index: init.d/net.lo -=================================================================== ---- init.d/net.lo (revision 1628) -+++ init.d/net.lo (working copy) -@@ -23,7 +23,7 @@ - } - - # Define where our modules are --MODULES_DIR="/lib/rcscripts/net.modules.d" -+MODULES_DIR="${svclib}/net.modules.d" - - # Some defaults - background="${background:-no}" -Index: sbin/functions.sh -=================================================================== ---- sbin/functions.sh (revision 1628) -+++ sbin/functions.sh (working copy) -@@ -40,7 +40,6 @@ - RC_TTY_NUMBER=${RC_TTY_NUMBER:-11} - RC_PARALLEL_STARTUP=${RC_PARALLEL_STARTUP:-no} - RC_NET_STRICT_CHECKING=${RC_NET_STRICT_CHECKING:-no} --RC_VOLUME_ORDER=${RC_VOLUME_ORDER:-raid evms lvm dm} - RC_USE_FSTAB=${RC_USE_FSTAB:-no} - RC_USE_CONFIG_PROFILE=${RC_USE_CONFIG_PROFILE:-yes} - RC_FORCE_AUTO=${RC_FORCE_AUTO:-no} diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_pre11-net3.patch b/sys-apps/baselayout/files/baselayout-1.12.0_pre11-net3.patch deleted file mode 100644 index 737c7d84a6ec..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.12.0_pre11-net3.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/rcscripts/net.modules.d/helpers.d/functions -=================================================================== ---- lib/rcscripts/net.modules.d/helpers.d/functions (revision 1630) -+++ lib/rcscripts/net.modules.d/helpers.d/functions (working copy) -@@ -568,7 +568,7 @@ - x="" - [[ -n ${option2} ]] && x="${v}_${option2}[@]" - [[ -z ${!x} ]] && x="${v}_${option1}[@]" -- [[ -n ${!x} ]] && eval "${v}_${ifvar}=( \"${!x}\" )" -+ [[ -n ${!x} ]] && eval "${v}_${ifvar}=( \"\${!x}\" )" - done - done - diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre11-r3 b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre11-r3 deleted file mode 100644 index ff1df0ed224d..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre11-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 abc62e768ebd4e10029975f61f9c4cab baselayout-1.12.0_pre11.tar.bz2 209907 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre12 b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre12 deleted file mode 100644 index a3484fca639c..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre12 +++ /dev/null @@ -1 +0,0 @@ -MD5 b31473a79352634d319bf1aaee149e45 baselayout-1.12.0_pre12.tar.bz2 210674 |