diff options
Diffstat (limited to 'sys-apps')
84 files changed, 949 insertions, 3933 deletions
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest index 8bc5538d2f34..aa09c5824d1c 100644 --- a/sys-apps/baselayout-prefix/Manifest +++ b/sys-apps/baselayout-prefix/Manifest @@ -1,4 +1,3 @@ -DIST baselayout-2.2.tar.bz2 40744 BLAKE2B 3a1dfdd64b45d5aa8fb3ff9781aa9b1218095874a0bb6d9dd0d2da4c447945272b25258b53b7ea130f3e1067c799fc4c0d14e577f3a3f749f19d72734136e6e9 SHA512 a5199c42e835d9f2683cc94f3c4c47ecdc392316c24e0932845736e2e90479b0c5c8ad72ead8e0537f097405b7d7548d00b87b7ff8c9e3651486e3c5c0970b36 DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b DIST baselayout-prefix-395424f90c8ca6969589905cbf86d74fae9d7ea6.patch 1760 BLAKE2B 227ea5a9f70e927ba19de675f408ad01c4d934575cfeb780a525a4e24afd46d9d91d4e4acf773403cb6ac4a493b81da1cad787a5c0e41096056ad4e233b3cfc8 SHA512 77b4c3cad19251497808b6a07a384846f3ebb2282860d55197cee03d373b16622ef3b6c95e411e1cbb79702f10fe2e9c43cfe4175cca1db3ea6c06c6b2331ac9 DIST baselayout-prefix-5926fe447541607ed137d67ca84080326584b2fc.patch 809 BLAKE2B 237eb610b6935ec5139299f1dccc6260b31a1d47a82390d713fc759ef37de986de8392a82068c70c1f63f382a9212103025fe019614796f5b6a3b4ed0f81f8b2 SHA512 6cd1bf81d8619be27c20fcd703be9a97cc6129d9c13402172e7f16adf6e9b9eb0238edfd311ca8b98b3898876d2bf9686a2a3905510d26608773a3da5233ee95 diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild deleted file mode 100644 index 775cc96e9530..000000000000 --- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils multilib libtool - -MY_P=${P/-prefix/} # just use "upstream" sources -DESCRIPTION="Minimal baselayout for Gentoo Prefix installs" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 - https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" - -RDEPEND="sys-apps/gentoo-functions" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -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 -} - -src_install() { - # make functions.sh available in /etc/init.d (from gentoo-functions) - # Note: we cannot replace the symlink with a file here, or Portage will - # config-protect it, and etc-update can't handle symlink to file updates - dodir etc/init.d - dosym ../../lib/gentoo/functions.sh /etc/init.d/functions.sh - - dodir etc - sed \ - -e "/PATH=/!s:/\(etc\|usr/bin\|bin\):\"${EPREFIX}\"/\1:g" \ - -e "/PATH=/s|\([:\"]\)/|\1${EPREFIX}/|g" \ - etc/profile > "${ED}"/etc/profile || die - sed \ - -e "/PATH=.*\/sbin/s|\"$|:/usr/sbin:/sbin\"|" \ - -e "/PATH=.*\/bin/s|\"$|:/usr/bin:/bin\"|" \ - -i "${ED}"/etc/profile || die - dodir etc/env.d - sed \ - -e "s:/\(etc/env.d\|opt\|usr\):${EPREFIX}/\1:g" \ - -e "/^PATH=/s|\"$|:${EPREFIX}/usr/sbin:${EPREFIX}/sbin\"|" \ - etc/env.d/00basic > "${ED}"/etc/env.d/00basic || die - dodoc ChangeLog.svn - - # add the host OS MANPATH - if [[ -d "${ROOT}"/usr/share/man ]] ; then - echo 'MANPATH="/usr/share/man"' > "${ED}"/etc/env.d/99basic || die - fi - - # rc-scripts version for testing of features that *should* be present - echo "Gentoo Prefix Base System release ${PV}" > "${ED}"/etc/gentoo-release - - # FHS compatibility symlinks stuff - dosym /var/tmp /usr/tmp - - # add a dummy to avoid Portage shebang errors - 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 -} - -pkg_postinst() { - # Take care of the etc-update for the user - if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then - mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release - fi - - # baselayout leaves behind a lot of .keep files, so let's clean them up - find "${EROOT}"/lib/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null - find "${EROOT}"/lib/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null -} diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild deleted file mode 100644 index 902bfdcf5755..000000000000 --- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild +++ /dev/null @@ -1,336 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib - -# just use "upstream" sources -MY_P=${P/-prefix/} -MY_PN=${PN/-prefix/} -S="${WORKDIR}/${MY_P}" - -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/${MY_PN}.git" - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2" - KEYWORDS="~arm ~arm64 ~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 kernel_FreeBSD kernel_linux +split-usr" - -my_prefix_commits=( - # commits in reverse order as listed by: - # git log --decorate=no --oneline --no-abbrev-commit origin/master.. - a054fcc408ad48f775f7379834385c6a707d7a53 # also create etc/gentoo-release - 5926fe447541607ed137d67ca84080326584b2fc # create usr/bin during layout-usrmerge - 395424f90c8ca6969589905cbf86d74fae9d7ea6 # add prefix-stack support - 95a8e95af948014d024842892be1405d656ab5fc # add prefix-guest support - c88ceddbfc6a965dc0153aef21e012e774d9e30c # sync prefix usage for Makefile target 'layout' - c9338e89cdb603c1e08998bba28fbc977a62fc51 # add prefix support per Makefile target 'install' -) -for my_c in ${my_prefix_commits[*]} -do - SRC_URI+=" https://github.com/haubi/gentoo-baselayout/commit/${my_c}.patch -> ${PN}-${my_c}.patch" - PATCHES=( "${DISTDIR}/${PN}-${my_c}.patch" "${PATCHES[@]}" ) -done -unset my_prefix_commits my_c - -pkg_setup() { - multilib_layout -} - -# Create our multilib dirs - the Makefile has no knowledge of this -multilib_layout() { - use prefix && return 0 - 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 - 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" ] && ! 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 - 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}" - 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 - - # 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="${ROOT}" layout - else - emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout-usrmerge - fi - fi - rm -f "${ED}"/usr/share/${PN}/Makefile -} - -src_prepare() { - default - - # 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+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}" - ldpaths+=":${EPREFIX}/usr/local/${libdir}" - done - echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout -} - -src_configure() { - local OS - # although having a prefix, RAP uses full Linux baselayout - OS=$(usex prefix-stack prefix-stack \ - $(usex prefix-guest prefix-guest \ - $(usex kernel_FreeBSD BSD \ - Linux ) ) ) - # set up immutable Makefile variables once - sed -e "/^EPREFIX\s*?\?=\s*$/s|?\?=.*|= ${EPREFIX}|" \ - -e "/^BROOT\s*?\?=\s*$/s|?\?=.*|= ${BROOT}|" \ - -e "/^OS\s*?\?=\s*$/s|?\?=.*|= ${OS}|" \ - -i Makefile || die -} - -src_install() { - emake ROOT="${ROOT}" DESTDIR="${D}" install - dodoc ChangeLog - - # need the makefile in pkg_preinst - insinto /usr/share/${PN} - doins Makefile - - use prefix-guest || return 0 - - # add a dummy to avoid Portage shebang errors - 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 -} - -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 - done - - # Force shadow permissions to not be world-readable #260993 - for x in shadow ; do - [ -e "${EROOT}/etc/${x}" ] && chmod o-rwx "${EROOT}/etc/${x}" - done - - # Take care of the etc-update for the user - if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then - mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release - fi - - # 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 - - 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 ${x} -lt 2.4; then - ewarn "After updating ${EROOT}/etc/profile, please run" - ewarn "env-update && . ${EPREFIX}/etc/profile" - fi - - if ver_test ${x} -lt 2.6; 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" - 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 -} diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild index a2a404b6929a..837a4b033565 100644 --- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild +++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild @@ -24,6 +24,8 @@ LICENSE="GPL-2" SLOT="0" IUSE="build kernel_FreeBSD kernel_linux +split-usr" +RDEPEND="!sys-apps/baselayout" #681760 + my_prefix_commits=( # commits in reverse order as listed by: # git log --decorate=no --oneline --no-abbrev-commit origin/master.. diff --git a/sys-apps/bolt/bolt-0.9-r1.ebuild b/sys-apps/bolt/bolt-0.9-r1.ebuild deleted file mode 100644 index afb1c1ec6aad..000000000000 --- a/sys-apps/bolt/bolt-0.9-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info meson systemd - -DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3" -HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt" -SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc systemd" - -DEPEND=" - >=dev-libs/glib-2.56.0:2 - dev-util/glib-utils - virtual/libudev - virtual/udev - dev-util/umockdev - sys-auth/polkit[introspection] - systemd? ( sys-apps/systemd ) - doc? ( app-text/asciidoc )" -RDEPEND="${DEPEND}" - -pkg_pretend() { - CONFIG_CHECK="~THUNDERBOLT" - ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver." - check_extra_config - - CONFIG_CHECK="~HOTPLUG_PCI" - ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support." - check_extra_config -} - -src_configure() { - local emesonargs=( - -Dman=$(usex doc true false) - --sysconfdir=/etc - --localstatedir=/var - --sharedstatedir=/var/lib - ) - meson_src_configure -} - -src_install() { - meson_src_install - newinitd "${FILESDIR}"/${PN}.openrc boltd - keepdir /var/lib/boltd -} diff --git a/sys-apps/bolt/bolt-0.9-r2.ebuild b/sys-apps/bolt/bolt-0.9-r2.ebuild index ddf044ade359..778cd7da043b 100644 --- a/sys-apps/bolt/bolt-0.9-r2.ebuild +++ b/sys-apps/bolt/bolt-0.9-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="doc systemd" DEPEND=" diff --git a/sys-apps/calculate-utils/Manifest b/sys-apps/calculate-utils/Manifest index 4197392f0ebb..7797e948edd7 100644 --- a/sys-apps/calculate-utils/Manifest +++ b/sys-apps/calculate-utils/Manifest @@ -8,9 +8,13 @@ DIST calculate-core-3.6.8.4.tar.bz2 99049 BLAKE2B a1bdd9b9210bafec3673251daedb8f DIST calculate-desktop-3.6.8.6.tar.bz2 19026 BLAKE2B 98be46d6246c6402b65cc800a2618b80b95cc761931bc19fe146347a1ef29e7a19597f559d47823c3d8200b4e1cfb9355d2d95f508e726ec1b0550578a600951 SHA512 cd0f44855f4ec0ca402ed2d952677b6c065811d2d31a1a65c0b025bccaa0bfc31e4e692658cd4ae25b4325660f58b712953ab50ca90d422446a9fab154ff386f DIST calculate-i18n-3.6.8.4.tar.bz2 814984 BLAKE2B 652cb46f5dbac3521f927442980e6c15b8cd3d7531bf9da1d88b7535e6ff3aba6f372590ea70f41322194c117feedf0822348181b41f4f66fec3eb9b7ef2ea48 SHA512 53c1679edb07cd12bdf5bbd76c55a663a89417e84ed863f61c44e962247e9380448120f59b8ef64e400ea922b70c136bd6dac7a35f9caf39878ec13e94979258 DIST calculate-i18n-3.6.8.5.tar.bz2 822332 BLAKE2B eabc80fc1428424940d324c409bf5482da404b57ccb75b846c0144c4f027ab230ea12d28ad1c2ea1f4e764cfdfb9bcc1bb511f0c5557a6273c41929b4fd71ae2 SHA512 7280635b8e3cca00d34a436b4e5fac26b46fd75ddbf1acef0638e058a6939566ebba3e16edded75e001f93ebfa0c325c763c71847f612f82762d3057684d5011 +DIST calculate-i18n-3.6.8.6.tar.bz2 823081 BLAKE2B c90b92e3533331cf01e30161bda92565e52ef5825e45298ae3904ce07710182237dfa986beff462f0f7c294d69fd3bb0b6667c8f0c8ee96240ef665b6d3e54e4 SHA512 27631a8dc21e2b1d16e8a3ae0608b5db71068c8b621bd53cb01914e79a136a52bea8d975f6d8a2429af332929df0a280726818808c826cf3468ffaa41ced0793 DIST calculate-install-3.6.8.3.tar.bz2 85148 BLAKE2B d29789524892e0753343c82dcade0496855f696b9580ae4c20c341e12c85c0a9da3975994dffc12ddcddf3cbfe9cae1c62a78919c4365c06095a00045f07dc02 SHA512 c2bcb7b3c60f2eff163a0e7884f729e2186ccfdbdb95dcc02d23738972c6ecdea3769127315513c076d6fd03b54e911d5520b92a8a311c7f5195ca8f836b706d +DIST calculate-install-3.6.8.4.tar.bz2 84931 BLAKE2B ce16ca69a376b2b48738f8a567e87bfc64819df4bb09233ba321f682ffc8c2fb67f5c128116cd8e4253b3db877616876d56686093d58f6cc8323dad89671d996 SHA512 d8ddb4f8900a0abcfc40961713f1a99efc0efcd9808491ff67a608cdd6d07aafab3917956b6da96afd9c733ebbfe075ccd1ef71b6d715c4f20ee4a9735be765d +DIST calculate-install-3.6.8.5.tar.bz2 85339 BLAKE2B b72a01a3587a3528e60fa862d1ca9c8b4c03ee08630286815c4f9e20ec0165f6f462b9027e2813082b75efd81ad51b52a9239cb976ee9de9a9553f58c498ca6d SHA512 ddf56219a62b9c66b85280ff7aaac027cfbbbe2e33cf514272f565c9c0df169c1b5936e8dffb4b0e2b222b419c553be86b39c710f32e36af2b727f1c44a921dc DIST calculate-ldap-3.6.8.tar.bz2 11923 BLAKE2B 473714789c6583bf577dca15cc60c125e6ffdb0f8d1fdc14e33209fc76540c380552cbd2064d97ce6c36fd3009b0acfd628360a09006c4a96fb14a735eac53f1 SHA512 aa84559b6571367946b46ad708a9dcad49afc92ad7d2cbf4e24d9665d4482007d66f80e39e988ed7ab79f2da367ca27923fe88ed3918ef4d82fe9493a438beaf DIST calculate-lib-3.6.8.7.tar.bz2 618084 BLAKE2B 6d15becc0e6e88b6f5c9d4234ecc09d2270e7c46a6a8165f33dfd415c23aa0fc93374c74616a49efa69f7f91d25708acfea91d3ca4051b8e40da48cbd8d4ddda SHA512 68ce28e92223a47f4c083599e31021813828b6521b7d494ff6874ab42d9c3c89853a8218d97072962a463e68f220d817aa597c07ad975d8250828477d341b12b +DIST calculate-lib-3.6.8.8.tar.bz2 618062 BLAKE2B 5e33834da34f5d4bb9d629c30bb8753feef9f70fc2d7655cfeec5d7fefe078ff3852af9693fec2127778f93e31d9a0b96bfdc5f4724aed6c53167e17ceabcf07 SHA512 47d27d791bedbab411d5bdbd5b881246b0000e06720017ba1456cf75efbfe18a4258dff6a03ed926b16a460cc4f03b3ce94995720c02edbc2872c0ebe213d730 DIST calculate-server-3.6.8.tar.bz2 6646 BLAKE2B e8900478cac290c3d3de491e505ea1b691907dbf3b37d959177e191d89360d52e1a4c46cb2e6be4f629aad2ae34c81b3372c47805c2842f766540af86103b039 SHA512 e88163b35a868295cb16a485dbe8d0eb50f11eb67ee34e02d3b27dccb394887cb9448e124767caaa3fefd2776b9e3ae5e31a9ec7af74d5da81635386f7a6ea7b DIST calculate-unix-3.6.8.tar.bz2 21691 BLAKE2B 9247c1c5be8ee4b00dd9be6f57ebe320a33413c95d93ee46aeaa2001e39c04fb31fb97ce5ce64c0d7ff3cadc1564cfa30d5ae50f89e711ebcc87f7d378d57db9 SHA512 6952992c1f74ad0243e83f14ad0b87641a475d179b99ba3b17d4b49ab5e49ad75d9ee027af166933d28687f04bd090cd594860af4514a46651161b2b877b70a7 DIST calculate-update-3.6.8.tar.bz2 38159 BLAKE2B ee6cea1dda68f85fed80a80075461356d8105eaca99de5002bacf3f60a64b5fa003d5fdcfb1af09c8c56f5f675eef59a862cdcaac8fc4861b6bdb539cc88cde0 SHA512 f477cbb9fd22cc4e60c02e973b32957ea0e4b8b68d2cf65939b75a1acaa7327364a032e0fb9277e115247a8d825914685a6e6adc5f994d031c2f406fb05f7069 diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.8.16.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.8.16.ebuild new file mode 100644 index 000000000000..754ba9100630 --- /dev/null +++ b/sys-apps/calculate-utils/calculate-utils-3.6.8.16.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="7" +PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} ) + +declare -A CALCULATE_MODULES=( + ["lib"]="3.6.8.7" + ["install"]="3.6.8.4" + ["core"]="3.6.8.4" + ["i18n"]="3.6.8.6" + ["client"]="3.6.8.2" + ["desktop"]="3.6.8.6" + ["console-gui"]="3.6.8.2" +) + +inherit calculate-utils-r11 + +DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade" +HOMEPAGE="https://www.calculate-linux.org/main/en/calculate_utilities" + +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="amd64" + diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.8.17.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.8.17.ebuild new file mode 100644 index 000000000000..ae2c96278e7a --- /dev/null +++ b/sys-apps/calculate-utils/calculate-utils-3.6.8.17.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="7" +PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} ) + +declare -A CALCULATE_MODULES=( + ["lib"]="3.6.8.7" + ["install"]="3.6.8.5" + ["core"]="3.6.8.4" + ["i18n"]="3.6.8.6" + ["client"]="3.6.8.2" + ["desktop"]="3.6.8.6" + ["console-gui"]="3.6.8.2" +) + +inherit calculate-utils-r11 + +DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade" +HOMEPAGE="https://www.calculate-linux.org/main/en/calculate_utilities" + +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="amd64" + diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.8.18.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.8.18.ebuild new file mode 100644 index 000000000000..de4327294c5a --- /dev/null +++ b/sys-apps/calculate-utils/calculate-utils-3.6.8.18.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="7" +PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} ) + +declare -A CALCULATE_MODULES=( + ["lib"]="3.6.8.8" + ["install"]="3.6.8.5" + ["core"]="3.6.8.4" + ["i18n"]="3.6.8.6" + ["client"]="3.6.8.2" + ["desktop"]="3.6.8.6" + ["console-gui"]="3.6.8.2" +) + +inherit calculate-utils-r11 + +DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade" +HOMEPAGE="https://www.calculate-linux.org/main/en/calculate_utilities" + +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="amd64" + diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild index 291d56399ba5..06ff65e516d7 100644 --- a/sys-apps/fbset/fbset-2.1.ebuild +++ b/sys-apps/fbset/fbset-2.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit toolchain-funcs flag-o-matic eutils +inherit toolchain-funcs flag-o-matic DESCRIPTION="A utility to set the framebuffer videomode" HOMEPAGE="https://users.telenet.be/geertu/Linux/fbdev/" @@ -14,15 +14,14 @@ SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86" IUSE="static" -DEPEND="sys-devel/bison +BDEPEND="sys-devel/bison sys-devel/flex" RDEPEND="" -src_prepare() { - epatch "${FILESDIR}/${P}-build.patch" - epatch "${FILESDIR}/${P}-add-linux-types-h.patch" - default -} +PATCHES=( + "${FILESDIR}/${P}-build.patch" + "${FILESDIR}/${P}-add-linux-types-h.patch" +) src_compile() { use static && append-ldflags -static diff --git a/sys-apps/flashrom/files/flashrom-1.2_make-libflashrom-usable.patch b/sys-apps/flashrom/files/flashrom-1.2_make-libflashrom-usable.patch deleted file mode 100644 index ea15a4230592..000000000000 --- a/sys-apps/flashrom/files/flashrom-1.2_make-libflashrom-usable.patch +++ /dev/null @@ -1,70 +0,0 @@ -1. Add an (extremely primitive) rule for generating a pkgconfig file - for libflashrom, as fwupd cannot find it without one. Note that this - rule depends on several variables to be passed to make, see ebuilds - using this patch for details; -2. Tweak the way library dependencies are passed around a bit to make it - easier to inject them into said pkgconfig file; -3. Move print.o from CLI_OBJS to LIB_OBJS - it contains the array - 'boards_known' which is used in library code. Upstream have already - fixed this in Meson files but not in the Makefile. - -diff -urN a/flashrom.pc.in b/flashrom.pc.in ---- a/flashrom.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ b/flashrom.pc.in 2020-07-28 22:47:01.928679346 +0200 -@@ -0,0 +1,9 @@ -+prefix=@PREFIX@ -+libdir=${prefix}/@LIBDIR@ -+includedir=${prefix}/@INCLUDEDIR@ -+ -+Name: libflashrom -+Description: library to interact with flashrom -+Version: @VERSION@ -+Libs: -L${libdir} -lflashrom @LIBS@ -+Cflags: -I${includedir} -diff -urN a/Makefile b/Makefile ---- a/Makefile 2019-12-31 18:25:41.000000000 +0100 -+++ b/Makefile 2020-07-28 23:18:41.019492448 +0200 -@@ -570,12 +570,12 @@ - ############################################################################### - # Library code. - --LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich_descriptors.o fmap.o -+LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich_descriptors.o fmap.o print.o - - ############################################################################### - # Frontend related stuff. - --CLI_OBJS = cli_classic.o cli_output.o cli_common.o print.o -+CLI_OBJS = cli_classic.o cli_output.o cli_common.o - - # versioninfo.inc stores metadata required to build a packaged flashrom. It is generated by the export rule and - # imported below. If versioninfo.inc is not found and the variables are not defined by the user, the info will -@@ -1130,11 +1130,16 @@ - @+$(MAKE) -C util/ich_descriptors_tool/ TARGET_OS=$(TARGET_OS) EXEC_SUFFIX=$(EXEC_SUFFIX) - endif - -+ALL_LIBS = $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) $(JAYLINKLIBS) $(NI845X_LIBS) -+ -+flashrom.pc: -+ sed -e "s#@PREFIX@#$(PREFIX)#" -e "s#@LIBDIR@#$(LIBDIR)#" -e "s#@INCLUDEDIR@#$(INCLUDEDIR)#" -e "s#@VERSION@#$(VERSION)#" -e "s#@LIBS@#$(ALL_LIBS)#" < $@.in > $@.tmp && mv $@.tmp $@ -+ - $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) -- $(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) $(JAYLINKLIBS) $(NI845X_LIBS) -+ $(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(ALL_LIBS) - --libflashrom.a: $(LIBFLASHROM_OBJS) -- $(AR) rcs $@ $^ -+libflashrom.a: $(LIBFLASHROM_OBJS) flashrom.pc -+ $(AR) rcs $@ $(LIBFLASHROM_OBJS) - $(RANLIB) $@ - - # TAROPTIONS reduces information leakage from the packager's system. -@@ -1149,7 +1154,7 @@ - # This includes all frontends and libflashrom. - # We don't use EXEC_SUFFIX here because we want to clean everything. - clean: -- rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a *.o *.d $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE) -+ rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a flashrom.pc *.o *.d $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE) - @+$(MAKE) -C util/ich_descriptors_tool/ clean - - distclean: clean diff --git a/sys-apps/flashrom/flashrom-1.2-r1.ebuild b/sys-apps/flashrom/flashrom-1.2-r1.ebuild deleted file mode 100644 index e984e762420a..000000000000 --- a/sys-apps/flashrom/flashrom-1.2-r1.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://review.coreboot.org/flashrom.git" - inherit git-r3 -else - MY_P="${PN}-v${PV}" - SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2" - KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips" -HOMEPAGE="https://flashrom.org/" - -LICENSE="GPL-2" -SLOT="0" -# The defaults match the upstream Makefile. -# Note: Do not list bitbang_spi as it is not a programmer; it's a backend used -# by some other spi programmers. -IUSE_PROGRAMMERS=" - atahpt - +atapromise - +atavia - +buspirate-spi - +ch341a-spi - +dediprog - +developerbox-spi - +digilent-spi - +drkaiser - +dummy - +ft2232-spi - +gfxnvidia - +internal - +it8212 - jlink-spi - +linux-mtd - +linux-spi - mstarddc-spi - +nic3com - +nicintel - +nicintel-eeprom - +nicintel-spi - nicnatsemi - +nicrealtek - +ogp-spi - +pickit2-spi - +pony-spi - +rayer-spi - +satamv - +satasii - +serprog - stlinkv3-spi - +usbblaster-spi -" - -IUSE="${IUSE_PROGRAMMERS} +internal-dmi static tools +wiki" - -LIB_DEPEND=" - atahpt? ( sys-apps/pciutils[static-libs(+)] ) - atapromise? ( sys-apps/pciutils[static-libs(+)] ) - atavia? ( sys-apps/pciutils[static-libs(+)] ) - ch341a-spi? ( virtual/libusb:1[static-libs(+)] ) - dediprog? ( virtual/libusb:1[static-libs(+)] ) - developerbox-spi? ( virtual/libusb:1[static-libs(+)] ) - digilent-spi? ( virtual/libusb:1[static-libs(+)] ) - drkaiser? ( sys-apps/pciutils[static-libs(+)] ) - ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] ) - gfxnvidia? ( sys-apps/pciutils[static-libs(+)] ) - internal? ( sys-apps/pciutils[static-libs(+)] ) - it8212? ( sys-apps/pciutils[static-libs(+)] ) - jlink-spi? ( dev-embedded/libjaylink[static-libs(+)] ) - nic3com? ( sys-apps/pciutils[static-libs(+)] ) - nicintel-eeprom? ( sys-apps/pciutils[static-libs(+)] ) - nicintel-spi? ( sys-apps/pciutils[static-libs(+)] ) - nicintel? ( sys-apps/pciutils[static-libs(+)] ) - nicnatsemi? ( sys-apps/pciutils[static-libs(+)] ) - nicrealtek? ( sys-apps/pciutils[static-libs(+)] ) - ogp-spi? ( sys-apps/pciutils[static-libs(+)] ) - pickit2-spi? ( virtual/libusb:0[static-libs(+)] ) - rayer-spi? ( sys-apps/pciutils[static-libs(+)] ) - satamv? ( sys-apps/pciutils[static-libs(+)] ) - satasii? ( sys-apps/pciutils[static-libs(+)] ) - stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] ) - usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] ) -" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - sys-apps/diffutils" -RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )" - -_flashrom_enable() { - local c="CONFIG_${2:-$(echo "$1" | tr '[:lower:]-' '[:upper:]_')}" - args+=( "${c}=$(usex $1 yes no)" ) -} -flashrom_enable() { - local u - for u ; do _flashrom_enable "${u}" ; done -} - -src_prepare() { - # To make libflashrom.a actually useful - append-flags -fPIC - - default -} - -src_compile() { - # Help keep things in sync. - local sprogs=$(echo $( - grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \ - LC_ALL=C sort -u | \ - sed 's:^CONFIG_::' | \ - tr '[:upper:]_' '[:lower:]-' | \ - grep -v ni845x-spi)) - local eprogs=$(echo ${IUSE_PROGRAMMERS} | sed -E 's/\B[-+]\b//g') - if [[ ${sprogs} != "${eprogs}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "IUSE set to: ${eprogs}" - eerror "flashrom.c : ${sprogs}" - die "sync IUSE to the list of source programmers" - fi - - # Turn USE flags into CONFIG_xxx settings. - local args=() - flashrom_enable ${eprogs} - _flashrom_enable wiki PRINT_WIKI - _flashrom_enable static STATIC - - # You have to specify at least one programmer, and if you specify more than - # one programmer you have to include either dummy or internal in the list. - # We pick dummy as the default because internal requires libpci. - if ! use internal && ! use dummy ; then - if [[ ${#args[@]} -ne 1 ]] ; then - ewarn "You have to specify at least one programmer, and if you specify" - ewarn "more than one programmer, you have to enable either dummy or" - ewarn "internal as well. 'dummy' will be the default now." - args+=( CONFIG_DUMMY=yes ) - fi - fi - - tc-export AR CC PKG_CONFIG RANLIB - emake WARNERROR=no "${args[@]}" all libflashrom.a -} - -src_install() { - dosbin flashrom - doman flashrom.8 - dodoc README Documentation/*.txt - dolib.a libflashrom.a - doheader libflashrom.h - - if use tools; then - dosbin util/ich_descriptors_tool/ich_descriptors_tool - fi -} diff --git a/sys-apps/flashrom/flashrom-1.2-r2.ebuild b/sys-apps/flashrom/flashrom-1.2-r2.ebuild deleted file mode 100644 index d8bff2a09caf..000000000000 --- a/sys-apps/flashrom/flashrom-1.2-r2.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://review.coreboot.org/flashrom.git" - inherit git-r3 -else - MY_P="${PN}-v${PV}" - SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2" - KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips" -HOMEPAGE="https://flashrom.org/" - -LICENSE="GPL-2" -SLOT="0" -# The defaults match the upstream Makefile. -# Note: Do not list bitbang_spi as it is not a programmer; it's a backend used -# by some other spi programmers. -IUSE_PROGRAMMERS=" - atahpt - +atapromise - +atavia - +buspirate-spi - +ch341a-spi - +dediprog - +developerbox-spi - +digilent-spi - +drkaiser - +dummy - +ft2232-spi - +gfxnvidia - +internal - +it8212 - jlink-spi - +linux-mtd - +linux-spi - mstarddc-spi - +nic3com - +nicintel - +nicintel-eeprom - +nicintel-spi - nicnatsemi - +nicrealtek - +ogp-spi - +pickit2-spi - +pony-spi - +rayer-spi - +satamv - +satasii - +serprog - stlinkv3-spi - +usbblaster-spi -" - -IUSE="${IUSE_PROGRAMMERS} +internal-dmi static tools +wiki" - -LIB_DEPEND=" - atahpt? ( sys-apps/pciutils[static-libs(+)] ) - atapromise? ( sys-apps/pciutils[static-libs(+)] ) - atavia? ( sys-apps/pciutils[static-libs(+)] ) - ch341a-spi? ( virtual/libusb:1[static-libs(+)] ) - dediprog? ( virtual/libusb:1[static-libs(+)] ) - developerbox-spi? ( virtual/libusb:1[static-libs(+)] ) - digilent-spi? ( virtual/libusb:1[static-libs(+)] ) - drkaiser? ( sys-apps/pciutils[static-libs(+)] ) - ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] ) - gfxnvidia? ( sys-apps/pciutils[static-libs(+)] ) - internal? ( sys-apps/pciutils[static-libs(+)] ) - it8212? ( sys-apps/pciutils[static-libs(+)] ) - jlink-spi? ( dev-embedded/libjaylink[static-libs(+)] ) - nic3com? ( sys-apps/pciutils[static-libs(+)] ) - nicintel-eeprom? ( sys-apps/pciutils[static-libs(+)] ) - nicintel-spi? ( sys-apps/pciutils[static-libs(+)] ) - nicintel? ( sys-apps/pciutils[static-libs(+)] ) - nicnatsemi? ( sys-apps/pciutils[static-libs(+)] ) - nicrealtek? ( sys-apps/pciutils[static-libs(+)] ) - ogp-spi? ( sys-apps/pciutils[static-libs(+)] ) - pickit2-spi? ( virtual/libusb:0[static-libs(+)] ) - rayer-spi? ( sys-apps/pciutils[static-libs(+)] ) - satamv? ( sys-apps/pciutils[static-libs(+)] ) - satasii? ( sys-apps/pciutils[static-libs(+)] ) - stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] ) - usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] ) -" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - sys-apps/diffutils" -RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.2_make-libflashrom-usable.patch -) - -_flashrom_enable() { - local c="CONFIG_${2:-$(echo "$1" | tr '[:lower:]-' '[:upper:]_')}" - args+=( "${c}=$(usex $1 yes no)" ) -} -flashrom_enable() { - local u - for u ; do _flashrom_enable "${u}" ; done -} - -src_prepare() { - # To make libflashrom.a actually useful - append-flags -fPIC - - default -} - -src_compile() { - # Help keep things in sync. - local sprogs=$(echo $( - grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \ - LC_ALL=C sort -u | \ - sed 's:^CONFIG_::' | \ - tr '[:upper:]_' '[:lower:]-' | \ - grep -v ni845x-spi)) - local eprogs=$(echo ${IUSE_PROGRAMMERS} | sed -E 's/\B[-+]\b//g') - if [[ ${sprogs} != "${eprogs}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "IUSE set to: ${eprogs}" - eerror "flashrom.c : ${sprogs}" - die "sync IUSE to the list of source programmers" - fi - - # Turn USE flags into CONFIG_xxx settings. - local args=() - flashrom_enable ${eprogs} - _flashrom_enable wiki PRINT_WIKI - _flashrom_enable static STATIC - - # You have to specify at least one programmer, and if you specify more than - # one programmer you have to include either dummy or internal in the list. - # We pick dummy as the default because internal requires libpci. - if ! use internal && ! use dummy ; then - if [[ ${#args[@]} -ne 1 ]] ; then - ewarn "You have to specify at least one programmer, and if you specify" - ewarn "more than one programmer, you have to enable either dummy or" - ewarn "internal as well. 'dummy' will be the default now." - args+=( CONFIG_DUMMY=yes ) - fi - fi - - tc-export AR CC PKG_CONFIG RANLIB - # PREFIX, INCLUDEDIR and LIBDIR are injected into the libflashrom pkgconfig - # file, which is why we pass them here even though src_install() puts all - # files in correct locations without employing make. - # VERSION too goes into the pkgconfig file, and we override the upstream - # value to get rid of the prefix 'v'. - emake \ - INCLUDEDIR="include" \ - LIBDIR="$(get_libdir)" \ - PREFIX="${EPREFIX}/usr" \ - VERSION="${PV}" \ - WARNERROR=no "${args[@]}" \ - all libflashrom.a -} - -src_install() { - dosbin flashrom - doman flashrom.8 - dodoc README Documentation/*.txt - dolib.a libflashrom.a - doheader libflashrom.h - - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc - - if use tools; then - dosbin util/ich_descriptors_tool/ich_descriptors_tool - fi -} diff --git a/sys-apps/flashrom/flashrom-1.2-r3.ebuild b/sys-apps/flashrom/flashrom-1.2-r3.ebuild index 106814bb570b..773755292456 100644 --- a/sys-apps/flashrom/flashrom-1.2-r3.ebuild +++ b/sys-apps/flashrom/flashrom-1.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P="${PN}-v${PV}" SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86" S="${WORKDIR}/${MY_P}" fi @@ -68,7 +68,7 @@ LIB_DEPEND=" developerbox-spi? ( virtual/libusb:1[static-libs(+)] ) digilent-spi? ( virtual/libusb:1[static-libs(+)] ) drkaiser? ( sys-apps/pciutils[static-libs(+)] ) - ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] ) + ft2232-spi? ( dev-embedded/libftdi:1=[static-libs(+)] ) gfxnvidia? ( sys-apps/pciutils[static-libs(+)] ) internal? ( sys-apps/pciutils[static-libs(+)] ) it8212? ( sys-apps/pciutils[static-libs(+)] ) @@ -85,7 +85,7 @@ LIB_DEPEND=" satamv? ( sys-apps/pciutils[static-libs(+)] ) satasii? ( sys-apps/pciutils[static-libs(+)] ) stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] ) - usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] ) + usbblaster-spi? ( dev-embedded/libftdi:1=[static-libs(+)] ) " RDEPEND="${LIB_DEPEND//\[static-libs(+)]}" DEPEND="${RDEPEND} diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild index 0a8400359fa9..a307041b2749 100644 --- a/sys-apps/flashrom/flashrom-9999.ebuild +++ b/sys-apps/flashrom/flashrom-9999.ebuild @@ -74,7 +74,7 @@ LIB_DEPEND=" developerbox-spi? ( virtual/libusb:1[static-libs(+)] ) digilent-spi? ( virtual/libusb:1[static-libs(+)] ) drkaiser? ( sys-apps/pciutils[static-libs(+)] ) - ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] ) + ft2232-spi? ( dev-embedded/libftdi:1=[static-libs(+)] ) gfxnvidia? ( sys-apps/pciutils[static-libs(+)] ) internal? ( sys-apps/pciutils[static-libs(+)] ) it8212? ( sys-apps/pciutils[static-libs(+)] ) @@ -91,7 +91,7 @@ LIB_DEPEND=" satamv? ( sys-apps/pciutils[static-libs(+)] ) satasii? ( sys-apps/pciutils[static-libs(+)] ) stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] ) - usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] ) + usbblaster-spi? ( dev-embedded/libftdi:1=[static-libs(+)] ) " RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest index ef9a926f745a..793b47e999f6 100644 --- a/sys-apps/flatpak/Manifest +++ b/sys-apps/flatpak/Manifest @@ -1,3 +1,2 @@ DIST flatpak-1.10.0.tar.xz 1504300 BLAKE2B 213fb5449b075250cbec9f43ea5b02afae809b8e58d3be0afd39a70d78431f7efc7912462ce46061a53aa4dc2ef8f5e9504cdaffe4b39d2f53292736442ceb3d SHA512 8eaabd66cbd26f5288fb72cddcd195ea4702243e9f5ceff425836b5f305e2b7a4172e67d30cc0e74ad97937c007e8f4ab81080a7ada3f528d05f74845c923aeb DIST flatpak-1.8.5.tar.xz 1430600 BLAKE2B dfa589073d3147725144c6c9c8f720a8b32918a6687a28af0f0284063e07278ece2ef191343b603e541401a5816ec095dbf3570ab7f27bba186ac416a359fbce SHA512 bdd330376e3d9ce184717692ee12f2b1ccbf1400411133ac955ea21c2d5e04ea7af9709a61ae897eae17fe258e40048576c2d829290721f349de7e6d74a9de71 -DIST flatpak-1.9.2.tar.xz 1490540 BLAKE2B 23e5c4cefaadebb1e9fd599ba8e372ddef9e7e241b186032a142f60bc07b243926d3fb514cc62e90437d2e8ddb17098476b4d73913c2ad656b2719268705057a SHA512 ab4feb6c10161a1bd92e428623772c4217ce3700db412c6280de3415247ffd39eb800dc917937529a82328d778e089f45bd0a8b48fdd7e0c8bf34c494dcb085b diff --git a/sys-apps/flatpak/flatpak-1.10.0.ebuild b/sys-apps/flatpak/flatpak-1.10.0.ebuild index 46536bc65c51..5e627ba9d097 100644 --- a/sys-apps/flatpak/flatpak-1.10.0.ebuild +++ b/sys-apps/flatpak/flatpak-1.10.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" IUSE="doc gtk kde introspection policykit seccomp systemd" RESTRICT+=" test" diff --git a/sys-apps/flatpak/flatpak-1.9.2.ebuild b/sys-apps/flatpak/flatpak-1.9.2.ebuild deleted file mode 100644 index 7a6ec08cf071..000000000000 --- a/sys-apps/flatpak/flatpak-1.9.2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit autotools linux-info python-any-r1 - -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" -DESCRIPTION="Linux application sandboxing and distribution framework" -HOMEPAGE="https://flatpak.org/" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86" -IUSE="doc gtk kde introspection policykit seccomp systemd" -RESTRICT+=" test" - -RDEPEND=" - acct-group/flatpak - acct-user/flatpak - >=app-arch/libarchive-2.8:= - app-arch/zstd:= - >=app-crypt/gpgme-1.1.8:= - >=dev-libs/appstream-glib-0.5.10:= - >=dev-libs/glib-2.56:2= - >=dev-libs/libxml2-2.4:= - dev-libs/json-glib:= - dev-libs/libassuan:= - >=dev-util/ostree-2020.8:=[gpg(+)] - || ( - dev-util/ostree[curl] - dev-util/ostree[soup] - ) - >=gnome-base/dconf-0.26:= - >=net-libs/libsoup-2.4:= - sys-apps/bubblewrap - sys-apps/dbus - >=sys-fs/fuse-2.9.9:0= - sys-apps/xdg-dbus-proxy - x11-apps/xauth - x11-libs/gdk-pixbuf:2= - x11-libs/libXau:= - policykit? ( >=sys-auth/polkit-0.98:= ) - seccomp? ( sys-libs/libseccomp:= ) - systemd? ( sys-apps/systemd:= ) -" - -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-devel/automake-1.13.4 - >=sys-devel/gettext-0.18.2 - virtual/pkgconfig - dev-util/gdbus-codegen - sys-devel/bison - introspection? ( >=dev-libs/gobject-introspection-1.40 ) - doc? ( - >=dev-util/gtk-doc-1.20 - dev-libs/libxslt - ) - $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') -" - -PDEPEND=" - gtk? ( sys-apps/xdg-desktop-portal-gtk ) - kde? ( kde-plasma/xdg-desktop-portal-kde ) -" - -python_check_deps() { - has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]" -} - -pkg_setup() { - local CONFIG_CHECK="~USER_NS" - linux-info_pkg_setup - python-any-r1_pkg_setup -} - -src_prepare() { - default - # This line fails because locales are in /usr/lib/locale/locale-archive. - sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die -} - -src_configure() { - local myeconfargs=( - --enable-sandboxed-triggers - --enable-xauth - --localstatedir="${EPREFIX}"/var - --with-system-bubblewrap - --with-system-dbus-proxy - $(use_enable doc documentation) - $(use_enable doc gtk-doc) - $(use_enable introspection) - $(use_enable policykit system-helper) - $(use_enable seccomp) - $(use_with systemd) - ) - - econf "${myeconfargs[@]}" -} diff --git a/sys-apps/fwupd/fwupd-1.5.5.ebuild b/sys-apps/fwupd/fwupd-1.5.5.ebuild index ebec7068ba50..569e70ed7154 100644 --- a/sys-apps/fwupd/fwupd-1.5.5.ebuild +++ b/sys-apps/fwupd/fwupd-1.5.5.ebuild @@ -67,6 +67,7 @@ CDEPEND="${PYTHON_DEPS} net-libs/gnutls sys-boot/gnu-efi sys-boot/efibootmgr + sys-fs/udisks sys-libs/efivar x11-libs/cairo ) diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild index 8ddffb888635..0d89c116a831 100644 --- a/sys-apps/groff/groff-1.22.4.ebuild +++ b/sys-apps/groff/groff-1.22.4.ebuild @@ -16,9 +16,10 @@ LICENSE="GPL-2" SLOT="0" [[ "${PV}" == *_rc* ]] || \ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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" -IUSE="examples X" +IUSE="examples uchardet X" RDEPEND=" + uchardet? ( app-i18n/uchardet ) X? ( x11-libs/libX11 x11-libs/libXt @@ -62,6 +63,7 @@ src_prepare() { src_configure() { local myeconfargs=( --with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults + $(use_with uchardet) $(use_with X x) ) econf "${myeconfargs[@]}" diff --git a/sys-apps/groff/metadata.xml b/sys-apps/groff/metadata.xml index f2dbe29d0b96..a90948144ebc 100644 --- a/sys-apps/groff/metadata.xml +++ b/sys-apps/groff/metadata.xml @@ -5,5 +5,8 @@ <email>base-system@gentoo.org</email> <name>Gentoo Base System</name> </maintainer> +<use> + <flag name="uchardet">Enable automatic encoding detection via <pkg>app-i18n/uchardet</pkg></flag> +</use> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest index 32b8067283a0..cee8b42e254f 100644 --- a/sys-apps/haveged/Manifest +++ b/sys-apps/haveged/Manifest @@ -1,4 +1,2 @@ -DIST haveged-1.9.13.tar.gz 495737 BLAKE2B 5a8c154d27ca7dc71e7d34051a5e24ec2bd49be7a68175c351293958261083f2cfb0b318daaf005cc95f6a9b76664df63d4c41d28d4276f6906081d21097475a SHA512 dff0f4273643ed6b2fea26f1ba5c17be3d655d27ab0b96091bcd23e1cb984fc440cc81e694cc7bcc84a9a667d96f3c04a73675f79ecae525ee56390940cce576 DIST haveged-1.9.14.tar.gz 496346 BLAKE2B 9df0b51dc5856b4b943a0c1c1c8f9b947dd3d22bdf45639920911e2619264fc771cba68ad70559b34523a6361cc5da588392bf0b24de1dbf824f1dfc7898a2bb SHA512 bdb6d9de667298d32b474bcbdd5f90c12b870b154b86f8817948de787d378b428bf823234f20129666bd1abced2f154643b5999e43975969f6bba87124650924 -DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa diff --git a/sys-apps/haveged/haveged-1.9.13.ebuild b/sys-apps/haveged/haveged-1.9.13.ebuild deleted file mode 100644 index e32068fc2a48..000000000000 --- a/sys-apps/haveged/haveged-1.9.13.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit systemd - -DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm" -HOMEPAGE="https://www.issihosts.com/haveged/" -SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="selinux static-libs threads" - -RDEPEND=" - !<sys-apps/openrc-0.11.8 - selinux? ( sec-policy/selinux-entropyd ) -" - -src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable threads) - --bindir=/usr/sbin - --enable-nistest - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # Install gentoo ones instead - newinitd "${FILESDIR}"/haveged-init.d.3 haveged - newconfd "${FILESDIR}"/haveged-conf.d haveged - - systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service - insinto /etc - doins "${FILESDIR}"/haveged.conf -} diff --git a/sys-apps/haveged/haveged-1.9.14.ebuild b/sys-apps/haveged/haveged-1.9.14-r1.ebuild index 3fab133a3397..344592bd972a 100644 --- a/sys-apps/haveged/haveged-1.9.14.ebuild +++ b/sys-apps/haveged/haveged-1.9.14-r1.ebuild @@ -38,4 +38,6 @@ src_install() { systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service insinto /etc doins "${FILESDIR}"/haveged.conf + + find "${ED}" -type f -name "*.la" -delete || die } diff --git a/sys-apps/haveged/haveged-1.9.2-r1.ebuild b/sys-apps/haveged/haveged-1.9.2-r1.ebuild deleted file mode 100644 index b1eabde34785..000000000000 --- a/sys-apps/haveged/haveged-1.9.2-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd - -DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm" -HOMEPAGE="https://www.issihosts.com/haveged/" -SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc x86" -IUSE="selinux static-libs" - -DEPEND="" -RDEPEND="!<sys-apps/openrc-0.11.8 - selinux? ( sec-policy/selinux-entropyd )" - -# threads are broken right now, but eventually -# we should add $(use_enable threads) -src_configure() { - econf \ - $(use_enable static-libs static) \ - --bindir=/usr/sbin \ - --enable-nistest \ - --disable-threads -} - -src_install() { - default - - # Install gentoo ones instead - newinitd "${FILESDIR}"/haveged-init.d.3 haveged - newconfd "${FILESDIR}"/haveged-conf.d haveged - - systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service - insinto /etc - doins "${FILESDIR}"/haveged.conf -} diff --git a/sys-apps/haveged/haveged-1.9.8c.ebuild b/sys-apps/haveged/haveged-1.9.8c-r1.ebuild index 0f02b33a084a..e43224c9bc51 100644 --- a/sys-apps/haveged/haveged-1.9.8c.ebuild +++ b/sys-apps/haveged/haveged-1.9.8c-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -42,4 +42,6 @@ src_install() { systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service insinto /etc doins "${FILESDIR}"/haveged.conf + + find "${ED}" -type f -name "*.la" -delete || die } diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest index dc717cbf51e1..694b96ff58e6 100644 --- a/sys-apps/help2man/Manifest +++ b/sys-apps/help2man/Manifest @@ -1 +1,2 @@ DIST help2man-1.47.16.tar.xz 203036 BLAKE2B 8e06c2c2e90adfc2ab8345908516b15ae50b02a7a9554d5d9beee4373b71c131aeaa0c148b9a988c531bbfe2149c25069af56a79101a4248b6c1adfeb734a132 SHA512 b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544 +DIST help2man-1.47.17.tar.xz 211476 BLAKE2B 67b1ccd4b6b66510a2fff424663bc2051e49e93c37c7e2a2b4631f3781d3773a97fd1773f96ca5ca2ba644bcd79ae35338931eff857ce199a847cc312d778b0e SHA512 185cd04aa6db6d8a4c898b61ad6a0aded7775659c7f02244b45927310eb3f8cd932fe9dd725ccac3e793aa22c656338b5d16f291f3a0420ed121681d4a4bac25 diff --git a/sys-apps/help2man/help2man-1.47.17.ebuild b/sys-apps/help2man/help2man-1.47.17.ebuild new file mode 100644 index 000000000000..2f5c10989e9b --- /dev/null +++ b/sys-apps/help2man/help2man-1.47.17.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="GNU utility to convert program --help output to a man page" +HOMEPAGE="https://www.gnu.org/software/help2man/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls" + +RDEPEND="dev-lang/perl + nls? ( dev-perl/Locale-gettext )" +DEPEND="${RDEPEND}" + +DOCS=( debian/changelog NEWS README THANKS ) #385753 + +PATCHES=( + "${FILESDIR}"/${PN}-1.46.1-linguas.patch +) + +src_prepare() { + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i \ + -e 's/-shared/-bundle/' \ + Makefile.in || die + fi + default +} + +src_configure() { + # Disable gettext requirement as the release includes the gmo files #555018 + local myeconfargs=( + ac_cv_path_MSGFMT=$(type -P false) + $(use_enable nls) + ) + econf "${myeconfargs[@]}" +} diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest index f74e73aee069..3ea848de3156 100644 --- a/sys-apps/init-system-helpers/Manifest +++ b/sys-apps/init-system-helpers/Manifest @@ -1 +1,2 @@ DIST init-system-helpers_1.49.tar.xz 42660 BLAKE2B 548711283b04e3df13e9287154e2648b99ac80c2cdc71a428b4496220cd7c319f8f7afccb1e611c07b9d801837ef8799a3295a0490aa62812d47b728ba5ddba9 SHA512 bd612207e51e18a44f9c90e1e5b069ab39e06c776b8a0d6c9ecb367890d4a44ff02b3028418ac10a688782745331f39bb9299ba836f333b712e6fdd7ddc8da16 +DIST init-system-helpers_1.60.tar.xz 40584 BLAKE2B ad21a65ef3c4bcec16b14fc4db890fb7f83df625d1038fe217c20e9391404914df189ae31506b9bbef0442cdd333f46bd9c4d9009b7d671d9ae2deb6b05eee8e SHA512 3739613fa8afa1fa6032f47f8cec67c526171987a7d1eae31d479db9cc1e49ae3cd397a858130c17680d62becb9c6499bd1da1268e9ed25b044337ab69f0dd88 diff --git a/sys-apps/init-system-helpers/files/revert-openrc-management.patch b/sys-apps/init-system-helpers/files/revert-openrc-management.patch index 49b4916fab31..582b71d9b1c4 100644 --- a/sys-apps/init-system-helpers/files/revert-openrc-management.patch +++ b/sys-apps/init-system-helpers/files/revert-openrc-management.patch @@ -1,3 +1,6 @@ +Tries to manage started service instead of allowing OpenRC to do it. +https://bugs.gentoo.org/641836 +https://bugs.gentoo.org/649014 --- a/script/service +++ b/script/service @@ -159,23 +160,6 @@ run_via_sysvinit() { diff --git a/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild b/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild new file mode 100644 index 000000000000..f42c39be7445 --- /dev/null +++ b/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Helper scripts useful for both OpenRC and systemd" +HOMEPAGE="https://packages.debian.org/sid/init-system-helpers" +# git repo: https://anonscm.debian.org/git/collab-maint/init-system-helpers.git +SRC_URI="http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV}.tar.xz" + +LICENSE="BSD GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +BDEPEND="dev-python/docutils" +RDEPEND="!<sys-apps/openrc-0.33" + +PATCHES=( + "${FILESDIR}/revert-openrc-management.patch" +) + +src_install() { + # We only care about 'service' script/manpage: + exeinto /sbin/ + doexe script/service + + rst2man.py man8/service.rst > man8/service.8 || die "Failed to generate man page" + + # FIXME: need to patch to remove *rc.d references, which we don't ship + # And should probably add a list of supported options (e.g., start/stop/etc.) + doman man8/service.8 +} diff --git a/sys-apps/init-system-helpers/metadata.xml b/sys-apps/init-system-helpers/metadata.xml index 3d4429370ed8..a57d5e6ac3be 100644 --- a/sys-apps/init-system-helpers/metadata.xml +++ b/sys-apps/init-system-helpers/metadata.xml @@ -2,5 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <stabilize-allarches/> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index c32d51e47904..d62d2b683b0a 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,3 +1,2 @@ -DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c diff --git a/sys-apps/kmod/files/kmod-26/fix-from-upstream-use-pkcs7-instead-of-cms.patch b/sys-apps/kmod/files/kmod-26-libressl.patch index 85c1edd2a584..cb36ab401c21 100644 --- a/sys-apps/kmod/files/kmod-26/fix-from-upstream-use-pkcs7-instead-of-cms.patch +++ b/sys-apps/kmod/files/kmod-26-libressl.patch @@ -1,7 +1,7 @@ From 628677e066198d8658d7edd5511a5bb27cd229f5 Mon Sep 17 00:00:00 2001 From: Stefan Strogin <steils@gentoo.org> Date: Sun, 19 May 2019 03:42:01 +0300 -Subject: libkmod-signature: use PKCS#7 instead of CMS +Subject: [PATCH] libkmod-signature: use PKCS#7 instead of CMS Linux uses either PKCS #7 or CMS for signing modules (see scripts/sign-file.c). CMS is not supported by LibreSSL or older OpenSSL, @@ -24,6 +24,8 @@ Changes v1->v2: - Don't use ifdefs for keeping redundant CMS code, just use PKCS #7 both with OpenSSL and LibreSSL. +Upstream-Status: Accepted +[https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=628677e066198d8658d7edd5511a5bb27cd229f5] Signed-off-by: Stefan Strogin <steils@gentoo.org> --- libkmod/libkmod-signature.c | 37 +++++++++++++++++++------------------ @@ -137,5 +139,5 @@ index 48d0145..4e8748c 100644 } -- -cgit 1.2-0.3.lf.el7 +2.21.0 diff --git a/sys-apps/kmod/files/kmod-26/fix-from-upstream-convert-return-value.patch b/sys-apps/kmod/files/kmod-26/fix-from-upstream-convert-return-value.patch deleted file mode 100644 index 29e23e1e96b1..000000000000 --- a/sys-apps/kmod/files/kmod-26/fix-from-upstream-convert-return-value.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 81dbf2bee644ef035d054e2101fceea86c50e07d Mon Sep 17 00:00:00 2001 -From: Topi Miettinen <toiwoton@gmail.com> -Date: Mon, 23 Dec 2019 18:58:13 +0200 -Subject: libkmod-module: convert return value from system() to errno - -Don't use exit status of a command directly as errno code, callers -will be confused. - -Signed-off-by: Topi Miettinen <toiwoton@gmail.com> ---- - libkmod/libkmod-module.c | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c -index 8044a8f..714ee21 100644 ---- a/libkmod/libkmod-module.c -+++ b/libkmod/libkmod-module.c -@@ -980,14 +980,19 @@ static int command_do(struct kmod_module *mod, const char *type, - err = system(cmd); - unsetenv("MODPROBE_MODULE"); - -- if (err == -1 || WEXITSTATUS(err)) { -- ERR(mod->ctx, "Error running %s command for %s\n", -- type, modname); -- if (err != -1) -- err = -WEXITSTATUS(err); -+ if (err == -1) { -+ ERR(mod->ctx, "Could not run %s command '%s' for module %s: %m\n", -+ type, cmd, modname); -+ return -EINVAL; - } - -- return err; -+ if (WEXITSTATUS(err)) { -+ ERR(mod->ctx, "Error running %s command '%s' for module %s: retcode %d\n", -+ type, cmd, modname, WEXITSTATUS(err)); -+ return -EINVAL; -+ } -+ -+ return 0; - } - - struct probe_insert_cb { --- -cgit 1.2-0.3.lf.el7 - diff --git a/sys-apps/kmod/files/kmod-26/fix-from-upstream-filter-undefined-linker.patch b/sys-apps/kmod/files/kmod-26/fix-from-upstream-filter-undefined-linker.patch deleted file mode 100644 index 3fcea4e7761f..000000000000 --- a/sys-apps/kmod/files/kmod-26/fix-from-upstream-filter-undefined-linker.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8aa52bf238daa007712fd828e8ae05cc26178566 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Mon, 18 Nov 2019 22:56:17 +0100 -Subject: Makefile.am: filter -Wl,--no-undefined - -Commit 1d14ef82f4a3be741bcdf6b1c6d51ce9dce43567 does not completely fix -the build with python 3.8 as we still get link failure due to -'-z undefs' being ignored by some versions of ld. - -Indeed, -z undefs was added by commit -97a232d7335f3bd0231fd9cd39455bde1d563922 in upstream binutils, and this -commit was first present in binutils 2.30. -So any toolchain using binutils version older than that won't have --z undefs and will build fail on: - -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mips-linux-gnu/5.3.0/../../../../mips-linux-gnu/bin/ld: warning: -z undefs ignored. - -/home/naourr/work/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64_be-linux-gnu/7.3.1/../../../../aarch64_be-linux-gnu/bin/ld: warning: -z undefs ignored. - -So filter -Wl,--no-undefined to fix the issue - -Fixes: - - http://autobuild.buildroot.org/results/e9645d9969481b09f507f6e0d0b35faaa283eb60 - - http://autobuild.buildroot.org/results/06a6d865b6b7d8ebd793bde214f4a4c40e0962e1 - -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - Makefile.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 8e9c90d..47505c1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -173,7 +173,10 @@ CPYTHON_MODULE_CFLAGS = \ - $(AM_CFLAGS) -DCPYTHON_COMPILING_IN_PYPY=0 \ - $(PYTHON_NOWARN) $(PYTHON_CFLAGS) \ - -fvisibility=default --CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared -Wl,-z,undefs -+# Filter -Wl,--no-undefined to fix build with python 3.8 -+comma = , -+CPYTHON_MODULE_LDFLAGS = $(subst -Wl$(comma)--no-undefined,,$(AM_LDFLAGS)) -+CPYTHON_MODULE_LDFLAGS += -module -avoid-version -shared - - if BUILD_PYTHON - pkgpyexec_LTLIBRARIES = \ --- -cgit 1.2-0.3.lf.el7 - diff --git a/sys-apps/kmod/files/kmod-26/fix-from-upstream-get-builtin-mods.patch b/sys-apps/kmod/files/kmod-26/fix-from-upstream-get-builtin-mods.patch deleted file mode 100644 index 4f84a42b74a4..000000000000 --- a/sys-apps/kmod/files/kmod-26/fix-from-upstream-get-builtin-mods.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 73eed2aba3cbe18bbda40f18f7bc32e8de1ec81f Mon Sep 17 00:00:00 2001 -From: Alexey Gladkov <gladkov.alexey@gmail.com> -Date: Fri, 8 Nov 2019 18:25:21 +0100 -Subject: libkmod: Add function to get list of built-in modules - -Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com> ---- - libkmod/libkmod-internal.h | 1 + - libkmod/libkmod-module.c | 40 ++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 41 insertions(+) - -diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h -index df01df1..ee4b97b 100644 ---- a/libkmod/libkmod-internal.h -+++ b/libkmod/libkmod-internal.h -@@ -145,6 +145,7 @@ void kmod_module_set_visited(struct kmod_module *mod, bool visited) __attribute_ - void kmod_module_set_builtin(struct kmod_module *mod, bool builtin) __attribute__((nonnull((1)))); - void kmod_module_set_required(struct kmod_module *mod, bool required) __attribute__((nonnull(1))); - bool kmod_module_is_builtin(struct kmod_module *mod) __attribute__((nonnull(1))); -+int kmod_module_get_builtin(struct kmod_ctx *ctx, struct kmod_list **list) __attribute__((nonnull(1, 2))); - - /* libkmod-file.c */ - struct kmod_file *kmod_file_open(const struct kmod_ctx *ctx, const char *filename) _must_check_ __attribute__((nonnull(1,2))); -diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c -index bffe715..8fbabd2 100644 ---- a/libkmod/libkmod-module.c -+++ b/libkmod/libkmod-module.c -@@ -2866,3 +2866,43 @@ KMOD_EXPORT void kmod_module_dependency_symbols_free_list(struct kmod_list *list - list = kmod_list_remove(list); - } - } -+ -+/** -+ * kmod_module_get_builtin: -+ * @ctx: kmod library context -+ * @list: where to save the builtin module list -+ * -+ * Returns: 0 on success or < 0 otherwise. -+ */ -+int kmod_module_get_builtin(struct kmod_ctx *ctx, struct kmod_list **list) -+{ -+ struct kmod_builtin_iter *iter; -+ int err = 0; -+ -+ iter = kmod_builtin_iter_new(ctx); -+ if (!iter) -+ return -errno; -+ -+ while (kmod_builtin_iter_next(iter)) { -+ struct kmod_module *mod = NULL; -+ char modname[PATH_MAX]; -+ -+ if (!kmod_builtin_iter_get_modname(iter, modname)) { -+ err = -errno; -+ goto fail; -+ } -+ -+ kmod_module_new_from_name(ctx, modname, &mod); -+ kmod_module_set_builtin(mod, true); -+ -+ *list = kmod_list_append(*list, mod); -+ } -+ -+ kmod_builtin_iter_free(iter); -+ return err; -+fail: -+ kmod_builtin_iter_free(iter); -+ kmod_module_unref_list(*list); -+ *list = NULL; -+ return err; -+} --- -cgit 1.2-0.3.lf.el7 - diff --git a/sys-apps/kmod/files/kmod-26/fix-from-upstream-ignore-builtin-module.patch b/sys-apps/kmod/files/kmod-26/fix-from-upstream-ignore-builtin-module.patch deleted file mode 100644 index e9d06b2599a2..000000000000 --- a/sys-apps/kmod/files/kmod-26/fix-from-upstream-ignore-builtin-module.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 52a0ba82e1ad180f9f91920db70a758fac49466a Mon Sep 17 00:00:00 2001 -From: Yauheni Kaliuta <yauheni.kaliuta@redhat.com> -Date: Thu, 31 Oct 2019 20:12:53 +0200 -Subject: modprobe: ignore builtin module on recursive removing - -If there are built-in dependencies and any of them is built-in in -the kernel, modprobe -r fails with - -modprobe: FATAL: Module module_name is builtin. - -It makes sense to ignore such dependencies for the case when -removing is called for non-top level module. - -Example: cifs module, it declares bunch of softdeps and the first -one fails on some kernel configs: - -modprobe: FATAL: Module gcm is builtin. - -Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com> ---- - tools/modprobe.c | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/tools/modprobe.c b/tools/modprobe.c -index a9e2331..44cd15c 100644 ---- a/tools/modprobe.c -+++ b/tools/modprobe.c -@@ -353,7 +353,8 @@ static int rmmod_do_remove_module(struct kmod_module *mod) - return err; - } - --static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies); -+static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies, -+ bool ignore_builtin); - - static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors) - { -@@ -361,7 +362,7 @@ static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors) - - kmod_list_foreach_reverse(l, list) { - struct kmod_module *m = kmod_module_get_module(l); -- int r = rmmod_do_module(m, false); -+ int r = rmmod_do_module(m, false, true); - kmod_module_unref(m); - - if (r < 0 && stop_on_errors) -@@ -371,7 +372,8 @@ static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors) - return 0; - } - --static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies) -+static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies, -+ bool ignore_builtin) - { - const char *modname = kmod_module_get_name(mod); - struct kmod_list *pre = NULL, *post = NULL; -@@ -401,8 +403,12 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies) - } - goto error; - } else if (state == KMOD_MODULE_BUILTIN) { -- LOG("Module %s is builtin.\n", modname); -- err = -ENOENT; -+ if (ignore_builtin) { -+ err = 0; -+ } else { -+ LOG("Module %s is builtin.\n", modname); -+ err = -ENOENT; -+ } - goto error; - } - } -@@ -462,7 +468,7 @@ static int rmmod(struct kmod_ctx *ctx, const char *alias) - - kmod_list_foreach(l, list) { - struct kmod_module *mod = kmod_module_get_module(l); -- err = rmmod_do_module(mod, true); -+ err = rmmod_do_module(mod, true, false); - kmod_module_unref(mod); - if (err < 0) - break; --- -cgit 1.2-0.3.lf.el7 - diff --git a/sys-apps/kmod/files/kmod-26/fix-from-upstream-link-against-libcrypto-not-all-of-openssl.patch b/sys-apps/kmod/files/kmod-26/fix-from-upstream-link-against-libcrypto-not-all-of-openssl.patch deleted file mode 100644 index 20bd6187ddd5..000000000000 --- a/sys-apps/kmod/files/kmod-26/fix-from-upstream-link-against-libcrypto-not-all-of-openssl.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 8e266b9eeffa3c1fc4dca0081c0553f8c2a488c0 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Wed, 13 Feb 2019 10:27:51 -0500 -Subject: Link against libcrypto, not all of openssl - -In the previous build setup, libkmod.so would link to not just -libcrypto.so, but also libssl.so: - -$ readelf -d /lib/libkmod.so | grep NEEDED - 0x0000000000000001 (NEEDED) Shared library: [liblzma.so.5] - 0x0000000000000001 (NEEDED) Shared library: [libz.so.1] - 0x0000000000000001 (NEEDED) Shared library: [libssl.so.1.1] - 0x0000000000000001 (NEEDED) Shared library: [libcrypto.so.1.1] - 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] - -We don't need any symbols from libssl, though. This patch ensures that -we pass 'libcrypto' to pkgconfig rather than 'openssl', getting only the -library that we need: - -$ readelf -d ./libkmod/.libs/libkmod.so.2.3.4 | grep NEEDED - 0x0000000000000001 (NEEDED) Shared library: [liblzma.so.5] - 0x0000000000000001 (NEEDED) Shared library: [libz.so.1] - 0x0000000000000001 (NEEDED) Shared library: [libcrypto.so.1.1] - 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] ---- - Makefile.am | 6 +++--- - configure.ac | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ddb25f0..758f4f0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -35,8 +35,8 @@ SED_PROCESS = \ - -e 's,@liblzma_LIBS\@,${liblzma_LIBS},g' \ - -e 's,@zlib_CFLAGS\@,${zlib_CFLAGS},g' \ - -e 's,@zlib_LIBS\@,${zlib_LIBS},g' \ -- -e 's,@openssl_CFLAGS\@,${openssl_CFLAGS},g' \ -- -e 's,@openssl_LIBS\@,${openssl_LIBS},g' \ -+ -e 's,@libcrypto_CFLAGS\@,${libcrypto_CFLAGS},g' \ -+ -e 's,@libcrypto_LIBS\@,${libcrypto_LIBS},g' \ - < $< > $@ || rm $@ - - %.pc: %.pc.in Makefile -@@ -89,7 +89,7 @@ libkmod_libkmod_la_DEPENDENCIES = \ - ${top_srcdir}/libkmod/libkmod.sym - libkmod_libkmod_la_LIBADD = \ - shared/libshared.la \ -- ${liblzma_LIBS} ${zlib_LIBS} ${openssl_LIBS} -+ ${liblzma_LIBS} ${zlib_LIBS} ${libcrypto_LIBS} - - noinst_LTLIBRARIES += libkmod/libkmod-internal.la - libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES) -diff --git a/configure.ac b/configure.ac -index ee72283..dffe278 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -110,12 +110,12 @@ AC_ARG_WITH([openssl], - AS_HELP_STRING([--with-openssl], [handle PKCS7 signatures @<:@default=disabled@:>@]), - [], [with_openssl=no]) - AS_IF([test "x$with_openssl" != "xno"], [ -- PKG_CHECK_MODULES([openssl], [openssl >= 1.1.0]) -+ PKG_CHECK_MODULES([libcrypto], [libcrypto >= 1.1.0]) - AC_DEFINE([ENABLE_OPENSSL], [1], [Enable openssl for modinfo.]) - ], [ - AC_MSG_NOTICE([openssl support not requested]) - ]) --CC_FEATURE_APPEND([with_features], [with_openssl], [OPENSSL]) -+CC_FEATURE_APPEND([with_features], [with_openssl], [LIBCRYPTO]) - - AC_ARG_WITH([bashcompletiondir], - AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]), --- -cgit 1.2-0.3.lf.el7 - diff --git a/sys-apps/kmod/files/kmod-26/fix-from-upstream-lookup-aliases-in-modules-builtin-info.patch b/sys-apps/kmod/files/kmod-26/fix-from-upstream-lookup-aliases-in-modules-builtin-info.patch deleted file mode 100644 index b36421843577..000000000000 --- a/sys-apps/kmod/files/kmod-26/fix-from-upstream-lookup-aliases-in-modules-builtin-info.patch +++ /dev/null @@ -1,192 +0,0 @@ -From b866b2165ae6cf18fb26b635f4a7ee57c0334731 Mon Sep 17 00:00:00 2001 -From: Alexey Gladkov <gladkov.alexey@gmail.com> -Date: Fri, 8 Nov 2019 18:25:22 +0100 -Subject: Lookup aliases in the modules.builtin.modinfo - -New modules.builtin.modinfo duplicates modules.builtin in the built-in -module name search. If it exists, then we can use this file, but if not, -then we need to fallback to the old file. - -Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com> ---- - libkmod/libkmod-internal.h | 1 + - libkmod/libkmod-module.c | 10 ++++++-- - libkmod/libkmod.c | 25 ++++++++++++++++++ - libkmod/libkmod.h | 1 + - tools/depmod.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 98 insertions(+), 2 deletions(-) - -diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h -index ee4b97b..b22ac2a 100644 ---- a/libkmod/libkmod-internal.h -+++ b/libkmod/libkmod-internal.h -@@ -89,6 +89,7 @@ int kmod_lookup_alias_from_config(struct kmod_ctx *ctx, const char *name, struct - int kmod_lookup_alias_from_symbols_file(struct kmod_ctx *ctx, const char *name, struct kmod_list **list) __attribute__((nonnull(1, 2, 3))); - int kmod_lookup_alias_from_aliases_file(struct kmod_ctx *ctx, const char *name, struct kmod_list **list) __attribute__((nonnull(1, 2, 3))); - int kmod_lookup_alias_from_moddep_file(struct kmod_ctx *ctx, const char *name, struct kmod_list **list) __attribute__((nonnull(1, 2, 3))); -+int kmod_lookup_alias_from_kernel_builtin_file(struct kmod_ctx *ctx, const char *name, struct kmod_list **list) __attribute__((nonnull(1, 2, 3))); - int kmod_lookup_alias_from_builtin_file(struct kmod_ctx *ctx, const char *name, struct kmod_list **list) __attribute__((nonnull(1, 2, 3))); - bool kmod_lookup_alias_is_builtin(struct kmod_ctx *ctx, const char *name) __attribute__((nonnull(1, 2))); - int kmod_lookup_alias_from_commands(struct kmod_ctx *ctx, const char *name, struct kmod_list **list) __attribute__((nonnull(1, 2, 3))); -diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c -index 8fbabd2..ee7e6bd 100644 ---- a/libkmod/libkmod-module.c -+++ b/libkmod/libkmod-module.c -@@ -575,10 +575,16 @@ KMOD_EXPORT int kmod_module_new_from_lookup(struct kmod_ctx *ctx, - err = kmod_lookup_alias_from_aliases_file(ctx, alias, list); - CHECK_ERR_AND_FINISH(err, fail, list, finish); - -- DBG(ctx, "lookup modules.builtin %s\n", alias); -- err = kmod_lookup_alias_from_builtin_file(ctx, alias, list); -+ DBG(ctx, "lookup modules.builtin.modinfo %s\n", alias); -+ err = kmod_lookup_alias_from_kernel_builtin_file(ctx, alias, list); - CHECK_ERR_AND_FINISH(err, fail, list, finish); - -+ if (err == 0) { -+ DBG(ctx, "lookup modules.builtin %s\n", alias); -+ err = kmod_lookup_alias_from_builtin_file(ctx, alias, list); -+ CHECK_ERR_AND_FINISH(err, fail, list, finish); -+ } -+ - finish: - DBG(ctx, "lookup %s=%d, list=%p\n", alias, err, *list); - return err; -diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c -index 69fe431..c9d9e2a 100644 ---- a/libkmod/libkmod.c -+++ b/libkmod/libkmod.c -@@ -57,6 +57,7 @@ static struct _index_files { - [KMOD_INDEX_MODULES_DEP] = { .fn = "modules.dep", .prefix = "" }, - [KMOD_INDEX_MODULES_ALIAS] = { .fn = "modules.alias", .prefix = "alias " }, - [KMOD_INDEX_MODULES_SYMBOL] = { .fn = "modules.symbols", .prefix = "alias "}, -+ [KMOD_INDEX_MODULES_BUILTIN_ALIAS] = { .fn = "modules.builtin.alias", .prefix = "" }, - [KMOD_INDEX_MODULES_BUILTIN] = { .fn = "modules.builtin", .prefix = ""}, - }; - -@@ -522,6 +523,30 @@ static char *lookup_builtin_file(struct kmod_ctx *ctx, const char *name) - return line; - } - -+int kmod_lookup_alias_from_kernel_builtin_file(struct kmod_ctx *ctx, -+ const char *name, -+ struct kmod_list **list) -+{ -+ struct kmod_list *l; -+ int ret = kmod_lookup_alias_from_alias_bin(ctx, -+ KMOD_INDEX_MODULES_BUILTIN_ALIAS, -+ name, list); -+ if (ret > 0) { -+ kmod_list_foreach(l, *list) { -+ struct kmod_module *mod = l->data; -+ kmod_module_set_builtin(mod, true); -+ } -+ } else if (ret == -ENOSYS) { -+ /* -+ * If the system does not support this yet, then -+ * there is no need to return an error. -+ */ -+ ret = 0; -+ } -+ -+ return ret; -+} -+ - int kmod_lookup_alias_from_builtin_file(struct kmod_ctx *ctx, const char *name, - struct kmod_list **list) - { -diff --git a/libkmod/libkmod.h b/libkmod/libkmod.h -index 352627e..3cab2e5 100644 ---- a/libkmod/libkmod.h -+++ b/libkmod/libkmod.h -@@ -70,6 +70,7 @@ enum kmod_index { - KMOD_INDEX_MODULES_DEP = 0, - KMOD_INDEX_MODULES_ALIAS, - KMOD_INDEX_MODULES_SYMBOL, -+ KMOD_INDEX_MODULES_BUILTIN_ALIAS, - KMOD_INDEX_MODULES_BUILTIN, - /* Padding to make sure enum is not mapped to char */ - _KMOD_INDEX_PAD = 1U << 31, -diff --git a/tools/depmod.c b/tools/depmod.c -index 391afe9..fbbce10 100644 ---- a/tools/depmod.c -+++ b/tools/depmod.c -@@ -2402,6 +2402,68 @@ static int output_devname(struct depmod *depmod, FILE *out) - return 0; - } - -+static int output_builtin_alias_bin(struct depmod *depmod, FILE *out) -+{ -+ int ret = 0, count = 0; -+ struct index_node *idx; -+ struct kmod_list *l, *builtin = NULL; -+ -+ idx = index_create(); -+ -+ if (idx == NULL) { -+ ret = -ENOMEM; -+ goto fail; -+ } -+ -+ ret = kmod_module_get_builtin(depmod->ctx, &builtin); -+ if (ret < 0) { -+ if (ret == -ENOENT) -+ ret = 0; -+ goto fail; -+ } -+ -+ kmod_list_foreach(l, builtin) { -+ struct kmod_list *ll, *info_list = NULL; -+ struct kmod_module *mod = l->data; -+ const char *modname = kmod_module_get_name(mod); -+ -+ ret = kmod_module_get_info(mod, &info_list); -+ if (ret < 0) -+ goto fail; -+ -+ kmod_list_foreach(ll, info_list) { -+ char alias[PATH_MAX]; -+ const char *key = kmod_module_info_get_key(ll); -+ const char *value = kmod_module_info_get_value(ll); -+ -+ if (!streq(key, "alias")) -+ continue; -+ -+ alias[0] = '\0'; -+ if (alias_normalize(value, alias, NULL) < 0) { -+ WRN("Unmatched bracket in %s\n", value); -+ continue; -+ } -+ -+ index_insert(idx, alias, modname, 0); -+ } -+ -+ kmod_module_info_free_list(info_list); -+ -+ index_insert(idx, modname, modname, 0); -+ count++; -+ } -+ -+ if (count) -+ index_write(idx, out); -+ index_destroy(idx); -+fail: -+ if (builtin) -+ kmod_module_unref_list(builtin); -+ -+ return ret; -+} -+ - static int depmod_output(struct depmod *depmod, FILE *out) - { - static const struct depfile { -@@ -2416,6 +2478,7 @@ static int depmod_output(struct depmod *depmod, FILE *out) - { "modules.symbols", output_symbols }, - { "modules.symbols.bin", output_symbols_bin }, - { "modules.builtin.bin", output_builtin_bin }, -+ { "modules.builtin.alias.bin", output_builtin_alias_bin }, - { "modules.devname", output_devname }, - { } - }; --- -cgit 1.2-0.3.lf.el7 - diff --git a/sys-apps/kmod/files/kmod-26/fix-from-upstream-new-parser-for-builtin-mods.patch b/sys-apps/kmod/files/kmod-26/fix-from-upstream-new-parser-for-builtin-mods.patch deleted file mode 100644 index d04620a1f32b..000000000000 --- a/sys-apps/kmod/files/kmod-26/fix-from-upstream-new-parser-for-builtin-mods.patch +++ /dev/null @@ -1,402 +0,0 @@ -From 60084cf1cb24dc3a257976c0d539a4c3ffda5db5 Mon Sep 17 00:00:00 2001 -From: Alexey Gladkov <gladkov.alexey@gmail.com> -Date: Fri, 8 Nov 2019 18:25:20 +0100 -Subject: libkmod: Add parser for modules.builtin.modinfo - -The kernel since version v5.2-rc1 exports information about built-in -modules in the modules.builtin.modinfo. Information is stored in -the same format as in the separate modules (null-terminated string -array). The module name is a prefix for each line. - -$ tr '\0' '\n' < modules.builtin.modinfo -ext4.softdep=pre: crc32c -ext4.license=GPL -ext4.description=Fourth Extended Filesystem -ext4.author=Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others -ext4.alias=fs-ext4 -ext4.alias=ext3 -ext4.alias=fs-ext3 -ext4.alias=ext2 -ext4.alias=fs-ext2 -md_mod.alias=block-major-9-* -md_mod.alias=md -md_mod.description=MD RAID framework -md_mod.license=GPL -md_mod.parmtype=create_on_open:bool -md_mod.parmtype=start_dirty_degraded:int -... - -Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com> ---- - Makefile.am | 1 + - libkmod/libkmod-builtin.c | 329 +++++++++++++++++++++++++++++++++++++++++++++ - libkmod/libkmod-internal.h | 8 ++ - 3 files changed, 338 insertions(+) - create mode 100644 libkmod/libkmod-builtin.c - -diff --git a/Makefile.am b/Makefile.am -index 47505c1..56c9ba6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -68,6 +68,7 @@ libkmod_libkmod_la_SOURCES = \ - libkmod/libkmod.h \ - libkmod/libkmod-internal.h \ - libkmod/libkmod.c \ -+ libkmod/libkmod-builtin.c \ - libkmod/libkmod-list.c \ - libkmod/libkmod-config.c \ - libkmod/libkmod-index.c \ -diff --git a/libkmod/libkmod-builtin.c b/libkmod/libkmod-builtin.c -new file mode 100644 -index 0000000..98d7365 ---- /dev/null -+++ b/libkmod/libkmod-builtin.c -@@ -0,0 +1,329 @@ -+/* -+ * libkmod - interface to kernel built-in modules -+ * -+ * Copyright (C) 2019 Alexey Gladkov <gladkov.alexey@gmail.com> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see <http://www.gnu.org/licenses/>. -+ */ -+ -+#include <sys/types.h> -+#include <sys/stat.h> -+ -+#include <unistd.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <errno.h> -+ -+#include "libkmod.h" -+#include "libkmod-internal.h" -+ -+#define MODULES_BUILTIN_MODINFO "modules.builtin.modinfo" -+ -+struct kmod_builtin_iter { -+ struct kmod_ctx *ctx; -+ -+ // The file descriptor. -+ int file; -+ -+ // The total size in bytes. -+ ssize_t size; -+ -+ // The offset of current module. -+ off_t pos; -+ -+ // The offset at which the next module is located. -+ off_t next; -+ -+ // Number of strings in the current block. -+ ssize_t nstrings; -+ -+ // Internal buffer and its size. -+ size_t bufsz; -+ char *buf; -+}; -+ -+struct kmod_builtin_iter *kmod_builtin_iter_new(struct kmod_ctx *ctx) -+{ -+ char path[PATH_MAX]; -+ int file, sv_errno; -+ struct stat sb; -+ struct kmod_builtin_iter *iter = NULL; -+ const char *dirname = kmod_get_dirname(ctx); -+ size_t len = strlen(dirname); -+ -+ file = -1; -+ -+ if ((len + 1 + strlen(MODULES_BUILTIN_MODINFO) + 1) >= PATH_MAX) { -+ sv_errno = ENAMETOOLONG; -+ goto fail; -+ } -+ -+ snprintf(path, PATH_MAX, "%s/%s", dirname, MODULES_BUILTIN_MODINFO); -+ -+ file = open(path, O_RDONLY|O_CLOEXEC); -+ if (file < 0) { -+ sv_errno = errno; -+ goto fail; -+ } -+ -+ if (fstat(file, &sb) < 0) { -+ sv_errno = errno; -+ goto fail; -+ } -+ -+ iter = malloc(sizeof(*iter)); -+ if (!iter) { -+ sv_errno = ENOMEM; -+ goto fail; -+ } -+ -+ iter->ctx = ctx; -+ iter->file = file; -+ iter->size = sb.st_size; -+ iter->nstrings = 0; -+ iter->pos = 0; -+ iter->next = 0; -+ iter->bufsz = 0; -+ iter->buf = NULL; -+ -+ return iter; -+fail: -+ if (file >= 0) -+ close(file); -+ -+ errno = sv_errno; -+ -+ return iter; -+} -+ -+void kmod_builtin_iter_free(struct kmod_builtin_iter *iter) -+{ -+ close(iter->file); -+ free(iter->buf); -+ free(iter); -+} -+ -+static off_t get_string(struct kmod_builtin_iter *iter, off_t offset, -+ char **line, size_t *size) -+{ -+ int sv_errno; -+ char *nullp = NULL; -+ size_t linesz = 0; -+ -+ while (!nullp) { -+ char buf[BUFSIZ]; -+ ssize_t sz; -+ size_t partsz; -+ -+ sz = pread(iter->file, buf, BUFSIZ, offset); -+ if (sz < 0) { -+ sv_errno = errno; -+ goto fail; -+ } else if (sz == 0) { -+ offset = 0; -+ break; -+ } -+ -+ nullp = memchr(buf, '\0', (size_t) sz); -+ partsz = (size_t)((nullp) ? (nullp - buf) + 1 : sz); -+ offset += (off_t) partsz; -+ -+ if (iter->bufsz < linesz + partsz) { -+ iter->bufsz = linesz + partsz; -+ iter->buf = realloc(iter->buf, iter->bufsz); -+ -+ if (!iter->buf) { -+ sv_errno = errno; -+ goto fail; -+ } -+ } -+ -+ strncpy(iter->buf + linesz, buf, partsz); -+ linesz += partsz; -+ } -+ -+ if (linesz) { -+ *line = iter->buf; -+ *size = linesz; -+ } -+ -+ return offset; -+fail: -+ errno = sv_errno; -+ return -1; -+} -+ -+bool kmod_builtin_iter_next(struct kmod_builtin_iter *iter) -+{ -+ char *line, *modname; -+ size_t linesz; -+ off_t pos, offset, modlen; -+ -+ modname = NULL; -+ -+ iter->nstrings = 0; -+ offset = pos = iter->next; -+ -+ while (offset < iter->size) { -+ char *dot; -+ off_t len; -+ -+ offset = get_string(iter, pos, &line, &linesz); -+ if (offset <= 0) { -+ if (offset) -+ ERR(iter->ctx, "get_string: %s\n", strerror(errno)); -+ pos = iter->size; -+ break; -+ } -+ -+ dot = strchr(line, '.'); -+ if (!dot) { -+ ERR(iter->ctx, "kmod_builtin_iter_next: unexpected string without modname prefix\n"); -+ pos = iter->size; -+ break; -+ } -+ -+ len = dot - line; -+ -+ if (!modname) { -+ modname = strdup(line); -+ modlen = len; -+ } else if (modlen != len || strncmp(modname, line, len)) { -+ break; -+ } -+ -+ iter->nstrings++; -+ pos = offset; -+ } -+ -+ iter->pos = iter->next; -+ iter->next = pos; -+ -+ free(modname); -+ -+ return (iter->pos < iter->size); -+} -+ -+bool kmod_builtin_iter_get_modname(struct kmod_builtin_iter *iter, -+ char modname[static PATH_MAX]) -+{ -+ int sv_errno; -+ char *line, *dot; -+ size_t linesz, len; -+ off_t offset; -+ -+ if (iter->pos == iter->size) -+ return false; -+ -+ line = NULL; -+ -+ offset = get_string(iter, iter->pos, &line, &linesz); -+ if (offset <= 0) { -+ sv_errno = errno; -+ if (offset) -+ ERR(iter->ctx, "get_string: %s\n", strerror(errno)); -+ goto fail; -+ } -+ -+ dot = strchr(line, '.'); -+ if (!dot) { -+ sv_errno = errno; -+ ERR(iter->ctx, "kmod_builtin_iter_get_modname: unexpected string without modname prefix\n"); -+ goto fail; -+ } -+ -+ len = dot - line; -+ -+ if (len > PATH_MAX) { -+ sv_errno = ENAMETOOLONG; -+ goto fail; -+ } -+ -+ strncpy(modname, line, len); -+ modname[len] = '\0'; -+ -+ return true; -+fail: -+ errno = sv_errno; -+ return false; -+} -+ -+/* array will be allocated with strings in a single malloc, just free *array */ -+ssize_t kmod_builtin_get_modinfo(struct kmod_ctx *ctx, const char *modname, -+ char ***modinfo) -+{ -+ ssize_t count = 0; -+ char *s, *line = NULL; -+ size_t i, n, linesz, modlen, size; -+ off_t pos, offset; -+ -+ char *name = NULL; -+ char buf[PATH_MAX]; -+ -+ struct kmod_builtin_iter *iter = kmod_builtin_iter_new(ctx); -+ -+ if (!iter) -+ return -1; -+ -+ while (!name && kmod_builtin_iter_next(iter)) { -+ if (!kmod_builtin_iter_get_modname(iter, buf)) { -+ count = -errno; -+ goto fail; -+ } -+ -+ if (strcmp(modname, buf)) -+ continue; -+ -+ name = buf; -+ } -+ -+ if (!name) { -+ count = -ENOSYS; -+ goto fail; -+ } -+ -+ modlen = strlen(modname) + 1; -+ count = iter->nstrings; -+ size = iter->next - iter->pos - (modlen * count); -+ -+ *modinfo = malloc(size + sizeof(char *) * (count + 1)); -+ if (!*modinfo) { -+ count = -errno; -+ goto fail; -+ } -+ -+ s = (char *)(*modinfo + count + 1); -+ i = 0; -+ -+ n = 0; -+ offset = pos = iter->pos; -+ -+ while (offset < iter->next) { -+ offset = get_string(iter, pos, &line, &linesz); -+ if (offset <= 0) { -+ count = (offset) ? -errno : -EOF; -+ goto fail; -+ } -+ -+ strcpy(s + i, line + modlen); -+ (*modinfo)[n++] = s + i; -+ i += linesz - modlen; -+ -+ pos = offset; -+ } -+fail: -+ kmod_builtin_iter_free(iter); -+ return count; -+} -diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h -index a65ddd1..df01df1 100644 ---- a/libkmod/libkmod-internal.h -+++ b/libkmod/libkmod-internal.h -@@ -193,3 +193,11 @@ struct kmod_signature_info { - }; - bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signature_info *sig_info) _must_check_ __attribute__((nonnull(1, 2))); - void kmod_module_signature_info_free(struct kmod_signature_info *sig_info) __attribute__((nonnull)); -+ -+/* libkmod-builtin.c */ -+struct kmod_builtin_iter; -+struct kmod_builtin_iter *kmod_builtin_iter_new(struct kmod_ctx *ctx) __attribute__((nonnull(1))); -+void kmod_builtin_iter_free(struct kmod_builtin_iter *iter) __attribute__((nonnull(1))); -+bool kmod_builtin_iter_next(struct kmod_builtin_iter *iter) __attribute__((nonnull(1))); -+bool kmod_builtin_iter_get_modname(struct kmod_builtin_iter *iter, char modname[static PATH_MAX]) __attribute__((nonnull(1, 2))); -+ssize_t kmod_builtin_get_modinfo(struct kmod_ctx *ctx, const char *modname, char ***modinfo) __attribute__((nonnull(1, 2, 3))); --- -cgit 1.2-0.3.lf.el7 - diff --git a/sys-apps/kmod/files/kmod-26/fix-from-upstream-print-refcnt-error.patch b/sys-apps/kmod/files/kmod-26/fix-from-upstream-print-refcnt-error.patch deleted file mode 100644 index c138699cce8a..000000000000 --- a/sys-apps/kmod/files/kmod-26/fix-from-upstream-print-refcnt-error.patch +++ /dev/null @@ -1,80 +0,0 @@ -From ea3e508f61251b16567f888042f6c4c60b48a4e0 Mon Sep 17 00:00:00 2001 -From: Ezequiel Garcia <ezequiel@collabora.com> -Date: Fri, 8 Mar 2019 17:39:07 -0300 -Subject: tools: Print a message if refcnt attribute is missing - -Currently, check_module_inuse returns a wrong user message -if the kernel is built without module unloading support. - -Fix it by returning a more specific error, in case 'refcnt' -attribute is missing. ---- - tools/remove.c | 9 ++++++--- - tools/rmmod.c | 9 ++++++--- - 2 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/tools/remove.c b/tools/remove.c -index 07e2cc0..387ef0e 100644 ---- a/tools/remove.c -+++ b/tools/remove.c -@@ -44,7 +44,7 @@ static void help(void) - - static int check_module_inuse(struct kmod_module *mod) { - struct kmod_list *holders; -- int state; -+ int state, ret; - - state = kmod_module_get_initstate(mod); - -@@ -74,12 +74,15 @@ static int check_module_inuse(struct kmod_module *mod) { - return -EBUSY; - } - -- if (kmod_module_get_refcnt(mod) != 0) { -+ ret = kmod_module_get_refcnt(mod); -+ if (ret > 0) { - ERR("Module %s is in use\n", kmod_module_get_name(mod)); - return -EBUSY; -+ } else if (ret == -ENOENT) { -+ ERR("Module unloading is not supported\n"); - } - -- return 0; -+ return ret; - } - - static int do_remove(int argc, char *argv[]) -diff --git a/tools/rmmod.c b/tools/rmmod.c -index bcdea4c..3942e7b 100644 ---- a/tools/rmmod.c -+++ b/tools/rmmod.c -@@ -63,7 +63,7 @@ static void help(void) - - static int check_module_inuse(struct kmod_module *mod) { - struct kmod_list *holders; -- int state; -+ int state, ret; - - state = kmod_module_get_initstate(mod); - -@@ -93,12 +93,15 @@ static int check_module_inuse(struct kmod_module *mod) { - return -EBUSY; - } - -- if (kmod_module_get_refcnt(mod) != 0) { -+ ret = kmod_module_get_refcnt(mod); -+ if (ret > 0) { - ERR("Module %s is in use\n", kmod_module_get_name(mod)); - return -EBUSY; -+ } else if (ret == -ENOENT) { -+ ERR("Module unloading is not supported\n"); - } - -- return 0; -+ return ret; - } - - static int do_rmmod(int argc, char *argv[]) --- -cgit 1.2-0.3.lf.el7 - diff --git a/sys-apps/kmod/files/kmod-26/fix-from-upstream-show-information-about-builtin-mods.patch b/sys-apps/kmod/files/kmod-26/fix-from-upstream-show-information-about-builtin-mods.patch deleted file mode 100644 index 188a238154b9..000000000000 --- a/sys-apps/kmod/files/kmod-26/fix-from-upstream-show-information-about-builtin-mods.patch +++ /dev/null @@ -1,149 +0,0 @@ -From e7e2cb61fa9f1db3429d91ef6accff549500d268 Mon Sep 17 00:00:00 2001 -From: Alexey Gladkov <gladkov.alexey@gmail.com> -Date: Fri, 8 Nov 2019 18:25:23 +0100 -Subject: modinfo: Show information about built-in modules - -Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com> ---- - libkmod/libkmod-builtin.c | 2 +- - libkmod/libkmod-module.c | 23 ++++++++++++++++------- - tools/modinfo.c | 39 +++++++++++++++++++++------------------ - 3 files changed, 38 insertions(+), 26 deletions(-) - -diff --git a/libkmod/libkmod-builtin.c b/libkmod/libkmod-builtin.c -index 98d7365..aaec5dd 100644 ---- a/libkmod/libkmod-builtin.c -+++ b/libkmod/libkmod-builtin.c -@@ -275,7 +275,7 @@ ssize_t kmod_builtin_get_modinfo(struct kmod_ctx *ctx, const char *modname, - struct kmod_builtin_iter *iter = kmod_builtin_iter_new(ctx); - - if (!iter) -- return -1; -+ return -errno; - - while (!name && kmod_builtin_iter_next(iter)) { - if (!kmod_builtin_iter_get_modname(iter, buf)) { -diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c -index ee7e6bd..8044a8f 100644 ---- a/libkmod/libkmod-module.c -+++ b/libkmod/libkmod-module.c -@@ -2286,13 +2286,22 @@ KMOD_EXPORT int kmod_module_get_info(const struct kmod_module *mod, struct kmod_ - - assert(*list == NULL); - -- elf = kmod_module_get_elf(mod); -- if (elf == NULL) -- return -errno; -+ /* remove const: this can only change internal state */ -+ if (kmod_module_is_builtin((struct kmod_module *)mod)) { -+ count = kmod_builtin_get_modinfo(mod->ctx, -+ kmod_module_get_name(mod), -+ &strings); -+ if (count < 0) -+ return count; -+ } else { -+ elf = kmod_module_get_elf(mod); -+ if (elf == NULL) -+ return -errno; - -- count = kmod_elf_get_strings(elf, ".modinfo", &strings); -- if (count < 0) -- return count; -+ count = kmod_elf_get_strings(elf, ".modinfo", &strings); -+ if (count < 0) -+ return count; -+ } - - for (i = 0; i < count; i++) { - struct kmod_list *n; -@@ -2316,7 +2325,7 @@ KMOD_EXPORT int kmod_module_get_info(const struct kmod_module *mod, struct kmod_ - goto list_error; - } - -- if (kmod_module_signature_info(mod->file, &sig_info)) { -+ if (mod->file && kmod_module_signature_info(mod->file, &sig_info)) { - struct kmod_list *n; - - n = kmod_module_info_append(list, "sig_id", strlen("sig_id"), -diff --git a/tools/modinfo.c b/tools/modinfo.c -index 86ac04b..0231bb0 100644 ---- a/tools/modinfo.c -+++ b/tools/modinfo.c -@@ -172,18 +172,33 @@ static int modinfo_do(struct kmod_module *mod) - { - struct kmod_list *l, *list = NULL; - struct param *params = NULL; -- int err; -+ int err, is_builtin; -+ const char *filename = kmod_module_get_path(mod); -+ -+ is_builtin = (filename == NULL); -+ -+ if (is_builtin) { -+ printf("%-16s%s%c", "name:", kmod_module_get_name(mod), separator); -+ filename = "(builtin)"; -+ } - - if (field != NULL && streq(field, "filename")) { -- printf("%s%c", kmod_module_get_path(mod), separator); -+ printf("%s%c", filename, separator); - return 0; - } else if (field == NULL) { - printf("%-16s%s%c", "filename:", -- kmod_module_get_path(mod), separator); -+ filename, separator); - } - - err = kmod_module_get_info(mod, &list); - if (err < 0) { -+ if (is_builtin && err == -ENOENT) { -+ /* -+ * This is an old kernel that does not have a file -+ * with information about built-in modules. -+ */ -+ return 0; -+ } - ERR("could not get modinfo from '%s': %s\n", - kmod_module_get_name(mod), strerror(-err)); - return err; -@@ -276,7 +291,7 @@ static int modinfo_path_do(struct kmod_ctx *ctx, const char *path) - - static int modinfo_alias_do(struct kmod_ctx *ctx, const char *alias) - { -- struct kmod_list *l, *filtered, *list = NULL; -+ struct kmod_list *l, *list = NULL; - int err = kmod_module_new_from_lookup(ctx, alias, &list); - if (err < 0) { - ERR("Module alias %s not found.\n", alias); -@@ -288,26 +303,14 @@ static int modinfo_alias_do(struct kmod_ctx *ctx, const char *alias) - return -ENOENT; - } - -- err = kmod_module_apply_filter(ctx, KMOD_FILTER_BUILTIN, list, &filtered); -- kmod_module_unref_list(list); -- if (err < 0) { -- ERR("Failed to filter list: %m\n"); -- return err; -- } -- -- if (filtered == NULL) { -- ERR("Module %s not found.\n", alias); -- return -ENOENT; -- } -- -- kmod_list_foreach(l, filtered) { -+ kmod_list_foreach(l, list) { - struct kmod_module *mod = kmod_module_get_module(l); - int r = modinfo_do(mod); - kmod_module_unref(mod); - if (r < 0) - err = r; - } -- kmod_module_unref_list(filtered); -+ kmod_module_unref_list(list); - return err; - } - --- -cgit 1.2-0.3.lf.el7 - diff --git a/sys-apps/kmod/files/kmod-26/fix-from-upstream-stop-using-dolt.patch b/sys-apps/kmod/files/kmod-26/fix-from-upstream-stop-using-dolt.patch deleted file mode 100644 index c01fe5ece810..000000000000 --- a/sys-apps/kmod/files/kmod-26/fix-from-upstream-stop-using-dolt.patch +++ /dev/null @@ -1,237 +0,0 @@ -From f8b8d7b330433511d19a936ddfc7b7d1af5490b5 Mon Sep 17 00:00:00 2001 -From: Adrian Bunk <bunk@kernel.org> -Date: Wed, 20 Feb 2019 14:22:04 +0200 -Subject: build: Stop using dolt - -This does regress "make -12" from 0.7s to 0.9s on my -Coffee Lake machine, but even on slower hardware this -will not amount to a noticable slowdown. - -On the other hand using dolt can create problems for -people doing cross-compilation, e.g. Yocto has two -hacks just for dolt in kmod: -https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-kernel/kmod/kmod.inc?id=a17abae00785c76cfffe5381a22fb2c86b982e82 - -(Lucas: remove leftover entry in Makefile and reformat commit message) ---- - Makefile.am | 2 - - configure.ac | 1 - - m4/dolt.m4 | 181 ----------------------------------------------------------- - 4 files changed, 186 deletions(-) - delete mode 100644 m4/dolt.m4 - -diff --git a/Makefile.am b/Makefile.am -index 758f4f0..c5c2f06 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -415,8 +415,6 @@ distclean-local: $(DISTCLEAN_LOCAL_HOOKS) - buildtest-TESTS: - $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) - --DISTCLEANFILES += $(DOLT_CLEANFILES) -- - # ------------------------------------------------------------------------------ - # coverage - # ------------------------------------------------------------------------------ -diff --git a/configure.ac b/configure.ac -index dffe278..e885d79 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -17,7 +17,6 @@ AM_MAINTAINER_MODE([enable]) - AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests parallel-tests]) - AM_SILENT_RULES([yes]) - LT_INIT([disable-static pic-only]) --DOLT - - AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by kmod])]) - AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by kmod])]) -diff --git a/m4/dolt.m4 b/m4/dolt.m4 -deleted file mode 100644 -index 775a572..0000000 ---- a/m4/dolt.m4 -+++ /dev/null -@@ -1,181 +0,0 @@ --dnl dolt, a replacement for libtool --dnl Copyright © 2007-2010 Josh Triplett <josh@joshtriplett.org> --dnl Copying and distribution of this file, with or without modification, --dnl are permitted in any medium without royalty provided the copyright --dnl notice and this notice are preserved. --dnl --dnl To use dolt, invoke the DOLT macro immediately after the libtool macros. --dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it --dnl installed when running autoconf on your project. -- --AC_DEFUN([DOLT], [ --AC_REQUIRE([AC_CANONICAL_HOST]) --# dolt, a replacement for libtool --# Josh Triplett <josh@freedesktop.org> --AC_PATH_PROG([DOLT_BASH], [bash]) --AC_MSG_CHECKING([if dolt supports this host]) --dolt_supported=yes --AS_IF([test x$DOLT_BASH = x], [dolt_supported=no]) --AS_IF([test x$GCC != xyes], [dolt_supported=no]) -- --AS_CASE([$host], -- [*-*-linux*|*-*-freebsd*], [pic_options='-fPIC'], -- [*-apple-darwin*], [pic_options='-fno-common'], -- [*mingw*|*nacl*], [pic_options=''] -- [*], [dolt_supported=no] --) --AS_IF([test x$dolt_supported = xno], [ -- AC_MSG_RESULT([no, falling back to libtool]) -- LTCOMPILE='$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)' -- LTCXXCOMPILE='$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)' -- m4_pattern_allow([AM_V_lt]) --], [ -- AC_MSG_RESULT([yes, replacing libtool]) -- --dnl Start writing out doltcompile. -- cat <<__DOLTCOMPILE__EOF__ >doltcompile --#!$DOLT_BASH --__DOLTCOMPILE__EOF__ -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --args=("$[]@") --for ((arg=0; arg<${#args@<:@@@:>@}; arg++)) ; do -- if test x"${args@<:@$arg@:>@}" = x-o ; then -- objarg=$((arg+1)) -- break -- fi --done --if test x$objarg = x ; then -- echo 'Error: no -o on compiler command line' 1>&2 -- exit 1 --fi --lo="${args@<:@$objarg@:>@}" --obj="${lo%.lo}" --if test x"$lo" = x"$obj" ; then -- echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2 -- exit 1 --fi --objbase="${obj##*/}" --__DOLTCOMPILE__EOF__ -- --dnl Write out shared compilation code. -- if test x$enable_shared = xyes; then -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --libobjdir="${obj%$objbase}.libs" --if test ! -d "$libobjdir" ; then -- mkdir_out="$(mkdir "$libobjdir" 2>&1)" -- mkdir_ret=$? -- if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then -- echo "$mkdir_out" 1>&2 -- exit $mkdir_ret -- fi --fi --pic_object="$libobjdir/$objbase.o" --args@<:@$objarg@:>@="$pic_object" --__DOLTCOMPILE__EOF__ -- cat <<__DOLTCOMPILE__EOF__ >>doltcompile -- pic_options="$pic_options" -- if test x\$passthrough = xtrue; then -- pic_options="" -- fi --__DOLTCOMPILE__EOF__ -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --"${args@<:@@@:>@}" $pic_options -DPIC || exit $? --__DOLTCOMPILE__EOF__ -- fi -- --dnl Write out static compilation code. --dnl Avoid duplicate compiler output if also building shared objects. -- if test x$enable_static = xyes; then -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --non_pic_object="$obj.o" --args@<:@$objarg@:>@="$non_pic_object" --__DOLTCOMPILE__EOF__ -- if test x$enable_shared = xyes; then -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --"${args@<:@@@:>@}" >/dev/null 2>&1 || exit $? --__DOLTCOMPILE__EOF__ -- else -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --"${args@<:@@@:>@}" || exit $? --__DOLTCOMPILE__EOF__ -- fi -- fi -- --dnl Write out the code to write the .lo file. --dnl The second line of the .lo file must match "^# Generated by .*libtool" -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --{ --echo "# $lo - a libtool object file" --echo "# Generated by doltcompile, not libtool" --__DOLTCOMPILE__EOF__ -- -- if test x$enable_shared = xyes; then -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --echo "pic_object='.libs/${objbase}.o'" --__DOLTCOMPILE__EOF__ -- else -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --echo pic_object=none --__DOLTCOMPILE__EOF__ -- fi -- -- if test x$enable_static = xyes; then -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --echo "non_pic_object='${objbase}.o'" --__DOLTCOMPILE__EOF__ -- else -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --echo non_pic_object=none --__DOLTCOMPILE__EOF__ -- fi -- -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --} > "$lo" --__DOLTCOMPILE__EOF__ -- --dnl Done writing out doltcompile; substitute it for libtool compilation. -- chmod +x doltcompile -- LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)' -- LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)' -- --dnl automake ignores LTCOMPILE and LTCXXCOMPILE when it has separate CFLAGS for --dnl a target, so write out a libtool wrapper to handle that case. --dnl Note that doltlibtool does not handle inferred tags or option arguments --dnl without '=', because automake does not use them. -- cat <<__DOLTLIBTOOL__EOF__ > doltlibtool --#!$DOLT_BASH --__DOLTLIBTOOL__EOF__ -- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool --top_builddir_slash="${0%%doltlibtool}" --: ${top_builddir_slash:=./} --args=() --modeok=false --tagok=false --for arg in "$[]@"; do -- case "$arg" in -- --mode=compile) modeok=true ;; -- --tag=CC|--tag=CXX) tagok=true ;; -- --tag=disable-static) tagok=true ;; -- --tag=ASM|--tag=YASM) tagok=true; passthrough=true;; -- --silent|--quiet) ;; -- *) args@<:@${#args[@]}@:>@="$arg" ;; -- esac --done --if $modeok && $tagok ; then -- . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" --else -- exec ${top_builddir_slash}libtool "$[]@" --fi --__DOLTLIBTOOL__EOF__ -- --dnl Done writing out doltlibtool; substitute it for libtool. -- chmod +x doltlibtool -- LIBTOOL='$(top_builddir)/doltlibtool' -- --DOLT_CLEANFILES="doltlibtool doltcompile" --AC_SUBST(DOLT_CLEANFILES) --]) --AC_SUBST(LTCOMPILE) --AC_SUBST(LTCXXCOMPILE) --# end dolt --]) --- -cgit 1.2-0.3.lf.el7 - diff --git a/sys-apps/kmod/files/kmod-26/fix-from-upstream-undef-symbols-check-when-building-python-mods.patch b/sys-apps/kmod/files/kmod-26/fix-from-upstream-undef-symbols-check-when-building-python-mods.patch deleted file mode 100644 index ad5ebfa9aa2a..000000000000 --- a/sys-apps/kmod/files/kmod-26/fix-from-upstream-undef-symbols-check-when-building-python-mods.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 1d14ef82f4a3be741bcdf6b1c6d51ce9dce43567 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> -Date: Thu, 24 Oct 2019 19:47:10 +0200 -Subject: Do not check for undefined symbols when building the Python modules - -kmod's configure.ac uses the -Wl,--no-undefined linker flag to verify -at link time that all symbols of shared libraries are available, and -that there are no undefined symbols. - -This make perfect sense for regular shared libraries. However, for -Python extensions, which will be dlopen()ed inside the Python -interpreter, it makes less sense. - -Since Python 3.8, there is a change in python-config script and -Python's pkg-config file: it no longer links Python extensions with -the libpython library. See -https://docs.python.org/dev/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build -which states: - - On the other hand, pkg-config python3.8 --libs no longer contains - -lpython3.8. C extensions must not be linked to libpython (except on - Android and Cygwin, whose cases are handled by the script); this - change is backward incompatible on purpose. (Contributed by Victor - Stinner in bpo-36721.) - -So, when linking the kmod Python extensions, it currently fails with -numerous unresolved symbols, that were previously provided by -libpython: - -/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__Pyx_PyObject_GetAttrStr': -list.c:(.text.__Pyx_PyObject_GetAttrStr+0x48): undefined reference to `PyObject_GetAttr' -/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__pyx_tp_dealloc_4kmod_4list_ModListItem': -list.c:(.text.__pyx_tp_dealloc_4kmod_4list_ModListItem+0x78): undefined reference to `PyObject_CallFinalizerFromDealloc' -/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__pyx_tp_dealloc_4kmod_4list_ModList': -list.c:(.text.__pyx_tp_dealloc_4kmod_4list_ModList+0x30): undefined reference to `PyErr_Fetch' - -[Complete log at http://autobuild.buildroot.net/results/79a/79a5a0398723e8cfea0d0aa3dec5f7649aee4c63/build-end.log] - -Linking with libpython is no longer recommended: those symbols should -remain unresolved in the Python extensions, as they wil be properly -resolved when the Python extension gets loaded into the Python -interpreter. - -Since we want to keep -Wl,--no-undefined globally in kmod, we leave -the configure.ac file unchanged, and instead, specifically in the -LDFLAGS used to build the Python extensions, we override --Wl,--no-undefined with -Wl,-z,undefs. Ideally, -Wl,--no-undefined is -the same as -Wl,-z,defs, and the effect of these options can be -canceled on the linker command line by a following -Wl,-z,undefs (see -the ld man page for details). - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> -Cc: Victor Stinner <victor.stinner@gmail.com> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index c5c2f06..8e9c90d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -173,7 +173,7 @@ CPYTHON_MODULE_CFLAGS = \ - $(AM_CFLAGS) -DCPYTHON_COMPILING_IN_PYPY=0 \ - $(PYTHON_NOWARN) $(PYTHON_CFLAGS) \ - -fvisibility=default --CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared -+CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared -Wl,-z,undefs - - if BUILD_PYTHON - pkgpyexec_LTLIBRARIES = \ --- -cgit 1.2-0.3.lf.el7 - diff --git a/sys-apps/kmod/files/kmod-26/fix-from-upstream-use-flags-rather-than-bool-args.patch b/sys-apps/kmod/files/kmod-26/fix-from-upstream-use-flags-rather-than-bool-args.patch deleted file mode 100644 index 5b1f01ad732c..000000000000 --- a/sys-apps/kmod/files/kmod-26/fix-from-upstream-use-flags-rather-than-bool-args.patch +++ /dev/null @@ -1,76 +0,0 @@ -From a6b540deaacd0f24f7ff22f1413f75ee82327622 Mon Sep 17 00:00:00 2001 -From: Lucas De Marchi <lucas.demarchi@intel.com> -Date: Wed, 6 Nov 2019 23:27:28 -0800 -Subject: modprobe: use flags rather than bool args - -It's easier to know what the caller is doing when we pass a named -flag rather than a list of bools. ---- - tools/modprobe.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/tools/modprobe.c b/tools/modprobe.c -index 44cd15c..9387537 100644 ---- a/tools/modprobe.c -+++ b/tools/modprobe.c -@@ -353,8 +353,9 @@ static int rmmod_do_remove_module(struct kmod_module *mod) - return err; - } - --static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies, -- bool ignore_builtin); -+#define RMMOD_FLAG_DO_DEPENDENCIES 0x1 -+#define RMMOD_FLAG_IGNORE_BUILTIN 0x2 -+static int rmmod_do_module(struct kmod_module *mod, int flags); - - static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors) - { -@@ -362,7 +363,7 @@ static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors) - - kmod_list_foreach_reverse(l, list) { - struct kmod_module *m = kmod_module_get_module(l); -- int r = rmmod_do_module(m, false, true); -+ int r = rmmod_do_module(m, RMMOD_FLAG_IGNORE_BUILTIN); - kmod_module_unref(m); - - if (r < 0 && stop_on_errors) -@@ -372,8 +373,7 @@ static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors) - return 0; - } - --static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies, -- bool ignore_builtin) -+static int rmmod_do_module(struct kmod_module *mod, int flags) - { - const char *modname = kmod_module_get_name(mod); - struct kmod_list *pre = NULL, *post = NULL; -@@ -403,7 +403,7 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies, - } - goto error; - } else if (state == KMOD_MODULE_BUILTIN) { -- if (ignore_builtin) { -+ if (flags & RMMOD_FLAG_IGNORE_BUILTIN) { - err = 0; - } else { - LOG("Module %s is builtin.\n", modname); -@@ -415,7 +415,7 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies, - - rmmod_do_deps_list(post, false); - -- if (do_dependencies && remove_dependencies) { -+ if ((flags & RMMOD_FLAG_DO_DEPENDENCIES) && remove_dependencies) { - struct kmod_list *deps = kmod_module_get_dependencies(mod); - - err = rmmod_do_deps_list(deps, true); -@@ -468,7 +468,7 @@ static int rmmod(struct kmod_ctx *ctx, const char *alias) - - kmod_list_foreach(l, list) { - struct kmod_module *mod = kmod_module_get_module(l); -- err = rmmod_do_module(mod, true, false); -+ err = rmmod_do_module(mod, RMMOD_FLAG_DO_DEPENDENCIES); - kmod_module_unref(mod); - if (err < 0) - break; --- -cgit 1.2-0.3.lf.el7 - diff --git a/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch b/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch new file mode 100644 index 000000000000..dc776b515bc0 --- /dev/null +++ b/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch @@ -0,0 +1,53 @@ +From 53b30aeba2dedae9f5558f560231d9462e063dfc Mon Sep 17 00:00:00 2001 +From: Lucas De Marchi <lucas.demarchi@intel.com> +Date: Thu, 5 Mar 2020 13:33:10 -0800 +Subject: depmod: do not output .bin to stdout + +index_write() relies on fseek/ftell to manage the position to which we +are write and thus needs the file stream to support it. + +Right now when trying to write the index to stdout we fail with: + + depmod: tools/depmod.c:416: index_write: Assertion `initial_offset >= 0' failed. + Aborted (core dumped) + +We have no interest in outputting our index to stdout, so just skip it +like is done with other indexes. + +While at it, add/remove some newlines to improve readability. + +Reported-by: Yanko Kaneti <yaneti@declera.com> +Fix: b866b2165ae6 ("Lookup aliases in the modules.builtin.modinfo") +--- + tools/depmod.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tools/depmod.c b/tools/depmod.c +index fbbce10..875e314 100644 +--- a/tools/depmod.c ++++ b/tools/depmod.c +@@ -2408,8 +2408,10 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out) + struct index_node *idx; + struct kmod_list *l, *builtin = NULL; + +- idx = index_create(); ++ if (out == stdout) ++ return 0; + ++ idx = index_create(); + if (idx == NULL) { + ret = -ENOMEM; + goto fail; +@@ -2456,7 +2458,9 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out) + + if (count) + index_write(idx, out); ++ + index_destroy(idx); ++ + fail: + if (builtin) + kmod_module_unref_list(builtin); +-- +cgit 1.2.3-1.el7 + diff --git a/sys-apps/kmod/files/zstd-support-27.patch b/sys-apps/kmod/files/zstd-support-27.patch new file mode 100644 index 000000000000..86738da9a104 --- /dev/null +++ b/sys-apps/kmod/files/zstd-support-27.patch @@ -0,0 +1,187 @@ +diff --git a/Makefile.am b/Makefile.am +index 8eadb99..a471c55 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -90,7 +90,7 @@ libkmod_libkmod_la_DEPENDENCIES = \ + ${top_srcdir}/libkmod/libkmod.sym + libkmod_libkmod_la_LIBADD = \ + shared/libshared.la \ +- ${liblzma_LIBS} ${zlib_LIBS} ${libcrypto_LIBS} ++ ${libzstd_LIBS} ${liblzma_LIBS} ${zlib_LIBS} ${libcrypto_LIBS} + + noinst_LTLIBRARIES += libkmod/libkmod-internal.la + libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES) +diff --git a/configure.ac b/configure.ac +index 4a65d6b..30aaa1d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -83,6 +83,17 @@ AC_ARG_WITH([rootlibdir], + [], [with_rootlibdir=$libdir]) + AC_SUBST([rootlibdir], [$with_rootlibdir]) + ++AC_ARG_WITH([zstd], ++ AS_HELP_STRING([--with-zstd], [handle Zstd-compressed modules @<:@default=disabled@:>@]), ++ [], [with_zstd=no]) ++AS_IF([test "x$with_zstd" != "xno"], [ ++ PKG_CHECK_MODULES([libzstd], [libzstd >= 1.4.4]) ++ AC_DEFINE([ENABLE_ZSTD], [1], [Enable Zstd for modules.]) ++], [ ++ AC_MSG_NOTICE([Zstd support not requested]) ++]) ++CC_FEATURE_APPEND([with_features], [with_zstd], [ZSTD]) ++ + AC_ARG_WITH([xz], + AS_HELP_STRING([--with-xz], [handle Xz-compressed modules @<:@default=disabled@:>@]), + [], [with_xz=no]) +@@ -307,7 +318,7 @@ AC_MSG_RESULT([ + tools: ${enable_tools} + python bindings: ${enable_python} + logging: ${enable_logging} +- compression: xz=${with_xz} zlib=${with_zlib} ++ compression: zstd=${with_zstd} xz=${with_xz} zlib=${with_zlib} + debug: ${enable_debug} + coverage: ${enable_coverage} + doc: ${enable_gtk_doc} +diff --git a/libkmod/libkmod-file.c b/libkmod/libkmod-file.c +index 5eeba6a..2575b01 100644 +--- a/libkmod/libkmod-file.c ++++ b/libkmod/libkmod-file.c +@@ -32,7 +32,9 @@ + #ifdef ENABLE_ZLIB + #include <zlib.h> + #endif +- ++#ifdef ENABLE_ZSTD ++#include <zstd.h> ++#endif + #include <shared/util.h> + + #include "libkmod.h" +@@ -45,6 +47,9 @@ struct file_ops { + }; + + struct kmod_file { ++#ifdef ENABLE_ZSTD ++ bool zstd_used; ++#endif + #ifdef ENABLE_XZ + bool xz_used; + #endif +@@ -60,6 +65,79 @@ struct kmod_file { + struct kmod_elf *elf; + }; + ++#ifdef ENABLE_ZSTD ++static int zstd_uncompress(ZSTD_DStream *strm, struct kmod_file *file) { ++ uint8_t in_buf[BUFSIZ], out_buf[BUFSIZ]; ++ ZSTD_outBuffer output = { out_buf, sizeof(out_buf), 0 }; ++ ZSTD_inBuffer input = { in_buf, 0, 0 }; ++ void *p = NULL; ++ int ret = 0; ++ size_t total = 0; ++ ++ while(true) { ++ size_t sz; ++ if (input.pos == input.size) { ++ ssize_t rdret = read(file->fd, in_buf, sizeof(in_buf)); ++ if (rdret < 0) { ++ ret = -errno; ++ goto out; ++ } ++ input.size = rdret; ++ input.pos = 0; ++ } ++ if (input.size == 0) { ++ break; ++ } ++ sz = ZSTD_decompressStream(strm, &output, &input); ++ if (ZSTD_isError(sz)) { ++ ret = -1; ++ goto out; ++ } ++ if (output.pos == output.size || sz == 0) { ++ size_t write_size = output.pos; ++ char *tmp = realloc(p, total + write_size); ++ if (tmp == NULL) { ++ ret = -errno; ++ goto out; ++ } ++ memcpy(tmp + total, out_buf, write_size); ++ total += write_size; ++ p = tmp; ++ if (output.pos == output.size) { ++ output.pos = 0; ++ } ++ } ++ } ++ file->zstd_used = true; ++ file->memory = p; ++ file->size = total; ++ return 0; ++out: ++ free(p); ++ return ret; ++} ++ ++static int load_zstd(struct kmod_file *file) ++{ ++ ZSTD_DStream* strm = ZSTD_createDStream(); ++ int ret; ++ ZSTD_initDStream(strm); ++ ++ ret = zstd_uncompress(strm, file); ++ ZSTD_freeDStream(strm); ++ return ret; ++} ++ ++static void unload_zstd(struct kmod_file *file) ++{ ++ if (!file->zstd_used) ++ return; ++ free(file->memory); ++} ++ ++static const char magic_zstd[] = {0x28, 0xb5, 0x2f, 0xfd}; ++#endif ++ + #ifdef ENABLE_XZ + static void xz_uncompress_belch(struct kmod_file *file, lzma_ret ret) + { +@@ -238,6 +316,9 @@ static const struct comp_type { + const char *magic_bytes; + const struct file_ops ops; + } comp_types[] = { ++#ifdef ENABLE_ZSTD ++ {sizeof(magic_zstd), magic_zstd, {load_zstd, unload_zstd}}, ++#endif + #ifdef ENABLE_XZ + {sizeof(magic_xz), magic_xz, {load_xz, unload_xz}}, + #endif +diff --git a/shared/util.c b/shared/util.c +index fd2028d..b487b5f 100644 +--- a/shared/util.c ++++ b/shared/util.c +@@ -45,6 +45,9 @@ static const struct kmod_ext { + #endif + #ifdef ENABLE_XZ + {".ko.xz", sizeof(".ko.xz") - 1}, ++#endif ++#ifdef ENABLE_ZSTD ++ {".ko.zst", sizeof(".ko.zst") - 1}, + #endif + { } + }; +diff --git a/testsuite/test-util.c b/testsuite/test-util.c +index 5e25e58..621446b 100644 +--- a/testsuite/test-util.c ++++ b/testsuite/test-util.c +@@ -156,6 +156,9 @@ static int test_path_ends_with_kmod_ext(const struct test *t) + #endif + #ifdef ENABLE_XZ + { "/bla.ko.xz", true }, ++#endif ++#ifdef ENABLE_ZSTD ++ { "/bla.ko.zst", true }, + #endif + { "/bla.ko.x", false }, + { "/bla.ko.", false }, diff --git a/sys-apps/kmod/kmod-25.ebuild b/sys-apps/kmod/kmod-25.ebuild deleted file mode 100644 index a09bd7d51f1b..000000000000 --- a/sys-apps/kmod/kmod-25.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} ) - -inherit bash-completion-r1 ltprune multilib python-r1 - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" - inherit autotools git-r3 -else - SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" - inherit libtool -fi - -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc lzma python static-libs +tools zlib" - -# Upstream does not support running the test suite with custom configure flags. -# I was also told that the test suite is intended for kmod developers. -# So we have to restrict it. -# See bug #408915. -RESTRICT="test" - -# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -RDEPEND="!sys-apps/module-init-tools - !sys-apps/modutils - !<sys-apps/openrc-0.13.8 - !<sys-apps/systemd-216-r3 - lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) - zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) - zlib? ( virtual/pkgconfig )" -if [[ ${PV} == 9999* ]]; then - DEPEND="${DEPEND} - dev-libs/libxslt" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS="NEWS README TODO" - -src_prepare() { - default - - if [ ! -e configure ]; then - if use doc; then - gtkdocize --copy --docdir libkmod/docs || die - else - touch libkmod/docs/gtk-doc.make - fi - eautoreconf - else - elibtoolize - fi - - # Restore possibility of running --enable-static wrt #472608 - sed -i \ - -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ - configure || die -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --enable-shared - --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" - $(use_enable debug) - $(use_enable doc gtk-doc) - $(use_enable static-libs static) - $(use_enable tools) - $(use_with lzma xz) - $(use_with zlib) - ) - - local ECONF_SOURCE="${S}" - - kmod_configure() { - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir econf "${myeconfargs[@]}" "$@" - } - - BUILD_DIR="${WORKDIR}/build" - kmod_configure --disable-python - - if use python; then - python_foreach_impl kmod_configure --enable-python - fi -} - -src_compile() { - emake -C "${BUILD_DIR}" - - if use python; then - local native_builddir=${BUILD_DIR} - - python_compile() { - emake -C "${BUILD_DIR}" -f Makefile -f - python \ - VPATH="${native_builddir}:${S}" \ - native_builddir="${native_builddir}" \ - libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ - <<< 'python: $(pkgpyexec_LTLIBRARIES)' - } - - python_foreach_impl python_compile - fi -} - -src_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" install - einstalldocs - - if use python; then - local native_builddir=${BUILD_DIR} - - python_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" \ - VPATH="${native_builddir}:${S}" \ - install-pkgpyexecLTLIBRARIES \ - install-dist_pkgpyexecPYTHON - } - - python_foreach_impl python_install - fi - - prune_libtool_files --modules - - if use tools; then - local bincmd sbincmd - for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do - dosym ../bin/kmod /sbin/${sbincmd} - done - - # These are also usable as normal user - for bincmd in lsmod modinfo; do - dosym kmod /bin/${bincmd} - done - fi - - cat <<-EOF > "${T}"/usb-load-ehci-first.conf - softdep uhci_hcd pre: ehci_hcd - softdep ohci_hcd pre: ehci_hcd - EOF - - insinto /lib/modprobe.d - doins "${T}"/usb-load-ehci-first.conf #260139 - - newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes -} - -pkg_postinst() { - if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then - ewarn "Removing old conflicting static-nodes init script from the boot runlevel" - rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes - fi - - # Add kmod to the runlevel automatically if this is the first install of this package. - if [[ -z ${REPLACING_VERSIONS} ]]; then - if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then - mkdir -p "${EROOT%/}"/etc/runlevels/sysinit - fi - if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then - ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes - fi - fi - - if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then - if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then - ewarn - ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" - ewarn "kernel modules to have required static nodes!" - ewarn "Run this command:" - ewarn "\trc-update add kmod-static-nodes sysinit" - fi - fi -} diff --git a/sys-apps/kmod/kmod-26-r3.ebuild b/sys-apps/kmod/kmod-26-r3.ebuild deleted file mode 100644 index e48326709af9..000000000000 --- a/sys-apps/kmod/kmod-26-r3.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} ) - -inherit bash-completion-r1 multilib python-r1 - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" - inherit autotools git-r3 -else - SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86" - inherit libtool -fi - -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc libressl +lzma pkcs7 -python static-libs +tools zlib" - -# Upstream does not support running the test suite with custom configure flags. -# I was also told that the test suite is intended for kmod developers. -# So we have to restrict it. -# See bug #408915. -RESTRICT="test" - -# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -RDEPEND="!sys-apps/module-init-tools - !sys-apps/modutils - !<sys-apps/openrc-0.13.8 - !<sys-apps/systemd-216-r3 - lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) - pkcs7? ( - !libressl? ( >=dev-libs/openssl-1.1.0:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) - zlib? ( virtual/pkgconfig )" -if [[ ${PV} == 9999* ]]; then - DEPEND="${DEPEND} - dev-libs/libxslt" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS="NEWS README TODO" - -PATCHES=( - "${FILESDIR}/${P}/fix-from-upstream-link-against-libcrypto-not-all-of-openssl.patch" - "${FILESDIR}/${P}/fix-from-upstream-stop-using-dolt.patch" - "${FILESDIR}/${P}/fix-from-upstream-print-refcnt-error.patch" - "${FILESDIR}/${P}/fix-from-upstream-use-pkcs7-instead-of-cms.patch" - "${FILESDIR}/${P}/fix-from-upstream-undef-symbols-check-when-building-python-mods.patch" - "${FILESDIR}/${P}/fix-from-upstream-ignore-builtin-module.patch" - "${FILESDIR}/${P}/fix-from-upstream-use-flags-rather-than-bool-args.patch" - "${FILESDIR}/${P}/fix-from-upstream-filter-undefined-linker.patch" - "${FILESDIR}/${P}/fix-from-upstream-new-parser-for-builtin-mods.patch" - "${FILESDIR}/${P}/fix-from-upstream-get-builtin-mods.patch" - "${FILESDIR}/${P}/fix-from-upstream-lookup-aliases-in-modules-builtin-info.patch" - "${FILESDIR}/${P}/fix-from-upstream-show-information-about-builtin-mods.patch" - "${FILESDIR}/${P}/fix-from-upstream-convert-return-value.patch" -) - -src_prepare() { - default - - if [[ ! -e configure ]] ; then - if use doc; then - gtkdocize --copy --docdir libkmod/docs || die - else - touch libkmod/docs/gtk-doc.make - fi - eautoreconf - else - elibtoolize - fi - - # Restore possibility of running --enable-static wrt #472608 - sed -i \ - -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ - configure || die -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --enable-shared - --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" - $(use_enable debug) - $(use_enable doc gtk-doc) - $(use_enable static-libs static) - $(use_enable tools) - $(use_with lzma xz) - $(use_with pkcs7 openssl) - $(use_with zlib) - ) - - local ECONF_SOURCE="${S}" - - kmod_configure() { - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir econf "${myeconfargs[@]}" "$@" - } - - BUILD_DIR="${WORKDIR}/build" - kmod_configure --disable-python - - if use python; then - python_foreach_impl kmod_configure --enable-python - fi -} - -src_compile() { - emake -C "${BUILD_DIR}" - - if use python; then - local native_builddir=${BUILD_DIR} - - python_compile() { - emake -C "${BUILD_DIR}" -f Makefile -f - python \ - VPATH="${native_builddir}:${S}" \ - native_builddir="${native_builddir}" \ - libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ - <<< 'python: $(pkgpyexec_LTLIBRARIES)' - } - - python_foreach_impl python_compile - fi -} - -src_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" install - einstalldocs - - if use python; then - local native_builddir=${BUILD_DIR} - - python_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" \ - VPATH="${native_builddir}:${S}" \ - install-pkgpyexecLTLIBRARIES \ - install-dist_pkgpyexecPYTHON - } - - python_foreach_impl python_install - fi - - find "${ED}" -name "*.la" -delete || die - - if use tools; then - local cmd - for cmd in depmod insmod modprobe rmmod; do - dosym ../bin/kmod /sbin/${cmd} - done - - # These are also usable as normal user - for cmd in lsmod modinfo; do - dosym kmod /bin/${cmd} - done - fi - - cat <<-EOF > "${T}"/usb-load-ehci-first.conf - softdep uhci_hcd pre: ehci_hcd - softdep ohci_hcd pre: ehci_hcd - EOF - - insinto /lib/modprobe.d - doins "${T}"/usb-load-ehci-first.conf #260139 - - newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes -} - -pkg_postinst() { - if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then - ewarn "Removing old conflicting static-nodes init script from the boot runlevel" - rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes - fi - - # Add kmod to the runlevel automatically if this is the first install of this package. - if [[ -z ${REPLACING_VERSIONS} ]]; then - if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then - mkdir -p "${EROOT%/}"/etc/runlevels/sysinit - fi - if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then - ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes - fi - fi - - if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then - if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then - ewarn - ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" - ewarn "kernel modules to have required static nodes!" - ewarn "Run this command:" - ewarn "\trc-update add kmod-static-nodes sysinit" - fi - fi -} diff --git a/sys-apps/kmod/kmod-27-r1.ebuild b/sys-apps/kmod/kmod-27-r3.ebuild index 3e093018153c..4a64e0694ac7 100644 --- a/sys-apps/kmod/kmod-27-r1.ebuild +++ b/sys-apps/kmod/kmod-27-r3.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" #inherit libtool fi @@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools zlib" +IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools +zlib +zstd" # Upstream does not support running the test suite with custom configure flags. # I was also told that the test suite is intended for kmod developers. @@ -35,6 +35,7 @@ RDEPEND="!sys-apps/module-init-tools !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) + zstd? ( >=app-arch/zstd-1.4.0 ) python? ( ${PYTHON_DEPS} ) pkcs7? ( !libressl? ( >=dev-libs/openssl-1.1.0:0= ) @@ -63,6 +64,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DOCS="NEWS README TODO" +PATCHES=( "${FILESDIR}"/${P}-depmod-do-not-output-.bin-to-stdout.patch + "${FILESDIR}"/zstd-support-27.patch +) + src_prepare() { default @@ -97,6 +102,7 @@ src_configure() { $(use_with lzma xz) $(use_with pkcs7 openssl) $(use_with zlib) + $(use_with zstd) ) local ECONF_SOURCE="${S}" @@ -192,7 +198,7 @@ pkg_postinst() { fi if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then - if [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then + if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then ewarn ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" ewarn "kernel modules to have required static nodes!" diff --git a/sys-apps/kmod/kmod-27.ebuild b/sys-apps/kmod/kmod-27.ebuild deleted file mode 100644 index 3323884a996c..000000000000 --- a/sys-apps/kmod/kmod-27.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit autotools bash-completion-r1 multilib python-r1 - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" - #inherit libtool -fi - -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools zlib" - -# Upstream does not support running the test suite with custom configure flags. -# I was also told that the test suite is intended for kmod developers. -# So we have to restrict it. -# See bug #408915. -RESTRICT="test" - -# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -RDEPEND="!sys-apps/module-init-tools - !sys-apps/modutils - !<sys-apps/openrc-0.13.8 - !<sys-apps/systemd-216-r3 - lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) - pkcs7? ( - !libressl? ( >=dev-libs/openssl-1.1.0:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - dev-util/gtk-doc - dev-util/gtk-doc-am - ) - lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) - zlib? ( virtual/pkgconfig ) -" -if [[ ${PV} == 9999* ]]; then - DEPEND="${DEPEND} - dev-libs/libxslt" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS="NEWS README TODO" - -src_prepare() { - default - - if [[ ! -e configure ]] || use doc ; then - if use doc; then - cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die - gtkdocize --copy --docdir libkmod/docs || die - else - touch libkmod/docs/gtk-doc.make - fi - eautoreconf - else - elibtoolize - fi - - # Restore possibility of running --enable-static wrt #472608 - sed -i \ - -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ - configure || die -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --enable-shared - --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" - $(use_enable debug) - $(usex doc '--enable-gtk-doc' '') - $(use_enable static-libs static) - $(use_enable tools) - $(use_with lzma xz) - $(use_with pkcs7 openssl) - $(use_with zlib) - ) - - local ECONF_SOURCE="${S}" - - kmod_configure() { - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir econf "${myeconfargs[@]}" "$@" - } - - BUILD_DIR="${WORKDIR}/build" - kmod_configure --disable-python - - if use python; then - python_foreach_impl kmod_configure --enable-python - fi -} - -src_compile() { - emake -C "${BUILD_DIR}" - - if use python; then - local native_builddir=${BUILD_DIR} - - python_compile() { - emake -C "${BUILD_DIR}" -f Makefile -f - python \ - VPATH="${native_builddir}:${S}" \ - native_builddir="${native_builddir}" \ - libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ - <<< 'python: $(pkgpyexec_LTLIBRARIES)' - } - - python_foreach_impl python_compile - fi -} - -src_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" install - einstalldocs - - if use python; then - local native_builddir=${BUILD_DIR} - - python_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" \ - VPATH="${native_builddir}:${S}" \ - install-pkgpyexecLTLIBRARIES \ - install-dist_pkgpyexecPYTHON - } - - python_foreach_impl python_install - fi - - find "${ED}" -type f -name "*.la" -delete || die - - if use tools; then - local cmd - for cmd in depmod insmod modprobe rmmod; do - dosym ../bin/kmod /sbin/${cmd} - done - - # These are also usable as normal user - for cmd in lsmod modinfo; do - dosym kmod /bin/${cmd} - done - fi - - cat <<-EOF > "${T}"/usb-load-ehci-first.conf - softdep uhci_hcd pre: ehci_hcd - softdep ohci_hcd pre: ehci_hcd - EOF - - insinto /lib/modprobe.d - doins "${T}"/usb-load-ehci-first.conf #260139 - - newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes -} - -pkg_postinst() { - if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then - ewarn "Removing old conflicting static-nodes init script from the boot runlevel" - rm -f "${EROOT}"/etc/runlevels/boot/static-nodes - fi - - # Add kmod to the runlevel automatically if this is the first install of this package. - if [[ -z ${REPLACING_VERSIONS} ]]; then - if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then - mkdir -p "${EROOT}"/etc/runlevels/sysinit - fi - if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then - ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes - fi - fi - - if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then - if [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then - ewarn - ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" - ewarn "kernel modules to have required static nodes!" - ewarn "Run this command:" - ewarn "\trc-update add kmod-static-nodes sysinit" - fi - fi -} diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild deleted file mode 100644 index 2be15dc2dbf5..000000000000 --- a/sys-apps/kmod/kmod-9999.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit autotools bash-completion-r1 multilib python-r1 - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" - #inherit libtool -fi - -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib" - -# Upstream does not support running the test suite with custom configure flags. -# I was also told that the test suite is intended for kmod developers. -# So we have to restrict it. -# See bug #408915. -RESTRICT="test" - -# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -RDEPEND="!sys-apps/module-init-tools - !sys-apps/modutils - !<sys-apps/openrc-0.13.8 - !<sys-apps/systemd-216-r3 - lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) - pkcs7? ( - !libressl? ( >=dev-libs/openssl-1.1.0:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - dev-util/gtk-doc - dev-util/gtk-doc-am - ) - lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) - zlib? ( virtual/pkgconfig ) -" -if [[ ${PV} == 9999* ]]; then - DEPEND="${DEPEND} - dev-libs/libxslt" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS="NEWS README TODO" - -src_prepare() { - default - - if [[ ! -e configure ]] || use doc ; then - if use doc; then - cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die - gtkdocize --copy --docdir libkmod/docs || die - else - touch libkmod/docs/gtk-doc.make - fi - eautoreconf - else - elibtoolize - fi - - # Restore possibility of running --enable-static wrt #472608 - sed -i \ - -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ - configure || die -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --enable-shared - --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" - $(use_enable debug) - $(usex doc '--enable-gtk-doc' '') - $(use_enable static-libs static) - $(use_enable tools) - $(use_with lzma xz) - $(use_with pkcs7 openssl) - $(use_with zlib) - ) - - local ECONF_SOURCE="${S}" - - kmod_configure() { - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir econf "${myeconfargs[@]}" "$@" - } - - BUILD_DIR="${WORKDIR}/build" - kmod_configure --disable-python - - if use python; then - python_foreach_impl kmod_configure --enable-python - fi -} - -src_compile() { - emake -C "${BUILD_DIR}" - - if use python; then - local native_builddir=${BUILD_DIR} - - python_compile() { - emake -C "${BUILD_DIR}" -f Makefile -f - python \ - VPATH="${native_builddir}:${S}" \ - native_builddir="${native_builddir}" \ - libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ - <<< 'python: $(pkgpyexec_LTLIBRARIES)' - } - - python_foreach_impl python_compile - fi -} - -src_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" install - einstalldocs - - if use python; then - local native_builddir=${BUILD_DIR} - - python_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" \ - VPATH="${native_builddir}:${S}" \ - install-pkgpyexecLTLIBRARIES \ - install-dist_pkgpyexecPYTHON - } - - python_foreach_impl python_install - fi - - find "${ED}" -type f -name "*.la" -delete || die - - if use tools; then - local cmd - for cmd in depmod insmod modprobe rmmod; do - dosym ../bin/kmod /sbin/${cmd} - done - - # These are also usable as normal user - for cmd in lsmod modinfo; do - dosym kmod /bin/${cmd} - done - fi - - cat <<-EOF > "${T}"/usb-load-ehci-first.conf - softdep uhci_hcd pre: ehci_hcd - softdep ohci_hcd pre: ehci_hcd - EOF - - insinto /lib/modprobe.d - doins "${T}"/usb-load-ehci-first.conf #260139 - - newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes -} - -pkg_postinst() { - if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then - ewarn "Removing old conflicting static-nodes init script from the boot runlevel" - rm -f "${EROOT}"/etc/runlevels/boot/static-nodes - fi - - # Add kmod to the runlevel automatically if this is the first install of this package. - if [[ -z ${REPLACING_VERSIONS} ]]; then - if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then - mkdir -p "${EROOT}"/etc/runlevels/sysinit - fi - if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then - ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes - fi - fi - - if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then - if [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then - ewarn - ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" - ewarn "kernel modules to have required static nodes!" - ewarn "Run this command:" - ewarn "\trc-update add kmod-static-nodes sysinit" - fi - fi -} diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml index b9a1eae5389b..d9f218199f50 100644 --- a/sys-apps/kmod/metadata.xml +++ b/sys-apps/kmod/metadata.xml @@ -10,8 +10,13 @@ </maintainer> <use> <flag name="lzma">Enable support for XZ compressed modules</flag> + <flag name="pkcs7">Enable PKCS#7 signature parsing for modinfo.</flag> <flag name="tools">Install module loading/unloading tools.</flag> <flag name="zlib">Enable support for gzipped modules</flag> + <flag name="zstd">Enable support for ZSTD compressed modules</flag> </use> - <origin>kit-fixups</origin> +<upstream> + <remote-id type="cpe">cpe:/a:kernel:kmod</remote-id> +</upstream> + <origin>calculatelinux-overlay</origin> </pkgmetadata> diff --git a/sys-apps/likwid/likwid-4.3.4.ebuild b/sys-apps/likwid/likwid-4.3.4.ebuild index 858306ee00f1..f88a1ca922be 100644 --- a/sys-apps/likwid/likwid-4.3.4.ebuild +++ b/sys-apps/likwid/likwid-4.3.4.ebuild @@ -5,7 +5,7 @@ EAPI=7 FORTRAN_NEEDED=fortran LUA_COMPAT=( lua5-{1..4} luajit ) -#PYTHON_COMPAT=( python3_{6,7} ) +#PYTHON_COMPAT=( python3_{6,7,8,9,10} ) # 4.3.4 will need python-single-r1 inherit fcaps fortran-2 linux-info lua-single toolchain-funcs diff --git a/sys-apps/man-db/man-db-2.9.3-r1.ebuild b/sys-apps/man-db/man-db-2.9.3-r1.ebuild index 56f3f6a09b52..627d63b58746 100644 --- a/sys-apps/man-db/man-db-2.9.3-r1.ebuild +++ b/sys-apps/man-db/man-db-2.9.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git" else SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-3" diff --git a/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild index 5dbafbb699f0..10385ec76269 100644 --- a/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild +++ b/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/${PN}/${MY_P}.tar.xz" LICENSE="man-pages-posix-2013" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="" RESTRICT="binchecks" diff --git a/sys-apps/man-pages-posix/metadata.xml b/sys-apps/man-pages-posix/metadata.xml index f2dbe29d0b96..126b61ac08bf 100644 --- a/sys-apps/man-pages-posix/metadata.xml +++ b/sys-apps/man-pages-posix/metadata.xml @@ -5,5 +5,6 @@ <email>base-system@gentoo.org</email> <name>Gentoo Base System</name> </maintainer> +<stabilize-allarches/> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/sys-apps/memtest86-bin/Manifest b/sys-apps/memtest86-bin/Manifest index dfc9bfb972ae..e8a2361a1625 100644 --- a/sys-apps/memtest86-bin/Manifest +++ b/sys-apps/memtest86-bin/Manifest @@ -1 +1,2 @@ DIST memtest86-bin-9.0_beta1.zip 9208162 BLAKE2B d21a2755b08a61c56e25f57a2e253ff6ab8f5e7aec9b291aa33daeb817ee9c6a5da7d40c5d2e97bfa39ba633567c9e601971767c1d6a6e6f699616b37b2149c4 SHA512 86c7962ad5abaf300f7a29cbcfc33bd20ad6d3b363d0c76a426682ec7ea2195e351c2fcace387e81e927aa30d2c66050ddc5415180401d17af3ef77d6a8b41a1 +DIST memtest86-bin-9.0_beta2.zip 10126202 BLAKE2B b6b7e2e5f6bba76fedc37244fd92b56be6fc3ed40efd42c55fc061c403a0e492f58f2ed719b2ff7b47596f41b3b6ccab1e13fbe885c168f59b51a783d7eb400f SHA512 f28cd912e98b2fa0a3a0f98a10b57627073e85acc24eb79a4e326ff5fe9c8401fa093a8007179365137cac2654de9a762f31373fa0b66850400c9884f925393f diff --git a/sys-apps/memtest86-bin/memtest86-bin-9.0_beta2.ebuild b/sys-apps/memtest86-bin/memtest86-bin-9.0_beta2.ebuild new file mode 100644 index 000000000000..ba2c5ea25d86 --- /dev/null +++ b/sys-apps/memtest86-bin/memtest86-bin-9.0_beta2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit mount-boot + +MY_PV=${PV/_beta/-beta-} + +DESCRIPTION="Stand alone memory testing software for x86 computers" +HOMEPAGE="https://www.memtest86.com/" +SRC_URI="https://www.memtest86.com/downloads/memtest86-usb-${MY_PV}.zip -> ${P}.zip" + +LICENSE="PassMark-EULA" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="" + +BDEPEND="app-arch/unzip + sys-fs/fatcat" + +S=${WORKDIR} + +src_unpack() { + default + fatcat memtest86-usb.img -O 1048576 -r /EFI/BOOT/BOOTX64.efi > ${PN}.efi || die +} + +src_install() { + insinto /boot + doins ${PN}.efi + + exeinto /etc/grub.d/ + newexe "${FILESDIR}"/${PN}-grub.d 39_memtest86-bin + + dodoc MemTest86_User_Guide_UEFI.pdf +} diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index a3f91725c18f..82e0a33c18d9 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1,2 +1 @@ -DIST openrc-0.40.2.tar.gz 245006 BLAKE2B 9e0aab4d42121296cb9bcc47e9222e0e99df80ab686636a8060c6271d30ff7c0d999f851d0e24dfab9e7a6532b56a6a1974cfa4514e88e6b82ec5fbbc192d76c SHA512 746e238f792113397486b9abb6e41c8179e51fe823c82c8e8942d71329a806b9c398628f835e2626ed0e8735c05b0dcd1b82bf9b5111f420105eeae6b0b0e3f2 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646 diff --git a/sys-apps/openrc/openrc-0.40.2-r2.ebuild b/sys-apps/openrc/openrc-0.40.2-r2.ebuild deleted file mode 100644 index fd9ac7bbd27e..000000000000 --- a/sys-apps/openrc/openrc-0.40.2-r2.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic pam toolchain-funcs - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="https://github.com/openrc/openrc/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="*" - -LICENSE="BSD-2" -SLOT="0" -IUSE="audit +bash-completion debug ncurses pam newnet prefix -netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD zsh-completion" - -COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) - ncurses? ( sys-libs/ncurses:0= ) - pam? ( - sys-libs/pam - sys-auth/pambase - ) - audit? ( sys-process/audit ) - kernel_linux? ( - sys-process/psmisc - !<sys-process/procps-3.3.9-r2 - ) - selinux? ( - sys-apps/policycoreutils - >=sys-libs/libselinux-2.6 - ) - !<sys-apps/baselayout-2.1-r1 - !<sys-fs/udev-init-scripts-27" -DEPEND="${COMMON_DEPEND} - virtual/os-headers - ncurses? ( virtual/pkgconfig )" -RDEPEND="${COMMON_DEPEND} - sys-apps/corenetwork - !prefix? ( - kernel_linux? ( - >=sys-apps/sysvinit-2.86-r6[selinux?] - virtual/tmpfiles - ) - kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) - ) - selinux? ( - >=sec-policy/selinux-base-policy-2.20170204-r4 - >=sec-policy/selinux-openrc-2.20170204-r4 - ) - !<app-shells/gentoo-bashcomp-20180302 -" - -PDEPEND="netifrc? ( net-misc/netifrc )" - -src_prepare() { - default - - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die - fi - # remove lxc keyword from devfs. FL-6048 - sed -i -e 's/-\lxc\+ //g' init.d/devfs.in || die "sed failed" - eapply "${FILESDIR}"/${PN}-systemd-cgroups.patch #FL-6105 -} - -src_compile() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} - LIBNAME=$(get_libdir) - LIBEXECDIR=${EPREFIX}/lib/rc - MKBASHCOMP=$(usex bash-completion) - MKNET=$(usex newnet) - MKSELINUX=$(usex selinux) - MKAUDIT=$(usex audit) - MKPAM=$(usev pam) - MKSTATICLIBS=$(usex static-libs) - MKZSHCOMP=$(usex zsh-completion)" - - local brand="Unknown" - if use kernel_linux ; then - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - elif use kernel_FreeBSD ; then - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" - brand="FreeBSD" - fi - export BRANDING="LiGurOS ${brand}" - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" - export DEBUG=$(usev debug) - export MKTERMCAP=$(usev ncurses) - - tc-export CC AR RANLIB - emake ${MAKE_ARGS} -} - -# set_config <file> <option name> <yes value> <no value> test -# a value of "#" will just comment out the option -set_config() { - local file="${ED}/$1" var=$2 val com - eval "${@:5}" && val=$3 || val=$4 - [[ ${val} == "#" ]] && com="#" && val='\2' - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" -} - -set_config_yes_no() { - set_config "$1" "$2" YES NO "${@:3}" -} - -src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install - - # move the shared libs back to /usr so ldscript can install - # more of a minimal set of files - # disabled for now due to #270646 - #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die - #gen_usr_ldscript -a einfo rc - gen_usr_ldscript libeinfo.so - gen_usr_ldscript librc.so - - if ! use kernel_linux; then - keepdir /lib/rc/init.d - fi - keepdir /lib/rc/tmp - - # Backup our default runlevels - dodir /usr/share/"${PN}" - cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die - rm -rf "${ED}"/etc/runlevels - - # Setup unicode defaults for silly unicode users - set_config_yes_no /etc/rc.conf unicode use unicode - - # Cater to the norm - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' - - # Funtoo tweaks - set_config_yes_no /etc/rc.conf rc_send_sigkill true - set_config /etc/rc.conf rc_timeout_stopsec 5 - set_config /etc/conf.d/net-online timeout 10 - # On HPPA, do not run consolefont by default (bug #222889) - if use hppa; then - rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont - fi - - # Support for logfile rotation - insinto /etc/logrotate.d - newins "${FILESDIR}"/openrc.logrotate openrc - - # install gentoo pam.d files - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon - newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon - - # install documentation - dodoc ChangeLog *.md - if use newnet; then - dodoc README.newnet - fi - - # funtoo goodies - exeinto /etc/init.d - newexe "$FILESDIR/hostname-r1" hostname - doexe "$FILESDIR/loopback" - - insinto /etc/conf.d - newins "$FILESDIR/hostname.confd" hostname -} - -pkg_preinst() { - local f LIBDIR=$(get_libdir) - - # avoid default thrashing in conf.d files when possible #295406 - if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then - ( - unset hostname HOSTNAME - source "${EROOT}"etc/conf.d/hostname - : ${hostname:=${HOSTNAME}} - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" - ) - fi - - # set default interactive shell to sulogin if it exists - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin -} - -# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev. -migrate_udev_mount_script() { - if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \ - ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then - add_boot_init udev-mount sysinit - fi - return 0 -} - -pkg_postinst() { - local LIBDIR=$(get_libdir) - - for r in sysinit boot shutdown default nonetwork; do - if [ ! -e ${EROOT}/etc/runlevels/$r ]; then - install -d ${EROOT}/etc/runlevels/$r - # install missing scripts - fi - for sc in $(cd ${EROOT}/usr/share/openrc/runlevels/$r; ls); do - if [ ! -L ${EROOT}/etc/runlevels/$r/$sc ]; then - einfo "Missing $r/$sc script, installing..." - cp -a ${EROOT}/usr/share/openrc/runlevels/$r/$sc ${EROOT}/etc/runlevels/$r/$sc - fi - done - # warn about extra scripts - for sc in $(cd ${EROOT}/etc/runlevels/$r; ls); do - if [ "$sc" == "netif.lo" ]; then - einfo "Removing old initscript netif.lo." - rm ${EROOT}/etc/runlevels/$r/$sc - #elif [ ! -e ${EROOT}/etc/runlevels/$r/$sc ]; then - # einfo "Removing broken symlink for initscript in runlevel $r/$sc" - # rm ${EROOT}/etc/runlevels/$r/$sc - fi - if [ ! -L ${EROOT}/usr/share/openrc/runlevels/$r/$sc ]; then - ewarn "Extra script $r/$sc found, possibly from other ebuild." - fi - done - done - - if use kernel_linux && [[ "${EROOT}" = "/" ]]; then - if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then - ewarn "The dependency data could not be migrated to /run/openrc." - ewarn "This means you need to reboot your system." - fi - fi - - # update the dependency tree after touching all files #224171 - [[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u - - elog "You should now update all files in /etc, using etc-update" - elog "or equivalent before restarting any services or this host." -} diff --git a/sys-apps/openrc/openrc-0.42.1.ebuild b/sys-apps/openrc/openrc-0.42.1-r1.ebuild index 1cf1bc05feae..b92ab61ca4ec 100644 --- a/sys-apps/openrc/openrc-0.42.1.ebuild +++ b/sys-apps/openrc/openrc-0.42.1-r1.ebuild @@ -142,9 +142,11 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/openrc.logrotate openrc - # install gentoo pam.d files - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon - newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon + if use pam; then + # install gentoo pam.d files + newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon + newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon + fi # install documentation dodoc ChangeLog *.md @@ -187,7 +189,7 @@ pkg_postinst() { ewarn "You have emerged OpenRc without network support. This" ewarn "means you need to SET UP a network manager such as" ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/connman," - ewarn "net-misc/NetworkManager, or net-vpn/badvpn." + ewarn " net-misc/NetworkManager, or net-vpn/badvpn." ewarn "Or, you have the option of emerging openrc with the newnet" ewarn "use flag and configuring /etc/conf.d/network and" ewarn "/etc/conf.d/staticroute if you only use static interfaces." diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild new file mode 100644 index 000000000000..da6d7d50ca18 --- /dev/null +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic pam toolchain-funcs + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="https://github.com/openrc/openrc/" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils + unicode" + +COMMON_DEPEND=" + ncurses? ( sys-libs/ncurses:0= ) + pam? ( + sys-auth/pambase + sys-libs/pam + ) + audit? ( sys-process/audit ) + sys-process/psmisc + !<sys-process/procps-3.3.9-r2 + selinux? ( + sys-apps/policycoreutils + >=sys-libs/libselinux-2.6 + ) + !<sys-apps/baselayout-2.1-r1 + !<sys-fs/udev-init-scripts-27" +DEPEND="${COMMON_DEPEND} + virtual/os-headers + ncurses? ( virtual/pkgconfig )" +RDEPEND="${COMMON_DEPEND} + bash? ( app-shells/bash ) + !prefix? ( + sysv-utils? ( !sys-apps/sysvinit ) + !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) + virtual/tmpfiles + ) + selinux? ( + >=sec-policy/selinux-base-policy-2.20170204-r4 + >=sec-policy/selinux-openrc-2.20170204-r4 + ) + !<app-shells/gentoo-bashcomp-20180302 + !<app-shells/gentoo-zsh-completions-20180228 +" + +PDEPEND="netifrc? ( net-misc/netifrc )" + +src_prepare() { + default + if [[ ${PV} == "9999" ]] ; then + local ver="git-${EGIT_VERSION:0:6}" + sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die + fi +} + +src_compile() { + unset LIBDIR #266688 + + MAKE_ARGS="${MAKE_ARGS} + LIBNAME=$(get_libdir) + LIBEXECDIR=${EPREFIX}/lib/rc + MKBASHCOMP=yes + MKNET=$(usex newnet) + MKSELINUX=$(usex selinux) + MKSYSVINIT=$(usex sysv-utils) + MKAUDIT=$(usex audit) + MKPAM=$(usev pam) + MKSTATICLIBS=no + MKZSHCOMP=yes + SH=$(usex bash /bin/bash /bin/sh)" + + local brand="Unknown" + MAKE_ARGS="${MAKE_ARGS} OS=Linux" + brand="Linux" + export BRANDING="Gentoo ${brand}" + use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" + export DEBUG=$(usev debug) + export MKTERMCAP=$(usev ncurses) + + tc-export CC AR RANLIB + emake ${MAKE_ARGS} +} + +# set_config <file> <option name> <yes value> <no value> test +# a value of "#" will just comment out the option +set_config() { + local file="${ED}/$1" var=$2 val com + eval "${@:5}" && val=$3 || val=$4 + [[ ${val} == "#" ]] && com="#" && val='\2' + sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" +} + +set_config_yes_no() { + set_config "$1" "$2" YES NO "${@:3}" +} + +src_install() { + emake ${MAKE_ARGS} DESTDIR="${D}" install + + keepdir /lib/rc/tmp + + # Setup unicode defaults for silly unicode users + set_config_yes_no /etc/rc.conf unicode use unicode + + # Cater to the norm + set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' + + # On HPPA, do not run consolefont by default (bug #222889) + if use hppa; then + rm -f "${ED}"/etc/runlevels/boot/consolefont + fi + + # Support for logfile rotation + insinto /etc/logrotate.d + newins "${FILESDIR}"/openrc.logrotate openrc + + if use pam; then + # install gentoo pam.d files + newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon + newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon + fi + + # install documentation + dodoc ChangeLog *.md + if use newnet; then + dodoc README.newnet + fi +} + +pkg_preinst() { + # avoid default thrashing in conf.d files when possible #295406 + if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then + ( + unset hostname HOSTNAME + source "${EROOT}"/etc/conf.d/hostname + : ${hostname:=${HOSTNAME}} + [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" + ) + fi + + # set default interactive shell to sulogin if it exists + set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin + return 0 +} + +pkg_postinst() { + if use hppa; then + elog "Setting the console font does not work on all HPPA consoles." + elog "You can still enable it by running:" + elog "# rc-update add consolefont boot" + fi + + # Added for 0.35. + if [[ ! -h "${EROOT}"/lib ]]; then + if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then + cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib + fi + fi + + if ! use newnet && ! use netifrc; then + ewarn "You have emerged OpenRc without network support. This" + ewarn "means you need to SET UP a network manager such as" + ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/connman," + ewarn " net-misc/NetworkManager, or net-vpn/badvpn." + ewarn "Or, you have the option of emerging openrc with the newnet" + ewarn "use flag and configuring /etc/conf.d/network and" + ewarn "/etc/conf.d/staticroute if you only use static interfaces." + ewarn + fi + + if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then + ewarn "Please add the network service to your boot runlevel" + ewarn "as soon as possible. Not doing so could leave you with a system" + ewarn "without networking." + ewarn + fi +} diff --git a/sys-apps/pkgcore/pkgcore-0.10.14.ebuild b/sys-apps/pkgcore/pkgcore-0.10.14.ebuild index 70db5d3daaf8..982aeca67420 100644 --- a/sys-apps/pkgcore/pkgcore-0.10.14.ebuild +++ b/sys-apps/pkgcore/pkgcore-0.10.14.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git" inherit git-r3 else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" fi diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 183d673cd0ce..6e79368bb269 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,2 +1,2 @@ -DIST portage-3.0.12.tar.bz2 1049335 BLAKE2B 9f7b17ebfe068559ffbc2bc0799f72901abab8b8b5bb608c8f6afe1f8f7fdaae1026c2a04d9b2256b367711196e32b58c6927ea6fc57146148ed71b295acdcb8 SHA512 6f93f35c06ac765f926f5281e2fac99d52140e8c5d95ee4224796c1ea23ed5f45ed5382acbbfc7aebf9f68a9c585fc1b41b615ef765be2d16577909032de1350 DIST portage-3.0.13.tar.bz2 1049930 BLAKE2B 092e4a25896d613dcfcdaaa1c75f29d19112688328c4078a8ab2b24edcf1e26fff3273da56a79f8b35aada5e11e3cf7f14ef40aca742da0874ea7e907c4778bc SHA512 a9106fce311053523fd026c6c65cb85562bae69ab6ea6b5ae784044ffedbfeb0e3b1c3758ebea9204b11f885da383f9d8ee31d34ad52ac14f059cf97894e3590 +DIST portage-3.0.14.tar.bz2 1049983 BLAKE2B 174fe1f14bf1cabbe044724bab5eeada6e4d86be7ffd00db1dfe97568dca450aa44856ef7c241e7ed194f99aecb6f8bcffaf30e428c17e53d4afd4265543b495 SHA512 796f34922abe8dcc0deb687c7b42644bc82fedf8751eeb97ef26355dcd600cd134809abcc71c3bdfc233e1c15511c13cbb06c66b5889f47f2b2f51d5384d5888 diff --git a/sys-apps/portage/portage-3.0.12.ebuild b/sys-apps/portage/portage-3.0.14.ebuild index 3bc74aff54b8..17ca9cdd12db 100644 --- a/sys-apps/portage/portage-3.0.12.ebuild +++ b/sys-apps/portage/portage-3.0.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 LiGurOs Authors +# Copyright 2020-2021 LiGurOs Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/sys-apps/qcontrol/qcontrol-0.4.2-r100.ebuild b/sys-apps/qcontrol/qcontrol-0.4.2-r100.ebuild index e9761c8693f4..e4da86b1b29b 100644 --- a/sys-apps/qcontrol/qcontrol-0.4.2-r100.ebuild +++ b/sys-apps/qcontrol/qcontrol-0.4.2-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/q/qcontrol/${P/-/_}.orig.tar.gz LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~arm" +KEYWORDS="arm" IUSE="" REQUIRED_USE="${LUA_REQUIRED_USE}" diff --git a/sys-apps/qingy/qingy-1.0.0-r4.ebuild b/sys-apps/qingy/qingy-1.0.0-r5.ebuild index dd4f010182c4..e00d17d32c04 100644 --- a/sys-apps/qingy/qingy-1.0.0-r4.ebuild +++ b/sys-apps/qingy/qingy-1.0.0-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -101,7 +101,10 @@ src_install() { use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE} rm "${D}"/etc/pam.d/qingy - pamd_mimic system-local-login qingy auth account password session + + if use pam; then + pamd_mimic system-local-login qingy auth account password session + fi systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service" } diff --git a/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild index 158bfd6444fc..823bf3d00684 100644 --- a/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild +++ b/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild @@ -114,8 +114,8 @@ src_install() { pkg_postinst() { if use daemon || use update-drivedb; then - local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h" - local db_path="${EROOT}/var/db/${PN}" + local initial_db_file="${EROOT}usr/share/${PN}/drivedb.h" + local db_path="${EROOT}var/db/${PN}" if [[ ! -f "${db_path}/drivedb.h" ]] ; then # No initial database found diff --git a/sys-apps/smartmontools/smartmontools-7.2.ebuild b/sys-apps/smartmontools/smartmontools-7.2.ebuild index bcbd184c16d7..8743a731e871 100644 --- a/sys-apps/smartmontools/smartmontools-7.2.ebuild +++ b/sys-apps/smartmontools/smartmontools-7.2.ebuild @@ -118,8 +118,8 @@ src_install() { pkg_postinst() { if use daemon || use update-drivedb; then - local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h" - local db_path="${EROOT}/var/db/${PN}" + local initial_db_file="${EROOT}usr/share/${PN}/drivedb.h" + local db_path="${EROOT}var/db/${PN}" if [[ ! -f "${db_path}/drivedb.h" ]] ; then # No initial database found diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild index bcbd184c16d7..8743a731e871 100644 --- a/sys-apps/smartmontools/smartmontools-9999.ebuild +++ b/sys-apps/smartmontools/smartmontools-9999.ebuild @@ -118,8 +118,8 @@ src_install() { pkg_postinst() { if use daemon || use update-drivedb; then - local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h" - local db_path="${EROOT}/var/db/${PN}" + local initial_db_file="${EROOT}usr/share/${PN}/drivedb.h" + local db_path="${EROOT}var/db/${PN}" if [[ ! -f "${db_path}/drivedb.h" ]] ; then # No initial database found diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild index f947df99e6b7..23df70bf71c9 100644 --- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild +++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${P LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86" IUSE="selinux test" RESTRICT="!test? ( test )" diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest index 5269429dd6b4..44ebc8331b32 100644 --- a/sys-apps/ucspi-ssl/Manifest +++ b/sys-apps/ucspi-ssl/Manifest @@ -1,5 +1 @@ -DIST ucspi-ssl-0.94.tgz 112640 BLAKE2B c85c75664e7da4486fbc1b7e0ba3c8e2c57b4719471527d67661d75e0903c953fa7667a6f2384d5c3ffcf8aa3bacaef464957f7e2149749b72bb1aaf50944435 SHA512 a2b7fcea0da4c99a02cd0cf9402d59e55309a65031232e8afc9f29134be268c2e385840f5616c2046649a3f421563f1abcb707a8a8e93c7d29e7aef4a368b604 -DIST ucspi-ssl-0.97.tgz 112640 BLAKE2B ead9a3d720e9aee8855039ce3873f30d9766ad78dcd7eece41e52bbf670945248ae0f8e0b9391c3abe390eef9174e0a31880be605af3378422356f170ab86eaa SHA512 2cafa091f700e0b06b6e0ab23ac02b9459003d747c1ee0e8e95cf0922d94f8f32bde5c956307e333b193ce4514cf99078383a3cc7ffee45aadbd303e2eb454c7 -DIST ucspi-ssl-0.98b.tgz 112640 BLAKE2B 3b970525f8c3f9511daadfc2fda3840566e679b885acd3c17b0d1b2a775d837b59e9ccbbf5543614440366bedd8c24ba5f8f1c4d6b94877c7ef92d3859fdf652 SHA512 c9f6749048059f870b5221296ecb01d4b5c57c1d8c8b3574c67926b60569bce983f257afacfc3383b1b9a60d55b470a5a1548d2c19b0a505b953171a83cee12b -DIST ucspi-ssl-0.99.tgz 112640 BLAKE2B da1974f59d2fece5877f645f5843311eadd509bfb715576a56b59bc79f6f9954eca9bad88bb36b055aa939d533a8b95b4fb3d3ae9ebde1081bcd6a51b60af5b4 SHA512 2fd29d0f6b31b54f2b53206c6ccd0cf35c759834f34aab26d2a883319d33ff2257163150fc85a2e450c7bd81ce7bbed7b59c4013d71a35a9b3446a6338cb406e DIST ucspi-ssl-0.99e.tgz 112640 BLAKE2B 6db975f412723da1c6c76ff1040c27001c2d5b2b0c8bb3199f37226c31cf1e48f629aa1f8234319c844f2ccf8001d6d9ffd7700da2ae57b6cb22177cfc1e56f8 SHA512 231ef75eedc4f52f46c1f7d6f44feac54069d859da206f9ea874d3a8082dead1be310cc4b7da1148564847b5b452b691718b7ba8076a03145e2002e9250182aa diff --git a/sys-apps/ucspi-ssl/files/ucspi-ssl-0.99e-fno-common.patch b/sys-apps/ucspi-ssl/files/ucspi-ssl-0.99e-fno-common.patch new file mode 100644 index 000000000000..ea7aa0a47688 --- /dev/null +++ b/sys-apps/ucspi-ssl/files/ucspi-ssl-0.99e-fno-common.patch @@ -0,0 +1,56 @@ +https://bugs.gentoo.org/707156 +--- a/src/ip6_bit.c ++++ b/src/ip6_bit.c +@@ -7,7 +7,7 @@ + + #define BITSUBSTITUTION + +-char strnum[FMT_ULONG]; ++extern char strnum[FMT_ULONG]; + + /** + * This function converts a IPv6 address into its binary representation. +--- a/src/remoteinfo.c ++++ b/src/remoteinfo.c +@@ -50,7 +50,7 @@ static int doit(stralloc *out,int s,char ipremote[4],uint16 portremote,char iplo + { + buffer b; + char bspace[128]; +- char strnum[FMT_ULONG]; ++ extern char strnum[FMT_ULONG]; + int numcolons; + char ch; + +--- a/src/sslclient.c ++++ b/src/sslclient.c +@@ -98,7 +98,7 @@ static stralloc moreaddresses; + + static stralloc tmp; + static stralloc fqdn; +-char strnum[FMT_ULONG]; ++extern char strnum[FMT_ULONG]; + char ipstr[IP6_FMT]; + + char seed[128]; +--- a/src/sslhandle.c ++++ b/src/sslhandle.c +@@ -91,7 +91,7 @@ static stralloc remotehostsa; + char *remotehost = 0; + char *verifyhost = 0; + +-char strnum[FMT_ULONG]; ++extern char strnum[FMT_ULONG]; + char strnum2[FMT_ULONG]; + + static stralloc tmp; +--- a/src/sslserver.c ++++ b/src/sslserver.c +@@ -87,7 +87,7 @@ char *verifyhost = 0; + unsigned long uid = 0; + unsigned long gid = 0; + +-char strnum[FMT_ULONG]; ++extern char strnum[FMT_ULONG]; + char strnum2[FMT_ULONG]; + + static stralloc tmp; diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild deleted file mode 100644 index 0f244a0951d6..000000000000 --- a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils fixheadtails qmail - -DESCRIPTION="Command-line tools for building SSL client-server applications" -HOMEPAGE="https://www.fehcom.de/ipnet/ucspi-ssl.html" -SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86" -IUSE="perl" - -DEPEND=" - >=dev-libs/openssl-0.9.6g:= - net-libs/libnsl - perl? ( dev-lang/perl:= ) -" -RDEPEND=" - ${DEPEND} - sys-apps/ucspi-tcp -" - -S="${WORKDIR}"/host/superscript.com/net/${P}/src - -src_prepare() { - ht_fix_all - sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh || die - sed -i -e 's:auto:gcc:' conf-cc || die - sed -i -e 's:-m64::' conf-ld || die - - qmail_set_cc - - echo "/usr/bin" > conf-tcpbin || die - echo "/usr/" > home || die - echo "/usr/share/ca-certificates/" > conf-cadir || die - echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die -} - -src_compile() { - # build fails without setting to j1 - emake -j1 -} - -src_install() { - dodoc ../doc/* - doman ../man/*.* - dobin sslserver sslclient sslcat sslconnect https\@ - use perl && dobin sslperl -} diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild deleted file mode 100644 index f5390091f87c..000000000000 --- a/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit fixheadtails qmail - -DESCRIPTION="Command-line tools for building SSL client-server applications" -HOMEPAGE="https://www.fehcom.de/ipnet/ucspi-ssl.html" -SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="perl" - -DEPEND=" - >=dev-libs/openssl-0.9.8z_p8:= - net-libs/libnsl - perl? ( dev-lang/perl:= ) -" -RDEPEND=" - ${DEPEND} - sys-apps/ucspi-tcp -" - -S="${WORKDIR}"/host/superscript.com/net/${P} - -src_prepare() { - ht_fix_all - sed -i -e 's:auto:gcc:' conf-cc || die - sed -i -e 's:-m64::' conf-ld || die - - qmail_set_cc - - echo "/usr/bin" > conf-tcpbin || die - echo "/usr/share/ca-certificates/" > conf-cadir || die - echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die - - cd src || die - echo "/usr/" > home || die - sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh || die - - eapply_user -} - -src_compile() { - # build fails without setting to j1 - emake -j1 -C src -} - -src_install() { - dodoc doc/* - doman man/*.* - dobin src/https\@ src/sslcat src/sslclient src/sslconnect src/sslprint src/sslserver - use perl && dobin src/sslperl -} diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild deleted file mode 100644 index c97b5504afe8..000000000000 --- a/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit fixheadtails qmail - -DESCRIPTION="Command-line tools for building SSL client-server applications" -HOMEPAGE="https://www.fehcom.de/ipnet/ucspi-ssl.html" -SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="perl" - -DEPEND=" - dev-libs/openssl:0= - net-libs/libnsl - perl? ( dev-lang/perl:= ) -" -RDEPEND=" - ${DEPEND} - sys-apps/ucspi-tcp -" - -S="${WORKDIR}"/host/superscript.com/net/${P} - -src_prepare() { - ht_fix_all - sed -i -e 's:auto:gcc:' conf-cc || die - sed -i -e 's:-m64::' conf-ld || die - - qmail_set_cc - - echo "/usr/bin" > conf-tcpbin || die - echo "/usr/share/ca-certificates/" > conf-cadir || die - echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die - - cd src || die - echo "/usr/" > home || die - sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh || die - - eapply_user -} - -src_compile() { - emake sysdeps -C src - emake -C src -} - -src_install() { - dodoc doc/* - doman man/*.* - dobin src/https\@ src/sslcat src/sslclient src/sslconnect src/sslprint src/sslserver - use perl && dobin src/sslperl -} diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild deleted file mode 100644 index d4daea150d10..000000000000 --- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit fixheadtails qmail - -DESCRIPTION="Command-line tools for building SSL client-server applications" -HOMEPAGE="https://www.fehcom.de/ipnet/ucspi-ssl.html" -SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="perl" - -DEPEND="dev-libs/openssl:= - net-libs/libnsl - perl? ( dev-lang/perl:= )" -RDEPEND="${DEPEND} - sys-apps/ucspi-tcp" - -S="${WORKDIR}"/host/superscript.com/net/${P} - -src_prepare() { - ht_fix_all - - sed -i -e 's:auto:gcc:' conf-cc || die - sed -i -e 's:-m64::' conf-ld || die - qmail_set_cc - - echo "/usr/bin" > conf-tcpbin || die - echo "/usr/share/ca-certificates/" > conf-cadir || die - echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die - echo "/usr/" > src/home || die - sed -i -e 's:HOME/command:/usr/bin:' \ - src/sslcat.sh src/sslconnect.sh src/https\@.sh || die - - eapply_user -} - -src_compile() { - cd src || die - emake sysdeps - emake uint32.h - emake -} - -src_install() { - dodoc doc/* - doman man/*.* - - cd src || die - dobin $(<../package/commands-base) - use perl && dobin $(<../package/commands-sslperl) -} diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild index 2b8ea0ee5f83..03a26b48ecbf 100644 --- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild +++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,8 @@ SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86" IUSE="bindist perl libressl" -DEPEND="libressl? ( dev-libs/libressl:0= ) +DEPEND=" + libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) perl? ( dev-lang/perl:= )" RDEPEND="${DEPEND} @@ -22,6 +23,8 @@ RDEPEND="${DEPEND} S="${WORKDIR}"/host/superscript.com/net/${P} +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + src_prepare() { ht_fix_all @@ -41,8 +44,7 @@ src_prepare() { if use bindist; then echo > conf-ecdh || die fi - - eapply_user + default } src_compile() { diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild index f35e8cfddecc..9d097a11e0a5 100644 --- a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild +++ b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86" IUSE="wayland X" BDEPEND=" diff --git a/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.8.0-fix-doc-portal.patch b/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.8.0-fix-doc-portal.patch new file mode 100644 index 000000000000..46b3aaf0fb40 --- /dev/null +++ b/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.8.0-fix-doc-portal.patch @@ -0,0 +1,135 @@ +From 57096483afb069e69b9addcc39fe92b72051f1d2 Mon Sep 17 00:00:00 2001 +From: James Henstridge <james@jamesh.id.au> +Date: Tue, 24 Nov 2020 15:48:19 +0800 +Subject: [PATCH] xdp-utils: check if alternate doc portal path matches in + path_for_fd() + +The document portal uses different inode number when exposing a +particular document in different parts of the file system. As sandboxed +apps only have a subtree of the document portal file system mounted, the +"same file" checks in xdp_app_info_get_path_for_fd() would fail for +document portal paths. + +To fix this, we check to see whether the corresponding "by-app/$app_id" +path matches the stat information of the file descriptor. + +Fixes #545 +--- + document-portal/document-portal.c | 2 ++ + src/documents.c | 2 ++ + src/xdp-utils.c | 47 +++++++++++++++++++++++++++++-- + src/xdp-utils.h | 3 ++ + 5 files changed, 85 insertions(+), 2 deletions(-) + +diff --git a/document-portal/document-portal.c b/document-portal/document-portal.c +index a4c044a..a4aacc4 100644 +--- a/document-portal/document-portal.c ++++ b/document-portal/document-portal.c +@@ -1448,6 +1448,8 @@ on_name_acquired (GDBusConnection *connection, + + fuse_dev = stbuf.st_dev; + ++ xdp_set_documents_mountpoint (xdp_fuse_get_mountpoint ()); ++ + while ((invocation = g_queue_pop_head (&get_mount_point_invocations)) != NULL) + { + xdp_dbus_documents_complete_get_mount_point (dbus_api, invocation, xdp_fuse_get_mountpoint ()); +diff --git a/src/documents.c b/src/documents.c +index 99de9e4..9ddc4ac 100644 +--- a/src/documents.c ++++ b/src/documents.c +@@ -31,6 +31,7 @@ + #include <gio/gunixfdlist.h> + + #include "xdp-dbus.h" ++#include "xdp-utils.h" + #include "document-enums.h" + + static XdpDocuments *documents = NULL; +@@ -46,6 +47,7 @@ init_document_proxy (GDBusConnection *connection) + xdp_documents_call_get_mount_point_sync (documents, + &documents_mountpoint, + NULL, NULL); ++ xdp_set_documents_mountpoint (documents_mountpoint); + } + + char * +diff --git a/src/xdp-utils.c b/src/xdp-utils.c +index fa6ca6f..ef68f0f 100644 +--- a/src/xdp-utils.c ++++ b/src/xdp-utils.c +@@ -884,6 +884,35 @@ verify_proc_self_fd (XdpAppInfo *app_info, + return xdp_app_info_remap_path (app_info, path_buffer); + } + ++static char *documents_mountpoint = NULL; ++ ++void ++xdp_set_documents_mountpoint (const char *path) ++{ ++ g_clear_pointer (&documents_mountpoint, g_free); ++ documents_mountpoint = g_strdup (path); ++} ++ ++/* alternate_document_path converts a file path */ ++char * ++xdp_get_alternate_document_path (const char *path, const char *app_id) ++{ ++ int len; ++ ++ /* If we don't know where the document portal is mounted, then there ++ * is no alternate path */ ++ if (documents_mountpoint == NULL) ++ return NULL; ++ ++ /* If the path is not within the document portal, then there is no ++ * alternative path */ ++ len = strlen (documents_mountpoint); ++ if (!g_str_has_prefix (path, documents_mountpoint) || path[len] != '/') ++ return NULL; ++ ++ return g_strconcat (documents_mountpoint, "/by-app/", app_id, &path[len], NULL); ++} ++ + char * + xdp_app_info_get_path_for_fd (XdpAppInfo *app_info, + int fd, +@@ -981,8 +1010,22 @@ xdp_app_info_get_path_for_fd (XdpAppInfo *app_info, + st_buf->st_dev != real_st_buf.st_dev || + st_buf->st_ino != real_st_buf.st_ino) + { +- /* Different files on the inside and the outside, reject the request */ +- return NULL; ++ /* If the path is provided by the document portal, the inode ++ number will not match, due to only a subtree being mounted in ++ the sandbox. So we check to see if the equivalent path ++ within that subtree matches our file descriptor. ++ ++ If the alternate path doesn't match either, then we treat it ++ as a failure. ++ */ ++ g_autofree char *alt_path = NULL; ++ alt_path = xdp_get_alternate_document_path (path, xdp_app_info_get_id (app_info)); ++ ++ if (alt_path == NULL || ++ stat (alt_path, &real_st_buf) < 0 || ++ st_buf->st_dev != real_st_buf.st_dev || ++ st_buf->st_ino != real_st_buf.st_ino) ++ return NULL; + } + + if (writable_out) +diff --git a/src/xdp-utils.h b/src/xdp-utils.h +index 7105bce..fea28b8 100644 +--- a/src/xdp-utils.h ++++ b/src/xdp-utils.h +@@ -88,6 +88,9 @@ char ** xdp_app_info_rewrite_commandline (XdpAppInfo *app_info, + + G_DEFINE_AUTOPTR_CLEANUP_FUNC(XdpAppInfo, xdp_app_info_unref) + ++void xdp_set_documents_mountpoint (const char *path); ++char *xdp_get_alternate_document_path (const char *path, const char *app_id); ++ + XdpAppInfo *xdp_invocation_lookup_app_info_sync (GDBusMethodInvocation *invocation, + GCancellable *cancellable, + GError **error); diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild new file mode 100644 index 000000000000..bb8cc5472f0b --- /dev/null +++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools systemd + +DESCRIPTION="Desktop integration portal" +HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal" +SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="geolocation screencast" + +BDEPEND=" + dev-util/gdbus-codegen + sys-devel/gettext + virtual/pkgconfig +" +DEPEND=" + dev-libs/glib:2 + dev-libs/json-glib + media-libs/fontconfig + sys-fs/fuse:0 + geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) + screencast? ( >=media-video/pipewire-0.3:= ) +" +RDEPEND="${DEPEND} + sys-apps/dbus +" + +PATCHES=( "${FILESDIR}/${P}-fix-doc-portal.patch" ) + +src_configure() { + local myeconfargs=( + --with-systemduserunitdir="$(systemd_get_userunitdir)" + $(use_enable geolocation geoclue) + $(use_enable screencast pipewire) + --disable-docbook-docs # flatpak not packaged + --disable-libportal # not packaged + ) + econf "${myeconfargs[@]}" +} |