From d131fa757fedbb09acbd2710d857b5ab8a0dd066 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Mon, 5 Jun 2006 14:32:04 +0000 Subject: [PATCH] New 1.12 release fixing a slew of bugs - check the ChangeLog. Added a patch to 1.14 and 1.15 which adds the man user/group back, #113298. Package-Manager: portage-2.1_rc4-r2 --- sys-apps/baselayout/ChangeLog | 11 +- sys-apps/baselayout/Manifest | 38 +- .../baselayout/baselayout-1.11.14-r8.ebuild | 3 +- .../baselayout/baselayout-1.11.15-r3.ebuild | 3 +- sys-apps/baselayout/baselayout-1.12.1.ebuild | 625 ++++++++++++++++++ .../files/baselayout-1.11.14-man.patch | 24 + .../baselayout/files/digest-baselayout-1.12.1 | 3 + 7 files changed, 691 insertions(+), 16 deletions(-) create mode 100644 sys-apps/baselayout/baselayout-1.12.1.ebuild create mode 100644 sys-apps/baselayout/files/baselayout-1.11.14-man.patch create mode 100644 sys-apps/baselayout/files/digest-baselayout-1.12.1 diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index b1ed67ff4bf5..dfcf2f4fdc0a 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,19 @@ # 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.329 2006/05/24 19:36:00 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.330 2006/06/05 14:32:04 uberlord Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog +*baselayout-1.12.1 (05 Jun 2006) + + 05 Jun 2006; Roy Marples + +files/baselayout-1.11.14-man.patch, baselayout-1.11.14-r8.ebuild, + baselayout-1.11.15-r3.ebuild, +baselayout-1.12.1.ebuild: + New 1.12 release fixing a slew of bugs - check the ChangeLog. + + Added a patch to 1.14 and 1.15 which adds the man user/group back, #113298. + *baselayout-1.12.0-r1 (24 May 2006) 24 May 2006; Roy Marples diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index c65883674803..1f59cecee085 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -18,6 +18,10 @@ AUX baselayout-1.11.14-iwconfig.patch 609 RMD160 5e5178bb9e100509eefb6dc5bc8a478 MD5 00027c12be3e1ed7ce2787cfca1b5a6c files/baselayout-1.11.14-iwconfig.patch 609 RMD160 5e5178bb9e100509eefb6dc5bc8a478621941feb files/baselayout-1.11.14-iwconfig.patch 609 SHA256 fba67a24d63c29407882894fc78bf6716329a923d7925e9f0cd2b6535afdd292 files/baselayout-1.11.14-iwconfig.patch 609 +AUX baselayout-1.11.14-man.patch 768 RMD160 b1743f52d71b6ff2bd0d8cb8106112d8fad9d5b7 SHA1 f61b8f985a27dc9f2dd834001602b008030e79ce SHA256 7c12d6ee90b14b3152c2256df5983d3e6d102ca53b5da3ca6505b8925a86a80a +MD5 dff93a6f0914f6969d21482d2f36e75e files/baselayout-1.11.14-man.patch 768 +RMD160 b1743f52d71b6ff2bd0d8cb8106112d8fad9d5b7 files/baselayout-1.11.14-man.patch 768 +SHA256 7c12d6ee90b14b3152c2256df5983d3e6d102ca53b5da3ca6505b8925a86a80a files/baselayout-1.11.14-man.patch 768 AUX baselayout-1.11.14-udev-sysinit.patch 1097 RMD160 533a2f4fb62eb1371413c120048b7f70a58fd41e SHA1 14556efed1eefb0e50c4f8041c3844324c8f60a4 SHA256 3bdaae5c1ce59856f77b57e8312a369b61fe1f3cbb17993454a699ea7703e0a6 MD5 34964dc9fff04e8eaa948a9a60185e94 files/baselayout-1.11.14-udev-sysinit.patch 1097 RMD160 533a2f4fb62eb1371413c120048b7f70a58fd41e files/baselayout-1.11.14-udev-sysinit.patch 1097 @@ -51,25 +55,26 @@ MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099 SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/copyright 2099 DIST baselayout-1.12.0.tar.bz2 213959 RMD160 0f89150fa793547d65fd26c9975bf709d6dfb571 SHA1 29a5f91b422c5ca292a03772cf72d8224638a837 SHA256 e4e004f1bc5b535a7d441d21f730b7beedf0e7487f6b3fbb7cbba35674b487aa +DIST baselayout-1.12.1.tar.bz2 215516 RMD160 8194f5caf7b9d8643ae9ff027a38a48117f4c685 SHA1 acb35aa453147a7b1c08d7047a9bf21931aa9688 SHA256 a9e07bf08d30f4057ae718f91d5d3ffdd07befdb44eaab420a15bffa538e3dd5 DIST rc-scripts-1.6.13.tar.bz2 156148 RMD160 c267e0862ffb0af4e7b016332e962ad3fb54723e SHA256 89f924fffbe4b9f84970a2fa559262d24714ee5c15c3d3bf6ebd6d95e25484c0 -DIST rc-scripts-1.6.14.tar.bz2 159580 RMD160 564997e6d116ce9d24fd5dcdb885504bce14809e SHA256 d269f2e7749e4034adc5d87bb618901348f6869939a40dba79ba763ea76633ee +DIST rc-scripts-1.6.14.tar.bz2 159580 RMD160 564997e6d116ce9d24fd5dcdb885504bce14809e SHA1 428f5971116b1c8d6465e6b826c5cc89621d84db SHA256 d269f2e7749e4034adc5d87bb618901348f6869939a40dba79ba763ea76633ee DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a EBUILD baselayout-1.11.13-r2.ebuild 19014 RMD160 3d1348291157e3f973f4ad16e4f222fd32645593 SHA1 e07be587ab059a3f0ec5c1b6d331d9b7d839ebee SHA256 236d09bf8aed1a3f73c26bdb287957a21212646ecb6eec21abaafa9ef6e3b2ef MD5 22a10db577b1b646d12ba31ed7b77a6c baselayout-1.11.13-r2.ebuild 19014 RMD160 3d1348291157e3f973f4ad16e4f222fd32645593 baselayout-1.11.13-r2.ebuild 19014 SHA256 236d09bf8aed1a3f73c26bdb287957a21212646ecb6eec21abaafa9ef6e3b2ef baselayout-1.11.13-r2.ebuild 19014 -EBUILD baselayout-1.11.14-r8.ebuild 19398 RMD160 b2fbbd876b836945df9e1520f591515d3ff34c6c SHA1 12a2c5bb8232e73f02528ad42460bd48d07c310b SHA256 a9ad52488deb53c03262d8074b5afd91370c6a2af97dd40fbd9f92d262fb9a89 -MD5 764c20fc8be5044bb782a186edb9c91d baselayout-1.11.14-r8.ebuild 19398 -RMD160 b2fbbd876b836945df9e1520f591515d3ff34c6c baselayout-1.11.14-r8.ebuild 19398 -SHA256 a9ad52488deb53c03262d8074b5afd91370c6a2af97dd40fbd9f92d262fb9a89 baselayout-1.11.14-r8.ebuild 19398 +EBUILD baselayout-1.11.14-r8.ebuild 19445 RMD160 227e2b927b24406aea95c4aaf0c22783347b41b4 SHA1 77e8ac668be757160a4955f56ff3cbaca7a898a1 SHA256 69f6a035d7d4bad3e37036331429161b5200105796a3cf8bf47f8dd151ab13cb +MD5 7ec9e3bfec9f13a049b1e946348f0069 baselayout-1.11.14-r8.ebuild 19445 +RMD160 227e2b927b24406aea95c4aaf0c22783347b41b4 baselayout-1.11.14-r8.ebuild 19445 +SHA256 69f6a035d7d4bad3e37036331429161b5200105796a3cf8bf47f8dd151ab13cb baselayout-1.11.14-r8.ebuild 19445 EBUILD baselayout-1.11.15-r1.ebuild 19131 RMD160 db614fc707f43b7cb0ba71f65004efb1b38963c0 SHA1 123cacf0e8744142e2f4945c039249cc872f7395 SHA256 9e7f068bc4443bdda2cd2e3dac11e0684e1289f308a569440349135f2d7ae1d1 MD5 219153e2fd3c83999df65701ab0df39a baselayout-1.11.15-r1.ebuild 19131 RMD160 db614fc707f43b7cb0ba71f65004efb1b38963c0 baselayout-1.11.15-r1.ebuild 19131 SHA256 9e7f068bc4443bdda2cd2e3dac11e0684e1289f308a569440349135f2d7ae1d1 baselayout-1.11.15-r1.ebuild 19131 -EBUILD baselayout-1.11.15-r3.ebuild 19173 RMD160 be79482250f6f22db62f1137a3660aedd78385c4 SHA1 b3b513f8c40c6a488cb27f63d9273d18b2269db8 SHA256 6cd330656bdbae217fe2ec1d4f13aea754ff45aa13eeff826974f92d86dd69cd -MD5 44fd75ee6cf039138fabcbcd20c86a6a baselayout-1.11.15-r3.ebuild 19173 -RMD160 be79482250f6f22db62f1137a3660aedd78385c4 baselayout-1.11.15-r3.ebuild 19173 -SHA256 6cd330656bdbae217fe2ec1d4f13aea754ff45aa13eeff826974f92d86dd69cd baselayout-1.11.15-r3.ebuild 19173 +EBUILD baselayout-1.11.15-r3.ebuild 19227 RMD160 08eb0003887ebf74659a86e04fff80422277543b SHA1 318627734e5d81e82da287209bcb8f4fe331073b SHA256 f84cdd3f252857883bbafbb7e97db20647acb3791af093e72949d7c40eb76bb8 +MD5 06477808d41d64627bdf0a4b59a13a25 baselayout-1.11.15-r3.ebuild 19227 +RMD160 08eb0003887ebf74659a86e04fff80422277543b baselayout-1.11.15-r3.ebuild 19227 +SHA256 f84cdd3f252857883bbafbb7e97db20647acb3791af093e72949d7c40eb76bb8 baselayout-1.11.15-r3.ebuild 19227 EBUILD baselayout-1.12.0-r1.ebuild 19859 RMD160 4e44ee1fce586e66df8db8ce3268ac07bfe7f98e SHA1 569e11367978b95dad88e9fcf4bb99dc721ed548 SHA256 41321668812d0682c73c8648ab62c79c1c815e97e3971c535fd8ec30550b10ff MD5 c47085ceccfb3bf2207b7d52339b351f baselayout-1.12.0-r1.ebuild 19859 RMD160 4e44ee1fce586e66df8db8ce3268ac07bfe7f98e baselayout-1.12.0-r1.ebuild 19859 @@ -78,10 +83,14 @@ EBUILD baselayout-1.12.0.ebuild 19813 RMD160 1681f0a425048c2ecf8e3a8c4449c1f1af9 MD5 e00c543c601ab57c285904be7e7f1cad baselayout-1.12.0.ebuild 19813 RMD160 1681f0a425048c2ecf8e3a8c4449c1f1af980fdf baselayout-1.12.0.ebuild 19813 SHA256 ae788f7f7ea3c029e3cf4d313046e984594d1bc339494286c539de75be0cc8e4 baselayout-1.12.0.ebuild 19813 -MISC ChangeLog 75334 RMD160 30f2bbbdb5a3a95627c461cb2f00ab323bccb973 SHA1 39230790972c607f90274fd82c3d647ac6704cc5 SHA256 9bb7c0cd27c7af014bf3f42d1229132badf80d1b979c0fa264526c4c2bbfe7fd -MD5 45020c5429310e40ebe214da637f1968 ChangeLog 75334 -RMD160 30f2bbbdb5a3a95627c461cb2f00ab323bccb973 ChangeLog 75334 -SHA256 9bb7c0cd27c7af014bf3f42d1229132badf80d1b979c0fa264526c4c2bbfe7fd ChangeLog 75334 +EBUILD baselayout-1.12.1.ebuild 19813 RMD160 a68216973c375571605a989156d960c70bcddb5f SHA1 1477441f273b847c5a52cbdc2cb3ee62305c2b14 SHA256 96ff6cf1d26aee8639b61ec7adb39825342c052064eb5fa04e6dde00cf7bd436 +MD5 05a8a5e1924b0fe5886937268eb7282e baselayout-1.12.1.ebuild 19813 +RMD160 a68216973c375571605a989156d960c70bcddb5f baselayout-1.12.1.ebuild 19813 +SHA256 96ff6cf1d26aee8639b61ec7adb39825342c052064eb5fa04e6dde00cf7bd436 baselayout-1.12.1.ebuild 19813 +MISC ChangeLog 75691 RMD160 5f1de63391011d152b8e966d5afadbb23a2fa855 SHA1 e3427c76decb9b71ff858131a97d661497246a8e SHA256 a6a34b7ee61b67c03eb90e18160a08a11939a429bbab09935f6d52e53b744027 +MD5 b07f3aa2e297630b9e626df161c756bb ChangeLog 75691 +RMD160 5f1de63391011d152b8e966d5afadbb23a2fa855 ChangeLog 75691 +SHA256 a6a34b7ee61b67c03eb90e18160a08a11939a429bbab09935f6d52e53b744027 ChangeLog 75691 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -104,3 +113,6 @@ SHA256 23efc124a5f53b4dd13a3d5509fe74ef35d40d59cb7ddbb51632c37914448178 files/di MD5 74285a147caeebbe39f57ca951c58797 files/digest-baselayout-1.12.0-r1 256 RMD160 3a831daa0ea9326bf2c7249ac84c287f016038c5 files/digest-baselayout-1.12.0-r1 256 SHA256 23efc124a5f53b4dd13a3d5509fe74ef35d40d59cb7ddbb51632c37914448178 files/digest-baselayout-1.12.0-r1 256 +MD5 3a465bae830e121519bef9682559a6a2 files/digest-baselayout-1.12.1 256 +RMD160 173a3f9fce25eeb8def155ca3c8de3d2c8e64586 files/digest-baselayout-1.12.1 256 +SHA256 26098d67da6a8b829a372e3a74eded308b9e24ae3440552e57f4f23c23b15e67 files/digest-baselayout-1.12.1 256 diff --git a/sys-apps/baselayout/baselayout-1.11.14-r8.ebuild b/sys-apps/baselayout/baselayout-1.11.14-r8.ebuild index ab9d224d2c64..654464e7c0c0 100644 --- a/sys-apps/baselayout/baselayout-1.11.14-r8.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.14-r8.ebuild @@ -1,6 +1,6 @@ # 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.11.14-r8.ebuild,v 1.1 2006/04/17 15:34:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.14-r8.ebuild,v 1.2 2006/06/05 14:32:04 uberlord Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -59,6 +59,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-depscan.patch epatch "${FILESDIR}"/${P}-uniqify.patch epatch "${FILESDIR}"/${P}-wpa_supplicant.patch #130104 + epatch "${FILESDIR}"/${P}-man.patch #113298 } src_compile() { diff --git a/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild b/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild index 872c26b7802e..99f21b298191 100644 --- a/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild @@ -1,6 +1,6 @@ # 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.11.15-r3.ebuild,v 1.1 2006/05/04 09:18:46 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild,v 1.2 2006/06/05 14:32:04 uberlord Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -40,6 +40,7 @@ src_unpack() { epatch "${FILESDIR}/${P}"-halt-sort.patch epatch "${FILESDIR}/${P}"-coldplug.patch + epatch "${FILESDIR}/${PN}"-1.11.14-man.patch #113298 # Setup unicode defaults for silly unicode users if use unicode ; then diff --git a/sys-apps/baselayout/baselayout-1.12.1.ebuild b/sys-apps/baselayout/baselayout-1.12.1.ebuild new file mode 100644 index 000000000000..317e0f188e6f --- /dev/null +++ b/sys-apps/baselayout/baselayout-1.12.1.ebuild @@ -0,0 +1,625 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.1.ebuild,v 1.1 2006/06/05 14:32:04 uberlord Exp $ + +inherit flag-o-matic eutils toolchain-funcs multilib + +DESCRIPTION="Filesystem baselayout and init scripts" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2 + http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2 + http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="bootstrap build static unicode" + +# This version of baselayout needs gawk in /bin, but as we do not have +# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" +# or "build" are in USE. +RDEPEND=">=sys-apps/sysvinit-2.86-r3 + !build? ( !bootstrap? ( + >=sys-libs/readline-5.0-r1 + >=app-shells/bash-3.1_p7 + >=sys-apps/coreutils-5.2.1 + ) )" +DEPEND="virtual/os-headers + >=sys-apps/portage-2.0.51" +PROVIDE="virtual/baselayout" + +src_unpack() { + unpack ${A} + cd "${S}" + + # Setup unicode defaults for silly unicode users + if use unicode ; then + sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf + fi + + # Tweak arch-specific details + cd "${S}" + + case $(tc-arch) in + sparc) + sed -i -e '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die + # Disable interactive boot on sparc due to stty calls, #104067 + sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die + ;; + esac + + # Use correct path to filefuncs.so on multilib systems + sed -i -e "s:/lib/rcscripts:/$(get_libdir)/rcscripts:" \ + ${S}/src/awk/{cachedepends,genenviron}.awk || die +} + +src_compile() { + local libdir="lib" + + use static && append-ldflags -static + + [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}") + + make -C "${S}"/src \ + CC="$(tc-getCC)" \ + LD="$(tc-getCC) ${LDFLAGS}" \ + CFLAGS="${CFLAGS}" \ + LIBDIR="${libdir}" || die +} + +# ${PATH} should include where to get MAKEDEV when calling this +# function +create_dev_nodes() { + case $(tc-arch) in + # amd64 must use generic-i386 because amd64/x86_64 does not have + # a generic option at this time, and the default 'generic' ends + # up erroring out, because MAKEDEV internally doesn't know what + # to use + arm*) suffix=-arm ;; + alpha) suffix=-alpha ;; + amd64) suffix=-i386 ;; + hppa) suffix=-hppa ;; + ia64) suffix=-ia64 ;; + m68k) suffix=-m68k ;; + mips*) suffix=-mips ;; + ppc*) suffix=-powerpc ;; + s390*) suffix=-s390 ;; + sh*) suffix=-sh ;; + sparc*) suffix=-sparc ;; + x86) suffix=-i386 ;; + esac + + einfo "Using generic${suffix} to make $(tc-arch) device nodes..." + MAKEDEV generic${suffix} + MAKEDEV sg scd rtc hde hdf hdg hdh input audio video +} + +# This is a temporary workaround until bug 9849 is completely solved +# in portage. We need to create the directories so they're available +# during src_install, but when src_install is finished, call unkdir +# to remove any empty directories instead of leaving them around. +kdir() { + typeset -a args + typeset d + + # Create the directories for the remainder of src_install, and + # remember how to create the directories later. + for d in "$@"; do + if [[ $d == /* ]]; then + install -d "${args[@]}" "${D}/${d}" + cat >> "${D}/usr/share/baselayout/mkdirs.sh" </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 + # For multilib, we want to make sure that all our multilibdirs exist + # and make lib even if it's not listed as one (like on amd64/ppc64 + # which sometimes has lib32/lib64 instead of lib/lib64). + # lib should NOT be a symlink to one of the other libdirs. + # Old systems with symlinks won't be affected by this change, as the + # symlinks already exist and won't get removed, but new systems will + # be setup properly. + # + # I'll be making a script to convert existing systems from symlink to + # nosymlink and putting it in /usr/portage/scripts. + libdirs=$(get_all_libdirs) + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + + # This should be /lib/rcscripts, but we have to support old profiles too. + if [[ ${SYMLINK_LIB} == "yes" ]]; then + rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts" + else + rcscripts_dir="/lib/rcscripts" + fi + + einfo "Creating directories..." + kdir /usr + kdir /usr/local + kdir /boot + kdir /dev + kdir /dev/pts + kdir /dev/shm + kdir /etc/conf.d + kdir /etc/cron.daily + kdir /etc/cron.hourly + kdir /etc/cron.monthly + kdir /etc/cron.weekly + kdir /etc/env.d + dodir /etc/init.d # .keep file might mess up init.d stuff + kdir /etc/modules.autoload.d + kdir /etc/modules.d + kdir /etc/opt + kdir /home + kdir ${rcscripts_dir} + kdir ${rcscripts_dir}/awk + kdir ${rcscripts_dir}/sh + kdir ${rcscripts_dir}/net + # Only install /mnt stuff at bootstrap time #88835 / #90022 + if use build ; then + kdir /mnt + kdir -m 0700 /mnt/cdrom + kdir -m 0700 /mnt/floppy + fi + kdir /opt + kdir -o root -g uucp -m0775 /var/lock + kdir /proc + kdir -m 0700 /root + kdir /sbin + kdir /sys # for 2.6 kernels + kdir /usr/bin + kdir /usr/include + kdir /usr/include/asm + kdir /usr/include/linux + kdir /usr/local/bin + kdir /usr/local/games + kdir /usr/local/sbin + kdir /usr/local/share + kdir /usr/local/share/doc + kdir /usr/local/share/man + kdir /usr/local/src + kdir ${PORTDIR} + kdir /usr/sbin + kdir /usr/share/doc + kdir /usr/share/info + kdir /usr/share/man + kdir /usr/share/misc + kdir /usr/src + kdir -m 1777 /tmp + kdir /var + dodir /var/db/pkg # .keep file messes up Portage + kdir /var/lib/misc + kdir /var/lock/subsys + kdir /var/log/news + kdir /var/run + kdir /var/spool + kdir /var/state + kdir -m 1777 /var/tmp + + for dir in ${libdirs}; do + libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir} + [[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue + kdir /${dir} + kdir /usr/${dir} + kdir /usr/local/${dir} + done + + # Ugly compatibility with stupid ebuilds and old profiles symlinks + if [[ ${SYMLINK_LIB} == "yes" ]] ; then + rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null + ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib + ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib + ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib + fi + + kdir /$(get_libdir)/dev-state + kdir /$(get_libdir)/udev-state + + # FHS compatibility symlinks stuff + ksym /var/tmp /usr/tmp + ksym share/man /usr/local/man + + # + # Setup files in /etc + # + insopts -m0644 + insinto /etc + doins -r "${S}"/etc/* + fperms 0640 /etc/sysctl.conf + + # Install some files to /usr/share/baselayout instead of /etc to keep from + # (1) overwriting the user's settings, (2) screwing things up when + # attempting to merge files, (3) accidentally packaging up personal files + # with quickpkg + fperms 0600 /etc/shadow + mv "${D}"/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} "${D}"/usr/share/baselayout + + # doinitd doesnt respect symlinks + dodir /etc/init.d + cp -P "${S}"/init.d/* "${D}"/etc/init.d/ || die "doinitd" + #doinitd "${S}"/init.d/* || die "doinitd" + doconfd "${S}"/etc/conf.d/* || die "doconfd" + doenvd "${S}"/etc/env.d/* || die "doenvd" + insinto /etc/modules.autoload.d + doins "${S}"/etc/modules.autoload.d/* + insinto /etc/modules.d + doins "${S}"/etc/modules.d/* + + # Special-case uglyness... For people updating from lib32 -> lib amd64 + # profiles, keep lib32 in the search path while it's around + if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then + libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" + fi + + # List all the multilib libdirs in /etc/env/04multilib (only if they're + # actually different from the normal + if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then + echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib + fi + + # As of baselayout-1.10-1-r1, sysvinit is its own package again, and + # provides the inittab itself + rm -f "${D}"/etc/inittab + + # Stash the rc-lists for use during pkg_postinst + cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout + + # rc-scripts version for testing of features that *should* be present + echo "Gentoo Base System version ${PV}" > ${D}/etc/gentoo-release + + # + # Setup files related to /dev + # + into / + dosbin "${S}"/sbin/MAKEDEV + dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV + dosym ../sbin/MAKEDEV /dev/MAKEDEV + + # + # Setup files in /bin + # + cd "${S}"/bin + dobin rc-status + + # + # Setup files in /sbin + # + cd "${S}"/sbin + into / + dosbin rc rc-update + # Need this in /sbin, as it could be run before + # /usr is mounted. + dosbin modules-update + # Compat symlinks until I can get things synced. + dosym modules-update /sbin/update-modules + dosym ../../sbin/modules-update /usr/sbin/update-modules + # These moved from /etc/init.d/ to /sbin to help newb systems + # from breaking + dosbin runscript.sh functions.sh + + # Compat symlinks between /etc/init.d and /sbin + # (some stuff have hardcoded paths) + dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh + dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh + dosym ../../sbin/functions.sh /etc/init.d/functions.sh + + # + # Setup files in /lib/rcscripts + # These are support files for other things in baselayout that needn't be + # under CONFIG_PROTECTed /etc + # + cd "${S}"/sbin + exeinto ${rcscripts_dir}/sh + doexe rc-services.sh rc-daemon.sh rc-help.sh + + # We can only install new, fast awk versions of scripts + # if 'build' or 'bootstrap' is not in USE. This will + # change if we have sys-apps/gawk-3.1.1-r1 or later in + # the build image ... + if ! use build; then + # This is for new depscan.sh and env-update.sh + # written in awk + cd "${S}"/sbin + into / + dosbin depscan.sh + dosbin env-update.sh + insinto ${rcscripts_dir}/awk + doins "${S}"/src/awk/*.awk + fi + + # Original design had these in /etc/net.modules.d but that is too + # problematic with CONFIG_PROTECT + dodir ${rcscripts_dir} + cp -pPR "${S}"/lib/rcscripts/net ${D}${rcscripts_dir} + chown -R root:0 ${D}${rcscripts_dir} + + # + # Install baselayout documentation + # + if ! use build ; then + doman "${S}"/man/*.* + docinto / + dodoc ${FILESDIR}/copyright + dodoc "${S}"/ChangeLog + fi + + # + # Install baselayout utilities + # + cd "${S}"/src + make DESTDIR="${D}" LIBDIR="$(get_libdir)" install || die + + # Hack to fix bug 9849, continued in pkg_postinst + unkdir +} + +# Support function for remapping old wireless dns vars +remap_dns_vars() { + local f="$1" + + if [[ -f ${ROOT}/etc/conf.d/${f} ]]; then + sed -e 's/\ ${IMAGE}/etc/conf.d/${f} + fi +} + +pkg_preinst() { + if [[ -f ${ROOT}/etc/modules.autoload && \ + ! -d ${ROOT}/etc/modules.autoload.d ]]; then + mkdir -p ${ROOT}/etc/modules.autoload.d + mv -f ${ROOT}/etc/modules.autoload \ + ${ROOT}/etc/modules.autoload.d/kernel-2.4 + ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload + fi + + # Change some vars introduced in baselayout-1.11.0 before we go stable + # The new names make more sense and allow nis_domain + # for use in baselayout-1.12.0 + remap_dns_vars net + remap_dns_vars wireless +} + +pkg_postinst() { + local x y + + # Reincarnate dirs from kdir/unkdir (hack for bug 9849) + einfo "Creating directories and .keep files." + einfo "Some of these might fail if they're read-only mounted" + einfo "filesystems, for example /dev or /proc. That's okay!" + source "${ROOT}"/usr/share/baselayout/mkdirs.sh + source "${ROOT}"/usr/share/baselayout/mklinks.sh + echo + + # This could be done in src_install, which would have the benefit of + # (1) devices.tar.bz2 would show up in CONTENTS + # (2) binary installations would be faster... just untar the devices tarball + # instead of needing to run MAKEDEV + # However the most common cases are that people are either updating + # baselayout or installing from scratch. In the installation case, it's no + # different to have here instead of src_install. In the update case, we + # save a couple minutes time by refraining from building the unnecessary + # tarball. + if [[ ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]]; then + # Create a directory in which to work + x=$(emktemp -d ${ROOT}/tmp/devnodes.XXXXXXXXX) \ + && cd "${x}" || die 'mktemp failed' + + # Create temp device nodes + echo + einfo "Making device node tarball (this could take a couple minutes)" + PATH=${ROOT}/sbin:${PATH} create_dev_nodes + + # Now create tarball that can also be used for udev. + # Need GNU tar for -j so call it by absolute path. + /bin/tar --one-file-system -cjpf "${ROOT}/lib/udev-state/devices.tar.bz2" * + rm -r * + cd .. + rmdir "${x}" + fi + + # We don't want to create devices if this is not a bootstrap and devfs + # is used, as this was the cause for all the devfs problems we had + if use build || use bootstrap; then + if [[ ! -e "${ROOT}/dev/.devfsd" && ! -e "${ROOT}/dev/.udev" ]]; then + einfo "Populating /dev with device nodes..." + cd ${ROOT}/dev || die + tar xjpf "${ROOT}/lib/udev-state/devices.tar.bz2" || die + fi + fi + + # Create /boot/boot symlink in pkg_postinst because sometimes + # /boot is a FAT filesystem. When that is the case, then the + # symlink will fail. Consequently, if we create it in + # src_install, then merge will fail. AFAIK there is no point to + # this symlink except for misconfigured grubs. See bug 50108 + # (05 May 2004 agriffis) + ln -sn . "${ROOT}"/boot/boot 2>/dev/null + + # Set up default runlevel symlinks + # This used to be done in src_install but required knowledge of ${ROOT}, + # which meant that it was effectively broken for binary installs. + if [[ -z $(/bin/ls "${ROOT}"/etc/runlevels 2>/dev/null) ]]; then + for x in boot default nonetwork single; do + einfo "Creating default runlevel symlinks for ${x}" + mkdir -p "${ROOT}"/etc/runlevels/${x} + for y in $(<"${ROOT}"/usr/share/baselayout/rc-lists/${x}); do + if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then + ewarn "init.d/${y} not found -- ignoring" + else + ln -sfn /etc/init.d/${y} \ + "${ROOT}"/etc/runlevels/${x}/${y} + fi + done + done + fi + + # Create /etc/hosts in pkg_postinst so we don't overwrite an + # existing file during bootstrap + if [[ ! -e ${ROOT}/etc/hosts ]]; then + cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc + fi + + # Touching /etc/passwd and /etc/shadow after install can be fatal, as many + # new users do not update them properly... see src_install() for why they + # are in /usr/share/baselayout/ + for x in passwd shadow group fstab ; do + if [[ -e ${ROOT}/etc/${x} ]] ; then + touch "${ROOT}/etc/${x}" + else + cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}" + fi + done + + # Under what circumstances would mtab be a symlink? It would be + # nice if there were an explanatory comment here + if [[ -L ${ROOT}/etc/mtab ]]; then + rm -f "${ROOT}/etc/mtab" + if [[ ${ROOT} == / ]]; then + cp /proc/mounts "${ROOT}/etc/mtab" + else + touch "${ROOT}/etc/mtab" + fi + fi + + # We should only install empty files if these files don't already exist. + [[ -e ${ROOT}/var/log/lastlog ]] || \ + touch "${ROOT}/var/log/lastlog" + [[ -e ${ROOT}/var/run/utmp ]] || \ + install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp" + [[ -e ${ROOT}/var/log/wtmp ]] || \ + install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp" + + # Reload init to fix unmounting problems of / on next reboot. + # This is really needed, as without the new version of init cause init + # not to quit properly on reboot, and causes a fsck of / on next reboot. + if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then + # Regenerate init.d dependency tree + /sbin/depscan.sh --update &>/dev/null + + # Regenerate /etc/modules.conf, else it will fail at next boot + einfo "Updating module dependencies..." + /sbin/modules-update force &>/dev/null + else + rm -f ${ROOT}/etc/modules.conf + fi + + # 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 + + # Remove old stuff that may cause problems. + if [[ -e "${ROOT}"/etc/env.d/01hostname ]] ; then + rm -f "${ROOT}"/etc/env.d/01hostname + fi + if [[ -e "${ROOT}"/etc/init.d/domainname ]] ; then + rm -f "${ROOT}"/etc/init.d/domainname + rm -f "${ROOT}"/etc/runlevels/*/domainname + ewarn "The domainname init script has been removed in this version." + ewarn "Consult ${ROOT}/etc/conf.d/net.example for details about how" + ewarn "to apply dns/nis information to the loopback interface." + fi +} diff --git a/sys-apps/baselayout/files/baselayout-1.11.14-man.patch b/sys-apps/baselayout/files/baselayout-1.11.14-man.patch new file mode 100644 index 000000000000..3018ef9aa0aa --- /dev/null +++ b/sys-apps/baselayout/files/baselayout-1.11.14-man.patch @@ -0,0 +1,24 @@ +Index: etc/group +=================================================================== +--- etc/group (revision 2050) ++++ etc/group (working copy) +@@ -13,6 +13,7 @@ + mail::12:mail + news::13:news + uucp::14:uucp ++man::15:man + console::17: + audio::18: + cdrom::19: +Index: etc/passwd +=================================================================== +--- etc/passwd (revision 2050) ++++ etc/passwd (working copy) +@@ -10,6 +10,7 @@ + news:x:9:13:news:/usr/lib/news:/bin/false + uucp:x:10:14:uucp:/var/spool/uucppublic:/bin/false + operator:x:11:0:operator:/root:/bin/bash ++man:x:13:15:man:/usr/share/man:/bin/false + postmaster:x:14:12:postmaster:/var/spool/mail:/bin/false + smmsp:x:209:209:smmsp:/var/spool/mqueue:/bin/false + portage:x:250:250:portage:/var/tmp/portage:/bin/false diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.1 b/sys-apps/baselayout/files/digest-baselayout-1.12.1 new file mode 100644 index 000000000000..3d246268d4c3 --- /dev/null +++ b/sys-apps/baselayout/files/digest-baselayout-1.12.1 @@ -0,0 +1,3 @@ +MD5 a06d07824f5b619403020288b392b27b baselayout-1.12.1.tar.bz2 215516 +RMD160 8194f5caf7b9d8643ae9ff027a38a48117f4c685 baselayout-1.12.1.tar.bz2 215516 +SHA256 a9e07bf08d30f4057ae718f91d5d3ffdd07befdb44eaab420a15bffa538e3dd5 baselayout-1.12.1.tar.bz2 215516 -- 2.26.2