commit: c3f38b806850689d99514fd320b37790b0206c08 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Sun Nov 23 03:28:46 2025 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Sun Nov 23 03:28:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=c3f38b80
net-libs/libssh: add 0.11.2, 0.11.3 Signed-off-by: orbea <orbea <AT> riseup.net> net-libs/libssh/Manifest | 5 +- net-libs/libssh/libssh-0.11.2.ebuild | 146 +++++++++++++++++++++++++++++++++++ net-libs/libssh/libssh-0.11.3.ebuild | 146 +++++++++++++++++++++++++++++++++++ 3 files changed, 294 insertions(+), 3 deletions(-) diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index 91230e1..f56cfc3 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1,4 +1,3 @@ -AUX libssh-0.11.1-libressl.patch 951 BLAKE2B b7518de5335906e75a69f5c51f1360331495f883ebc35cc3d83f9c354cbc2d8554e6830fb57f1c718cf98643f2811ee50d3ae086b5604055c66263abc87d4bed SHA512 f98a9fdf45c5c05eaf098429a1735576b35909caa41123e19063100986e8e6ba0667af9eb6e842186ba3d7eade7f5ad009af4189d35335291e7a517918fd7aee DIST libssh-0.11.1.tar.xz 621108 BLAKE2B 87079b4eaf66ceb77803b3d854f847b3f3fb6a67ac3bfa756ebcf8f06bf2b313e976044e0a1d81227fb5278fb04bc56f1a82877d14a6ee76bec0c690b14f38a7 SHA512 284d376ad9ea30b0274b4ac754b27d168286dca862ece43ef15ca6d89e66865ad7a6703cc12dd4a8564a60b8449ae9b36e6496fd51d34cc27ac4030f6cf216d6 -EBUILD libssh-0.11.1-r1.ebuild 3463 BLAKE2B e4e06d4276f435e83638ed7ffa2aa1a74abc329cf73e40b42476a3a2fade453e3c4d71fe5a9508807970044be52997a8a41ca4d32349c7e0d54a7401e833d6a1 SHA512 d10df56baad19f88d789988b7865299eb5dd70c6c8ce437403137eec2faf8418d030a5dbfcd3510ced605ce31cc4fc283f3deded75e7462c4251cb8768968d56 -MISC metadata.xml 704 BLAKE2B 5a3e9f32decb26a947dc4c51845cb8979ee071e90782367d1f0bec0eb89b54f0374bc0943e4cefcfbd5c0033bca49f613824c31f302873cccd14fdbc15eb696e SHA512 6b6fc79261d7e7d921be1b7f288a5207d5d95ba36b93db3719e39527ef6036716698412bc7fb214667040e6ca0651aedb0b09ee726e3351af44fab9ce64bdd6a +DIST libssh-0.11.2.tar.xz 619428 BLAKE2B 7f4a97b2027e386f5bfd308b1aac1938484722d4d1bb55ce0fa2de8358bedea47955df1cb4e68679033d1a5538058422770872f2f6513a82199ff506eccfad0e SHA512 15d56c3f82ee81c3ab4af2b17eba054626bb53c3337ef45f829479f8b64c552f6e7cbf307e41c9792bcb3438f282d2690acbe994150bd03a8b6c21ba8b1cfe50 +DIST libssh-0.11.3.tar.xz 622776 BLAKE2B 859e4af9bf6305e54175e456d153a85e678a6fc49ac184dbe09d94ab01dde42f0321f5a2ac35cf4ca9df188daab6c4bf3171dcd8a3776419a3a1a20474ccf89a SHA512 0670bee29a7cf5507dba7dd82b82cd8a926b83a43cee441fa8a698be2523b16aacb392433f9e63887bd72e6eb817667f6ef986f292f335d1856759af4ede40c4 diff --git a/net-libs/libssh/libssh-0.11.2.ebuild b/net-libs/libssh/libssh-0.11.2.ebuild new file mode 100644 index 0000000..0e7bdbc --- /dev/null +++ b/net-libs/libssh/libssh-0.11.2.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib dot-a + +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 ~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 gssapi mbedtls pcap server +sftp static-libs test zlib" +# Maintainer: check IUSE-defaults at DefineOptions.cmake +RESTRICT="!test? ( test )" + +RDEPEND=" + !mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + mbedtls? ( net-libs/mbedtls:3=[${MULTILIB_USEDEP},threads] ) + zlib? ( >=virtual/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-text/doxygen[dot] )" + +DOCS=( AUTHORS CHANGELOG README ) + +PATCHES=( "${FILESDIR}"/${PN}-0.11.1-libressl.patch ) + +src_prepare() { + # Remove custom find module to use system one + rm cmake/Modules/FindMbedTLS.cmake || die + + cmake_src_prepare + + # just install the examples, do not compile them + cmake_comment_add_subdirectory examples + + sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ + -i ConfigureChecks.cmake || die + + if use test; then + local skip_tests=( + # keyfile torture test is currently broken + -e "/torture_keyfiles/d" + + # Tries to expand ~ which fails w/ portage homedir + # (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir) + -e "/torture_misc/d" + -e "/torture_config/d" + ) + + # Disable tests that take too long (bug #677006) + if use sparc; then + skip_tests+=( + -e "/torture_threads_pki_rsa/d" + -e "/torture_pki_dsa/d" + ) + fi + + if (( ${#skip_tests[@]} )) ; then + sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die + fi + + if use elibc_musl; then + sed -e "/SOLARIS/d" \ + -i tests/CMakeLists.txt || die + fi + fi +} + +src_configure() { + lto-guarantee-fat + multilib-minimal_src_configure +} + +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) + # Deprecated per CMakeLists.txt + -DWITH_GCRYPT=OFF + -DWITH_GSSAPI=$(usex gssapi) + -DWITH_MBEDTLS=$(usex mbedtls) + -DMBEDTLS_FOUND=$(usex mbedtls) # Enforce variable from custom find module + -DWITH_PCAP=$(usex pcap) + -DWITH_SERVER=$(usex server) + -DWITH_SFTP=$(usex sftp) + -DBUILD_STATIC_LIB=$(usex static-libs) + # TODO: try enabling {CLIENT,SERVER}_TESTING + -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_test() { + cmake_src_test --timeout 3000 +} + +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() { + strip-lto-bytecode + 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-0.11.3.ebuild b/net-libs/libssh/libssh-0.11.3.ebuild new file mode 100644 index 0000000..0e7bdbc --- /dev/null +++ b/net-libs/libssh/libssh-0.11.3.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib dot-a + +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 ~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 gssapi mbedtls pcap server +sftp static-libs test zlib" +# Maintainer: check IUSE-defaults at DefineOptions.cmake +RESTRICT="!test? ( test )" + +RDEPEND=" + !mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + mbedtls? ( net-libs/mbedtls:3=[${MULTILIB_USEDEP},threads] ) + zlib? ( >=virtual/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-text/doxygen[dot] )" + +DOCS=( AUTHORS CHANGELOG README ) + +PATCHES=( "${FILESDIR}"/${PN}-0.11.1-libressl.patch ) + +src_prepare() { + # Remove custom find module to use system one + rm cmake/Modules/FindMbedTLS.cmake || die + + cmake_src_prepare + + # just install the examples, do not compile them + cmake_comment_add_subdirectory examples + + sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ + -i ConfigureChecks.cmake || die + + if use test; then + local skip_tests=( + # keyfile torture test is currently broken + -e "/torture_keyfiles/d" + + # Tries to expand ~ which fails w/ portage homedir + # (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir) + -e "/torture_misc/d" + -e "/torture_config/d" + ) + + # Disable tests that take too long (bug #677006) + if use sparc; then + skip_tests+=( + -e "/torture_threads_pki_rsa/d" + -e "/torture_pki_dsa/d" + ) + fi + + if (( ${#skip_tests[@]} )) ; then + sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die + fi + + if use elibc_musl; then + sed -e "/SOLARIS/d" \ + -i tests/CMakeLists.txt || die + fi + fi +} + +src_configure() { + lto-guarantee-fat + multilib-minimal_src_configure +} + +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) + # Deprecated per CMakeLists.txt + -DWITH_GCRYPT=OFF + -DWITH_GSSAPI=$(usex gssapi) + -DWITH_MBEDTLS=$(usex mbedtls) + -DMBEDTLS_FOUND=$(usex mbedtls) # Enforce variable from custom find module + -DWITH_PCAP=$(usex pcap) + -DWITH_SERVER=$(usex server) + -DWITH_SFTP=$(usex sftp) + -DBUILD_STATIC_LIB=$(usex static-libs) + # TODO: try enabling {CLIENT,SERVER}_TESTING + -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_test() { + cmake_src_test --timeout 3000 +} + +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() { + strip-lto-bytecode + use mbedtls && DOCS+=( README.mbedtls ) + einstalldocs + + if use examples; then + docinto examples + dodoc examples/*.{c,h,cpp} + fi +}
