From 541eca7cf7b9950f0adaaf9158f94c76ba0aedc9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Oct 2022 19:30:29 +0100 Subject: gentoo auto-resync : 08:10:2022 - 19:30:29 --- sys-libs/libxcrypt/Manifest | 6 +- sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild | 206 -------------------------- sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 7 + sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild | 7 + 4 files changed, 16 insertions(+), 210 deletions(-) delete mode 100644 sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild (limited to 'sys-libs/libxcrypt') diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest index 48a758eb3c86..bd3394389268 100644 --- a/sys-libs/libxcrypt/Manifest +++ b/sys-libs/libxcrypt/Manifest @@ -1,7 +1,5 @@ AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d37373370748690878b4171709028b7b894ad2c76c9188496ab089a46645ad6f9fca09fa4f89cdcb444e1400747ee358c079441661 SHA512 3cbd4bbd0827801faaaa2198eccccb285100cdfc43525b70816121aa70b32dc2c8479c53e16b9e99920926b1b11014dcc19909c4f72a09d9d19fcdb0fa6350cd -DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 4c23af2a765495758e52c8e95d53d1c1d911fea011375160c4f10e468939734fcc7198cc327fafa4d5c90afa6d4c56dfe6d1b56c2c17bbc015b44cffcd7bcc8b SHA512 5b7504e9d83df12af7d11864e88d1034ed9ce0a837ef061044c5c7fe603d7f3e5613ddf20b30613a7943735120cd058f2117401d59879afcba34ce0e48ae62ee DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d SHA512 3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217 -EBUILD libxcrypt-4.4.20.ebuild 5801 BLAKE2B 1bbb95809c595b9b9b85684f9878d3d814272738fcaf3f4467d701582cff7f8ba6a70f39eeb6ef5694f8a1faac5a01bd8bd19a98b5260c89bf770abab6e6dc2e SHA512 7d4bf26b7b89f5246df45a1552afa5dc1a8dbacc7d6c81090f2f0e6027f0ce2bfd5b134c211f058a7632348d171cd81df408e34b93c80aa1482d149e61c8f3f2 -EBUILD libxcrypt-4.4.28-r1.ebuild 8435 BLAKE2B ea5bd05145dfbde4b8d9fecfea0cf114ff672e1b3bb4e02426da124f66aed56e0ad454b00b74bfb1dbf9232af7851dcf55fe50f14cc127d84359cf040d75ed8e SHA512 139f15197854d8712852bde3c69063691c65c5b62a23edb05234429db13a01948c9d0b439bf69f50d95a8da9a9d245de8390983da24c8ed28a6c209ffa2378f0 -EBUILD libxcrypt-4.4.28-r2.ebuild 8474 BLAKE2B 728c1c771567e2c1ab125c1610b0bd09ff27ec436265d173f11d4faa2fb5381003a1ada77c0d54d43347525d84443d101b3b1c0b61754db3f769e80e412f6b55 SHA512 3b4dd4612105a9e7a35b264b64b85b2552d9700f27ebe20635005f1c7669412021343eec7bdd6d3d4316db55a951579e5e42f9fc2e5fdcd30a600de60a6d71e2 +EBUILD libxcrypt-4.4.28-r1.ebuild 8642 BLAKE2B 45f75b8c9a89d14a9c45a271fc8fabfe4de1a581174a34c862757b3d7de728cf1068e316ffd81b5196413ab0beb2c427f519627b4787e0de85f75b656ed44b13 SHA512 28c8337383c25abe91c48d6634760579370eca766d98a79e15d6290ecc31ae9a15bc70074731bfea637c1f291817f6d363b9cc13f5527c8575742b2310751fe0 +EBUILD libxcrypt-4.4.28-r2.ebuild 8681 BLAKE2B e82d8f34862304d446ef3bc824614ccd46233c51248d2bcb75f4356aba9c1b7e57bc9abb804f819ad57d00c1284af1dcf19ad020bb7e0b893e60cf7b6c31ced5 SHA512 00f8ba2c0212e460a29b6f6226e97759411376ec353f2936ec2b74409ddf900539597b73f7885d75ea7eadf0cb6cfe81cf388931e90e891d1b2c630ab948ad6a MISC metadata.xml 842 BLAKE2B 7ade88185cd771cbded8cf2c4274ddf1e2d1ef7c77df5e061575a3f40e985a547caf2326a51cce74c0edb5ca882cfc72ef7c549a5c67cd99e68658c807f751fc SHA512 3e12bc289e30c763fd9162f92e4c5a4fd0b2155cb0a55db2a53ca4b2647dfa8d30d917aefdb675ff875c2ead622772e6c4de7fc8ef4b92384406b8709671674a diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild deleted file mode 100644 index b918f9efda8d..000000000000 --- a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 2004-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) -# NEED_BOOTSTRAP is for developers to quickly generate a tarball -# for publishing to the tree. -NEED_BOOTSTRAP="no" -inherit multibuild multilib python-any-r1 multilib-minimal - -DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others" -HOMEPAGE="https://github.com/besser82/libxcrypt" -if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then - inherit autotools - SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -else - SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools.tar.xz" -fi - -LICENSE="LGPL-2.1+ public-domain BSD BSD-2" -SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="+compat split-usr static-libs system test" -REQUIRED_USE="split-usr? ( system )" -RESTRICT="!test? ( test )" - -DEPEND="system? ( - elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) - !sys-libs/musl - )" -RDEPEND="${DEPEND}" -BDEPEND="dev-lang/perl - test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )" - -python_check_deps() { - python_has_version "dev-python/passlib[${PYTHON_USEDEP}]" -} - -pkg_setup() { - MULTIBUILD_VARIANTS=( - $(usex compat 'xcrypt_compat' '') - xcrypt_nocompat - ) - - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # WARNING: Please read on bumping or applying patches! - # - # There are two circular dependencies to be aware of: - # 1) - # if we're bootstrapping configure and makefiles: - # libxcrypt -> automake -> perl -> libxcrypt - # - # mitigation: - # toolchain@ manually runs `make dist` after running autoconf + `./configure` - # and the ebuild uses that. - # (Don't include the pre-generated Perl artefacts.) - # - # solution for future: - # Upstream are working on producing `make dist` tarballs. - # https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573 - # - # 2) - # configure *unconditionally* needs Perl at build time to generate - # a list of enabled algorithms based on the set passed to `configure`: - # libxcrypt -> perl -> libxcrypt - # - # mitigation: - # None at the moment. - # - # solution for future: - # Not possible right now. Upstream intend on depending on Perl for further - # configuration options. - # https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573 - # - # Therefore, on changes (inc. bumps): - # * You must check whether upstream have started providing tarballs with bootstrapped - # auto{conf,make}; - # - # * diff the build system changes! - # - if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then - # Facilitate our split variant build for compat + non-compat - eapply "${FILESDIR}"/${PN}-4.4.19-multibuild.patch - eautoreconf - fi -} - -src_configure() { - multibuild_foreach_variant multilib-minimal_src_configure -} - -get_xclibdir() { - printf -- "%s/%s/%s\n" \ - "$(usex split-usr '' '/usr')" \ - "$(get_libdir)" \ - "$(usex system '' 'xcrypt')" -} - -multilib_src_configure() { - local -a myconf=( - --disable-werror - --libdir="${EPREFIX}"$(get_xclibdir) - --with-pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" - --includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')" - ) - - case "${MULTIBUILD_ID}" in - xcrypt_compat-*) - myconf+=( - --disable-static - --disable-xcrypt-compat-files - --enable-obsolete-api=yes - ) - ;; - xcrypt_nocompat-*) - myconf+=( - --enable-obsolete-api=no - $(use_enable static-libs static) - ) - ;; - *) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";; - esac - - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -src_compile() { - multibuild_foreach_variant multilib-minimal_src_compile -} - -multilib_src_test() { - emake check -} - -src_test() { - multibuild_foreach_variant multilib-minimal_src_test -} - -src_install() { - multibuild_foreach_variant multilib-minimal_src_install - - ( - shopt -s failglob || die "failglob failed" - - # Make sure our man pages do not collide with glibc or man-pages. - for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do - mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \ - || die "mv failed" - done - ) || die "failglob error" - - # Remove useless stuff from installation - find "${ED}"/usr/share/doc/${PF} -type l -delete || die - find "${ED}" -name '*.la' -delete || die -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - # Don't install the libcrypt.so symlink for the "compat" version - case "${MULTIBUILD_ID}" in - xcrypt_compat-*) - rm "${ED}"$(get_xclibdir)/libcrypt$(get_libname) \ - || die "failed to remove extra compat libraries" - ;; - xcrypt_nocompat-*) - if use split-usr; then - ( - if use static-libs; then - # .a files are installed to /$(get_libdir) by default - # Move static libraries to /usr prefix or portage will abort - shopt -s nullglob || die "failglob failed" - static_libs=( "${ED}"/$(get_xclibdir)/*.a ) - - if [[ -n ${static_libs[*]} ]]; then - dodir "/usr/$(get_xclibdir)" - mv "${static_libs[@]}" "${ED}/usr/$(get_xclibdir)" \ - || die "Moving static libs failed" - fi - fi - - if use system; then - # Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir) - # to allow linker to correctly find shared libraries. - shopt -s failglob || die "failglob failed" - - for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do - lib_file_basename="$(basename "${lib_file}")" - lib_file_target="$(basename "$(readlink -f "${lib_file}")")" - dosym "../../$(get_libdir)/${lib_file_target}" "/usr/$(get_xclibdir)/${lib_file_basename}" - done - - rm "${ED}"$(get_xclibdir)/*$(get_libname) || die "Removing symlinks in incorrect location failed" - fi - ) - fi - ;; - *) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";; - esac -} diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild index b43b4ada2480..c55c58c004b0 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild @@ -172,6 +172,13 @@ multilib_src_configure() { --mandir="$(get_xcmandir)" ) + if use elibc_musl; then + # musl declares getcontext and swapcontext in ucontext.h, + # but does not implement them in libc. + # https://bugs.gentoo.org/838172 + myconf+=( ac_cv_header_ucontext_h=no ) + fi + case "${MULTIBUILD_ID}" in xcrypt_compat-*) myconf+=( diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild index 5bac36b61b87..8cd9318c3373 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild @@ -174,6 +174,13 @@ multilib_src_configure() { --mandir="$(get_xcmandir)" ) + if use elibc_musl; then + # musl declares getcontext and swapcontext in ucontext.h, + # but does not implement them in libc. + # https://bugs.gentoo.org/838172 + myconf+=( ac_cv_header_ucontext_h=no ) + fi + case "${MULTIBUILD_ID}" in xcrypt_compat-*) myconf+=( -- cgit v1.2.3