From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 85A8C158095 for ; Tue, 30 Aug 2022 22:21:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91BC7E086E; Tue, 30 Aug 2022 22:21:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46D8DE086E for ; Tue, 30 Aug 2022 22:21:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D388534111B for ; Tue, 30 Aug 2022 22:21:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D2E257D for ; Tue, 30 Aug 2022 22:21:26 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1661898079.68be73afc06c27eeeef724acbaa6ff5b20dacc3f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/files/, net-libs/libssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libssh/Manifest net-libs/libssh/files/libssh-0.10.1-disable-broken-test.patch net-libs/libssh/libssh-0.10.1.ebuild net-libs/libssh/libssh-9999.ebuild X-VCS-Directories: net-libs/libssh/ net-libs/libssh/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 68be73afc06c27eeeef724acbaa6ff5b20dacc3f X-VCS-Branch: master Date: Tue, 30 Aug 2022 22:21:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 154c262e-fbe0-4f80-a7a9-2e8510d24fea X-Archives-Hash: 562e7e9f3172fe1046073de1c1f664df commit: 68be73afc06c27eeeef724acbaa6ff5b20dacc3f Author: Sam James gentoo org> AuthorDate: Tue Aug 30 22:20:55 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Aug 30 22:21:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68be73af net-libs/libssh: add 0.10.1 Signed-off-by: Sam James gentoo.org> net-libs/libssh/Manifest | 1 + .../files/libssh-0.10.1-disable-broken-test.patch | 28 +++++++++++++++++++ .../{libssh-9999.ebuild => libssh-0.10.1.ebuild} | 31 +++++++++++++--------- net-libs/libssh/libssh-9999.ebuild | 31 +++++++++++++--------- 4 files changed, 65 insertions(+), 26 deletions(-) diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index e353f0232c89..f4d48d1a6473 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1,2 +1,3 @@ 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 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 +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-9999.ebuild b/net-libs/libssh/libssh-0.10.1.ebuild similarity index 85% copy from net-libs/libssh/libssh-9999.ebuild copy to net-libs/libssh/libssh-0.10.1.ebuild index 9b897cf8885e..25b41a81f804 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-0.10.1.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) ) 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) )