diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-24 14:47:38 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-24 14:47:38 +0100 |
commit | b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 (patch) | |
tree | 911928b566777494d08ebe2c16cb64f15af71901 /sys-libs/libxcrypt | |
parent | 61f10f985e19dfe20a4d9552902625edd5b6eabb (diff) |
gentoo resync : 24.06.2021
Diffstat (limited to 'sys-libs/libxcrypt')
-rw-r--r-- | sys-libs/libxcrypt/Manifest | 4 | ||||
-rw-r--r-- | sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild | 2 | ||||
-rw-r--r-- | sys-libs/libxcrypt/libxcrypt-4.4.23.ebuild | 163 |
3 files changed, 167 insertions, 2 deletions
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest index fdbbbcaafde5..179b99132835 100644 --- a/sys-libs/libxcrypt/Manifest +++ b/sys-libs/libxcrypt/Manifest @@ -4,7 +4,9 @@ AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d3737337 DIST libxcrypt-4.4.17.tar.gz 519096 BLAKE2B 12cbe3d1f235baddd8d2ec8159f2a7514e75c2f91cf0db18ef909ec11c38ac19efebecec647a90cafb27c7ebc7e940da448ca8f3edd1c49e5cb9cc4407d5198c SHA512 94aaba6ccf9b6d1a32f9a571ee32261cecd393d5b8d8c6f18d740dc7bb29ac0fbd381124e7f0d84882559bb634208c08151b3dc05c9138fa0a229c4ba20fb6f7 DIST libxcrypt-4.4.20.tar.gz 534367 BLAKE2B 9174bd342dc13db8fd724a13e3fbd222a0f5e2d058be2d7f511816e137fa61bd73d4b9482c85d81f27404d0e650be59c45f25d70ec3c506730d2422da4e97417 SHA512 66b1966003427728f96d5a83f75930a4b82d31133392bede3975cf9a1e1423d0312e73da598e40d0e3507f26fac5222cc92d7a5593f2b737d8557a5d4bf2461e DIST libxcrypt-4.4.22.tar.gz 535698 BLAKE2B 7f5e7cb19c8306edd6042834f039d2937cb606aa4f1c122591b56a705e45af72d776fd81e619dd4b10158aaef180354734bc32aea5db481ce7fa45d65f384dcb SHA512 360c5df9a8a239c8e63b5edeea4c99f451fe67c0ef3084f7659c9ad4c976486bb09328fa1e731238538d7ea05133078d4f890d11c030aaee7734ea6f4ae28b1c +DIST libxcrypt-4.4.23.tar.gz 536009 BLAKE2B b7311dec9e528abf6229f6c105e806a31a1e525e71d26252c8f30a3e1dbd61a7752b7303bd167d9ddc99b04261f02e3c7b50cc36bbc3348a337f4089f6e1c6f3 SHA512 4d5854a082a8c707416507611881c1407f0ea0bda0557c5f7ae6b70d8dd1c7a0828afe29d8f2e7754f5f97b824aaa03671dae6d4dad329fcd131b94b77ddb713 EBUILD libxcrypt-4.4.17.ebuild 4261 BLAKE2B 621c91e359a6d2c4d3e152b9c2590e676bfb2d5dee5d50ee7247418e37710e1a486a47b690fc015830f1464ed2eb83facec5385f3435b03359a83e38cb1f347b SHA512 f148a47f62ef9aff0fd3fde65d00df2f5819e28b44ea60fed5d04d0aa5efe7dab5eb71b9d1735fb9ce6647af12705dc6cb6a3eae06eece12874e5ba7844bc228 -EBUILD libxcrypt-4.4.20.ebuild 4210 BLAKE2B e6fc81f00836d55668a4ea66a1b36e741aae96a4bd3b21371fb0f90b7cac01ce5e6575a76bafb10d75c4b9495e381e149f08fa851ba2ae6886a7853d98788aaa SHA512 2e7208cab82472addfee1a064f6d644624897d224f3e29e32536b35167059d28423c8eade3fd2330b135a87916f11beff013658f9baf80b2c87113ebbb5f016b +EBUILD libxcrypt-4.4.20.ebuild 4209 BLAKE2B a745a9b1459053849f287d7875ad9bc843d30c4116d6624a8cec7f4070f80aede406063ede67b8570662a177431063ee1fe6dfbdfc3ecac7d0bb83a3a5ab71cb SHA512 d2b4114e89fd063bbf3cdc351c8be357b101b84372e25d9a80ed17673e8e59999ccd719ae59f7a73eec9b52698bf77131d6138f4a70aea460528294fb28572b6 EBUILD libxcrypt-4.4.22.ebuild 4216 BLAKE2B f6406b279c9366b9be6f4af554e5279c8989c85e73a90e9fd473afeec7cce26d6c02a8273e99a989a1dbd8ee1d2a8556510dc7424b7b6f06b265bf6000f3de0f SHA512 5537b889af5b4e833c13f372f3a0db3326dca7d22349ef706a778cf5d5e2960cb0acff67b2555680e0c3148bf4a2d95918557aa282a1dd4fe746e0c93121d0f6 +EBUILD libxcrypt-4.4.23.ebuild 4216 BLAKE2B f6406b279c9366b9be6f4af554e5279c8989c85e73a90e9fd473afeec7cce26d6c02a8273e99a989a1dbd8ee1d2a8556510dc7424b7b6f06b265bf6000f3de0f SHA512 5537b889af5b4e833c13f372f3a0db3326dca7d22349ef706a778cf5d5e2960cb0acff67b2555680e0c3148bf4a2d95918557aa282a1dd4fe746e0c93121d0f6 MISC metadata.xml 830 BLAKE2B 21022e8e6a34737874590a560010f2a8fd1fb11275b4f675d195b66af70ebf8f28a2d881bab0a6653b0b1fbc09c14b99339f43d6f07fd8ffe282f951c64a4f96 SHA512 03dafb661b2273d25c7e282bb91ba01a371734446e12d140d5c5c469172e62f768de6d2a0f5bcdcdae7275f4ba0ad46de69c546b381c1f0bf338cdb487267773 diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild index 98e90f02913a..6c945aa8c0d3 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/besser82/libxcrypt" 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" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="+compat split-usr +static-libs system test" DEPEND="system? ( diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.23.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.23.ebuild new file mode 100644 index 000000000000..375a789a8391 --- /dev/null +++ b/sys-libs/libxcrypt/libxcrypt-4.4.23.ebuild @@ -0,0 +1,163 @@ +# Copyright 2004-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..10} ) +inherit autotools multibuild python-any-r1 multilib-minimal + +DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others" +SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/besser82/libxcrypt" + +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" + +DEPEND="system? ( + elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) + !sys-libs/musl + )" +RDEPEND="${DEPEND}" +BDEPEND="sys-apps/findutils + test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )" + +RESTRICT="!test? ( test )" + +REQUIRED_USE="split-usr? ( system )" + +PATCHES=( + "${FILESDIR}/libxcrypt-4.4.19-multibuild.patch" +) + +python_check_deps() { + has_version -b "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 + eautoreconf +} + +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=$(get_xclibdir) + --with-pkgconfigdir=/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 "${D}"/usr/share/doc/${PF} -type l -delete || die + find "${D}" -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 "${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=( "${ED}"/$(get_xclibdir)/*.a ) + + if [[ -n ${static_libs[*]} ]]; then + dodir "/usr/$(get_xclibdir)" + mv "${static_libs[@]}" "${D}/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 +} |