From 4bd6fd31e606d063b1b8bb8bca95ad767b7d6a2b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 18 Jul 2023 15:15:31 +0100 Subject: x11-base/xorg-server : use Gentoo's build --- metadata/md5-cache/sys-apps/baselayout-2.13-r3 | 15 - metadata/md5-cache/sys-apps/baselayout-2.13-r4 | 15 + metadata/md5-cache/sys-apps/lsb-release-3.2-r1 | 12 - metadata/md5-cache/sys-apps/lsb-release-3.2-r2 | 12 + metadata/md5-cache/x11-base/xorg-server-21.1.8-r10 | 18 - metadata/pkg_desc_index | 5 +- sys-apps/baselayout/baselayout-2.13-r3.ebuild | 438 -------------------- sys-apps/baselayout/baselayout-2.13-r4.ebuild | 442 +++++++++++++++++++++ .../baselayout/files/baselayout-2.13-redcore.patch | 2 +- .../baselayout/files/baselayout-2.8-redcore.patch | 39 -- sys-apps/baselayout/files/xorgcfg | 9 + sys-apps/lsb-release/lsb-release-3.2-r1.ebuild | 43 -- sys-apps/lsb-release/lsb-release-3.2-r2.ebuild | 43 ++ x11-base/xorg-server/Manifest | 1 - .../xorg-server/files/99-synaptics-overrides.conf | 9 - .../files/xorg-server-1.12-unloadsubmodule.patch | 53 --- ...rver-1.18-support-multiple-Files-sections.patch | 53 --- x11-base/xorg-server/files/xorg-sets.conf | 6 - x11-base/xorg-server/xorg-server-21.1.8-r10.ebuild | 197 --------- 19 files changed, 524 insertions(+), 888 deletions(-) delete mode 100644 metadata/md5-cache/sys-apps/baselayout-2.13-r3 create mode 100644 metadata/md5-cache/sys-apps/baselayout-2.13-r4 delete mode 100644 metadata/md5-cache/sys-apps/lsb-release-3.2-r1 create mode 100644 metadata/md5-cache/sys-apps/lsb-release-3.2-r2 delete mode 100644 metadata/md5-cache/x11-base/xorg-server-21.1.8-r10 delete mode 100644 sys-apps/baselayout/baselayout-2.13-r3.ebuild create mode 100644 sys-apps/baselayout/baselayout-2.13-r4.ebuild delete mode 100644 sys-apps/baselayout/files/baselayout-2.8-redcore.patch create mode 100644 sys-apps/baselayout/files/xorgcfg delete mode 100644 sys-apps/lsb-release/lsb-release-3.2-r1.ebuild create mode 100644 sys-apps/lsb-release/lsb-release-3.2-r2.ebuild delete mode 100644 x11-base/xorg-server/Manifest delete mode 100644 x11-base/xorg-server/files/99-synaptics-overrides.conf delete mode 100644 x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch delete mode 100644 x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch delete mode 100644 x11-base/xorg-server/files/xorg-sets.conf delete mode 100644 x11-base/xorg-server/xorg-server-21.1.8-r10.ebuild diff --git a/metadata/md5-cache/sys-apps/baselayout-2.13-r3 b/metadata/md5-cache/sys-apps/baselayout-2.13-r3 deleted file mode 100644 index 3ac9c576..00000000 --- a/metadata/md5-cache/sys-apps/baselayout-2.13-r3 +++ /dev/null @@ -1,15 +0,0 @@ -BDEPEND=virtual/pkgconfig -DEFINED_PHASES=install postinst postrm preinst prepare setup -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 -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 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 c19072c3cd7ac5cb21de013f7e9832e0 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c udev eec0bbab06977f1cfc5597269c1fa152 -_md5_=6fb5a985bb02d62cd0d767cef6874bfb diff --git a/metadata/md5-cache/sys-apps/baselayout-2.13-r4 b/metadata/md5-cache/sys-apps/baselayout-2.13-r4 new file mode 100644 index 00000000..989aefd7 --- /dev/null +++ b/metadata/md5-cache/sys-apps/baselayout-2.13-r4 @@ -0,0 +1,15 @@ +BDEPEND=virtual/pkgconfig +DEFINED_PHASES=install postinst postrm preinst prepare setup +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 +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 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 c19072c3cd7ac5cb21de013f7e9832e0 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c udev eec0bbab06977f1cfc5597269c1fa152 +_md5_=c1bdabf12e133e71aaba1809105bb9bb diff --git a/metadata/md5-cache/sys-apps/lsb-release-3.2-r1 b/metadata/md5-cache/sys-apps/lsb-release-3.2-r1 deleted file mode 100644 index de1c5695..00000000 --- a/metadata/md5-cache/sys-apps/lsb-release-3.2-r1 +++ /dev/null @@ -1,12 +0,0 @@ -BDEPEND=dev-lang/perl -DEFINED_PHASES=install prepare -DESCRIPTION=LSB version query program -EAPI=8 -HOMEPAGE=https://wiki.linuxfoundation.org/lsb/ -INHERIT=prefix -KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 -LICENSE=GPL-2 -SLOT=0 -SRC_URI=https://github.com/thkukuk/lsb-release_os-release/archive/refs/tags/v3.2.tar.gz -> lsb-release-3.2.tar.gz -_eclasses_=prefix eab3c99d77fe00506c109c8a736186f7 -_md5_=6e63b3083f5ce69852337ba450add99a diff --git a/metadata/md5-cache/sys-apps/lsb-release-3.2-r2 b/metadata/md5-cache/sys-apps/lsb-release-3.2-r2 new file mode 100644 index 00000000..60ba5aba --- /dev/null +++ b/metadata/md5-cache/sys-apps/lsb-release-3.2-r2 @@ -0,0 +1,12 @@ +BDEPEND=dev-lang/perl +DEFINED_PHASES=install prepare +DESCRIPTION=LSB version query program +EAPI=8 +HOMEPAGE=https://wiki.linuxfoundation.org/lsb/ +INHERIT=prefix +KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=https://github.com/thkukuk/lsb-release_os-release/archive/refs/tags/v3.2.tar.gz -> lsb-release-3.2.tar.gz +_eclasses_=prefix eab3c99d77fe00506c109c8a736186f7 +_md5_=08f195ff3e6541b7dd61d8df7800a6e4 diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.8-r10 b/metadata/md5-cache/x11-base/xorg-server-21.1.8-r10 deleted file mode 100644 index a0b12d93..00000000 --- a/metadata/md5-cache/x11-base/xorg-server-21.1.8-r10 +++ /dev/null @@ -1,18 +0,0 @@ -BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array -DEFINED_PHASES=compile configure install postinst postrm prepare test unpack -DEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util test? ( >=x11-libs/libxcvt-0.1.0 ) -DESCRIPTION=X.Org X servers -EAPI=8 -HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server -INHERIT=flag-o-matic xorg-3 meson -IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux -LICENSE=MIT -PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 ) -RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 ) -REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) -RESTRICT=!test? ( test ) -SLOT=0/21.1.8 -SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.8.tar.xz -_eclasses_=autotools 6ae9a4347149b19a112caa1182d03bde flag-o-matic ad475baa777c9978fa035216c8264a10 gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 9d3a9a889a6fa62ae794f817c156491b meson 18d046bdb14e1bdb22cce6e5d953e364 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 python-utils-r1 a013e16d5d896b3d8be68dd2a0e846ea toolchain-funcs 513c31b3346458ed1f3878b57da6d61c xorg-3 94d3e3c20538edd72a65ea18d9a57af4 -_md5_=707fd7e0dfad886612f7ada57f7df543 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index cf8921fd..79b01ead 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -38,9 +38,9 @@ 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.13-r3: Filesystem baselayout and init scripts +sys-apps/baselayout 2.13-r4: 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/lsb-release 3.2-r2: LSB version query program sys-apps/openrc 0.47.1-r1: OpenRC manages the services, startup and shutdown of a host sys-auth/polkit-qt 0.113.0-r11: PolicyKit Qt API wrapper library (meta package) sys-auth/polkit-qt5 0.113.0-r5: Qt wrapper around polkit-1 client libraries @@ -71,7 +71,6 @@ virtual/notification-daemon 1.334.1337: Virtual (dummy package) for notification virtual/tmpfiles 1.314.1337: Virtual to select between different tmpfiles.d handlers virtual/udev 314.1337: Virtual to select between different udev daemon providers x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg drivers (dummy package) -x11-base/xorg-server 21.1.8-r10: X.Org X servers x11-drivers/nvidia-drivers 390.157-r5 470.199.02-r2 525.125.06-r2 535.54.03-r1: NVIDIA Accelerated Graphics Driver x11-libs/gtk+ 2.24.33-r3 3.24.37-r1: Gimp ToolKit + x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utilities diff --git a/sys-apps/baselayout/baselayout-2.13-r3.ebuild b/sys-apps/baselayout/baselayout-2.13-r3.ebuild deleted file mode 100644 index a361b3fd..00000000 --- a/sys-apps/baselayout/baselayout-2.13-r3.ebuild +++ /dev/null @@ -1,438 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib 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 ~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" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="build +split-usr" - -DEPEND="acct-group/smbshare - sys-apps/fakeroot - !net-fs/sambacfg - !sys-boot/grubcfg - !sys-kernel/dracutcfg" -RDEPEND="${DEPEND} - !sys-apps/baselayout-prefix" - -pkg_setup() { - multilib_layout -} - -riscv_compat_symlink() { - # Here we apply some special sauce for riscv. - # Two multilib layouts exist for now: - # 1) one level libdirs, (32bit) "lib" and (64bit) "lib64" - # these are chosen by us to closely resemble other arches - # 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ... - # this is the glibc/gcc default - # Unfortunately, the default has only one fallback, which is "lib" - # for both 32bit and 64bit. So things do not break in 1), we need - # to provide compatibility symlinks... - - # This function has exactly two parameters: - # - the default libdir, to determine if 1) or 2) applies - # - the location of the symlink (which points to ".") - - # Note: we call this only in the ${SYMLINK_LIB} = no codepath, since - # there never was a ${SYMLINK_LIB} = yes riscv profile. - - case ${CHOST} in - riscv*) - # are we on a one level libdir profile? is there no symlink yet? - if [[ ${1} != */* && ! -L ${2} ]] ; then - ln -s . $2 || die "Unable to make $2 riscv compatibility symlink" - fi - ;; - esac -} - -# 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) - - 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 - libdir="${libdir%%/*}" - dir="${prefix}${libdir}" - 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 - [[ -d "${prefix}${def_libdir}" ]] && riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}" - 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 - 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() { - # 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 - - # Create symlinks in pkg_preinst to avoid Portage collision check. - # Create the symlinks in ${ED} via dosym so that we own it. - # Only create the symlinks if it wont cause a conflict in ${EROOT}. - if [[ -L ${EROOT}/var/lock || ! -e ${EROOT}/var/lock ]]; then - dosym ../run/lock /var/lock - fi - if [[ -L ${EROOT}/var/run || ! -e ${EROOT}/var/run ]]; then - dosym ../run /var/run - fi -} - -src_prepare() { - default - eapply "${FILESDIR}"/"${P}"-redcore.patch - - # don't want symlinked directories in PATH on systems with usr-merge - if ! use split-usr && ! use prefix-guest; then - sed \ - -e 's|:/usr/sbin:|:|g' \ - -e 's|:/sbin:|:|g' \ - -e 's|:/bin:|:|g' \ - -i etc/env.d/50baselayout || die - fi - - if use prefix; then - hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile - hprefixify etc/shells share/passwd - hprefixify -w '/PATH=/' etc/env.d/50baselayout - hprefixify -w 1 etc/env.d/50baselayout - echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host - - # change branding - sed -i \ - -e '/gentoo-release/s/Gentoo Base/Gentoo Prefix Base/' \ - -e '/make_os_release/s/${OS}/Prefix/' \ - Makefile || 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 - if use split-usr || use prefix-guest; then - ldpaths+=":${EPREFIX}/${libdir}" - fi - 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 \ - DESTDIR="${ED}" \ - install - - if [[ ${CHOST} == *-darwin* ]] ; then - # add SDK path which contains development manpages - echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \ - > "${ED}"/etc/env.d/98macos-sdk - fi - - # need the makefile in pkg_preinst - insinto /usr/share/${PN} - doins Makefile - - dodoc ChangeLog - - # bug 858596 - if use prefix-guest ; then - dodir sbin - cat > "${ED}"/sbin/runscript <<- EOF - #!/usr/bin/env sh - source "${EPREFIX}/lib/gentoo/functions.sh" - - eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2 - exit 1 - EOF - chmod 755 "${ED}"/sbin/runscript || die - cp "${ED}"/sbin/{runscript,openrc-run} || die - fi - - ############### 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 ${ROOT}" $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 ver_test 2.4 -lt ${x}; then - ewarn "After updating ${EROOT}/etc/profile, please run" - ewarn "env-update && . /etc/profile" - fi - - if ver_test 2.6 -lt ${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 - ############################################ -} diff --git a/sys-apps/baselayout/baselayout-2.13-r4.ebuild b/sys-apps/baselayout/baselayout-2.13-r4.ebuild new file mode 100644 index 00000000..cbfd0b2c --- /dev/null +++ b/sys-apps/baselayout/baselayout-2.13-r4.ebuild @@ -0,0 +1,442 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib 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 ~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" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="build +split-usr" + +DEPEND="acct-group/smbshare + sys-apps/fakeroot + !net-fs/sambacfg + !sys-boot/grubcfg + !sys-kernel/dracutcfg" +RDEPEND="${DEPEND} + !sys-apps/baselayout-prefix" + +pkg_setup() { + multilib_layout +} + +riscv_compat_symlink() { + # Here we apply some special sauce for riscv. + # Two multilib layouts exist for now: + # 1) one level libdirs, (32bit) "lib" and (64bit) "lib64" + # these are chosen by us to closely resemble other arches + # 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ... + # this is the glibc/gcc default + # Unfortunately, the default has only one fallback, which is "lib" + # for both 32bit and 64bit. So things do not break in 1), we need + # to provide compatibility symlinks... + + # This function has exactly two parameters: + # - the default libdir, to determine if 1) or 2) applies + # - the location of the symlink (which points to ".") + + # Note: we call this only in the ${SYMLINK_LIB} = no codepath, since + # there never was a ${SYMLINK_LIB} = yes riscv profile. + + case ${CHOST} in + riscv*) + # are we on a one level libdir profile? is there no symlink yet? + if [[ ${1} != */* && ! -L ${2} ]] ; then + ln -s . $2 || die "Unable to make $2 riscv compatibility symlink" + fi + ;; + esac +} + +# 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) + + 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 + libdir="${libdir%%/*}" + dir="${prefix}${libdir}" + 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 + [[ -d "${prefix}${def_libdir}" ]] && riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}" + 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 + 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() { + # 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 + + # Create symlinks in pkg_preinst to avoid Portage collision check. + # Create the symlinks in ${ED} via dosym so that we own it. + # Only create the symlinks if it wont cause a conflict in ${EROOT}. + if [[ -L ${EROOT}/var/lock || ! -e ${EROOT}/var/lock ]]; then + dosym ../run/lock /var/lock + fi + if [[ -L ${EROOT}/var/run || ! -e ${EROOT}/var/run ]]; then + dosym ../run /var/run + fi +} + +src_prepare() { + default + eapply "${FILESDIR}"/"${P}"-redcore.patch + + # don't want symlinked directories in PATH on systems with usr-merge + if ! use split-usr && ! use prefix-guest; then + sed \ + -e 's|:/usr/sbin:|:|g' \ + -e 's|:/sbin:|:|g' \ + -e 's|:/bin:|:|g' \ + -i etc/env.d/50baselayout || die + fi + + if use prefix; then + hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile + hprefixify etc/shells share/passwd + hprefixify -w '/PATH=/' etc/env.d/50baselayout + hprefixify -w 1 etc/env.d/50baselayout + echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host + + # change branding + sed -i \ + -e '/gentoo-release/s/Gentoo Base/Gentoo Prefix Base/' \ + -e '/make_os_release/s/${OS}/Prefix/' \ + Makefile || 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 + if use split-usr || use prefix-guest; then + ldpaths+=":${EPREFIX}/${libdir}" + fi + 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_boulder_uphill" > etc/redcore-release +} + +src_install() { + emake \ + DESTDIR="${ED}" \ + install + + if [[ ${CHOST} == *-darwin* ]] ; then + # add SDK path which contains development manpages + echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \ + > "${ED}"/etc/env.d/98macos-sdk + fi + + # need the makefile in pkg_preinst + insinto /usr/share/${PN} + doins Makefile + + dodoc ChangeLog + + # bug 858596 + if use prefix-guest ; then + dodir sbin + cat > "${ED}"/sbin/runscript <<- EOF + #!/usr/bin/env sh + source "${EPREFIX}/lib/gentoo/functions.sh" + + eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2 + exit 1 + EOF + chmod 755 "${ED}"/sbin/runscript || die + cp "${ED}"/sbin/{runscript,openrc-run} || die + fi + + ############### 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 + # + # Xorg + dodir /usr/share/X11/xorg.conf.d + insinto /usr/share/X11/xorg.conf.d + newins ${FILESDIR}/xorgcfg 80-synaptics-overrides.conf + ############################################## +} + +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 ${ROOT}" $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 ver_test 2.4 -lt ${x}; then + ewarn "After updating ${EROOT}/etc/profile, please run" + ewarn "env-update && . /etc/profile" + fi + + if ver_test 2.6 -lt ${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 + ############################################ +} diff --git a/sys-apps/baselayout/files/baselayout-2.13-redcore.patch b/sys-apps/baselayout/files/baselayout-2.13-redcore.patch index f7bf014f..b3247d17 100644 --- a/sys-apps/baselayout/files/baselayout-2.13-redcore.patch +++ b/sys-apps/baselayout/files/baselayout-2.13-redcore.patch @@ -11,7 +11,7 @@ diff -Nur a/Makefile b/Makefile $(INSTALL_DIR) $(DESTDIR)/usr/lib ln -snf ../usr/lib/os-release ${DESTDIR}/etc/os-release - ./make_os_release ${PV} > $(DESTDIR)/usr/lib/os-release -+ ./make_os_release rolling > $(DESTDIR)/usr/lib/os-release ++ ./make_os_release rolling_boulder_uphill > $(DESTDIR)/usr/lib/os-release $(INSTALL_DIR) $(DESTDIR)/usr/share/baselayout cp -pPR share/* $(DESTDIR)/usr/share/baselayout/ ln -snf ../proc/self/mounts $(DESTDIR)/etc/mtab diff --git a/sys-apps/baselayout/files/baselayout-2.8-redcore.patch b/sys-apps/baselayout/files/baselayout-2.8-redcore.patch deleted file mode 100644 index ef24e25a..00000000 --- a/sys-apps/baselayout/files/baselayout-2.8-redcore.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Nur a/Makefile b/Makefile ---- a/Makefile 2021-09-27 22:48:05.000000000 +0100 -+++ b/Makefile 2022-09-21 12:52:08.248406011 +0100 -@@ -63,12 +63,11 @@ - install: - $(INSTALL_DIR) $(DESTDIR)/etc - cp -pPR etc/* etc.$(OS)/* $(DESTDIR)/etc/ -- echo "Gentoo Base System release ${PV}" > ${DESTDIR}/etc/gentoo-release - $(INSTALL_DIR) $(DESTDIR)/lib - cp -pPR lib.$(OS)/* $(DESTDIR)/lib/ - $(INSTALL_DIR) $(DESTDIR)/usr/lib - ln -snf ../usr/lib/os-release ${DESTDIR}/etc/os-release -- ./make_os_release ${OS} ${PV} > $(DESTDIR)/usr/lib/os-release -+ ./make_os_release ${OS} rolling > $(DESTDIR)/usr/lib/os-release - $(INSTALL_DIR) $(DESTDIR)/usr/share/baselayout - cp -pPR share.$(OS)/* $(DESTDIR)/usr/share/baselayout/ - -diff -Nur a/make_os_release b/make_os_release ---- a/make_os_release 2021-09-27 22:48:05.000000000 +0100 -+++ b/make_os_release 2022-09-21 12:49:21.760390518 +0100 -@@ -4,12 +4,12 @@ - exit 1 - fi - cat < "${D}/etc/lsb-release" <<- EOF - DISTRIB_ID="Redcore" - DISTRIB_RELEASE="rolling" - DISTRIB_DESCRIPTION="Redcore Linux Hardened - rolling" - EOF -} diff --git a/sys-apps/lsb-release/lsb-release-3.2-r2.ebuild b/sys-apps/lsb-release/lsb-release-3.2-r2.ebuild new file mode 100644 index 00000000..0357f2a7 --- /dev/null +++ b/sys-apps/lsb-release/lsb-release-3.2-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit prefix + +DESCRIPTION="LSB version query program" +HOMEPAGE="https://wiki.linuxfoundation.org/lsb/" +# mirror://sourceforge/lsb/${P}.tar.gz +SRC_URI="https://github.com/thkukuk/lsb-release_os-release/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}_os-release-${PV} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +# Perl isn't needed at runtime, it is just used to generate the man page. +BDEPEND="dev-lang/perl" + +src_prepare() { + default + + # Use POSIX 'printf' instead of bash 'echo -e', bug #482370 + sed -i \ + -e "s:echo -e:printf '%b\\\n':g" \ + -e 's:--long:-l:g' \ + lsb_release || die + + # TODO: unbundle help2man? + hprefixify lsb_release help2man +} + +src_install() { + emake prefix="${ED}"/usr install + + dodir /etc + cat > "${D}/etc/lsb-release" <<- EOF + DISTRIB_ID="Redcore" + DISTRIB_RELEASE="rolling_boulder_uphill" + DISTRIB_DESCRIPTION="Redcore Linux Hardened - rolling_boulder_uphill" + EOF +} diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest deleted file mode 100644 index 4aa30fb7..00000000 --- a/x11-base/xorg-server/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937 diff --git a/x11-base/xorg-server/files/99-synaptics-overrides.conf b/x11-base/xorg-server/files/99-synaptics-overrides.conf deleted file mode 100644 index ee2a3ebd..00000000 --- a/x11-base/xorg-server/files/99-synaptics-overrides.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Enable clicks using touchpad (https://bugs.redcorelinux.org/show_bug.cgi?id=48) - -Section "InputClass" - Identifier "touchpad overrides" - MatchDriver "synaptics" - Option "TapButton1" "1" - Option "VertEdgeScroll" "1" - Option "RBCornerButton" "3" -EndSection diff --git a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch deleted file mode 100644 index 57c7349d..00000000 --- a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -u13 -r xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c xorg-server-1.12.3/hw/xfree86/loader/loadmod.c ---- xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c 2012-09-05 18:26:42.000000000 +0200 -+++ xorg-server-1.12.3/hw/xfree86/loader/loadmod.c 2012-09-05 18:28:54.000000000 +0200 -@@ -1109,39 +1109,38 @@ - static void - RemoveChild(ModuleDescPtr child) - { - ModuleDescPtr mdp; - ModuleDescPtr prevsib; - ModuleDescPtr parent; - - if (!child->parent) - return; - - parent = child->parent; - if (parent->child == child) { - parent->child = child->sib; -- return; -- } -- -- prevsib = parent->child; -- mdp = prevsib->sib; -- while (mdp && mdp != child) { -- prevsib = mdp; -- mdp = mdp->sib; -+ } -+ else { -+ prevsib = parent->child; -+ mdp = prevsib->sib; -+ while (mdp && mdp != child) { -+ prevsib = mdp; -+ mdp = mdp->sib; -+ } -+ if (mdp == child) -+ prevsib->sib = child->sib; - } -- if (mdp == child) -- prevsib->sib = child->sib; - child->sib = NULL; -- return; - } - - void - LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin) - { - const char *msg; - MessageType type = X_ERROR; - - switch (errmaj) { - case LDR_NOERROR: - msg = "no error"; - break; - case LDR_NOMEM: diff --git a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch deleted file mode 100644 index 0a611456..00000000 --- a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch +++ /dev/null @@ -1,53 +0,0 @@ -See http://lists.x.org/archives/xorg-devel/2015-February/045755.html - -diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c -index 849bf92..5cc3ec7 100644 ---- a/hw/xfree86/parser/Files.c -+++ b/hw/xfree86/parser/Files.c -@@ -76,14 +76,18 @@ static xf86ConfigSymTabRec FilesTab[] = { - #define CLEANUP xf86freeFiles - - XF86ConfFilesPtr --xf86parseFilesSection(void) -+xf86parseFilesSection(XF86ConfFilesPtr ptr) - { - int i, j; - int k, l; - char *str; - int token; - -- parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec) -+ if (!ptr) { -+ if( (ptr=calloc(1,sizeof(XF86ConfFilesRec))) == NULL ) { -+ return NULL; -+ } -+ } - - while ((token = xf86getToken(FilesTab)) != ENDSECTION) { - switch (token) { -diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h -index 171f8e8..e8199fe 100644 ---- a/hw/xfree86/parser/configProcs.h -+++ b/hw/xfree86/parser/configProcs.h -@@ -36,7 +36,7 @@ void xf86freeDeviceList(XF86ConfDevicePtr ptr); - int xf86validateDevice(XF86ConfigPtr p); - - /* Files.c */ --XF86ConfFilesPtr xf86parseFilesSection(void); -+XF86ConfFilesPtr xf86parseFilesSection(XF86ConfFilesPtr ptr); - void xf86printFileSection(FILE * cf, XF86ConfFilesPtr ptr); - void xf86freeFiles(XF86ConfFilesPtr p); - -diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c -index 327c02a..e0d6139 100644 ---- a/hw/xfree86/parser/read.c -+++ b/hw/xfree86/parser/read.c -@@ -110,7 +110,7 @@ xf86readConfigFile(void) - if (xf86nameCompare(xf86_lex_val.str, "files") == 0) { - free(xf86_lex_val.str); - xf86_lex_val.str = NULL; -- HANDLE_RETURN(conf_files, xf86parseFilesSection()); -+ HANDLE_RETURN(conf_files, xf86parseFilesSection(ptr->conf_files)); - } - else if (xf86nameCompare(xf86_lex_val.str, "serverflags") == 0) { - free(xf86_lex_val.str); diff --git a/x11-base/xorg-server/files/xorg-sets.conf b/x11-base/xorg-server/files/xorg-sets.conf deleted file mode 100644 index 5cd8112f..00000000 --- a/x11-base/xorg-server/files/xorg-sets.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Rebuild all X11 modules (mostly useful after xorg-server ABI change). -[x11-module-rebuild] -class = portage.sets.dbapi.VariableSet -world-candidate = false -variable = CATEGORY -includes = x11-drivers diff --git a/x11-base/xorg-server/xorg-server-21.1.8-r10.ebuild b/x11-base/xorg-server/xorg-server-21.1.8-r10.ebuild deleted file mode 100644 index 4cb12760..00000000 --- a/x11-base/xorg-server/xorg-server-21.1.8-r10.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -XORG_TARBALL_SUFFIX="xz" -XORG_EAUTORECONF="no" -inherit flag-o-matic xorg-3 meson -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" - -DESCRIPTION="X.Org X servers" -SLOT="0/${PV}" -if [[ ${PV} != 9999* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -IUSE_SERVERS="xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" -RESTRICT="!test? ( test )" - -CDEPEND=" - media-libs/libglvnd[X] - dev-libs/libbsd - dev-libs/openssl:0= - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - x11-apps/xkbcomp - >=x11-libs/libdrm-2.4.89 - >=x11-libs/libpciaccess-0.12.901 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXfont2-2.0.1 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libxshmfence-1.1 - >=x11-libs/pixman-0.27.2 - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-2.4.1-r3 - xorg? ( - >=x11-libs/libxcvt-0.1.0 - ) - xnest? ( - >=x11-libs/libXext-1.0.99.4 - >=x11-libs/libX11-1.1.5 - ) - xephyr? ( - x11-libs/libxcb - x11-libs/xcb-util - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) - !minimal? ( - >=media-libs/mesa-18[X(+),egl(+),gbm(+)] - >=media-libs/libepoxy-1.5.4[X,egl(+)] - ) - udev? ( virtual/libudev:= ) - unwind? ( sys-libs/libunwind:= ) - selinux? ( - sys-process/audit - sys-libs/libselinux:= - ) - systemd? ( - sys-apps/dbus - sys-apps/systemd - ) - elogind? ( - sys-apps/dbus - sys-auth/elogind[pam] - sys-auth/pambase[elogind] - ) - !!x11-drivers/nvidia-drivers[-libglvnd(+)] -" -DEPEND="${CDEPEND} - >=x11-base/xorg-proto-2021.4.99.2 - >=x11-libs/xtrans-1.3.5 - media-fonts/font-util - test? ( >=x11-libs/libxcvt-0.1.0 ) -" -RDEPEND="${CDEPEND} - !systemd? ( gui-libs/display-manager-init ) - selinux? ( sec-policy/selinux-xserver ) - xorg? ( >=x11-apps/xinit-1.3.3-r1 ) -" -BDEPEND=" - sys-devel/flex -" -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - ) - elogind? ( udev ) - ?? ( elogind systemd )" - -UPSTREAMED_PATCHES=( -) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch - # needed for new eselect-opengl, bug #541232 - "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch -) - -src_configure() { - # bug #835653 - use x86 && replace-flags -Os -O2 - - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - local emesonargs=( - --localstatedir "${EPREFIX}/var" - --sysconfdir "${EPREFIX}/etc/X11" - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - $(meson_use !minimal dri1) - $(meson_use !minimal dri2) - $(meson_use !minimal dri3) - $(meson_use !minimal glamor) - $(meson_use !minimal glx) - $(meson_use udev) - $(meson_use udev udev_kms) - $(meson_use unwind libunwind) - $(meson_use xcsecurity) - $(meson_use selinux xselinux) - $(meson_use xephyr) - $(meson_use xnest) - $(meson_use xorg) - $(meson_use xvfb) - -Ddocs=false - -Ddrm=true - -Ddtrace=false - -Dipv6=true - -Dhal=false - -Dlinux_acpi=false - -Dlinux_apm=false - -Dsecure-rpc=false - -Dsha1=libcrypto - -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" - ) - - if [[ ${PV} == 9999 ]] ; then - # Gone in 21.1.x, but not in master. - emesonargs+=( -Dxwayland=false ) - fi - - if use systemd || use elogind; then - emesonargs+=( - -Dsystemd_logind=true - $(meson_use suid suid_wrapper) - ) - else - emesonargs+=( - -Dsystemd_logind=false - -Dsuid_wrapper=false - ) - fi - - meson_src_configure -} - -src_install() { - meson_src_install - - # The meson build system does not support install-setuid - if ! use systemd && ! use elogind; then - if use suid; then - chmod u+s "${ED}"/usr/bin/Xorg - fi - fi - - if ! use xorg; then - rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${ED}"/usr/share/man/man1/Xserver.1x || die - fi - - # enable clicks using touchpad (https://bugs.redcorelinux.org/show_bug.cgi?id=48) - insinto /usr/share/X11/xorg.conf.d - doins "${FILESDIR}"/99-synaptics-overrides.conf - - # install the @x11-module-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules - fi -} -- cgit v1.2.3