| 1 |
commit: 68be73afc06c27eeeef724acbaa6ff5b20dacc3f |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 22:20:55 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 22:21:19 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68be73af |
| 7 |
|
| 8 |
net-libs/libssh: add 0.10.1 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
net-libs/libssh/Manifest | 1 + |
| 13 |
.../files/libssh-0.10.1-disable-broken-test.patch | 28 +++++++++++++++++++ |
| 14 |
.../{libssh-9999.ebuild => libssh-0.10.1.ebuild} | 31 +++++++++++++--------- |
| 15 |
net-libs/libssh/libssh-9999.ebuild | 31 +++++++++++++--------- |
| 16 |
4 files changed, 65 insertions(+), 26 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest |
| 19 |
index e353f0232c89..f4d48d1a6473 100644 |
| 20 |
--- a/net-libs/libssh/Manifest |
| 21 |
+++ b/net-libs/libssh/Manifest |
| 22 |
@@ -1,2 +1,3 @@ |
| 23 |
DIST libssh-0.10.0.tar.xz 553384 BLAKE2B 4a57e2095a4f56d06b2be591e02c9b9ded5e1fa28ed2774389a2902a8277f6e6b99014f8868f0740ca2900409d33b968f65c9eaa312e259926436afb49fc108c SHA512 d97235f78b94a980aabc844ee7614108944967441219f0c2417b207734d5200eb26efd5fd6de0da97a34fb612b843dc0a3b32a3364c1d8333e4c49680212aaaa |
| 24 |
+DIST libssh-0.10.1.tar.xz 553808 BLAKE2B 1e0a648153122619e473481484af70b9c388e75a6586a7b5ea605fede4a592f2f1ae2978c19762ac396d3dff2a3dd03451ee293c9fbd4f861a1bb5668e2489b7 SHA512 d56b2809527d4f3c1d88881b8f7a7cd49321df8abe4fde011dfe7323e7552641b36a607f3b1b37c26703adae01d0176fc3d71c6c207598aaae5ebdf10237742e |
| 25 |
DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1 |
| 26 |
|
| 27 |
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 |
| 28 |
new file mode 100644 |
| 29 |
index 000000000000..0e91bedaef6e |
| 30 |
--- /dev/null |
| 31 |
+++ b/net-libs/libssh/files/libssh-0.10.1-disable-broken-test.patch |
| 32 |
@@ -0,0 +1,28 @@ |
| 33 |
+https://sources.debian.org/patches/libssh/0.9.6-2/2003-disable-expand_tilde_unix-test.patch/ |
| 34 |
+ |
| 35 |
+Description: Disable torture_path_expand_tilde_unix, its not working well on buildd |
| 36 |
+ On buildd, the HOME is set to a non-existing directory, this makes |
| 37 |
+ torture_path_expand_tilde_unix fail |
| 38 |
+Author: Laurent Bigonville <bigon@××××××.org> |
| 39 |
+Forwarded: not-needed |
| 40 |
+ |
| 41 |
+--- a/tests/unittests/torture_misc.c |
| 42 |
++++ b/tests/unittests/torture_misc.c |
| 43 |
+@@ -662,11 +662,11 @@ int torture_run_tests(void) { |
| 44 |
+ cmocka_unit_test(torture_basename), |
| 45 |
+ cmocka_unit_test(torture_dirname), |
| 46 |
+ cmocka_unit_test(torture_ntohll), |
| 47 |
+-#ifdef _WIN32 |
| 48 |
+- cmocka_unit_test(torture_path_expand_tilde_win), |
| 49 |
+-#else |
| 50 |
+- cmocka_unit_test(torture_path_expand_tilde_unix), |
| 51 |
+-#endif |
| 52 |
++//#ifdef _WIN32 |
| 53 |
++// cmocka_unit_test(torture_path_expand_tilde_win), |
| 54 |
++//#else |
| 55 |
++// cmocka_unit_test(torture_path_expand_tilde_unix), |
| 56 |
++//#endif |
| 57 |
+ cmocka_unit_test_setup_teardown(torture_path_expand_escape, setup, teardown), |
| 58 |
+ cmocka_unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown), |
| 59 |
+ cmocka_unit_test_setup_teardown(torture_path_expand_percent, setup, teardown), |
| 60 |
+ |
| 61 |
|
| 62 |
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-0.10.1.ebuild |
| 63 |
similarity index 85% |
| 64 |
copy from net-libs/libssh/libssh-9999.ebuild |
| 65 |
copy to net-libs/libssh/libssh-0.10.1.ebuild |
| 66 |
index 9b897cf8885e..25b41a81f804 100644 |
| 67 |
--- a/net-libs/libssh/libssh-9999.ebuild |
| 68 |
+++ b/net-libs/libssh/libssh-0.10.1.ebuild |
| 69 |
@@ -45,7 +45,9 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )" |
| 70 |
|
| 71 |
DOCS=( AUTHORS CHANGELOG README ) |
| 72 |
|
| 73 |
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) |
| 74 |
+PATCHES=( |
| 75 |
+ "${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch |
| 76 |
+) |
| 77 |
|
| 78 |
src_prepare() { |
| 79 |
cmake_src_prepare |
| 80 |
@@ -53,22 +55,24 @@ src_prepare() { |
| 81 |
# just install the examples, do not compile them |
| 82 |
cmake_comment_add_subdirectory examples |
| 83 |
|
| 84 |
- # keyfile torture test is currently broken |
| 85 |
- sed -e "/torture_keyfiles/d" \ |
| 86 |
- -i tests/unittests/CMakeLists.txt || die |
| 87 |
+ sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ |
| 88 |
+ -i ConfigureChecks.cmake || die |
| 89 |
|
| 90 |
- # disable tests that take too long (bug #677006) |
| 91 |
- if use sparc; then |
| 92 |
- sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \ |
| 93 |
+ if use test; then |
| 94 |
+ # keyfile torture test is currently broken |
| 95 |
+ sed -e "/torture_keyfiles/d" \ |
| 96 |
-i tests/unittests/CMakeLists.txt || die |
| 97 |
- fi |
| 98 |
|
| 99 |
- sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ |
| 100 |
- -i ConfigureChecks.cmake || die |
| 101 |
+ # disable tests that take too long (bug #677006) |
| 102 |
+ if use sparc; then |
| 103 |
+ sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \ |
| 104 |
+ -i tests/unittests/CMakeLists.txt || die |
| 105 |
+ fi |
| 106 |
|
| 107 |
- if use test && use elibc_musl; then |
| 108 |
- sed -e "/SOLARIS/d" \ |
| 109 |
- -i tests/CMakeLists.txt || die |
| 110 |
+ if use elibc_musl; then |
| 111 |
+ sed -e "/SOLARIS/d" \ |
| 112 |
+ -i tests/CMakeLists.txt || die |
| 113 |
+ fi |
| 114 |
fi |
| 115 |
} |
| 116 |
|
| 117 |
@@ -86,6 +90,7 @@ multilib_src_configure() { |
| 118 |
-DWITH_SERVER=$(usex server) |
| 119 |
-DWITH_SFTP=$(usex sftp) |
| 120 |
-DBUILD_STATIC_LIB=$(usex static-libs) |
| 121 |
+ # TODO: try enabling {CLIENT,SERVER}_TESTING |
| 122 |
-DUNIT_TESTING=$(usex test) |
| 123 |
-DWITH_ZLIB=$(usex zlib) |
| 124 |
) |
| 125 |
|
| 126 |
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild |
| 127 |
index 9b897cf8885e..25b41a81f804 100644 |
| 128 |
--- a/net-libs/libssh/libssh-9999.ebuild |
| 129 |
+++ b/net-libs/libssh/libssh-9999.ebuild |
| 130 |
@@ -45,7 +45,9 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )" |
| 131 |
|
| 132 |
DOCS=( AUTHORS CHANGELOG README ) |
| 133 |
|
| 134 |
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) |
| 135 |
+PATCHES=( |
| 136 |
+ "${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch |
| 137 |
+) |
| 138 |
|
| 139 |
src_prepare() { |
| 140 |
cmake_src_prepare |
| 141 |
@@ -53,22 +55,24 @@ src_prepare() { |
| 142 |
# just install the examples, do not compile them |
| 143 |
cmake_comment_add_subdirectory examples |
| 144 |
|
| 145 |
- # keyfile torture test is currently broken |
| 146 |
- sed -e "/torture_keyfiles/d" \ |
| 147 |
- -i tests/unittests/CMakeLists.txt || die |
| 148 |
+ sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ |
| 149 |
+ -i ConfigureChecks.cmake || die |
| 150 |
|
| 151 |
- # disable tests that take too long (bug #677006) |
| 152 |
- if use sparc; then |
| 153 |
- sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \ |
| 154 |
+ if use test; then |
| 155 |
+ # keyfile torture test is currently broken |
| 156 |
+ sed -e "/torture_keyfiles/d" \ |
| 157 |
-i tests/unittests/CMakeLists.txt || die |
| 158 |
- fi |
| 159 |
|
| 160 |
- sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ |
| 161 |
- -i ConfigureChecks.cmake || die |
| 162 |
+ # disable tests that take too long (bug #677006) |
| 163 |
+ if use sparc; then |
| 164 |
+ sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \ |
| 165 |
+ -i tests/unittests/CMakeLists.txt || die |
| 166 |
+ fi |
| 167 |
|
| 168 |
- if use test && use elibc_musl; then |
| 169 |
- sed -e "/SOLARIS/d" \ |
| 170 |
- -i tests/CMakeLists.txt || die |
| 171 |
+ if use elibc_musl; then |
| 172 |
+ sed -e "/SOLARIS/d" \ |
| 173 |
+ -i tests/CMakeLists.txt || die |
| 174 |
+ fi |
| 175 |
fi |
| 176 |
} |
| 177 |
|
| 178 |
@@ -86,6 +90,7 @@ multilib_src_configure() { |
| 179 |
-DWITH_SERVER=$(usex server) |
| 180 |
-DWITH_SFTP=$(usex sftp) |
| 181 |
-DBUILD_STATIC_LIB=$(usex static-libs) |
| 182 |
+ # TODO: try enabling {CLIENT,SERVER}_TESTING |
| 183 |
-DUNIT_TESTING=$(usex test) |
| 184 |
-DWITH_ZLIB=$(usex zlib) |
| 185 |
) |
Archives