From 28e3d252dc8ac8a5635206dfefe1cfe05058d1db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Aug 2018 06:32:46 +0100 Subject: gentoo resync : 12.08.2018 --- net-libs/libssh/Manifest | 7 +- net-libs/libssh/files/libssh-0.8.0-tests.patch | 11 +++ net-libs/libssh/libssh-0.8.0.ebuild | 110 +++++++++++++++++++++++++ net-libs/libssh/libssh-9999.ebuild | 41 ++++++--- net-libs/libssh/metadata.xml | 4 +- 5 files changed, 159 insertions(+), 14 deletions(-) create mode 100644 net-libs/libssh/files/libssh-0.8.0-tests.patch create mode 100644 net-libs/libssh/libssh-0.8.0.ebuild (limited to 'net-libs/libssh') diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index 431bd17fc3c0..33d27f9c49ae 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -3,9 +3,12 @@ AUX libssh-0.7.5-add-macro-for-MAX.patch 916 BLAKE2B bc24cd008159c9c20ff75dc1784 AUX libssh-0.7.5-fix-config-buffer-underflow.patch 742 BLAKE2B 5db1e2be05b45914bd832d1c3ecfa850ab2dfa88baba5566c41e8acf783a8dd0cf118851344dc8ddba39393532bede4d8a6134aa81d121da18bff9c1b4ffd27c SHA512 0e6ed4f39637b5bc3476225b1cbd28891e668609e681b4b55343c37d6a7f0c5be0f71ce684b6a83ab5e5f14cca3206d0752a17cab1138fdf274656ba36a764e5 AUX libssh-0.7.5-fix-config-parsing.patch 1076 BLAKE2B f710d58d36ec529c9390647b1a53506defe4a480463e899f8d7aeb8fe7d0d463b80f87ab6ec35fd89afadadb5f7698ac3e33a6f5693092494bfb1cf43886a9e6 SHA512 45d21c11ce242d6f2a86fe1fe96ed934a06d0dd54b9e2af6ad873bbec1b0db91cb884879205f42c1006740a4cfc1c16723180f447640e96e8373b39be8828aa5 AUX libssh-0.7.5-fix-internal-algo-selection.patch 4711 BLAKE2B 04d61ee7ab3eba651342ac2b3dba52ef191271de37e741b2cb82da11c2f9cfb19d64a6befe9ebbab8d8525bd75c9213dee56c32023340db92e046827835df7ae SHA512 29bf9b43c8ee2f65c65040163fc9f250f35d5ca77ace5db2782eb8478dc14d9d16c0cf0e991025443a701d3d60124f83134a35e7cde6fae20932e3d2ff4b6732 +AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8 DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f8311c30364bbf06d4f01121a58f5b560e0a1d9071655ce9b310fa3f3f801e11e880ca3eacde66efa0f49dc51b2b SHA512 94b8183e5c83e339303c1a160c92ccff6159471ac7d189ab66cf6d606d2e803fd616519f079aef1577c947d3a14e315332b05ea08e44d0ab550edbcb768dbea7 DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775 +DIST libssh-0.8.0.tar.xz 409280 BLAKE2B ac777167db69a956ecee172995dac0d13781b80f395b79f2aa4b691da9d33c886ecbdfe12f9ee926525cc97f358ddbda4f31be719386ef78cebfc9be51626fe0 SHA512 63512871f77a3dee52ace4434844647d5715c08f7803e2ffee3b0aa1effe287452e7601df56f7628608d3d58b6cb48d5c909501457e7a3ead5414b7b260070f4 EBUILD libssh-0.7.4.ebuild 2481 BLAKE2B da53e49934deb1984710a1a10f5955fa25b4b0c953566d287ff11e7a90f1991f4f5d58784cb78dc620fc522b0713be1ded8545898909a19bf18cae79e5f6e569 SHA512 e89b9b43fcef2b218cf099dbdee607fbddec3d25ffb11371029b98492ed151dc84d4f0c53050f10b48330c29066c898c83f233858edb2b19fdfa95acc1f6a369 EBUILD libssh-0.7.5-r2.ebuild 2691 BLAKE2B bd987e06bd7418f27ddd0bec9917df13958547bde473965ac53928d68802e311c6e26a023c0de0a81c01e8861b9c8acf5553a508538e2ab09da6df826ffd644a SHA512 4c64f74e75efe58acfcb5bd75de8341428c50a837441416719fae63dee449405aeb8df2d4bbd83725aba8df35e1b63715501049f730397a55200fcbc0d83c2ee -EBUILD libssh-9999.ebuild 2131 BLAKE2B 86c8166af0d50df56a128723a3069e8e0e87f49c0209f967a3b5d926927cdb8c9bfa00bceeb16f8d6166f348c3bc0d79b74bbaaf54eeda6f8a3e44200c5ea945 SHA512 f222add792f72ba6e09e1bac8f82d1fda31623a5c47b9a6a65926a63381c5dc7ecd6d80fb91efe4fb102ae492fccc856b99d71ad681fe48fe9bf064ac6d63bb5 -MISC metadata.xml 648 BLAKE2B bd4e4be029fdb3ef1e5ce2e16b6f5b922bf43c32ff4ecd50a67db98f9f7669022caf96d965fc85065b5ea8ac65b5547bc3d62d1da6bebdbc5a9a877be5a23c18 SHA512 4e99644645a43ccf7c479c6808ecb2dfe9f9aba69518ab1e2a1289732b926d853ff5554c69fff71e4bb572d12af298ebe19ecb1086da2e8675153b5c42faf589 +EBUILD libssh-0.8.0.ebuild 2729 BLAKE2B 7d2dc81eb803d787d3da9b74fd5c301a6950deca785d8708bf66a49b1d9bed9d995defafecca2228fe6e914a02c4a6c8460e12f1bb4cdbc4ee30c77fd9bc8ac9 SHA512 d3c9a57e26abaa9f946aa19b91117d427860d2ce0405310ea243f4cf85858942945b18bec300e011bf1810b84328189c1410ced16b3e34f4507a70ad5a4f7bbf +EBUILD libssh-9999.ebuild 2729 BLAKE2B 7d2dc81eb803d787d3da9b74fd5c301a6950deca785d8708bf66a49b1d9bed9d995defafecca2228fe6e914a02c4a6c8460e12f1bb4cdbc4ee30c77fd9bc8ac9 SHA512 d3c9a57e26abaa9f946aa19b91117d427860d2ce0405310ea243f4cf85858942945b18bec300e011bf1810b84328189c1410ced16b3e34f4507a70ad5a4f7bbf +MISC metadata.xml 687 BLAKE2B 788f87388b4ab449521ab57684fa2c52393697e4e9826640473a1bc08bd886d384354362424c64a01a8d091c157610dbb4cebf80243bb4b73d125f47996f4f5f SHA512 95ca85fe4d9070acfeeb6a81505236e004d1e93464f9ba17d6d45968a4ab855121d67b4e09a54812063e924aa8b3a8e7ca3f13b68dc243b4fc0d062fb600fea8 diff --git a/net-libs/libssh/files/libssh-0.8.0-tests.patch b/net-libs/libssh/files/libssh-0.8.0-tests.patch new file mode 100644 index 000000000000..7ce84f89983b --- /dev/null +++ b/net-libs/libssh/files/libssh-0.8.0-tests.patch @@ -0,0 +1,11 @@ +--- libssh-0.8.0/tests/unittests/torture_misc.c ++++ libssh-0.8.0/tests/unittests/torture_misc.c +@@ -361,7 +361,7 @@ + #ifdef _WIN32 + cmocka_unit_test(torture_path_expand_tilde_win), + #else +- cmocka_unit_test(torture_path_expand_tilde_unix), ++ //cmocka_unit_test(torture_path_expand_tilde_unix), + #endif + cmocka_unit_test_setup_teardown(torture_path_expand_escape, setup, teardown), + cmocka_unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown), diff --git a/net-libs/libssh/libssh-0.8.0.ebuild b/net-libs/libssh/libssh-0.8.0.ebuild new file mode 100644 index 000000000000..f29e2283d91c --- /dev/null +++ b/net-libs/libssh/libssh-0.8.0.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_P="${PN}-${PV/_rc/rc}" +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 + inherit eapi7-ver + SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" +fi + +LICENSE="LGPL-2.1" +SLOT="0/4" # subslot = soname major version +IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib" +# Maintainer: check IUSE-defaults at DefineOptions.cmake + +RDEPEND=" + !gcrypt? ( + !mbedtls? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:=[${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} + doc? ( app-doc/doxygen ) + test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) +" + +REQUIRED_USE="?? ( gcrypt mbedtls )" + +DOCS=( AUTHORS README ChangeLog ) + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-0.8.0-tests.patch" +) + +src_prepare() { + cmake-utils_src_prepare + + # just install the examples do not compile them + sed -i \ + -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \ + CMakeLists.txt || die + + # keyfile torture test is currently broken + sed -i \ + -e '/torture_keyfiles/d' \ + tests/unittests/CMakeLists.txt || die +} + +multilib_src_configure() { + local mycmakeargs=( + -DUNIT_TESTING="$(usex test)" + -DWITH_DEBUG_CALLTRACE="$(usex debug)" + -DWITH_DEBUG_CRYPTO="$(usex debug)" + -DWITH_GCRYPT="$(usex gcrypt)" + -DWITH_GSSAPI="$(usex gssapi)" + -DWITH_MBEDTLS="$(usex mbedtls)" + -DWITH_NACL=no + -DWITH_PCAP="$(usex pcap)" + -DWITH_SERVER="$(usex server)" + -DWITH_SFTP="$(usex sftp)" + -DWITH_STATIC_LIB="$(usex static-libs)" + -DWITH_STATIC_LIB="$(usex test)" + -DWITH_ZLIB="$(usex zlib)" + ) + + cmake-utils_src_configure +} + +multilib_src_compile() { + cmake-utils_src_compile + multilib_is_native_abi && use doc && cmake-utils_src_compile doc +} + +multilib_src_install() { + cmake-utils_src_install + + if multilib_is_native_abi && use doc ; then + docinto html + dodoc -r doc/html/. + fi + + use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a +} + +multilib_src_install_all() { + 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 7c520c85c87c..f29e2283d91c 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-9999.ebuild @@ -3,25 +3,36 @@ EAPI=6 -inherit cmake-multilib git-r3 +MY_P="${PN}-${PV/_rc/rc}" +inherit cmake-multilib DESCRIPTION="Access a working SSH implementation by means of a library" HOMEPAGE="https://www.libssh.org/" -EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git" + +if [[ "${PV}" == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git" +else + inherit eapi7-ver + SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" +fi LICENSE="LGPL-2.1" -KEYWORDS="" -SLOT="0" -IUSE="debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 static-libs test zlib" +SLOT="0/4" # subslot = soname major version +IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib" # Maintainer: check IUSE-defaults at DefineOptions.cmake RDEPEND=" !gcrypt? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) + !mbedtls? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:=[${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} @@ -29,9 +40,15 @@ DEPEND="${RDEPEND} test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) " +REQUIRED_USE="?? ( gcrypt mbedtls )" + DOCS=( AUTHORS README ChangeLog ) -EGIT_MIN_CLONE_TYPE=single +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-0.8.0-tests.patch" +) src_prepare() { cmake-utils_src_prepare @@ -41,22 +58,26 @@ src_prepare() { -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \ CMakeLists.txt || die + # keyfile torture test is currently broken + sed -i \ + -e '/torture_keyfiles/d' \ + tests/unittests/CMakeLists.txt || die } multilib_src_configure() { local mycmakeargs=( + -DUNIT_TESTING="$(usex test)" -DWITH_DEBUG_CALLTRACE="$(usex debug)" -DWITH_DEBUG_CRYPTO="$(usex debug)" -DWITH_GCRYPT="$(usex gcrypt)" -DWITH_GSSAPI="$(usex gssapi)" + -DWITH_MBEDTLS="$(usex mbedtls)" -DWITH_NACL=no -DWITH_PCAP="$(usex pcap)" -DWITH_SERVER="$(usex server)" -DWITH_SFTP="$(usex sftp)" - -DWITH_SSH1="$(usex ssh1)" -DWITH_STATIC_LIB="$(usex static-libs)" -DWITH_STATIC_LIB="$(usex test)" - -DWITH_TESTING="$(usex test)" -DWITH_ZLIB="$(usex zlib)" ) diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml index d4993171dff1..fa9ac337d5e8 100644 --- a/net-libs/libssh/metadata.xml +++ b/net-libs/libssh/metadata.xml @@ -6,9 +6,9 @@ Gentoo KDE Project - Prefer dev-libs/libgcrypt over - dev-libs/openssl for encryption + Use dev-libs/libgcrypt as TLS provider Enable gssapi support + Use net-libs/mbedtls as TLS provider Build with PCAP output support Build with SFTP support Build with SSH1 support -- cgit v1.2.3