From f1aa825b8483db57bf28d0772acfa10aeebe83c3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Aug 2022 02:53:16 +0100 Subject: gentoo auto-resync : 27:08:2022 - 02:53:16 --- net-libs/libssh/Manifest | 4 +- net-libs/libssh/libssh-0.10.0.ebuild | 122 +++++++++++++++++++++++++++++++++++ net-libs/libssh/libssh-9999.ebuild | 40 ++++++------ 3 files changed, 144 insertions(+), 22 deletions(-) create mode 100644 net-libs/libssh/libssh-0.10.0.ebuild (limited to 'net-libs/libssh') diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index 3dfa88ce68a8..fe0188bdd3e5 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1,5 +1,7 @@ AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8 +DIST libssh-0.10.0.tar.xz 553384 BLAKE2B 4a57e2095a4f56d06b2be591e02c9b9ded5e1fa28ed2774389a2902a8277f6e6b99014f8868f0740ca2900409d33b968f65c9eaa312e259926436afb49fc108c SHA512 d97235f78b94a980aabc844ee7614108944967441219f0c2417b207734d5200eb26efd5fd6de0da97a34fb612b843dc0a3b32a3364c1d8333e4c49680212aaaa DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1 +EBUILD libssh-0.10.0.ebuild 3235 BLAKE2B 1baf12eaae4002ea04742900310076a7f7e87781018162211f0529f53c8fea173304afdd993df3a2a42c1e6e740215615ac63a90811baea61c3525767ee7b559 SHA512 d94cf9bf306f5affdc32be9dfbfc27276d75c91f8401be090853e3658f5da887891023bb44d0306dcaee53ac18f4287319c58482be17b6fb417bb7c4b688ebd3 EBUILD libssh-0.9.6.ebuild 3249 BLAKE2B 262c8a347a8f2f22fbd8f64d592666b6f41272709ced4caa7f7b8642bfa0047e208494938073acc22c35251aa5742b4391ad863bd57438661368328c5635ea7b SHA512 f6cc5499261f82c457740bdfe2665f380d62a23447857d0ee9eb5c7c4dc28b064bb49ccb86265921eb9ff47d366f298f84caa9751cb175a9f7b963442833e513 -EBUILD libssh-9999.ebuild 3257 BLAKE2B 7641d31df4309fcf66c6d0ae208db2799c2133398ee1f0361f951910b2eca7ba043d059130b003547c05c316f33758c4823290aa86a1dbc4d1dfb80985eb3b0d SHA512 c6ee8faf4e5ab98cf06079ea24a8a3ad4c68627cb7dec9f3148b4cc5469f37610737d9f0901da70cfa968581a5d3a7f67ec3769246f502341d5f4245a6cf98e5 +EBUILD libssh-9999.ebuild 3235 BLAKE2B 1baf12eaae4002ea04742900310076a7f7e87781018162211f0529f53c8fea173304afdd993df3a2a42c1e6e740215615ac63a90811baea61c3525767ee7b559 SHA512 d94cf9bf306f5affdc32be9dfbfc27276d75c91f8401be090853e3658f5da887891023bb44d0306dcaee53ac18f4287319c58482be17b6fb417bb7c4b688ebd3 MISC metadata.xml 629 BLAKE2B 7e39c205fc187646d471362dd85d59f3d7988a151eec3b758c6d830ff0b0f472f4d49e38d9bfe9c99b504b52d7db1db384c9286cc41d9627fdf9a5f3c1989aab SHA512 02a38b6ec328a0b638ea94745e97a2e0f3bdf767044124b3136a6425120fbfcd377ae2b0d78a22c62569dbd8e90d795c47ce3ede81f5acbf8ba26582f36c45e2 diff --git a/net-libs/libssh/libssh-0.10.0.ebuild b/net-libs/libssh/libssh-0.10.0.ebuild new file mode 100644 index 000000000000..9b897cf8885e --- /dev/null +++ b/net-libs/libssh/libssh-0.10.0.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="Access a working SSH implementation by means of a library" +HOMEPAGE="https://www.libssh.org/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git" +else + SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="LGPL-2.1" +SLOT="0/4" # subslot = soname major version +IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib" +# Maintainer: check IUSE-defaults at DefineOptions.cmake + +REQUIRED_USE="?? ( gcrypt mbedtls )" +RESTRICT="!test? ( test )" + +RDEPEND=" + !gcrypt? ( + !mbedtls? ( + >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] + ) + ) + gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) + gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + test? ( + >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] + elibc_musl? ( sys-libs/argp-standalone ) + ) +" +BDEPEND="doc? ( app-doc/doxygen[dot] )" + +DOCS=( AUTHORS CHANGELOG README ) + +PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) + +src_prepare() { + cmake_src_prepare + + # just install the examples, do not compile them + cmake_comment_add_subdirectory examples + + # keyfile torture test is currently broken + sed -e "/torture_keyfiles/d" \ + -i tests/unittests/CMakeLists.txt || die + + # disable tests that take too long (bug #677006) + if use sparc; then + sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \ + -i tests/unittests/CMakeLists.txt || die + fi + + sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ + -i ConfigureChecks.cmake || die + + if use test && use elibc_musl; then + sed -e "/SOLARIS/d" \ + -i tests/CMakeLists.txt || die + fi +} + +multilib_src_configure() { + local mycmakeargs=( + -DWITH_NACL=OFF + -DWITH_STACK_PROTECTOR=OFF + -DWITH_STACK_PROTECTOR_STRONG=OFF + -DWITH_DEBUG_CALLTRACE=$(usex debug) + -DWITH_DEBUG_CRYPTO=$(usex debug) + -DWITH_GCRYPT=$(usex gcrypt) + -DWITH_GSSAPI=$(usex gssapi) + -DWITH_MBEDTLS=$(usex mbedtls) + -DWITH_PCAP=$(usex pcap) + -DWITH_SERVER=$(usex server) + -DWITH_SFTP=$(usex sftp) + -DBUILD_STATIC_LIB=$(usex static-libs) + -DUNIT_TESTING=$(usex test) + -DWITH_ZLIB=$(usex zlib) + ) + + multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) + + cmake_src_configure +} + +multilib_src_compile() { + cmake_src_compile + multilib_is_native_abi && use doc && cmake_src_compile docs +} + +multilib_src_install() { + cmake_src_install + multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + + use static-libs && dolib.a src/libssh.a + + # compatibility symlink until all consumers have been updated + # to no longer use libssh_threads.so + dosym libssh.so /usr/$(get_libdir)/libssh_threads.so +} + +multilib_src_install_all() { + use mbedtls && DOCS+=( README.mbedtls ) + einstalldocs + + if use examples; then + docinto examples + dodoc examples/*.{c,h,cpp} + fi +} diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild index d49e399b64d4..9b897cf8885e 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-9999.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake-multilib DESCRIPTION="Access a working SSH implementation by means of a library" HOMEPAGE="https://www.libssh.org/" -if [[ "${PV}" == *9999 ]] ; then +if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git" else @@ -22,10 +22,8 @@ IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs tes # Maintainer: check IUSE-defaults at DefineOptions.cmake REQUIRED_USE="?? ( gcrypt mbedtls )" +RESTRICT="!test? ( test )" -BDEPEND=" - doc? ( app-doc/doxygen[dot] ) -" RDEPEND=" !gcrypt? ( !mbedtls? ( @@ -40,15 +38,15 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] - elibc_musl? ( sys-libs/argp-standalone ) ) + elibc_musl? ( sys-libs/argp-standalone ) + ) " +BDEPEND="doc? ( app-doc/doxygen[dot] )" -DOCS=( AUTHORS README ChangeLog ) +DOCS=( AUTHORS CHANGELOG README ) PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) -RESTRICT+=" !test? ( test )" - src_prepare() { cmake_src_prepare @@ -79,17 +77,17 @@ multilib_src_configure() { -DWITH_NACL=OFF -DWITH_STACK_PROTECTOR=OFF -DWITH_STACK_PROTECTOR_STRONG=OFF - -DWITH_DEBUG_CALLTRACE="$(usex debug)" - -DWITH_DEBUG_CRYPTO="$(usex debug)" - -DWITH_GCRYPT="$(usex gcrypt)" - -DWITH_GSSAPI="$(usex gssapi)" - -DWITH_MBEDTLS="$(usex mbedtls)" - -DWITH_PCAP="$(usex pcap)" - -DWITH_SERVER="$(usex server)" - -DWITH_SFTP="$(usex sftp)" - -DBUILD_STATIC_LIB="$(usex static-libs)" - -DUNIT_TESTING="$(usex test)" - -DWITH_ZLIB="$(usex zlib)" + -DWITH_DEBUG_CALLTRACE=$(usex debug) + -DWITH_DEBUG_CRYPTO=$(usex debug) + -DWITH_GCRYPT=$(usex gcrypt) + -DWITH_GSSAPI=$(usex gssapi) + -DWITH_MBEDTLS=$(usex mbedtls) + -DWITH_PCAP=$(usex pcap) + -DWITH_SERVER=$(usex server) + -DWITH_SFTP=$(usex sftp) + -DBUILD_STATIC_LIB=$(usex static-libs) + -DUNIT_TESTING=$(usex test) + -DWITH_ZLIB=$(usex zlib) ) multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) @@ -104,7 +102,7 @@ multilib_src_compile() { multilib_src_install() { cmake_src_install - multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) use static-libs && dolib.a src/libssh.a -- cgit v1.2.3