diff options
author | Patrick McLean <chutzpah@gentoo.org> | 2020-09-11 21:41:08 -0700 |
---|---|---|
committer | Patrick McLean <chutzpah@gentoo.org> | 2020-09-11 21:41:08 -0700 |
commit | b6b6a736d1b2f248319fc8f9bce3179551000012 (patch) | |
tree | f1bf4c0446c38fc6a9d7ba62b42094310af4c024 /sys-libs | |
parent | sys-libs/libxcrypt-4.4.17: Bump (diff) | |
download | gentoo-b6b6a736d1b2f248319fc8f9bce3179551000012.tar.gz gentoo-b6b6a736d1b2f248319fc8f9bce3179551000012.tar.bz2 gentoo-b6b6a736d1b2f248319fc8f9bce3179551000012.zip |
sys-libs/libxcrypt: Remove old
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/libxcrypt/Manifest | 3 | ||||
-rw-r--r-- | sys-libs/libxcrypt/files/libxcrypt-2.4-glibc-2.16.patch | 40 | ||||
-rw-r--r-- | sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch | 25 | ||||
-rw-r--r-- | sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch | 17 | ||||
-rw-r--r-- | sys-libs/libxcrypt/libxcrypt-2.4.ebuild | 28 | ||||
-rw-r--r-- | sys-libs/libxcrypt/libxcrypt-4.4.10-r1.ebuild | 153 | ||||
-rw-r--r-- | sys-libs/libxcrypt/libxcrypt-4.4.12-r3.ebuild | 163 |
7 files changed, 0 insertions, 429 deletions
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest index 45541365c9fd..c6dcdc9dde51 100644 --- a/sys-libs/libxcrypt/Manifest +++ b/sys-libs/libxcrypt/Manifest @@ -1,5 +1,2 @@ -DIST libxcrypt-4.4.10.tar.gz 499736 BLAKE2B 32da99488c21a21c3310a735a08a70002a3a56d7d9d4a9fd0c16436ef2b42ee8a9b877c5b5dcbf1bc9a38fbef3370d5ff4585167ff25025f854ccd020014dcd4 SHA512 fd714542dad40db721c03270b5a03e2c068b0750e887dcac4c651433d5905d08bd5c5db3762cc2e4ceee0103bd62810559ea197d164126169e0b253675415ca2 -DIST libxcrypt-4.4.12.tar.gz 493620 BLAKE2B 185cc9a0b9f573801e75bf2ffb3eaa578016804d175443a53b2cef01334acb6f8fa5a0fe72e346ff368e3db355338b1f1dbd00e93828dde2594f0adee3753f69 SHA512 945dfd307ebd3d1b3dd9f22057b23b651c0ffaab55bf4151950565a3f0fea8b0e2bc2886318ceea707985d720e83e8663e4590bc72e91f470bae3a98f41ab30f DIST libxcrypt-4.4.16.tar.gz 480694 BLAKE2B 0e93c2ff45a8148f82a80a67fb732a3ef42e87505d19258023f91d3352a382483204e77e2704e7a0de15f4f1e38a326d0867506a5580faf8c81857270588a4a3 SHA512 e1d3b1262c6be7c6c8847b8c4eb8191d9e5e482798be6f1186876c72f3d8c737124378ec45a38aa464f556e10a557b96f855bd371f03c3611eada27904bf6781 DIST libxcrypt-4.4.17.tar.gz 519096 BLAKE2B 12cbe3d1f235baddd8d2ec8159f2a7514e75c2f91cf0db18ef909ec11c38ac19efebecec647a90cafb27c7ebc7e940da448ca8f3edd1c49e5cb9cc4407d5198c SHA512 94aaba6ccf9b6d1a32f9a571ee32261cecd393d5b8d8c6f18d740dc7bb29ac0fbd381124e7f0d84882559bb634208c08151b3dc05c9138fa0a229c4ba20fb6f7 -DIST libxcrypt_2.4.orig.tar.gz 361503 BLAKE2B 6347bea4b22ae7742cb516a0a8673bbd7c37f645b2dbb383f4c4a6bbcc95a12897068ab7354fa015bbb65f6dc331b95ce24b48aa4bdd7a57433d8f5bc245392d SHA512 7171ce1b5b7f949232c4db94cf98bdd6396c3e2a8f2f483c041cab92d752e3a2fa93d564ede7efece57c069df129e6cc03049cf3e3f07bd3556031a7c4197cbf diff --git a/sys-libs/libxcrypt/files/libxcrypt-2.4-glibc-2.16.patch b/sys-libs/libxcrypt/files/libxcrypt-2.4-glibc-2.16.patch deleted file mode 100644 index 150ff99ab2f9..000000000000 --- a/sys-libs/libxcrypt/files/libxcrypt-2.4-glibc-2.16.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -urN libxcrypt-3.0.2/src/crypt_util.c libxcrypt-3.0.2.new/src/crypt_util.c ---- libxcrypt-3.0.2/src/crypt_util.c 2007-10-25 15:17:46.000000000 +0200 -+++ libxcrypt-3.0.2.new/src/crypt_util.c 2013-02-04 12:45:20.560191479 +0100 -@@ -30,8 +30,7 @@ - #endif - #include <string.h> - --#include <bits/libc-lock.h> --#define __libc_lock_t pthread_mutex_t -+#include <pthread.h> - - #ifndef STATIC - #define STATIC static -@@ -265,7 +264,7 @@ - */ - struct crypt_data _ufc_foobar; - --__libc_lock_define_initialized (static, _ufc_tables_lock) -+static pthread_mutex_t _ufc_tables_lock = PTHREAD_MUTEX_INITIALIZER; - - #ifdef DEBUG - -@@ -362,7 +361,7 @@ - #endif - - if(small_tables_initialized == 0) { -- __libc_lock_lock (_ufc_tables_lock); -+ pthread_mutex_lock (&_ufc_tables_lock); - if(small_tables_initialized) - goto small_tables_done; - -@@ -471,7 +470,7 @@ - } - small_tables_initialized = 1; - small_tables_done: -- __libc_lock_unlock(_ufc_tables_lock); -+ pthread_mutex_unlock (&_ufc_tables_lock); - } - - /* diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch deleted file mode 100644 index aee7d7229b1b..000000000000 --- a/sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 0ca1563995bd..000000000000 --- a/sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch +++ /dev/null @@ -1,17 +0,0 @@ -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-2.4.ebuild b/sys-libs/libxcrypt/libxcrypt-2.4.ebuild deleted file mode 100644 index 28ba5c5295c1..000000000000 --- a/sys-libs/libxcrypt/libxcrypt-2.4.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils ltprune multilib - -DESCRIPTION="A replacement for libcrypt with DES, MD5 and blowfish support" -SRC_URI="mirror://debian/pool/main/libx/${PN}/${PN}_${PV}.orig.tar.gz" -HOMEPAGE="http://packages.debian.org/sid/libxcrypt1" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -src_prepare() { - epatch "${FILESDIR}/${PN}-2.4-glibc-2.16.patch" -} - -src_configure() { - # Do not install into /usr so that tcb and pam can use us. - econf --libdir=/$(get_libdir) --disable-static -} - -src_install() { - default - prune_libtool_files -} diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.10-r1.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.10-r1.ebuild deleted file mode 100644 index 8e27bd3934b4..000000000000 --- a/sys-libs/libxcrypt/libxcrypt-4.4.10-r1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# 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/libxcrypt-4.4.12-r3.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.12-r3.ebuild deleted file mode 100644 index 166f638a5790..000000000000 --- a/sys-libs/libxcrypt/libxcrypt-4.4.12-r3.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 2004-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -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_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="split-usr? ( system )" - -PATCHES=( - "${FILESDIR}/libxcrypt-4.4.12-pythonver.patch" - "${FILESDIR}/libxcrypt-4.4.12-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=( - --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 -} |