commit: dabf5ac4fb577f2725274aee03f16adcbd5536bc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 9 04:11:23 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 9 04:11:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dabf5ac4
sys-libs/libxcrypt: add 4.4.25
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/libxcrypt/Manifest | 1 +
sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild | 211 +++++++++++++++++++++++++++++
2 files changed, 212 insertions(+)
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index f37a8422c58..ba026464d54 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,3 +1,4 @@
DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B
4c23af2a765495758e52c8e95d53d1c1d911fea011375160c4f10e468939734fcc7198cc327fafa4d5c90afa6d4c56dfe6d1b56c2c17bbc015b44cffcd7bcc8b
SHA512
5b7504e9d83df12af7d11864e88d1034ed9ce0a837ef061044c5c7fe603d7f3e5613ddf20b30613a7943735120cd058f2117401d59879afcba34ce0e48ae62ee
DIST libxcrypt-4.4.23-autotools.tar.xz 630204 BLAKE2B
a1c82906f59f6d0ed8f00de8fecf2c3c20608f0e3422bc0692b290c4eefd536019395e28b380031ae16be4ef37671327aca20dc63ca0367f73c2e85dfa5e3199
SHA512
30acea7e643a87d2c032c97ad8ca6c8c445c2e4af66d22906e332311a5b54a6905cc7ca74af7215a2e9ca362e1af2a8a3be8b3e0f0872f42ce0e5ea3e63bad46
DIST libxcrypt-4.4.24-autotools.tar.xz 635260 BLAKE2B
b353877144ca976480834bfd51d54bb0f288e5a1d0718d9b04871d5ecc79a4e762bc3a9760b600c0301ea75a5255acef2bb59b22840c373f3f3234c21b031568
SHA512
3b867d86df4d14aff4e90975b408eb5478fa4819139ffadef3f32eed5a3518a7a45104a1ea1f4f16c854d7d3f4087b76867000eb5e3217cdf52b9f84cc6f71b0
+DIST libxcrypt-4.4.25-autotools.tar.xz 614652 BLAKE2B
f0f4fbf92585fdd8d328aaa68811ea15bdf75778363ea4bc46a75fb76bb065f044708446d655356ebbf2834f8b14bac40fbe700b510b09ce101f750667a04298
SHA512
30f38a54c8e5cbd31c463223913079f9869d38ed38a2f64c57778ac4cf1b6f557caa527073df54ca8396bb7220807b84afcae2f9790f6604af1561a4b277874e
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
new file mode 100644
index 00000000000..6ca63517d94
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
@@ -0,0 +1,211 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit multibuild 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/glibc[crypt(+)]
+ )
+ !sys-libs/musl
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/perl
+ sys-apps/findutils
+ test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+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
+
+ # 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
+}
