| 1 |
commit: 44207f33399f9bb406432c3d3689a4362bfb1b23 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 3 03:48:35 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 3 03:48:35 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44207f33 |
| 7 |
|
| 8 |
net-libs/libssh: add 0.10.2 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
net-libs/libssh/Manifest | 1 + |
| 13 |
.../{libssh-9999.ebuild => libssh-0.10.2.ebuild} | 28 ++++++++++++++-------- |
| 14 |
net-libs/libssh/libssh-9999.ebuild | 28 ++++++++++++++-------- |
| 15 |
3 files changed, 37 insertions(+), 20 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest |
| 18 |
index 4a35ffc7b747..e75dd2adba4e 100644 |
| 19 |
--- a/net-libs/libssh/Manifest |
| 20 |
+++ b/net-libs/libssh/Manifest |
| 21 |
@@ -1,2 +1,3 @@ |
| 22 |
DIST libssh-0.10.1.tar.xz 553808 BLAKE2B 1e0a648153122619e473481484af70b9c388e75a6586a7b5ea605fede4a592f2f1ae2978c19762ac396d3dff2a3dd03451ee293c9fbd4f861a1bb5668e2489b7 SHA512 d56b2809527d4f3c1d88881b8f7a7cd49321df8abe4fde011dfe7323e7552641b36a607f3b1b37c26703adae01d0176fc3d71c6c207598aaae5ebdf10237742e |
| 23 |
+DIST libssh-0.10.2.tar.xz 554240 BLAKE2B 5732ed9709735ced62c6a1c0fc32f4c35d26bf26fd8a086ce145f7f6c679468c146a1c1a8f85035dc73971f60bd59b0a784e5fe0afc2575de947b386a4cef804 SHA512 8855ebb9ea97e6ad03dec800e0885381c5397a04f5578f0b79b82e49458766f7b6c394713c4fbdc8ff6bb8d3b4c3b8b4f7b797f39ddbc95caf205ee6d89d3278 |
| 24 |
DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1 |
| 25 |
|
| 26 |
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-0.10.2.ebuild |
| 27 |
similarity index 84% |
| 28 |
copy from net-libs/libssh/libssh-9999.ebuild |
| 29 |
copy to net-libs/libssh/libssh-0.10.2.ebuild |
| 30 |
index 25b41a81f804..c8592e03bb83 100644 |
| 31 |
--- a/net-libs/libssh/libssh-9999.ebuild |
| 32 |
+++ b/net-libs/libssh/libssh-0.10.2.ebuild |
| 33 |
@@ -45,10 +45,6 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )" |
| 34 |
|
| 35 |
DOCS=( AUTHORS CHANGELOG README ) |
| 36 |
|
| 37 |
-PATCHES=( |
| 38 |
- "${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch |
| 39 |
-) |
| 40 |
- |
| 41 |
src_prepare() { |
| 42 |
cmake_src_prepare |
| 43 |
|
| 44 |
@@ -59,14 +55,26 @@ src_prepare() { |
| 45 |
-i ConfigureChecks.cmake || die |
| 46 |
|
| 47 |
if use test; then |
| 48 |
- # keyfile torture test is currently broken |
| 49 |
- sed -e "/torture_keyfiles/d" \ |
| 50 |
- -i tests/unittests/CMakeLists.txt || die |
| 51 |
+ local skip_tests=( |
| 52 |
+ # keyfile torture test is currently broken |
| 53 |
+ -e "/torture_keyfiles/d" |
| 54 |
+ |
| 55 |
+ # Tries to expand ~ which fails w/ portage homedir |
| 56 |
+ # (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir) |
| 57 |
+ -e "/torture_misc/d" |
| 58 |
+ -e "/torture_config/d" |
| 59 |
+ ) |
| 60 |
|
| 61 |
- # disable tests that take too long (bug #677006) |
| 62 |
+ # Disable tests that take too long (bug #677006) |
| 63 |
if use sparc; then |
| 64 |
- sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \ |
| 65 |
- -i tests/unittests/CMakeLists.txt || die |
| 66 |
+ skip_tests+=( |
| 67 |
+ -e "/torture_threads_pki_rsa/d" |
| 68 |
+ -e "/torture_pki_dsa/d" |
| 69 |
+ ) |
| 70 |
+ fi |
| 71 |
+ |
| 72 |
+ if (( ${#skip_tests[@]} )) ; then |
| 73 |
+ sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die |
| 74 |
fi |
| 75 |
|
| 76 |
if use elibc_musl; then |
| 77 |
|
| 78 |
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild |
| 79 |
index 25b41a81f804..c8592e03bb83 100644 |
| 80 |
--- a/net-libs/libssh/libssh-9999.ebuild |
| 81 |
+++ b/net-libs/libssh/libssh-9999.ebuild |
| 82 |
@@ -45,10 +45,6 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )" |
| 83 |
|
| 84 |
DOCS=( AUTHORS CHANGELOG README ) |
| 85 |
|
| 86 |
-PATCHES=( |
| 87 |
- "${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch |
| 88 |
-) |
| 89 |
- |
| 90 |
src_prepare() { |
| 91 |
cmake_src_prepare |
| 92 |
|
| 93 |
@@ -59,14 +55,26 @@ src_prepare() { |
| 94 |
-i ConfigureChecks.cmake || die |
| 95 |
|
| 96 |
if use test; then |
| 97 |
- # keyfile torture test is currently broken |
| 98 |
- sed -e "/torture_keyfiles/d" \ |
| 99 |
- -i tests/unittests/CMakeLists.txt || die |
| 100 |
+ local skip_tests=( |
| 101 |
+ # keyfile torture test is currently broken |
| 102 |
+ -e "/torture_keyfiles/d" |
| 103 |
+ |
| 104 |
+ # Tries to expand ~ which fails w/ portage homedir |
| 105 |
+ # (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir) |
| 106 |
+ -e "/torture_misc/d" |
| 107 |
+ -e "/torture_config/d" |
| 108 |
+ ) |
| 109 |
|
| 110 |
- # disable tests that take too long (bug #677006) |
| 111 |
+ # Disable tests that take too long (bug #677006) |
| 112 |
if use sparc; then |
| 113 |
- sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \ |
| 114 |
- -i tests/unittests/CMakeLists.txt || die |
| 115 |
+ skip_tests+=( |
| 116 |
+ -e "/torture_threads_pki_rsa/d" |
| 117 |
+ -e "/torture_pki_dsa/d" |
| 118 |
+ ) |
| 119 |
+ fi |
| 120 |
+ |
| 121 |
+ if (( ${#skip_tests[@]} )) ; then |
| 122 |
+ sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die |
| 123 |
fi |
| 124 |
|
| 125 |
if use elibc_musl; then |
Archives