From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q0ghV-0002Z2-Hj for garchives@archives.gentoo.org; Fri, 18 Mar 2011 20:55:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF42AE05B1; Fri, 18 Mar 2011 20:55:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9713FE05B1 for ; Fri, 18 Mar 2011 20:55:05 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C92381B4057 for ; Fri, 18 Mar 2011 20:49:12 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 68BE620054; Fri, 18 Mar 2011 20:49:11 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: baselayout-2.0.2.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: baselayout-2.0.2.ebuild ChangeLog X-VCS-Directories: sys-apps/baselayout X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20110318204911.68BE620054@flycatcher.gentoo.org> Date: Fri, 18 Mar 2011 20:49:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2a07dc87b1f091bd5fafcdefec59b221 vapier 11/03/18 20:49:11 Modified: ChangeLog Added: baselayout-2.0.2.ebuild Log: Version bump. =20 (Portage version: 2.2.0_alpha26/cvs/Linux x86_64) Revision Changes Path 1.492 sys-apps/baselayout/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayou= t/ChangeLog?rev=3D1.492&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayou= t/ChangeLog?rev=3D1.492&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayou= t/ChangeLog?r1=3D1.491&r2=3D1.492 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v retrieving revision 1.491 retrieving revision 1.492 diff -u -r1.491 -r1.492 --- ChangeLog 13 Dec 2010 08:05:07 -0000 1.491 +++ ChangeLog 18 Mar 2011 20:49:11 -0000 1.492 @@ -1,10 +1,15 @@ # ChangeLog for sys-apps/baselayout -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.491= 2010/12/13 08:05:07 vapier Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.492= 2011/03/18 20:49:11 vapier Exp $ =20 # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/Chang= eLog =20 +*baselayout-2.0.2 (18 Mar 2011) + + 18 Mar 2011; Mike Frysinger +baselayout-2.0.2.ebui= ld: + Version bump. + 13 Dec 2010; Mike Frysinger baselayout-2.0.1-r1.ebuild: Redo how we handle forced gentoo-release update so we avoid md5/mtime 1.1 sys-apps/baselayout/baselayout-2.0.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayou= t/baselayout-2.0.2.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayou= t/baselayout-2.0.2.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: baselayout-2.0.2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.2.e= build,v 1.1 2011/03/18 20:49:11 vapier Exp $ inherit eutils multilib DESCRIPTION=3D"Filesystem baselayout and init scripts" HOMEPAGE=3D"http://www.gentoo.org/" SRC_URI=3D"mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 = ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE=3D"build" PDEPEND=3D"sys-apps/openrc" pkg_preinst() { # Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of # the baselayout-1.x ebuild copies all the real configs from the user's # /etc/conf.d into ${D}, it makes them all appear to be the default # versions. In order to protect them from being unmerged after this # upgrade, modify their timestamps. touch "${ROOT}"/etc/conf.d/* 2>/dev/null # This is written in src_install (so it's in CONTENTS), but punt all # pending updates to avoid user having to do etc-update (and make the # pkg_postinst logic simpler). rm -f "${ROOT}"/etc/._cfg????_gentoo-release # 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 ; then local libdirs=3D"$(get_all_libdirs)" dir=3D # Create our multilib dirs - the Makefile has no knowledge of this : ${libdirs:=3Dlib} # it isn't that we don't trust multilib.eclass... for dir in ${libdirs}; do mkdir -p "${ROOT}${dir}" touch "${ROOT}${dir}"/.keep mkdir -p "${ROOT}usr/${dir}" touch "${ROOT}usr/${dir}"/.keep mkdir -p "${ROOT}usr/local/${dir}" touch "${ROOT}usr/local/${dir}"/.keep done # Create symlinks for /lib, /usr/lib, and /usr/local/lib and # merge contents of duplicate directories if necessary. # Only do this when $ROOT !=3D / since it should only be necessary # when merging to an empty $ROOT, and it's not very safe to perform # this operation when $ROOT =3D /. if [ "${SYMLINK_LIB}" =3D yes ] && [ "$ROOT" !=3D / ] ; then local prefix libabi=3D$(get_abi_LIBDIR $DEFAULT_ABI) for prefix in "$ROOT"{,usr/,usr/local/} ; do [ ! -d "${prefix}lib" ] && rm -f "${prefix}lib" && \ mkdir -p "${prefix}lib" [ ! -d "$prefix$libabi" ] && ln -sf "${prefix}lib" [ -h "$prefix$libabi" ] && [ -d "${prefix}lib" ] && \ [ "$prefix$libabi" -ef "${prefix}lib" ] && continue local destdir=3D$prefix$libabi/ srcdir=3D${prefix}lib/ [ -d "$destdir" ] || die "unable to create '$destdir'" [ -d "$srcdir" ] || die "unable to create $srcdir" mv -f "$srcdir".keep "$destdir".keep 2>/dev/null if ! rmdir "$srcdir" 2>/dev/null ; then ewarn "merging contents of '$srcdir' into '$destdir':" # Move directories if the dest doesn't exist. find "$srcdir" -type d -print0 | \ while read -d $'\0' src ; do # If a parent directory of $src has already # been merged then it will no longer exist. [ -d "$src" ] || continue dest=3D$destdir${src#${srcdir}} if [ ! -d "$dest" ] ; then if [ -e "$dest" ] ; then ewarn " not overwriting file '$dest'" \ "with directory '$src'" continue fi mv -f "$src" "$dest" && \ ewarn " /${src#${ROOT}} merged" || \ ewarn " /${src#${ROOT}} not merged" fi done # Move non-directories. find "$srcdir" ! -type d -print0 | \ while read -d $'\0' src ; do dest=3D$destdir${src#${srcdir}} if [ -e "$dest" ] ; then if [ -d "$dest" ] ; then ewarn " not overwriting directory '$dest'" \ "with file '$src'" else if [ -f "$src" -a ! -s "$src" ] && \ [ -f "$dest" -a ! -s "$dest" ] ; then # Ignore empty files such as '.keep'. true else ewarn " not overwriting file '$dest'" \ "with file '$src'" fi fi continue fi mv -f "$src" "$dest" && \ ewarn " /${src#${ROOT}} merged" || \ ewarn " /${src#${ROOT}} not merged" done fi rm -rf "${prefix}lib" || \ die "unable to remove '${prefix}lib'" ln -s "$libabi" "${prefix}lib" || \ die "unable to create '${prefix}lib' symlink" done fi emake -C "${D}/usr/share/${PN}" DESTDIR=3D"${ROOT}" layout || die "fail= ed to layout filesystem" fi rm -f "${D}"/usr/share/${PN}/Makefile } src_install() { local libdir=3D"lib" [[ ${SYMLINK_LIB} =3D=3D "yes" ]] && libdir=3D$(get_abi_LIBDIR "${DEFAUL= T_ABI}") emake \ OS=3D$(use kernel_FreeBSD && echo BSD || echo Linux) \ LIB=3D${libdir} \ DESTDIR=3D"${D}" \ install || die dodoc ChangeLog.svn # need the makefile in pkg_preinst insinto /usr/share/${PN} doins Makefile || die # 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) !=3D "lib" -o -n "${CONF_MULT= ILIBDIR}" ]; then local libdirs=3D"$(get_all_libdirs)" libdirs_env=3D dir=3D : ${libdirs:=3Dlib} # it isn't that we don't trust multilib.eclass... for dir in ${libdirs}; do libdirs_env=3D${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/lo= cal/${dir} done # Special-case uglyness... For people updating from lib32 -> lib amd64 # profiles, keep lib32 in the search path while it's around if has_multilib_profile && [ -d "${ROOT}"lib32 -o -d "${ROOT}"lib32 ] &= & ! hasq lib32 ${libdirs}; then libdirs_env=3D"${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" fi echo "LDPATH=3D\"${libdirs_env}\"" > "${T}"/04multilib doenvd "${T}"/04multilib fi # rc-scripts version for testing of features that *should* be present echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release } pkg_postinst() { local x # We installed some files to /usr/share/baselayout instead of /etc to st= op # (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 # Force shadow permissions to not be world-readable #260993 for x in shadow ; do [ -e "${ROOT}etc/${x}" ] && chmod o-rwx "${ROOT}etc/${x}" done # Take care of the etc-update for the user if [ -e "${ROOT}"/etc/._cfg0000_gentoo-release ] ; then mv "${ROOT}"/etc/._cfg0000_gentoo-release "${ROOT}"/etc/gentoo-release fi # whine about users that lack passwords #193541 if [[ -e ${ROOT}/etc/shadow ]] ; then local bad_users=3D$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${ROOT}"/= etc/shadow) if [[ -n ${bad_users} ]] ; then echo ewarn "The following users lack passwords!" ewarn ${bad_users} fi fi # whine about users with invalid shells #215698 if [[ -e ${ROOT}/etc/passwd ]] ; then local bad_shells=3D$(awk -F: 'system("test -e " $7) { print $1 " - " $7= }' /etc/passwd | sort) if [[ -n ${bad_shells} ]] ; then echo ewarn "The following users have non-existent shells!" ewarn "${bad_shells}" fi fi }