gentoo auto-resync : 03:09:2022 - 10:18:49

3 files changed, 156 insertions, 11 deletions

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index e7840ce3ed0a..7ef2f3cfceca 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,8 +1,10 @@
 AUX libssh-0.10.1-disable-broken-test.patch 1182 BLAKE2B 2ae0c370077d0c8dc79b81f33b84949f26ced643788d414973b1cd56ab2ee0223fdabb1fcf4e311774a7d47018d8258e7b0f4d073c08f825eb0da62a5a45ed4b SHA512 923f18a7c125d1becb83aec6a743535588ca7b99e35a9a54f76189558892f56bbde55ef6f7b44141f7a8b30aed945fc6e7fc00625644b5621bdb82eaccdb05a0
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
 DIST libssh-0.10.1.tar.xz 553808 BLAKE2B 1e0a648153122619e473481484af70b9c388e75a6586a7b5ea605fede4a592f2f1ae2978c19762ac396d3dff2a3dd03451ee293c9fbd4f861a1bb5668e2489b7 SHA512 d56b2809527d4f3c1d88881b8f7a7cd49321df8abe4fde011dfe7323e7552641b36a607f3b1b37c26703adae01d0176fc3d71c6c207598aaae5ebdf10237742e
+DIST libssh-0.10.2.tar.xz 554240 BLAKE2B 5732ed9709735ced62c6a1c0fc32f4c35d26bf26fd8a086ce145f7f6c679468c146a1c1a8f85035dc73971f60bd59b0a784e5fe0afc2575de947b386a4cef804 SHA512 8855ebb9ea97e6ad03dec800e0885381c5397a04f5578f0b79b82e49458766f7b6c394713c4fbdc8ff6bb8d3b4c3b8b4f7b797f39ddbc95caf205ee6d89d3278
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1
 EBUILD libssh-0.10.1.ebuild 3321 BLAKE2B 138549fbf62bb54e6f2568e76a0462d1d31a8383d014419e93d179c4c8a652c9ed1936cadcdf1a0fb57039a022792d12251b134d40ad9721c7c93c27ff9550a6 SHA512 08ab3d89a88bdc15e02078219cdd13731a6c42fa8289bc8e6e03bb534e073055ba60ce8dcac1ea78c4b375ac682c5c74703b5113ea552fe31d8a013cf224b585
+EBUILD libssh-0.10.2.ebuild 3502 BLAKE2B 610cc25ac1e65176f7480905017cfb1a945b49bd72903ce6f694f254d278173df285e4db5574eaf9c505ea9ae031cb6adbc7cf40918975719f250b2f6fa0f6fd SHA512 158df4438cfa23b01d76860fe185d01f20c9283ce18974cf98cabda01b5d1e7e00ec9170d8638770f6eac0e80dc2640be31ad472a5aeb93858b8d5bff6851317
 EBUILD libssh-0.9.6.ebuild 3249 BLAKE2B 262c8a347a8f2f22fbd8f64d592666b6f41272709ced4caa7f7b8642bfa0047e208494938073acc22c35251aa5742b4391ad863bd57438661368328c5635ea7b SHA512 f6cc5499261f82c457740bdfe2665f380d62a23447857d0ee9eb5c7c4dc28b064bb49ccb86265921eb9ff47d366f298f84caa9751cb175a9f7b963442833e513
-EBUILD libssh-9999.ebuild 3321 BLAKE2B 138549fbf62bb54e6f2568e76a0462d1d31a8383d014419e93d179c4c8a652c9ed1936cadcdf1a0fb57039a022792d12251b134d40ad9721c7c93c27ff9550a6 SHA512 08ab3d89a88bdc15e02078219cdd13731a6c42fa8289bc8e6e03bb534e073055ba60ce8dcac1ea78c4b375ac682c5c74703b5113ea552fe31d8a013cf224b585
+EBUILD libssh-9999.ebuild 3502 BLAKE2B 610cc25ac1e65176f7480905017cfb1a945b49bd72903ce6f694f254d278173df285e4db5574eaf9c505ea9ae031cb6adbc7cf40918975719f250b2f6fa0f6fd SHA512 158df4438cfa23b01d76860fe185d01f20c9283ce18974cf98cabda01b5d1e7e00ec9170d8638770f6eac0e80dc2640be31ad472a5aeb93858b8d5bff6851317
 MISC metadata.xml 726 BLAKE2B 351703a7c13b7f66c152121dac43d09b53f3d141d9a37e0dfcd8601f6f30943698c66cf6e51cb6053d1891313b1bc46fbf4071aca39bf3d07d218f8d47ed1e83 SHA512 8f639e4c5ee39a54778e9948e347551372b2f83ca30fe360a1281a52c681563c5dd2d2e053c2263b24440fc1a11c6d3cf866eaa46e39610cbd01c76c29fde7bc
diff --git a/net-libs/libssh/libssh-0.10.2.ebuild b/net-libs/libssh/libssh-0.10.2.ebuild
new file mode 100644
index 000000000000..c8592e03bb83
--- /dev/null
+++ b/net-libs/libssh/libssh-0.10.2.ebuild
@@ -0,0 +1,135 @@
+# 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 )
+
+src_prepare() {
+	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
+}
+
+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)
+		# 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_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 25b41a81f804..c8592e03bb83 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -45,10 +45,6 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 DOCS=( AUTHORS CHANGELOG README )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch
-)
-
 src_prepare() {
 	cmake_src_prepare
 
@@ -59,14 +55,26 @@ src_prepare() {
 		-i ConfigureChecks.cmake || die
 
 	if use test; then
-		# keyfile torture test is currently broken
-		sed -e "/torture_keyfiles/d" \
-			-i tests/unittests/CMakeLists.txt || die
+		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)
+		# 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
+			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