From b252d74a825138ea0f76d99328d9d3be2b496395 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 4 Jan 2017 17:41:19 +0000 Subject: slowly prepare for release version 1701 --- sys-apps/baselayout/baselayout-2.2-r5.ebuild | 262 --------------------- sys-apps/baselayout/baselayout-2.2-r6.ebuild | 262 +++++++++++++++++++++ sys-apps/baselayout/files/baselayout-redcore.patch | 8 +- 3 files changed, 266 insertions(+), 266 deletions(-) delete mode 100644 sys-apps/baselayout/baselayout-2.2-r5.ebuild create mode 100644 sys-apps/baselayout/baselayout-2.2-r6.ebuild diff --git a/sys-apps/baselayout/baselayout-2.2-r5.ebuild b/sys-apps/baselayout/baselayout-2.2-r5.ebuild deleted file mode 100644 index 2473db19..00000000 --- a/sys-apps/baselayout/baselayout-2.2-r5.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.2 2012/08/23 21:47:35 vapier Exp $ - -inherit eutils multilib - -DESCRIPTION="Filesystem baselayout and init scripts" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="build kernel_linux" - -pkg_setup() { - multilib_layout -} - -# Create our multilib dirs - the Makefile has no knowledge of this -multilib_warn() { - local syms=$1 dirs=$2 def_libdir=$3 - - [ -z "${syms}${dirs}" ] && return - - ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB}, so that means" - if [ -z "${syms}" ] ; then - ewarn "you need to have these paths as symlinks to ${def_libdir}:" - ewarn "$1" - fi -} -multilib_layout() { - local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... - - [ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" - - # figure out which paths should be symlinks and which should be directories - local dirs syms exp d - for libdir in ${libdirs} ; do - exp=( {,usr/,usr/local/}${libdir} ) - for d in "${exp[@]/#/${ROOT}}" ; do - # most things should be dirs - if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then - [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}" - else - [ -h "${d}" ] && syms+=" ${d}" - fi - done - done - if [ -n "${syms}${dirs}" ] ; then - ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to" - ewarn "have these paths configured as follows:" - [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}" - [ -n "${syms}" ] && ewarn "directories:${syms}" - ewarn "The ebuild will attempt to fix these, but only for trivial conversions." - ewarn "If things fail, you will need to manually create/move the directories." - echo - fi - - # setup symlinks and dirs where we expect them to be; do not migrate - # data ... just fall over in that case. - local prefix - for prefix in "${ROOT}"{,usr/,usr/local/} ; do - if [ "${SYMLINK_LIB}" = yes ] ; then - # we need to make sure "lib" points to the native libdir - if [ -h "${prefix}lib" ] ; then - # it's already a symlink! assume it's pointing to right place ... - continue - elif [ -d "${prefix}lib" ] ; then - # "lib" is a dir, so need to convert to a symlink - ewarn "Converting ${prefix}lib from a dir to a symlink" - rm -f "${prefix}lib"/.keep - if rmdir "${prefix}lib" 2>/dev/null ; then - ln -s ${def_libdir} "${prefix}lib" || die - else - die "non-empty dir found where we needed a symlink: ${prefix}lib" - fi - else - # nothing exists, so just set it up sanely - ewarn "Initializing ${prefix}lib as a symlink" - mkdir -p "${prefix}" || die - rm -f "${prefix}lib" || die - ln -s ${def_libdir} "${prefix}lib" || die - mkdir -p "${prefix}${def_libdir}" #423571 - fi - else - # we need to make sure "lib" is a dir - if [ -h "${prefix}lib" ] ; then - # "lib" is a symlink, so need to convert to a dir - ewarn "Converting ${prefix}lib from a symlink to a dir" - rm -f "${prefix}lib" || die - if [ -d "${prefix}lib32" ] ; then - ewarn "Migrating ${prefix}lib32 to ${prefix}lib" - mv "${prefix}lib32" "${prefix}lib" || die - else - mkdir -p "${prefix}lib" || die - fi - elif [ -d "${prefix}lib" ] ; then - # make sure the old "lib" ABI location does not exist; we - # only symlinked the lib dir on systems where we moved it - # to "lib32" ... - case ${CHOST} in - i?86*|x86_64*|powerpc*|sparc*|s390*) - if [ -d "${prefix}lib32" ] ; then - rm -f "${prefix}lib32"/.keep - if ! rmdir "${prefix}lib32" 2>/dev/null ; then - ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" - die "non-empty dir found where there should be none: ${prefix}lib32" - fi - fi - ;; - esac - else - # nothing exists, so just set it up sanely - ewarn "Initializing ${prefix}lib as a dir" - mkdir -p "${prefix}" || die - rm -f "${prefix}lib" || die - ln -s ${def_libdir} "${prefix}lib" || die - fi - fi - done -} - -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. - multilib_layout - if use build ; then - emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die - fi - rm -f "${D}"/usr/share/${PN}/Makefile - - # Kogaion customization, protect /etc/hosts from removal (from older ebuilds) - local etc_hosts="${ROOT}/etc/hosts" - if [ -e "${etc_hosts}" ]; then - cp -p "${etc_hosts}" "${etc_hosts}.baselayout_ebuild_backup" # don't die - fi -} - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}/${PN}-redcore.patch" -} - -src_install() { - # Setup /run directory, this is missing from original baselayout - dodir /run - - emake \ - OS=$(usex kernel_FreeBSD BSD Linux) \ - DESTDIR="${D}" \ - install || die - dodoc ChangeLog.svn - - # need the makefile in pkg_preinst - insinto /usr/share/${PN} - doins Makefile || die - - # handle multilib paths. do it here because we want this behavior - # regardless of the C library that you're using. we do explicitly - # list paths which the native ldconfig searches, but this isn't - # problematic as it doesn't change the resulting ld.so.cache or - # take longer to generate. similarly, listing both the native - # path and the symlinked path doesn't change the resulting cache. - local libdir ldpaths - for libdir in $(get_all_libdirs) ; do - ldpaths+=":/${libdir}:/usr/${libdir}:/usr/local/${libdir}" - done - echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic - - # rc-scripts version for testing of features that *should* be present - echo "Redcore Linux 1.0" > "${D}"/etc/gentoo-release - - # Sabayon customization, install /etc/hosts separately (to .example) - mv "${D}"/etc/hosts "${D}"/etc/hosts.example || die "cannot move /etc/hosts" - -} - -pkg_postinst() { - local x - - # 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 - - # 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=$(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 - - # baselayout leaves behind a lot of .keep files, so let's clean them up - find "${ROOT}"/lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null - find "${ROOT}"/lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null - - # whine about users with invalid shells #215698 - if [[ -e ${ROOT}/etc/passwd ]] ; then - local bad_shells=$(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 - - # Sabayon customization, copy /etc/hosts back in place if it doesn't exist - local etc_hosts="${ROOT}/etc/hosts" - if [ -e "${etc_hosts}.baselayout_ebuild_backup" ]; then - cp -p "${etc_hosts}.baselayout_ebuild_backup" "${etc_hosts}" # don't die - elif [ ! -e "${etc_hosts}" ]; then - cp -p "${etc_hosts}.example" "${etc_hosts}" # don't die - fi - chown root:root "${etc_hosts}" # don't die - - # http://bugs.gentoo.org/361349 - if use kernel_linux; then - mkdir -p "${ROOT}"/run - - if ! grep -qs "^tmpfs.*/run " "${ROOT}"/proc/mounts ; then - echo - ewarn "You should reboot the system now to get /run mounted with tmpfs!" - fi - fi -} diff --git a/sys-apps/baselayout/baselayout-2.2-r6.ebuild b/sys-apps/baselayout/baselayout-2.2-r6.ebuild new file mode 100644 index 00000000..56f01f23 --- /dev/null +++ b/sys-apps/baselayout/baselayout-2.2-r6.ebuild @@ -0,0 +1,262 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.2 2012/08/23 21:47:35 vapier Exp $ + +inherit eutils multilib + +DESCRIPTION="Filesystem baselayout and init scripts" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="mirror://gentoo/${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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="build kernel_linux" + +pkg_setup() { + multilib_layout +} + +# Create our multilib dirs - the Makefile has no knowledge of this +multilib_warn() { + local syms=$1 dirs=$2 def_libdir=$3 + + [ -z "${syms}${dirs}" ] && return + + ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB}, so that means" + if [ -z "${syms}" ] ; then + ewarn "you need to have these paths as symlinks to ${def_libdir}:" + ewarn "$1" + fi +} +multilib_layout() { + local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + + [ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" + + # figure out which paths should be symlinks and which should be directories + local dirs syms exp d + for libdir in ${libdirs} ; do + exp=( {,usr/,usr/local/}${libdir} ) + for d in "${exp[@]/#/${ROOT}}" ; do + # most things should be dirs + if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then + [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}" + else + [ -h "${d}" ] && syms+=" ${d}" + fi + done + done + if [ -n "${syms}${dirs}" ] ; then + ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to" + ewarn "have these paths configured as follows:" + [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}" + [ -n "${syms}" ] && ewarn "directories:${syms}" + ewarn "The ebuild will attempt to fix these, but only for trivial conversions." + ewarn "If things fail, you will need to manually create/move the directories." + echo + fi + + # setup symlinks and dirs where we expect them to be; do not migrate + # data ... just fall over in that case. + local prefix + for prefix in "${ROOT}"{,usr/,usr/local/} ; do + if [ "${SYMLINK_LIB}" = yes ] ; then + # we need to make sure "lib" points to the native libdir + if [ -h "${prefix}lib" ] ; then + # it's already a symlink! assume it's pointing to right place ... + continue + elif [ -d "${prefix}lib" ] ; then + # "lib" is a dir, so need to convert to a symlink + ewarn "Converting ${prefix}lib from a dir to a symlink" + rm -f "${prefix}lib"/.keep + if rmdir "${prefix}lib" 2>/dev/null ; then + ln -s ${def_libdir} "${prefix}lib" || die + else + die "non-empty dir found where we needed a symlink: ${prefix}lib" + fi + else + # nothing exists, so just set it up sanely + ewarn "Initializing ${prefix}lib as a symlink" + mkdir -p "${prefix}" || die + rm -f "${prefix}lib" || die + ln -s ${def_libdir} "${prefix}lib" || die + mkdir -p "${prefix}${def_libdir}" #423571 + fi + else + # we need to make sure "lib" is a dir + if [ -h "${prefix}lib" ] ; then + # "lib" is a symlink, so need to convert to a dir + ewarn "Converting ${prefix}lib from a symlink to a dir" + rm -f "${prefix}lib" || die + if [ -d "${prefix}lib32" ] ; then + ewarn "Migrating ${prefix}lib32 to ${prefix}lib" + mv "${prefix}lib32" "${prefix}lib" || die + else + mkdir -p "${prefix}lib" || die + fi + elif [ -d "${prefix}lib" ] ; then + # make sure the old "lib" ABI location does not exist; we + # only symlinked the lib dir on systems where we moved it + # to "lib32" ... + case ${CHOST} in + i?86*|x86_64*|powerpc*|sparc*|s390*) + if [ -d "${prefix}lib32" ] ; then + rm -f "${prefix}lib32"/.keep + if ! rmdir "${prefix}lib32" 2>/dev/null ; then + ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" + die "non-empty dir found where there should be none: ${prefix}lib32" + fi + fi + ;; + esac + else + # nothing exists, so just set it up sanely + ewarn "Initializing ${prefix}lib as a dir" + mkdir -p "${prefix}" || die + rm -f "${prefix}lib" || die + ln -s ${def_libdir} "${prefix}lib" || die + fi + fi + done +} + +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. + multilib_layout + if use build ; then + emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die + fi + rm -f "${D}"/usr/share/${PN}/Makefile + + # Kogaion customization, protect /etc/hosts from removal (from older ebuilds) + local etc_hosts="${ROOT}/etc/hosts" + if [ -e "${etc_hosts}" ]; then + cp -p "${etc_hosts}" "${etc_hosts}.baselayout_ebuild_backup" # don't die + fi +} + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}/${PN}-redcore.patch" +} + +src_install() { + # Setup /run directory, this is missing from original baselayout + dodir /run + + emake \ + OS=$(usex kernel_FreeBSD BSD Linux) \ + DESTDIR="${D}" \ + install || die + dodoc ChangeLog.svn + + # need the makefile in pkg_preinst + insinto /usr/share/${PN} + doins Makefile || die + + # handle multilib paths. do it here because we want this behavior + # regardless of the C library that you're using. we do explicitly + # list paths which the native ldconfig searches, but this isn't + # problematic as it doesn't change the resulting ld.so.cache or + # take longer to generate. similarly, listing both the native + # path and the symlinked path doesn't change the resulting cache. + local libdir ldpaths + for libdir in $(get_all_libdirs) ; do + ldpaths+=":/${libdir}:/usr/${libdir}:/usr/local/${libdir}" + done + echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic + + # rc-scripts version for testing of features that *should* be present + echo "Redcore Linux 1701" > "${D}"/etc/gentoo-release + + # Sabayon customization, install /etc/hosts separately (to .example) + mv "${D}"/etc/hosts "${D}"/etc/hosts.example || die "cannot move /etc/hosts" + +} + +pkg_postinst() { + local x + + # 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 + + # 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=$(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 + + # baselayout leaves behind a lot of .keep files, so let's clean them up + find "${ROOT}"/lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null + find "${ROOT}"/lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null + + # whine about users with invalid shells #215698 + if [[ -e ${ROOT}/etc/passwd ]] ; then + local bad_shells=$(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 + + # Sabayon customization, copy /etc/hosts back in place if it doesn't exist + local etc_hosts="${ROOT}/etc/hosts" + if [ -e "${etc_hosts}.baselayout_ebuild_backup" ]; then + cp -p "${etc_hosts}.baselayout_ebuild_backup" "${etc_hosts}" # don't die + elif [ ! -e "${etc_hosts}" ]; then + cp -p "${etc_hosts}.example" "${etc_hosts}" # don't die + fi + chown root:root "${etc_hosts}" # don't die + + # http://bugs.gentoo.org/361349 + if use kernel_linux; then + mkdir -p "${ROOT}"/run + + if ! grep -qs "^tmpfs.*/run " "${ROOT}"/proc/mounts ; then + echo + ewarn "You should reboot the system now to get /run mounted with tmpfs!" + fi + fi +} diff --git a/sys-apps/baselayout/files/baselayout-redcore.patch b/sys-apps/baselayout/files/baselayout-redcore.patch index f6334a32..6eaff31d 100644 --- a/sys-apps/baselayout/files/baselayout-redcore.patch +++ b/sys-apps/baselayout/files/baselayout-redcore.patch @@ -1,11 +1,11 @@ diff -Nur a/etc.Linux/modprobe.d/blacklist.conf b/etc.Linux/modprobe.d/blacklist.conf --- a/etc.Linux/modprobe.d/blacklist.conf 1970-01-01 01:00:00.000000000 +0100 -+++ b/etc.Linux/modprobe.d/blacklist.conf 2016-11-06 15:09:49.930439684 +0000 ++++ b/etc.Linux/modprobe.d/blacklist.conf 2017-01-04 17:35:32.196531159 +0000 @@ -0,0 +1 @@ +blacklist vboxvideo diff -Nur a/etc.Linux/os-release b/etc.Linux/os-release --- a/etc.Linux/os-release 2012-05-17 05:21:08.000000000 +0100 -+++ b/etc.Linux/os-release 2016-11-06 15:08:06.375432952 +0000 ++++ b/etc.Linux/os-release 2017-01-04 17:36:01.981119062 +0000 @@ -1,7 +1,7 @@ -NAME=Gentoo -ID=gentoo @@ -18,5 +18,5 @@ diff -Nur a/etc.Linux/os-release b/etc.Linux/os-release -SUPPORT_URL="http://www.gentoo.org/main/en/support.xml" -BUG_REPORT_URL="https://bugs.gentoo.org/" +HOME_URL="http://redcorelinux.org" -+SUPPORT_URL="http://redcorelinux.org" -+BUG_REPORT_URL="http://redcorelinux.org" ++SUPPORT_URL="http://wiki.redcorelinux.org" ++BUG_REPORT_URL="http://bugs.redcorelinux.org" -- cgit v1.2.3