From 1ab8c7f6ed10f981d767a0acc2f420cf86775f12 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Nov 2022 09:09:19 +0000 Subject: gentoo auto-resync : 02:11:2022 - 09:09:18 --- sys-libs/Manifest.gz | Bin 14404 -> 14401 bytes sys-libs/libxcrypt/Manifest | 8 +- sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild | 2 +- sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild | 2 +- sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild | 2 +- sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild | 329 ++++++++++++++++++++++++++ 6 files changed, 337 insertions(+), 6 deletions(-) create mode 100644 sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild (limited to 'sys-libs') diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz index d66e1257dd0b..85ad6a678c15 100644 Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest index 64bedd4e9cd6..462023413daf 100644 --- a/sys-libs/libxcrypt/Manifest +++ b/sys-libs/libxcrypt/Manifest @@ -1,7 +1,9 @@ AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d37373370748690878b4171709028b7b894ad2c76c9188496ab089a46645ad6f9fca09fa4f89cdcb444e1400747ee358c079441661 SHA512 3cbd4bbd0827801faaaa2198eccccb285100cdfc43525b70816121aa70b32dc2c8479c53e16b9e99920926b1b11014dcc19909c4f72a09d9d19fcdb0fa6350cd DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d SHA512 3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217 DIST libxcrypt-4.4.29-autotools.tar.xz 623720 BLAKE2B a7762a4e4a5cb65c98e69070717a066ffbfb96b5a04ae413d81148f11da2601359bc71b4e6a774dada6328785f03b8964a596c8578a0e5926d3355f29cd280d8 SHA512 278aa6e043855f7ca4e6a4676d8d55120c0bf2179d88619c574e3aea9a8a1cda91242b4a686a53ad39675b1d6dd31ae14c86dd2e5e06f93c558fc2f4fb8adaf0 -EBUILD libxcrypt-4.4.28-r1.ebuild 8806 BLAKE2B df348fd8a3aff7ba077d1e932f9bed8789605195617416ddfe0ec67d673284864530ca659803d93ae6b314b0e15d971ccd0670b4dd539bd907f7e0d161bde79c SHA512 b598e6d156f5dea5afab10270577a612f5b37137d30058bce3b9b85ec16d0ed8b20dba8c1fd8979fbbc4aa31b9fa2b0692f22ded0338edaa3847e442cbf10058 -EBUILD libxcrypt-4.4.28-r2.ebuild 9207 BLAKE2B 28819d0e37361d96af20eb5bfee10d96ddd1d53ce2174039638486aa40e3af83259ee13f9d4899c369e6f375318e1e2d02cf8e2ad627a82c347c07359c42ec09 SHA512 0c478ec3ff31a72377d91bd7e5c7230fff726f37affad760b2b3971f73e4e51a58267d310e1530a6be3c0c3f42993379bc09a1b379745fd85824c8abf0559462 -EBUILD libxcrypt-4.4.29.ebuild 9207 BLAKE2B 558e5f5329ec7fac0af9a689db104c9cd9dee82dc78c865a66cf8e620dff009fcd35a4d89bc8244bf049cf4b542587c97d4bc0fa90f5d5246fa6681cf2ee9955 SHA512 35e1dd2c357e7433f32bee11142ce2a46509ee5ff7144c1d4922f819e335f7d8308f21837de4e47b50e215d5246fceececacbf4dec239cb528744bdf1dfbf3d1 +DIST libxcrypt-4.4.30-autotools.tar.xz 623560 BLAKE2B ebd4aeb7c07a6acd2abc32cc5fe2a01181a47a55290c245b7d02f196da7a1a6b22ab5090f2262b3c6be587c0646e454fe19a0eb3a3ac8c7c7f53e65d0e268f2c SHA512 14f808c93bac43316ba7c1fb7f7446d5f935aa2bbca7191126c135cae7d9506eb6a9314ab9cdb9b7b5f6a50931574eae4728cb33b8c1694c089c54827074d409 +EBUILD libxcrypt-4.4.28-r1.ebuild 8807 BLAKE2B 60b00d1d0d9e0f1ec66bf234d63c08703e789fd0319eadf440ca0b9433eaff11685a3906af2ddda4301f46033cd92688b0a87186de25c178523928c59c213571 SHA512 05daee208a35a70f82da2ea650aeebfb692692b9e019c18614ea436c20a8dbb355d657e9b625ca7eb6daf31ad52dd01c64afa256669d4950fb8ebc08c4625414 +EBUILD libxcrypt-4.4.28-r2.ebuild 9208 BLAKE2B 6135632aa93a142b71aa1179d76ab58b823598378e767ef8a242cdcda6d75546ca4ddff606dc74a2be225083d30b230abc0dd8f4610f975635203d7a91867ac7 SHA512 ee9ee52ad1562abd11a31b9a7b11d4ad7d83e496ff672412fbce29c1fcb3591e785e02fa8a9a1ab4eaf7b518d9417e6cbf66d65f3c3047ab0eb7c9c503e3af4f +EBUILD libxcrypt-4.4.29.ebuild 9208 BLAKE2B ec6630d5ba699f7f32629dcdf9078517f1a7328a2156f8f744db8e8aa73f7938639429dfb6055886d9435efbdae5387cdf8347e9a5821df8b46933ec48f96f78 SHA512 05f81a00dcc935ce9dba38039e92528971af60523d9cca2b1bc31f17865c8dba7057380902e0edc38b536af0ab9a85ceffb6c5444f11629c9ce6e56f18101d8a +EBUILD libxcrypt-4.4.30.ebuild 9001 BLAKE2B e69127b8943f9764064c81b909fa10c67e8e4204439c8fd806d0b5aed05b9a42e864dd28244617be1d9b4aea9065d6b2eaa5fecd5fc51227ef7376d541bbe10c SHA512 9bf45eb1105a4389720cee496c452584504970afbc023dc98b921359a7e88da2f1a6b053ef9c10dd2edfa261705258af7571a83a97b898b24c84851504ecf554 MISC metadata.xml 913 BLAKE2B c2b3f52bd72bb46b0de4eb4a5f47dcb3aacfd248b811bcdc88db88c6f9cbe3ed1af4fda3e643b350fd22131273af03f2f888d78d306f0f7274d9432eb65075a3 SHA512 0ebbc3c2aa661f1a40e7f654384a395662b1b0235f145c7778b7b86bfb65ad09d4e8900bc6ede94413f057e769397c355bfd1bcafe8540acbf7e00e5451400c9 diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild index 7c7340f29a7b..8f335d8027ca 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild @@ -21,7 +21,7 @@ fi LICENSE="LGPL-2.1+ public-domain BSD BSD-2" SLOT="0/1" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="+compat split-usr static-libs system test" +IUSE="+compat split-usr static-libs +system test" REQUIRED_USE="split-usr? ( system )" RESTRICT="!test? ( test )" diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild index 430e3dc385ed..5e72a74c6d85 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild @@ -21,7 +21,7 @@ fi LICENSE="LGPL-2.1+ public-domain BSD BSD-2" SLOT="0/1" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="+compat split-usr static-libs system test headers-only" +IUSE="+compat split-usr static-libs +system test headers-only" REQUIRED_USE="split-usr? ( system )" RESTRICT="!test? ( test )" diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild index 111353e6e533..1593faa8066b 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild @@ -21,7 +21,7 @@ fi LICENSE="LGPL-2.1+ public-domain BSD BSD-2" SLOT="0/1" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="+compat split-usr static-libs system test headers-only" +IUSE="+compat split-usr static-libs +system test headers-only" REQUIRED_USE="split-usr? ( system )" RESTRICT="!test? ( test )" diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild new file mode 100644 index 000000000000..bb75ae09bb7a --- /dev/null +++ b/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild @@ -0,0 +1,329 @@ +# Copyright 2004-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..11} ) +# NEED_BOOTSTRAP is for developers to quickly generate a tarball +# for publishing to the tree. +NEED_BOOTSTRAP="no" +inherit eapi8-dosym multibuild multilib python-any-r1 flag-o-matic toolchain-funcs 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="+compat split-usr static-libs +system test headers-only" +REQUIRED_USE="split-usr? ( system )" +RESTRICT="!test? ( test )" + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET=${CATEGORY/cross-} + fi +fi + +is_cross() { + local enabled_abis=( $(multilib_get_enabled_abis) ) + [[ "${#enabled_abis[@]}" -le 1 ]] && [[ ${CHOST} != ${CTARGET} ]] +} + +DEPEND="system? ( + elibc_glibc? ( + ${CATEGORY}/glibc[-crypt(+)] + !${CATEGORY}/glibc[crypt(+)] + ) + elibc_musl? ( + !${CATEGORY}/musl[crypt(+)] + ) + ) +" +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_pretend() { + if has "distcc" ${FEATURES} ; then + ewarn "Please verify all distcc nodes are using the same versions of GCC (>= 10) and Binutils!" + ewarn "Older/mismatched versions of GCC may lead to a misbehaving library: bug #823179." + + if [[ ${BUILD_TYPE} != "binary" ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]] ; then + die "libxcrypt is known to fail to build or be broken at runtime with < GCC 10 (bug #823179)!" + fi + fi +} + +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() { + # Avoid possible "illegal instruction" errors with gold + # bug #821496 + tc-ld-disable-gold + + # Doesn't work with LTO: bug #852917. + # https://github.com/besser82/libxcrypt/issues/24 + filter-lto + + multibuild_foreach_variant multilib-minimal_src_configure +} + +get_xcprefix() { + if is_cross; then + echo "${EPREFIX}/usr/${CTARGET}" + else + echo "${EPREFIX}" + fi +} + +get_xclibdir() { + printf -- "%s/%s/%s/%s\n" \ + "$(get_xcprefix)" \ + "$(usex split-usr '' '/usr')" \ + "$(get_libdir)" \ + "$(usex system '' 'xcrypt')" +} + +get_xcincludedir() { + printf -- "%s/usr/include/%s\n" \ + "$(get_xcprefix)" \ + "$(usex system '' 'xcrypt')" +} + +get_xcmandir() { + printf -- "%s/usr/share/man\n" \ + "$(get_xcprefix)" +} + +get_xcpkgconfigdir() { + printf -- "%s/usr/%s/pkgconfig\n" \ + "$(get_xcprefix)" \ + "$(get_libdir)" +} + +multilib_src_configure() { + local -a myconf=( + --host=${CTARGET} + --disable-werror + --libdir=$(get_xclibdir) + --with-pkgconfigdir=$(get_xcpkgconfigdir) + --includedir=$(get_xcincludedir) + --mandir="$(get_xcmandir)" + ) + + tc-export PKG_CONFIG + + if is_cross; then + if tc-is-clang; then + export CC="${CTARGET}-clang" + else + export CC="${CTARGET}-gcc" + fi + fi + + 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 + + if use headers-only; then + # Nothing is compiled here which would affect the headers for the target. + # So forcing CC is sane. + headers_only_flags="CC=$(tc-getBUILD_CC)" + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" "${headers_only_flags}" +} + +src_compile() { + use headers-only && return + + 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 + + use headers-only || \ + ( + shopt -s failglob || die "failglob failed" + + # Make sure our man pages do not collide with glibc or man-pages. + for manpage in "${D}$(get_xcmandir)"/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 + + # workaround broken upstream cross-* --docdir by installing files in proper locations + if is_cross; then + insinto "$(get_xcprefix)"/usr/share + doins -r "${ED}"/usr/share/doc + rm -r "${ED}"/usr/share/doc || die + fi +} + +multilib_src_install() { + if use headers-only; then + emake DESTDIR="${D}" install-nodist_includeHEADERS + return + fi + + emake DESTDIR="${D}" install + + # Don't install the libcrypt.so symlink for the "compat" version + case "${MULTIBUILD_ID}" in + xcrypt_compat-*) + rm "${D}"$(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=( "${D}"/$(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 "${D}"$(get_xclibdir)/*$(get_libname); do + lib_file_basename="$(basename "${lib_file}")" + lib_file_target="$(basename "$(readlink -f "${lib_file}")")" + + # We already know we're in split-usr (checked above) + # See bug #843209 (also worth keeping in mind bug #802222 too) + local libdir_no_prefix=$(get_xclibdir) + libdir_no_prefix=${libdir_no_prefix#${EPREFIX}} + libdir_no_prefix=${libdir_no_prefix%/usr} + dosym8 -r "/$(get_libdir)/${lib_file_target}" "/usr/${libdir_no_prefix}/${lib_file_basename}" + done + + rm "${D}"$(get_xclibdir)/*$(get_libname) || die "Removing symlinks in incorrect location failed" + fi + ) + fi + ;; + *) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";; + esac +} + +pkg_preinst() { + # Verify we're not in a bad case like bug #843209 with broken symlinks. + # This can be dropped when, if ever, the split-usr && system && compat case + # is cleaned up in *_src_install. + local broken_symlinks=() + mapfile -d '' broken_symlinks < <( + find "${ED}" -type l ! -exec test -e {} \; -print0 2>/dev/null + ) + + [[ -z "${broken_symlinks[@]}" ]] && return + + eerror "Broken symlinks found before merging!" + for symlink in "${broken_symlinks[@]}" ; do + bad_dest="$(readlink -f ${symlink})" + eerror "\t${symlink} is broken!" + eerror "\treadlink -f ${symlink}:" + eerror "\t\t${bad_dest}" + die "Broken symlinks found! Aborting to avoid damaging system. Please report a bug." + done +} -- cgit v1.2.3