gentoo auto-resync : 31:08:2022 - 04:49:49

5 files changed, 66 insertions, 90 deletions

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index bdfbac5caa90..e7840ce3ed0a 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,8 +1,8 @@
-AUX libssh-0.10.0-fix-musl-gnu-source.patch 1961 BLAKE2B 2a6fe18a8a1e1a712b8af791721ee46f862c56cf88188bc9788b61842f4a429d0d2b02126f4a5c4c76859aea6896fba071b077a69e1c5ec2b36e264d30200d29 SHA512 1d7d73fa1d3219e1fe11559c53e4fe0024458e3a5238c3c6680c938189da33742eb222a7f3d7a9a38fe58d6eda35b63a9bb15cca3978a115857f0cdf56007103
+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.0.tar.xz 553384 BLAKE2B 4a57e2095a4f56d06b2be591e02c9b9ded5e1fa28ed2774389a2902a8277f6e6b99014f8868f0740ca2900409d33b968f65c9eaa312e259926436afb49fc108c SHA512 d97235f78b94a980aabc844ee7614108944967441219f0c2417b207734d5200eb26efd5fd6de0da97a34fb612b843dc0a3b32a3364c1d8333e4c49680212aaaa
+DIST libssh-0.10.1.tar.xz 553808 BLAKE2B 1e0a648153122619e473481484af70b9c388e75a6586a7b5ea605fede4a592f2f1ae2978c19762ac396d3dff2a3dd03451ee293c9fbd4f861a1bb5668e2489b7 SHA512 d56b2809527d4f3c1d88881b8f7a7cd49321df8abe4fde011dfe7323e7552641b36a607f3b1b37c26703adae01d0176fc3d71c6c207598aaae5ebdf10237742e
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1
-EBUILD libssh-0.10.0-r1.ebuild 3294 BLAKE2B 4b714f450303a30b52f882d405ef3f4328ad9f23e60b4fd4f231c9ed9943f2db168eca2ba2718594fb6fa2fe142157fa85ed25742d5233e954a45d8f2906889c SHA512 f08ac0db3214801c4a63a6dfe591b423af82a4543853a080ac556c4c0f89fbcb86f32d0f9e5e9fb64ff5c65053caca0ac46c87afb761fcd3c5b562b23b7aa240
+EBUILD libssh-0.10.1.ebuild 3321 BLAKE2B 138549fbf62bb54e6f2568e76a0462d1d31a8383d014419e93d179c4c8a652c9ed1936cadcdf1a0fb57039a022792d12251b134d40ad9721c7c93c27ff9550a6 SHA512 08ab3d89a88bdc15e02078219cdd13731a6c42fa8289bc8e6e03bb534e073055ba60ce8dcac1ea78c4b375ac682c5c74703b5113ea552fe31d8a013cf224b585
 EBUILD libssh-0.9.6.ebuild 3249 BLAKE2B 262c8a347a8f2f22fbd8f64d592666b6f41272709ced4caa7f7b8642bfa0047e208494938073acc22c35251aa5742b4391ad863bd57438661368328c5635ea7b SHA512 f6cc5499261f82c457740bdfe2665f380d62a23447857d0ee9eb5c7c4dc28b064bb49ccb86265921eb9ff47d366f298f84caa9751cb175a9f7b963442833e513
-EBUILD libssh-9999.ebuild 3235 BLAKE2B 1baf12eaae4002ea04742900310076a7f7e87781018162211f0529f53c8fea173304afdd993df3a2a42c1e6e740215615ac63a90811baea61c3525767ee7b559 SHA512 d94cf9bf306f5affdc32be9dfbfc27276d75c91f8401be090853e3658f5da887891023bb44d0306dcaee53ac18f4287319c58482be17b6fb417bb7c4b688ebd3
+EBUILD libssh-9999.ebuild 3321 BLAKE2B 138549fbf62bb54e6f2568e76a0462d1d31a8383d014419e93d179c4c8a652c9ed1936cadcdf1a0fb57039a022792d12251b134d40ad9721c7c93c27ff9550a6 SHA512 08ab3d89a88bdc15e02078219cdd13731a6c42fa8289bc8e6e03bb534e073055ba60ce8dcac1ea78c4b375ac682c5c74703b5113ea552fe31d8a013cf224b585
 MISC metadata.xml 726 BLAKE2B 351703a7c13b7f66c152121dac43d09b53f3d141d9a37e0dfcd8601f6f30943698c66cf6e51cb6053d1891313b1bc46fbf4071aca39bf3d07d218f8d47ed1e83 SHA512 8f639e4c5ee39a54778e9948e347551372b2f83ca30fe360a1281a52c681563c5dd2d2e053c2263b24440fc1a11c6d3cf866eaa46e39610cbd01c76c29fde7bc
diff --git a/net-libs/libssh/files/libssh-0.10.0-fix-musl-gnu-source.patch b/net-libs/libssh/files/libssh-0.10.0-fix-musl-gnu-source.patch
deleted file mode 100644
index be234bab53c9..000000000000
--- a/net-libs/libssh/files/libssh-0.10.0-fix-musl-gnu-source.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-https://gitlab.com/libssh/libssh-mirror/-/commit/8cf9c8162fc317761f19c35f60fc0cae7337ceea
-https://gitlab.com/libssh/libssh-mirror/-/issues/141
-
-From: Jakub Jelen <jjelen@redhat.com>
-Date: Mon, 29 Aug 2022 12:48:34 +0200
-Subject: [PATCH] Do not force GNU_SOURCE during build to fix #141
-
-Signed-off-by: Jakub Jelen <jjelen@redhat.com>
-Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -348,10 +348,6 @@ endif (WITH_SYMBOL_VERSIONING AND HAVE_LD_VERSION_SCRIPT AND ABIMAP_FOUND)
- # This gets built as a static library, if -DBUILD_SHARED_LIBS=OFF is passed to
- # cmake.
- add_library(ssh ${libssh_SRCS})
--target_compile_options(ssh
--                       PRIVATE
--                           ${DEFAULT_C_COMPILE_FLAGS}
--                           -D_GNU_SOURCE)
- target_include_directories(ssh
-                            PUBLIC
-                                $<BUILD_INTERFACE:${libssh_SOURCE_DIR}/include>
-@@ -408,10 +404,6 @@ install(EXPORT libssh-config
- 
- if (BUILD_STATIC_LIB)
-   add_library(ssh-static STATIC ${libssh_SRCS})
--  target_compile_options(ssh-static
--                         PRIVATE
--                            ${DEFAULT_C_COMPILE_FLAGS}
--                            -D_GNU_SOURCE)
- 
-   target_include_directories(ssh-static
-                              PUBLIC
---- a/src/misc.c
-+++ b/src/misc.c
-@@ -1956,7 +1956,7 @@ char *ssh_strerror(int err_num, char *buf, size_t buflen)
- #if defined(_WIN32)
-     strerror_s(buf, buflen, err_num);
-     return buf;
--#elif defined(__linux__) && defined(_GNU_SOURCE)
-+#elif defined(__linux__) && defined(__GLIBC__) && defined(_GNU_SOURCE)
-     /* GNU extension on Linux */
-     return strerror_r(err_num, buf, buflen);
- #else
---- a/tests/torture.h
-+++ b/tests/torture.h
-@@ -24,10 +24,6 @@
- #ifndef _TORTURE_H
- #define _TORTURE_H
- 
--#ifndef _GNU_SOURCE
--#define _GNU_SOURCE
--#endif
--
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdarg.h>
-GitLab
diff --git a/net-libs/libssh/files/libssh-0.10.1-disable-broken-test.patch b/net-libs/libssh/files/libssh-0.10.1-disable-broken-test.patch
new file mode 100644
index 000000000000..0e91bedaef6e
--- /dev/null
+++ b/net-libs/libssh/files/libssh-0.10.1-disable-broken-test.patch
@@ -0,0 +1,28 @@
+https://sources.debian.org/patches/libssh/0.9.6-2/2003-disable-expand_tilde_unix-test.patch/
+
+Description: Disable torture_path_expand_tilde_unix, its not working well on buildd
+ On buildd, the HOME is set to a non-existing directory, this makes
+ torture_path_expand_tilde_unix fail
+Author: Laurent Bigonville <bigon@debian.org>
+Forwarded: not-needed
+
+--- a/tests/unittests/torture_misc.c
++++ b/tests/unittests/torture_misc.c
+@@ -662,11 +662,11 @@ int torture_run_tests(void) {
+         cmocka_unit_test(torture_basename),
+         cmocka_unit_test(torture_dirname),
+         cmocka_unit_test(torture_ntohll),
+-#ifdef _WIN32
+-        cmocka_unit_test(torture_path_expand_tilde_win),
+-#else
+-        cmocka_unit_test(torture_path_expand_tilde_unix),
+-#endif
++//#ifdef _WIN32
++//        cmocka_unit_test(torture_path_expand_tilde_win),
++//#else
++//        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),
+         cmocka_unit_test_setup_teardown(torture_path_expand_percent, setup, teardown),
+
diff --git a/net-libs/libssh/libssh-0.10.0-r1.ebuild b/net-libs/libssh/libssh-0.10.1.ebuild
index 0a5989b9a16b..25b41a81f804 100644
--- a/net-libs/libssh/libssh-0.10.0-r1.ebuild
+++ b/net-libs/libssh/libssh-0.10.1.ebuild
@@ -45,10 +45,8 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 DOCS=( AUTHORS CHANGELOG README )
 
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-musl-gnu-source.patch
+	"${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch
 )
 
 src_prepare() {
@@ -57,22 +55,24 @@ 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
+	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+		-i ConfigureChecks.cmake || 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" \
+	if use test; then
+		# keyfile torture test is currently broken
+		sed -e "/torture_keyfiles/d" \
 			-i tests/unittests/CMakeLists.txt || die
-	fi
 
-	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-		-i ConfigureChecks.cmake || 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
 
-	if use test && use elibc_musl; then
-		sed -e "/SOLARIS/d" \
-			-i tests/CMakeLists.txt || die
+		if use elibc_musl; then
+			sed -e "/SOLARIS/d" \
+				-i tests/CMakeLists.txt || die
+		fi
 	fi
 }
 
@@ -90,6 +90,7 @@ multilib_src_configure() {
 		-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)
 	)
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 9b897cf8885e..25b41a81f804 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -45,7 +45,9 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 DOCS=( AUTHORS CHANGELOG README )
 
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch
+)
 
 src_prepare() {
 	cmake_src_prepare
@@ -53,22 +55,24 @@ 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
+	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+		-i ConfigureChecks.cmake || 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" \
+	if use test; then
+		# keyfile torture test is currently broken
+		sed -e "/torture_keyfiles/d" \
 			-i tests/unittests/CMakeLists.txt || die
-	fi
 
-	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-		-i ConfigureChecks.cmake || 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
 
-	if use test && use elibc_musl; then
-		sed -e "/SOLARIS/d" \
-			-i tests/CMakeLists.txt || die
+		if use elibc_musl; then
+			sed -e "/SOLARIS/d" \
+				-i tests/CMakeLists.txt || die
+		fi
 	fi
 }
 
@@ -86,6 +90,7 @@ multilib_src_configure() {
 		-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)
 	)