From 77398e424e45d9e98c1cef3c43bdadb9d56e81ef Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Nov 2019 13:21:36 +0000 Subject: gentoo resync : 10.11.2019 --- sys-libs/libxcrypt/Manifest | 6 +- .../files/libxcrypt-4.4.10-multibuild.patch | 25 ++++ .../files/libxcrypt-4.4.10-pythonver.patch | 17 +++ sys-libs/libxcrypt/libxcrypt-4.4.10-r1.ebuild | 153 +++++++++++++++++++++ sys-libs/libxcrypt/metadata.xml | 25 ++-- 5 files changed, 216 insertions(+), 10 deletions(-) create mode 100644 sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch create mode 100644 sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch create mode 100644 sys-libs/libxcrypt/libxcrypt-4.4.10-r1.ebuild (limited to 'sys-libs/libxcrypt') diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest index b633f1468169..d84175dee589 100644 --- a/sys-libs/libxcrypt/Manifest +++ b/sys-libs/libxcrypt/Manifest @@ -1,4 +1,8 @@ AUX libxcrypt-2.4-glibc-2.16.patch 1024 BLAKE2B 8dd6aa90feef9b056de81e8d499ad4699c8050bd243cd581db691cfd8b4457b997f245f76eaa1abce2c5a93a1155c75455925ff148632f9fd86f09f73def1664 SHA512 72dc3944ea6ad600887d99ba0a9b3c0acb9d107f6591a139f863032a45a5efa516ec8b08a06e564552694d14febed0a1e065b96dc4aef06cd274aebf98baedcd +AUX libxcrypt-4.4.10-multibuild.patch 637 BLAKE2B c7c81457457b6262a5236a378fe3a2487b6da1f10ac84b4b3bc42f0beb47c52a42d20836ae44f647819d2b2042ff03b69a7681f76fc5eea5ab1333f9cd6f3ac0 SHA512 8222636d4b29909f1fa09aecd9a2284ceaa732707d4242df73bc9215edbb3c59fe517227fae66251c6312fb98ee79b6e73aab7b3c7dc5db1594740f9bd514cc6 +AUX libxcrypt-4.4.10-pythonver.patch 617 BLAKE2B 2d3779020a63899f9e4f0275e279baee2128b6c491bc6c2e6a5f9f1ce53b467838f82b4a7c4ec176c69f520544acc896b6372a8beca879aa4acdff80b384bccd SHA512 c1fda3843f02e9ffde09307147ed7cf617e2ab5a86c1766f85bb99fa377dcd4ac37e9bbcca814623c22bcf45a3d7da19237409d88a4578f38795ddd65abd1a7f +DIST libxcrypt-4.4.10.tar.gz 499736 BLAKE2B 32da99488c21a21c3310a735a08a70002a3a56d7d9d4a9fd0c16436ef2b42ee8a9b877c5b5dcbf1bc9a38fbef3370d5ff4585167ff25025f854ccd020014dcd4 SHA512 fd714542dad40db721c03270b5a03e2c068b0750e887dcac4c651433d5905d08bd5c5db3762cc2e4ceee0103bd62810559ea197d164126169e0b253675415ca2 DIST libxcrypt_2.4.orig.tar.gz 361503 BLAKE2B 6347bea4b22ae7742cb516a0a8673bbd7c37f645b2dbb383f4c4a6bbcc95a12897068ab7354fa015bbb65f6dc331b95ce24b48aa4bdd7a57433d8f5bc245392d SHA512 7171ce1b5b7f949232c4db94cf98bdd6396c3e2a8f2f483c041cab92d752e3a2fa93d564ede7efece57c069df129e6cc03049cf3e3f07bd3556031a7c4197cbf EBUILD libxcrypt-2.4.ebuild 644 BLAKE2B b0198af2c9a0a96d5a821b18ad4aa79f6cfd7d5b45a967adf1f5be9f1ad3964989a540dbdaa60e4239618e0b8a9abacae655b42e2b2adda04037a7b463c82cbc SHA512 b619989540baabbe0a88c8536b2c2fd0c1ba5d60e701228e5d34d1c276bb67c27c9ae4ef8eff8cdf18ffbd87d331ecbc1d5846196b089425fb9d4dbed3888388 -MISC metadata.xml 483 BLAKE2B 0c5c38a1a1986c380dde118b909e6808825e103970ed0554f8dfa5add4bc8bb29c451e390617040e2d9cdb468683308c8a7a063c071b38691817412a9f382b7a SHA512 4caf2b033aa710f33a3570d9c7148d603f228ffc1926b8ca14d418f2fc54bd5a51401b555316e4f5d7a1fb8e131d1445caf3f9c64a03bcff4a16c0f60fbe7050 +EBUILD libxcrypt-4.4.10-r1.ebuild 3662 BLAKE2B 3ca592fb85f417b6d36613123ea86067dc1153b8e59acbb76ffbfad3aa1bb3b7024907225e8bd1f401e4bfbf766072c750cf39e3f0d270920520560b61dd3140 SHA512 3002fc88260a5b3a7695de457e9bcf4b0a085de239d4bcd06d627fea29d9567734ef73e4dd5eae73c29d36928e5fb9834a3335879ef7628c23b323aff484f6a6 +MISC metadata.xml 856 BLAKE2B e9fea1aa08f5b3f0abdd4d490973da2f133ea90e3a366d4549361233f51e674cc646b2fb6b4b15bca72d5a4e3b36be9a06e55afd3a4cb8f439d3958f09f8af25 SHA512 862cf3201efbecfc23167ecd1f6798f6729ba4e76749c174d17baf8aa4887f21d36f40234f35bc1b896e4384d110033b3f2260f01930b926f759e0243039adf8 diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch new file mode 100644 index 000000000000..aee7d7229b1b --- /dev/null +++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch @@ -0,0 +1,25 @@ +diff --git a/Makefile.am b/Makefile.am +index 3502a5c..afb8079 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -84,11 +84,7 @@ noinst_HEADERS = \ + test/des-cases.h \ + test/crypt-kat.inc + +-if ENABLE_XCRYPT_COMPAT_FILES + nodist_include_HEADERS += xcrypt.h +-else +-nodist_noinst_HEADERS += xcrypt.h +-endif + + noinst_PROGRAMS = \ + lib/gen-des-tables +@@ -137,7 +133,7 @@ uninstall_hook_targets = \ + uninstall-hook-pkgconfig + install-data-hook-pkgconfig: + cd $(DESTDIR)$(pkgconfigdir) && \ +- $(LN_S) libxcrypt.pc libcrypt.pc ++ $(LN_S) -f libxcrypt.pc libcrypt.pc + uninstall-hook-pkgconfig: + -rm -f $(DESTDIR)$(pkgconfigdir)/libcrypt.pc + diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch new file mode 100644 index 000000000000..0ca1563995bd --- /dev/null +++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch @@ -0,0 +1,17 @@ +diff --git a/configure.ac b/configure.ac +index 16885c8..fd8c8e3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -247,11 +247,7 @@ ENABLE_CRYPT_KAT_GEN="no" + # This way we just need one call to AC_PATH_PROGS to likely get a + # suitable version of Python. The version check afterwards is for + # the case just a generic 'python3' or 'python' executable was found. +-PYTHON_CANDIDATE_VERSIONS="python3 python" +- +-for ver in `seq 6 1 10`; do +- PYTHON_CANDIDATE_VERSIONS="python3.$ver $PYTHON_CANDIDATE_VERSIONS" +-done ++PYTHON_CANDIDATE_VERSIONS="${EPYTHON}" + + AC_PATH_PROGS([PYTHON], [$PYTHON_CANDIDATE_VERSIONS], []) + diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.10-r1.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.10-r1.ebuild new file mode 100644 index 000000000000..8e27bd3934b4 --- /dev/null +++ b/sys-libs/libxcrypt/libxcrypt-4.4.10-r1.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7} ) +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="~amd64 ~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_DEPS} + $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') + )" + +# Gentoo CI complained about not having this +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/libxcrypt-4.4.10-pythonver.patch" + "${FILESDIR}/libxcrypt-4.4.10-multibuild.patch" +) + +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\n" "$(usex split-usr '' '/usr')/$(get_libdir)/$(usex system '' 'xcrypt')" +} + +multilib_src_configure() { + local -a myconf=( + --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 out man pages don't 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_install() { + local install_target + + case "${MULTIBUILD_ID}" in + xcrypt_compat-*) install_target="install-libLTLIBRARIES";; + xcrypt_nocompat-*) + if is_final_abi; then + install_target="install" + else + install_target="install-libLTLIBRARIES" + fi + ;; + *) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";; + esac + + emake DESTDIR="${D}" ${install_target} + + # don't install the libcrypt.so symlink for the "compat" version + case "${MULTIBUILD_ID}" in + xcrypt_compat-*) + rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \ + "${D}"/usr/include/$(usex system '' 'xcrypt/')xcrypt.h || die + ;; + xcrypt_nocompat-*) + if use split-usr; then + ( + shopt -s failglob || die "failglob failed" + + for so_file in "${D}"$(get_xclibdir)/*$(get_libname)*; do + so_file=$(basename "${so_file}") || die + + dosym ../../$(usex system '' '../')$(get_libdir)/$(usex system '' 'xcrypt')/${so_file} \ + /usr/$(get_libdir)/$(usex system '' 'xcrypt/')${so_file} + done + ) || die "symlinking library failure" + fi + ;; + esac +} diff --git a/sys-libs/libxcrypt/metadata.xml b/sys-libs/libxcrypt/metadata.xml index 3f12685cdb12..d84b73d6af1e 100644 --- a/sys-libs/libxcrypt/metadata.xml +++ b/sys-libs/libxcrypt/metadata.xml @@ -1,13 +1,20 @@ - - hardened@gentoo.org - Gentoo Hardened - - - Crypt library for DES, MD5, and blowfish. Libxcrypt is a replacement for - libcrypt, which comes with the GNU C Library. It supports DES crypt, - MD5, and passwords with blowfish encryption. - + + hardened@gentoo.org + Gentoo Hardened + + + Crypt library for DES, MD5, and blowfish. Libxcrypt is a replacement for + libcrypt, which comes with the GNU C Library. It supports DES crypt, + MD5, and passwords with blowfish encryption. + + + Build with compatibility interfaces for other crypt implementations + Install as system libcrypt.so rather than to an alternate directory (will collide with sys-libs/glibc's version) + + + besser82/libxcrypt + -- cgit v1.2.3