Fix #157589
authorRoy Marples <uberlord@gentoo.org>
Sat, 9 Dec 2006 12:47:12 +0000 (12:47 +0000)
committerRoy Marples <uberlord@gentoo.org>
Sat, 9 Dec 2006 12:47:12 +0000 (12:47 +0000)
Package-Manager: portage-2.1.2_rc2-r5

sys-apps/baselayout/ChangeLog
sys-apps/baselayout/Manifest
sys-apps/baselayout/baselayout-1.13.0_alpha8-r1.ebuild [new file with mode: 0644]
sys-apps/baselayout/files/baselayout-1.13.0_alpha8-use.patch [new file with mode: 0644]
sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha8-r1 [new file with mode: 0644]

index 09508e2c7efa49e2db4f4570d98c997152197cbd..0430f32960b45fc4e6435625e311b25979eedffb 100644 (file)
@@ -1,10 +1,17 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.367 2006/12/08 22:44:52 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.368 2006/12/09 12:47:12 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+*baselayout-1.13.0_alpha8-r1 (09 Dec 2006)
+
+  09 Dec 2006; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.13.0_alpha8-use.patch,
+  +baselayout-1.13.0_alpha8-r1.ebuild:
+  Fix #157589
+
 *baselayout-1.13.0_alpha8 (08 Dec 2006)
 
   08 Dec 2006; Roy Marples <uberlord@gentoo.org>
index 106849b9aca41b500a9bf2094feada662ee3b347..68198f58d85126731f73ecaf8f815a59c0c21488 100644 (file)
@@ -86,6 +86,10 @@ AUX baselayout-1.13.0_alpha7-2380.patch 1245 RMD160 9569358ba672b873cbfdc055ef5b
 MD5 f58aed630c19dbfe0178f9fb69d670d7 files/baselayout-1.13.0_alpha7-2380.patch 1245
 RMD160 9569358ba672b873cbfdc055ef5be856493565b5 files/baselayout-1.13.0_alpha7-2380.patch 1245
 SHA256 9e08046a07819462f8042e4bf23322d1e56594fa49aa6bd5fe223d7977808074 files/baselayout-1.13.0_alpha7-2380.patch 1245
+AUX baselayout-1.13.0_alpha8-use.patch 685 RMD160 297e0d9529f83f2b7acd2d5e17926242cda31e64 SHA1 07c095e0c449b78d8747c3a4079091723d206ae2 SHA256 b785458e90cc9afa5bbe76aa9593e046fe3b6865024211afaa92a1f8e0b657c9
+MD5 8526913205a8290f5620ed14b12c54f1 files/baselayout-1.13.0_alpha8-use.patch 685
+RMD160 297e0d9529f83f2b7acd2d5e17926242cda31e64 files/baselayout-1.13.0_alpha8-use.patch 685
+SHA256 b785458e90cc9afa5bbe76aa9593e046fe3b6865024211afaa92a1f8e0b657c9 files/baselayout-1.13.0_alpha8-use.patch 685
 AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783cc637392429ba2f63d321873fa1526ee SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099
@@ -126,14 +130,18 @@ EBUILD baselayout-1.13.0_alpha7-r1.ebuild 10230 RMD160 c7917177f114fe0417b317014
 MD5 e0c1072935993a2cad3e418d51d14659 baselayout-1.13.0_alpha7-r1.ebuild 10230
 RMD160 c7917177f114fe0417b317014d097e05fa578d7a baselayout-1.13.0_alpha7-r1.ebuild 10230
 SHA256 45a29874c4d312626407e6f092811dc806aa3b49954779099fc8b72f551a79b6 baselayout-1.13.0_alpha7-r1.ebuild 10230
+EBUILD baselayout-1.13.0_alpha8-r1.ebuild 10192 RMD160 8030934f1826984df292fd8e16a7fd54098a42b2 SHA1 a5c2268d91fa4f9a4f2d3d1fcde3b5e869e1284a SHA256 c48d920ed3b6dcedbc4b91a136eb9d7d8a156817f03b32d0e03cd3a854911d2c
+MD5 f28c99d1aa8439c3eafcf91d9fb1a3e4 baselayout-1.13.0_alpha8-r1.ebuild 10192
+RMD160 8030934f1826984df292fd8e16a7fd54098a42b2 baselayout-1.13.0_alpha8-r1.ebuild 10192
+SHA256 c48d920ed3b6dcedbc4b91a136eb9d7d8a156817f03b32d0e03cd3a854911d2c baselayout-1.13.0_alpha8-r1.ebuild 10192
 EBUILD baselayout-1.13.0_alpha8.ebuild 10111 RMD160 be9a56c5d7a7783d98173e18e9334d34948d45ba SHA1 41ea65903957811c2d51905c7522fbd9267a139d SHA256 de353e0a897b07fac7a0778c1d60e8f387896170cf2cb4cd0d8831430b20c35e
 MD5 3809ea091f7b23d5f4ed5c4e494d900f baselayout-1.13.0_alpha8.ebuild 10111
 RMD160 be9a56c5d7a7783d98173e18e9334d34948d45ba baselayout-1.13.0_alpha8.ebuild 10111
 SHA256 de353e0a897b07fac7a0778c1d60e8f387896170cf2cb4cd0d8831430b20c35e baselayout-1.13.0_alpha8.ebuild 10111
-MISC ChangeLog 83046 RMD160 fed954a541b64008e94b4444f04e2b2c1a322935 SHA1 d6621741c4f3929ad2c3d62810065e2f9324fe7e SHA256 439615ab783e05afa9eede248ed21fc3a5ba7e6fe3800e362b3dbb583d1945a1
-MD5 a52e73348ad4c732bff27ab10e080301 ChangeLog 83046
-RMD160 fed954a541b64008e94b4444f04e2b2c1a322935 ChangeLog 83046
-SHA256 439615ab783e05afa9eede248ed21fc3a5ba7e6fe3800e362b3dbb583d1945a1 ChangeLog 83046
+MISC ChangeLog 83238 RMD160 2d3092a7715817b849abb3c53b87994b32c0b659 SHA1 e2bba387b9f32ea4858b79fc431911520756be2e SHA256 a493a2b7d074e12e2722cea527cf5857a6b729d98507e8f3e4d6c1a64b07c192
+MD5 551237476c7b66adf844632acd05446c ChangeLog 83238
+RMD160 2d3092a7715817b849abb3c53b87994b32c0b659 ChangeLog 83238
+SHA256 a493a2b7d074e12e2722cea527cf5857a6b729d98507e8f3e4d6c1a64b07c192 ChangeLog 83238
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -162,3 +170,6 @@ SHA256 790aafb90a5186b950fee42956a5d9bf3386a6a3a74e11e4d37ecdd52292314c files/di
 MD5 6ef95df4856b1b41e6cbaa59cc3f0d2a files/digest-baselayout-1.13.0_alpha8 277
 RMD160 70d1203ccdd399c1bb53f3f327f50c8e12813397 files/digest-baselayout-1.13.0_alpha8 277
 SHA256 d6648ff3124f84326fb51ad2c22645e91a3cfd495de4ec3963611e4fdb7a163d files/digest-baselayout-1.13.0_alpha8 277
+MD5 6ef95df4856b1b41e6cbaa59cc3f0d2a files/digest-baselayout-1.13.0_alpha8-r1 277
+RMD160 70d1203ccdd399c1bb53f3f327f50c8e12813397 files/digest-baselayout-1.13.0_alpha8-r1 277
+SHA256 d6648ff3124f84326fb51ad2c22645e91a3cfd495de4ec3963611e4fdb7a163d files/digest-baselayout-1.13.0_alpha8-r1 277
diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha8-r1.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha8-r1.ebuild
new file mode 100644 (file)
index 0000000..e747b88
--- /dev/null
@@ -0,0 +1,289 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.13.0_alpha8-r1.ebuild,v 1.1 2006/12/09 12:47:12 uberlord Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+       http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2
+       http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2
+       http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="bootstrap build pam static unicode kernel_linux kernel_FreeBSD"
+
+# This version of baselayout needs awk 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="kernel_linux? ( >=sys-apps/sysvinit-2.86-r3 )
+               !build? (
+                       !bootstrap? (
+                               >=sys-libs/readline-5.0-r1
+                               >=app-shells/bash-3.2_p3-r1
+                               kernel_linux? (
+                                       >=sys-apps/coreutils-5.2.1
+                               )
+                               kernel_FreeBSD? (
+                                       sys-process/fuser-bsd
+                                       sys-process/pidof-bsd
+                               )
+                       )
+               )
+               pam? ( virtual/pam )
+               !<net-misc/dhcpcd-2.0.0"
+DEPEND="virtual/os-headers"
+PROVIDE="virtual/baselayout"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # Fix bug #157589.
+       epatch "${FILESDIR}/baselayout-1.13.0_alpha8-use.patch"
+
+       # Setup unicode defaults for silly unicode users
+       if use unicode ; then
+               sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
+       fi
+
+       # SPARC does not like stty, so we disable RC_INTERACTIVE which requires it
+       # see Gentoo bug #104067.
+       if use sparc ; then \
+               sed -i -e  '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die
+               sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
+       fi
+}
+
+make_opts() {
+       # Standard options
+       local opts="DESTDIR=\"${ROOT}\" ARCH=\"$(tc-arch)\" CC=\"$(tc-getCC)\""
+       local libdir="lib"
+
+       [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+
+       opts="${opts} LIB=${libdir}"
+
+       if use kernel_linux ; then
+               opts="${opts} OS=Linux"
+       else
+               opts="${opts} OS=BSD"
+       fi
+
+       use pam && opts="${opts} HAVE_PAM=1"
+
+       echo "${opts}"
+}
+
+src_compile() {
+       use static && append-ldflags -static
+       emake $(make_opts) || die
+}
+
+# Support function for remapping old wireless dns vars
+remap_dns_vars() {
+       if [[ -f "${ROOT}/etc/conf.d/$1" ]]; 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/$1" > "${IMAGE}/etc/conf.d/$1"
+       fi
+}
+
+pkg_preinst() {
+       # Move our makefiles to a temporay location
+       mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
+
+       # 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
+}
+
+src_install() {
+       make $(make_opts) DESTDIR="${D}" install
+       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" || -n ${CONF_MULTILIBDIR} ]]; then
+               local libdirs="$(get_all_libdirs)" libdirs_env=
+               : ${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 /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
+                       libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
+               fi
+               echo "LDPATH=\"${libdirs_env}\"" > "${D}"/etc/env.d/04multilib
+       fi
+
+       # rc-scripts version for testing of features that *should* be present
+       echo "Gentoo Base System version ${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*
+}
+
+pkg_postinst() {
+       # 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
+               make -C "${T}" $(make_opts) layout || die "failed to layout filesystem"
+       fi
+
+       # Make our runlevels if they don't exist
+       if [[ ! -e ${ROOT}etc/runlevels ]] ; then
+               einfo "Making default runlevels"
+               make -C "${T}" $(make_opts) runlevels_install >/dev/null
+       fi
+
+       if use kernel_linux ; then
+               if use build || use bootstrap ; then
+                       # Create base directories
+                       if [[ ! -e ${ROOT}/dev/.udev && ! -e ${ROOT}/dev/.devfsd ]] ; then
+                               einfo "Creating dev nodes"
+                               PATH="${ROOT}"/sbin:${PATH} make -C "${T}" $(make_opts) \
+                                       dev || die "failed to create /dev nodes"
+                       fi
+               fi
+       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
+
+       # 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
+               # We need to copy svcdir if it's empty
+               if [[ ! -e ${ROOT}lib/rcscripts/init.d/deptree ]] ; then
+                       (
+                       source "${ROOT}etc/conf.d/rc"
+                       svcdir="${svcdir:-/var/lib/init.d}"
+                       if [[ -e ${ROOT}${svcdir}/deptree ]] ; then
+                               cp -RPp "${ROOT}${svcdir}"/* ${ROOT}lib/rcscripts/init.d
+                       fi
+                       )
+               fi
+
+               # Regenerate init.d dependency tree
+               /sbin/depscan.sh --update >/dev/null
+
+               # Regenerate /etc/modules.conf, else it will fail at next boot
+               if [[ -x /sbin/modules-update ]] ; then
+                       einfo "Updating module dependencies..."
+                       /sbin/modules-update force >/dev/null
+               fi
+       else
+               rm -f "${ROOT}"/etc/modules.conf
+       fi
+
+       # This is also written in src_install (so it's in CONTENTS), but
+       # write it here so that the new version is immediately in the file
+       # (without waiting for the user to do etc-update)
+       rm -f "${ROOT}"/etc/._cfg????_gentoo-release
+       echo "Gentoo Base System version ${PV}" > "${ROOT}"/etc/gentoo-release
+
+       echo
+       einfo "Please be sure to update all pending '._cfg*' files in /etc,"
+       einfo "else things might break at your next reboot!      You can use 'etc-update'"
+       einfo "to accomplish this:"
+       einfo
+       einfo "  # etc-update"
+
+       local lo="net.lo0"
+       use kernel_linux && lo="net.lo"
+       for f in ${ROOT}etc/init.d/net.*; do
+               [[ -L ${f} ]] && 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
+
+       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'"
+       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."
+       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/{conf.d,init.d}/domainname \
+                       "${ROOT}"/etc/runlevels/*/domainname
+               echo
+               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
+
+       echo
+       einfo "baselayout-1.13 and higher have dropped the RC_STRICT_NET_CHECKING"
+       einfo "variable from /etc/conf.d/rc. ${lo} now provides \"net\" and so does"
+       einfo "each net script linked to it."
+       einfo "The net dependency is now satisfied by any net.* scripts in the default"
+       einfo "runlevel, otherwise it's the last net.* script running which includes"
+       einfo "${lo}. So if you need to restart a net script that is listed in the"
+       einfo "runlevel you are in and not restart anything that needs it then you"
+       einfo "will need to use the --nodeps command line option."
+
+       echo
+       ewarn "baselayout-1.13 and higher now force \$svcdir to be mounted ramdisk."
+       ewarn "If you downgrade to a lower version you'll need to copy the directory"
+       ewarn "  /$(get_libdir)/rcscripts/init.d"
+       ewarn "to \$svcdir as defined in /etc/conf.d/rc"
+       ewarn "  /var/lib/init.d (by default)"
+       ewarn "You should also erase /$(get_libdir)/rcscripts/init.d so that when you upgrade"
+       ewarn "again your current state is automatically copied across."
+}
diff --git a/sys-apps/baselayout/files/baselayout-1.13.0_alpha8-use.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha8-use.patch
new file mode 100644 (file)
index 0000000..9acdd03
--- /dev/null
@@ -0,0 +1,20 @@
+Index: src/rc-depend.c
+===================================================================
+--- src/rc-depend.c    (revision 2408)
++++ src/rc-depend.c    (working copy)
+@@ -597,7 +597,6 @@
+                   {
+                     di = get_depinfo (deptree, lp->item);
+                     if (di && (strcmp (type->item, "ineed") == 0 ||
+-                               strcmp (type->item, "iuse") == 0 ||
+                                valid_service (di->service)))
+                       visit_service (deptree, types, sorted, visited, di,
+                                      true);
+@@ -606,7 +605,6 @@
+               }
+             else
+               if (di && (strcmp (type->item, "ineed") == 0 ||
+-                         strcmp (type->item, "iuse") == 0 ||
+                          valid_service (service)))
+                 visit_service (deptree, types, sorted, visited, di, true);
+           }
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha8-r1 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha8-r1
new file mode 100644 (file)
index 0000000..1ea7b64
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 9ae26687f2ca9b81bb0b820248453cf5 baselayout-1.13.0_alpha8.tar.bz2 255845
+RMD160 6cf6ca5f2a171674297565936195bd0a8d53199e baselayout-1.13.0_alpha8.tar.bz2 255845
+SHA256 8a9c09367bd03096c7c9331874b8cc3096f6ddb78bb8f320e64b90590b76eefd baselayout-1.13.0_alpha8.tar.bz2 255845