diff options
| -rw-r--r-- | metadata/md5-cache/sys-apps/baselayout-2.13-r3 (renamed from metadata/md5-cache/sys-apps/baselayout-2.13-r2) | 6 | ||||
| -rw-r--r-- | metadata/md5-cache/sys-apps/baselayout-2.8-r3 | 14 | ||||
| -rw-r--r-- | metadata/pkg_desc_index | 2 | ||||
| -rw-r--r-- | sys-apps/baselayout/Manifest | 1 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-2.13-r3.ebuild (renamed from sys-apps/baselayout/baselayout-2.13-r2.ebuild) | 1 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-2.8-r3.ebuild | 372 |
6 files changed, 5 insertions, 391 deletions
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.13-r2 b/metadata/md5-cache/sys-apps/baselayout-2.13-r3 index c610d345..e4a7024b 100644 --- a/metadata/md5-cache/sys-apps/baselayout-2.13-r2 +++ b/metadata/md5-cache/sys-apps/baselayout-2.13-r3 @@ -1,6 +1,6 @@ BDEPEND=virtual/pkgconfig DEFINED_PHASES=install postinst postrm preinst prepare setup -DEPEND=acct-group/smbshare !net-fs/sambacfg !sys-boot/grubcfg !sys-kernel/dracutcfg +DEPEND=acct-group/smbshare sys-apps/fakeroot !net-fs/sambacfg !sys-boot/grubcfg !sys-kernel/dracutcfg DESCRIPTION=Filesystem baselayout and init scripts EAPI=7 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage @@ -8,8 +8,8 @@ INHERIT=multilib prefix udev IUSE=build +split-usr KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt LICENSE=GPL-2 -RDEPEND=acct-group/smbshare !net-fs/sambacfg !sys-boot/grubcfg !sys-kernel/dracutcfg !sys-apps/baselayout-prefix +RDEPEND=acct-group/smbshare sys-apps/fakeroot !net-fs/sambacfg !sys-boot/grubcfg !sys-kernel/dracutcfg !sys-apps/baselayout-prefix SLOT=0 SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.13.tar.bz2 _eclasses_=multilib 104e1332efb829e2f7cbf89307a474f1 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e udev eec0bbab06977f1cfc5597269c1fa152 -_md5_=e423573f0e8a362efc7c095c6fb56bdc +_md5_=6fb5a985bb02d62cd0d767cef6874bfb diff --git a/metadata/md5-cache/sys-apps/baselayout-2.8-r3 b/metadata/md5-cache/sys-apps/baselayout-2.8-r3 deleted file mode 100644 index b406a275..00000000 --- a/metadata/md5-cache/sys-apps/baselayout-2.8-r3 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=install postinst postrm preinst prepare setup -DEPEND=acct-group/smbshare !net-fs/sambacfg !sys-boot/grubcfg !sys-kernel/dracutcfg virtual/pkgconfig -DESCRIPTION=Filesystem baselayout and init scripts -EAPI=6 -HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage -INHERIT=multilib versionator prefix udev -IUSE=build kernel_FreeBSD kernel_linux +split-usr -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 -LICENSE=GPL-2 -RDEPEND=acct-group/smbshare !net-fs/sambacfg !sys-boot/grubcfg !sys-kernel/dracutcfg -SLOT=0 -SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.8.tar.bz2 -_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib 104e1332efb829e2f7cbf89307a474f1 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e udev eec0bbab06977f1cfc5597269c1fa152 versionator d3fb3ba33acc3bbbdc4d7970227c100d -_md5_=135464cb102737c1577b53b2be0d4e42 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index a2a4ed60..bb6ded23 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -38,7 +38,7 @@ net-dialup/rp-pppoe 4.0-r5: A user-mode PPPoE client and server suite for Linux net-misc/warpinator 1.4.5: Share files across the LAN net-print/lexmark-upd-ppd 1.0.0.20210304-r1: Lexmark universal printer driver PPDs net-wireless/broadcom-sta 6.30.223.271-r4: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver -sys-apps/baselayout 2.8-r3 2.13-r2: Filesystem baselayout and init scripts +sys-apps/baselayout 2.13-r3: Filesystem baselayout and init scripts sys-apps/firetools 0.9.64: Graphical user interface of app-emulation/firejail sys-apps/lsb-release 3.2-r1: LSB version query program sys-apps/openrc 0.46-r1: OpenRC manages the services, startup and shutdown of a host diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index f25272d9..92b823c4 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,2 +1 @@ DIST baselayout-2.13.tar.bz2 29423 BLAKE2B a399e515297d3a936c5821205f1f0d6de844580099936be50e80a463b9fa6239aead52b7b371136680e263e326f7e6a1faea8cd8db0f11462cf0e8166707fc91 SHA512 ff16f20cf2c65258ab6d48c403607113f84fc57ffee6650652202746095f402f8c6a4f22040d0bb9310180945131bed6a0fda3717b39080a987e4f5224339095 -DIST baselayout-2.8.tar.bz2 30236 BLAKE2B 0bac62dd5585f1f550da8c99d06a7f8ab6cdd473b0499a8f0ac58a5c43e3883b42adb7f80c172d894fae93a6ddb6fec7a65cad9897f4a2532b481c82065ed96b SHA512 506d7cc8399b530eabc9ba2d16cbb6c024350f9487a2a9168c670cee9876f62e5a716942f698c4883013d6ccc9591c2d7fc2ac9d782f0ce8d724371ca94c739a diff --git a/sys-apps/baselayout/baselayout-2.13-r2.ebuild b/sys-apps/baselayout/baselayout-2.13-r3.ebuild index 3617a851..a361b3fd 100644 --- a/sys-apps/baselayout/baselayout-2.13-r2.ebuild +++ b/sys-apps/baselayout/baselayout-2.13-r3.ebuild @@ -20,6 +20,7 @@ SLOT="0" IUSE="build +split-usr" DEPEND="acct-group/smbshare + sys-apps/fakeroot !net-fs/sambacfg !sys-boot/grubcfg !sys-kernel/dracutcfg" diff --git a/sys-apps/baselayout/baselayout-2.8-r3.ebuild b/sys-apps/baselayout/baselayout-2.8-r3.ebuild deleted file mode 100644 index d47972a3..00000000 --- a/sys-apps/baselayout/baselayout-2.8-r3.ebuild +++ /dev/null @@ -1,372 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib versionator prefix udev - -DESCRIPTION="Filesystem baselayout and init scripts" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git" - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="build kernel_FreeBSD kernel_linux +split-usr" - -DEPEND="acct-group/smbshare - !net-fs/sambacfg - !sys-boot/grubcfg - !sys-kernel/dracutcfg" -RDEPEND="${DEPEND}" - -pkg_setup() { - multilib_layout -} - -# Create our multilib dirs - the Makefile has no knowledge of this -multilib_layout() { - local dir def_libdir libdir libdirs - local prefix prefix_lst - def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) - libdirs=$(get_all_libdirs) - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... - - if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then - prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) - for prefix in "${prefix_lst[@]}"; do - for libdir in ${libdirs}; do - dir="${prefix}${libdir}" - if [[ -e "${dir}" ]]; then - [[ ! -d "${dir}" ]] && - die "${dir} exists but is not a directory" - continue - fi - if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then - einfo "symlinking ${dir} to usr/${libdir}" - ln -s usr/${libdir} ${dir} || - die " Unable to make ${dir} symlink" - else - einfo "creating directory ${dir}" - mkdir -p "${dir}" || - die "Unable to create ${dir} directory" - fi - done - done - return 0 - fi - - [ -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 - if use split-usr ; then - exp=( {,usr/,usr/local/}${libdir} ) - else - exp=( {usr/,usr/local/}${libdir} ) - fi - for d in "${exp[@]}" ; 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. - if use split-usr ; then - prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) - else - prefix_lst=( "${EROOT}"{usr/,usr/local/} ) - fi - for prefix in "${prefix_lst[@]}"; 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 || die - 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}" || die #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" ] && ! has lib32 ${libdirs} ; 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 - *-gentoo-freebsd*) ;; # We want it the other way on fbsd. - i?86*|x86_64*|powerpc*|sparc*|s390*) - if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then - rm -f "${prefix}lib32"/.keep || die - 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}lib" || die - fi - fi - done - if ! use split-usr ; then - for libdir in ${libdirs}; do - if [[ ! -e "${EROOT}${libdir}" ]]; then - ln -s usr/"${libdir}" "${EROOT}${libdir}" || - die " Unable to make ${EROOT}${libdir} symlink" - fi - done - fi -} - -pkg_preinst() { - # 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 "${EROOT}"/etc/._cfg????_gentoo-release || die - - # 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 - if use split-usr ; then - emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout - else - emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge - fi - fi - rm -f "${ED}"/usr/share/${PN}/Makefile || die -} - -src_prepare() { - default - eapply "${FILESDIR}"/"${P}"-redcore.patch - if use prefix; then - hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile - hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd - echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host - fi - - # don't want symlinked directories in PATH on systems with usr-merge - if ! use split-usr; then - sed \ - -e 's|/usr/local/sbin:||g' \ - -e 's|:/usr/sbin:|:|g' \ - -e 's|:/sbin:|:|g' \ - -e 's|:/bin:|:|g' \ - -i etc/env.d/50baselayout || die - fi - - # 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 - use split-usr && ldpaths+=":${EPREFIX}/${libdir}" - ldpaths+=":${EPREFIX}/usr/${libdir}" - ldpaths+=":${EPREFIX}/usr/local/${libdir}" - done - echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout - - # rc-scripts version for testing of features that *should* be present - echo "Redcore Linux Hardened - rolling" > etc/redcore-release -} - -src_install() { - emake \ - OS=$(usex kernel_FreeBSD BSD Linux) \ - DESTDIR="${ED}" \ - install - - # need the makefile in pkg_preinst - insinto /usr/share/${PN} - doins Makefile - dodoc ChangeLog - - ############### Redcore Linux ############### - # - # issue.logo - rm "${ED}"/etc/issue.logo - # - # NetworkManager - dodir /etc/NetworkManager - insinto /etc/NetworkManager - newins "${FILESDIR}"/nmcfg NetworkManager.conf - # - # dracut - dodir /etc/dracut.conf.d - insinto /etc/dracut.conf.d - newins "${FILESDIR}"/dracutcfg dracut-redcore.conf - # - # grub - dodir /etc/default - insinto /etc/default - newins "${FILESDIR}"/grubcfg grub - # - # samba - dodir /etc/samba - insinto /etc/samba - newins "${FILESDIR}"/smbcfg smb.conf - keepdir var/lib/samba/usershare - # cryptsetup - dodir /etc/conf.d - insinto /etc/conf.d - newins ${FILESDIR}/dmcryptcfg dmcrypt - # - # esync - dodir /etc/security/limits.d - insinto /etc/security/limits.d - newins ${FILESDIR}/esynccfg 50-esync.conf - # - # IOsched - dodir /lib/udev/rules.d/ - insinto /lib/udev/rules.d - newins ${FILESDIR}/ioschedcfg 60-iosched.rules - # - ############################################## -} - -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 "${EROOT}etc/${x}" ] && continue - [ -e "${EROOT}usr/share/baselayout/${x}" ] || continue - cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc || die - done - - # Force shadow permissions to not be world-readable #260993 - for x in shadow ; do - if [ -e "${EROOT}etc/${x}" ] ; then - chmod o-rwx "${EROOT}etc/${x}" || die - fi - done - - # whine about users that lack passwords #193541 - if [[ -e "${EROOT}"etc/shadow ]] ; then - local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/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 "${EROOT}"etc/passwd ]] ; then - local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort) - if [[ -n ${bad_shells} ]] ; then - echo - ewarn "The following users have non-existent shells!" - ewarn "${bad_shells}" - fi - fi - - # https://bugs.gentoo.org/361349 - if use kernel_linux; then - mkdir -p "${EROOT}"run || die - - local found fstype mountpoint - while read -r _ mountpoint fstype _; do - [[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1 - done < "${ROOT}"proc/mounts - [[ -z ${found} ]] && - ewarn "You should reboot now to get /run mounted with tmpfs!" - fi - - for x in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 2.4 ${x}; then - ewarn "After updating ${EROOT}etc/profile, please run" - ewarn "env-update && . /etc/profile" - fi - - if ! version_is_at_least 2.6 ${x}; then - ewarn "Please run env-update then log out and back in to" - ewarn "update your path." - fi - # clean up after 2.5 typos - # https://bugs.gentoo.org/show_bug.cgi?id=656380 - if [[ ${x} == 2.5 ]]; then - rm -fr "${EROOT}{,usr" || die - fi - done - - if [[ -e "${EROOT}"etc/env.d/00basic ]]; then - ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout" - ewarn "Please migrate your changes." - fi - - ############### Redcore Linux ############### - rm -rf "${EROOT}"etc/dracut.conf.d/._cfg????_dracut-redcore.conf - rm -rf "${EROOT}"etc/default/._cfg????_grub - rm -rf "${EROOT}"etc/samba/._cfg????_smb.conf - rm -rf "${EROOT}"etc/conf.d/._cfg???_dmcrypt - rm -rf "${EROOT}"etc/security/limits.d/._cfg???_50-esync.conf - rm -rf "${EROOT}"lib/udev/rules.d/._cfg???_60-iosched.rules - chown root:smbshare /var/lib/samba/usershare - chmod 1770 /var/lib/samba/usershare - udev_reload - ############################################ -} - -pkg_postrm() { - ############### Redcore Linux ############### - udev_reload - ############################################ -} |