From c0187f93bb969f52c05bd5bb5059ce43d3b4d2fd Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 18 Jan 2020 11:19:20 +0100 Subject: app-portage/portage-utils-0.84-r1: fix crash seen with qcheck Closes: https://bugs.gentoo.org/705636 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Fabian Groffen --- .../portage-utils/portage-utils-0.84-r1.ebuild | 92 ++++++++++++++++++++++ .../portage-utils/portage-utils-0.84.ebuild | 85 -------------------- 2 files changed, 92 insertions(+), 85 deletions(-) create mode 100644 app-portage/portage-utils/portage-utils-0.84-r1.ebuild delete mode 100644 app-portage/portage-utils/portage-utils-0.84.ebuild diff --git a/app-portage/portage-utils/portage-utils-0.84-r1.ebuild b/app-portage/portage-utils/portage-utils-0.84-r1.ebuild new file mode 100644 index 000000000000..f6aff824f7a9 --- /dev/null +++ b/app-portage/portage-utils/portage-utils-0.84-r1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +DESCRIPTION="Small and fast Portage helper tools written in C" +HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls static openmp +qmanifest +qtegrity libressl" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 autotools + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" +else + SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +RDEPEND=" + qmanifest? ( + openmp? ( + || ( + >=sys-devel/gcc-4.2:*[openmp] + sys-devel/clang-runtime:*[openmp] + ) + ) + static? ( + app-crypt/libb2:=[static-libs] + !libressl? ( dev-libs/openssl:0=[static-libs] ) + libressl? ( dev-libs/libressl:0=[static-libs] ) + sys-libs/zlib:=[static-libs] + app-crypt/gpgme:=[static-libs] + ) + !static? ( + app-crypt/libb2:= + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + sys-libs/zlib:= + app-crypt/gpgme:= + ) + ) + qtegrity? ( + openmp? ( + || ( + >=sys-devel/gcc-4.2:*[openmp] + sys-devel/clang-runtime:*[openmp] + ) + ) + static? ( + !libressl? ( dev-libs/openssl:0=[static-libs] ) + libressl? ( dev-libs/libressl:0=[static-libs] ) + ) + !static? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + # fix #705636, basically apply 2f917fee + sed -i -e '/free(name);/d' libq/tree.c || die +} + +src_configure() { + econf \ + --disable-maintainer-mode \ + --with-eprefix="${EPREFIX}" \ + $(use_enable qmanifest) \ + $(use_enable qtegrity) \ + $(use_enable openmp) \ + $(use_enable static) +} + +pkg_postinst() { + local pvr + local doshow= + for pvr in ${REPLACING_VERSIONS} ; do + [[ ${pvr} != "0.8"[012]* ]] && doshow=true + done + + if [[ ${doshow} == true ]] ; then + elog "This version of Portage utils has undergone significant changes." + elog "Please read the elog manpages for applets like qlop(1) and" + elog "qfile(1) where argument options have changed." + fi +} diff --git a/app-portage/portage-utils/portage-utils-0.84.ebuild b/app-portage/portage-utils/portage-utils-0.84.ebuild deleted file mode 100644 index d1e5d7ff75ff..000000000000 --- a/app-portage/portage-utils/portage-utils-0.84.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Small and fast Portage helper tools written in C" -HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls static openmp +qmanifest +qtegrity libressl" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 autotools - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" -else - SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -RDEPEND=" - qmanifest? ( - openmp? ( - || ( - >=sys-devel/gcc-4.2:*[openmp] - sys-devel/clang-runtime:*[openmp] - ) - ) - static? ( - app-crypt/libb2:=[static-libs] - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) - sys-libs/zlib:=[static-libs] - app-crypt/gpgme:=[static-libs] - ) - !static? ( - app-crypt/libb2:= - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib:= - app-crypt/gpgme:= - ) - ) - qtegrity? ( - openmp? ( - || ( - >=sys-devel/gcc-4.2:*[openmp] - sys-devel/clang-runtime:*[openmp] - ) - ) - static? ( - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) - ) - !static? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) -" -DEPEND="${RDEPEND}" - -src_configure() { - econf \ - --disable-maintainer-mode \ - --with-eprefix="${EPREFIX}" \ - $(use_enable qmanifest) \ - $(use_enable qtegrity) \ - $(use_enable openmp) \ - $(use_enable static) -} - -pkg_postinst() { - local pvr - local doshow= - for pvr in ${REPLACING_VERSIONS} ; do - [[ ${pvr} != "0.8"[012]* ]] && doshow=true - done - - if [[ ${doshow} == true ]] ; then - elog "This version of Portage utils has undergone significant changes." - elog "Please read the elog manpages for applets like qlop(1) and" - elog "qfile(1) where argument options have changed." - fi -} -- cgit v1.2.3-18-g5258