summaryrefslogtreecommitdiff
path: root/net-libs/libssh
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-04-28 09:54:45 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-04-28 09:54:45 +0100
commitb7ebc951da8800f711142f69d9d958bde67a112d (patch)
treee318514216845acb8f2e49fff7a5cba4027e9d91 /net-libs/libssh
parentdc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
gentoo resync : 28.04.2019
Diffstat (limited to 'net-libs/libssh')
-rw-r--r--net-libs/libssh/Manifest6
-rw-r--r--net-libs/libssh/libssh-0.8.6.ebuild2
-rw-r--r--net-libs/libssh/libssh-0.8.7.ebuild8
-rw-r--r--net-libs/libssh/libssh-9999.ebuild10
4 files changed, 21 insertions, 5 deletions
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index ddaf4dc8888c..9ae2139aed63 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -4,7 +4,7 @@ DIST libssh-0.8.5.tar.xz 427372 BLAKE2B d1cd94a50f09b1562f7267ff435b2d180b84d413
DIST libssh-0.8.6.tar.xz 433680 BLAKE2B f222e67676a90a2d2431463dc71859ad336a23a519b54e08fe368efe6322d0b9c8e393ec92d5246cb4721cd57bb955856fa6a2d92ffe71b6c35e2c94cde28762 SHA512 e91d1f4c1343aa232ade0fe4b5e9a92ca65e3716f4ebe2ec25b04def4fae5a3774349f05a6919836551f66fb0288ed6a3e19e0ab786c081616218be973356522
DIST libssh-0.8.7.tar.xz 430104 BLAKE2B 8ad9455d81120726434a418abb74bfee53279040541cda50117909d43088ea992b9dbc7164b079dbe970b4348b967ed0d3f6352df98f60d1e6d9f14a086b5a40 SHA512 13c3dccad81d521edf29c8a5e2c5f7fdd90507a0eda652b2b040a0a17bab88860873e089a46e181907ea3f449ca1847b1c84453b1960f456e391eefe5be983c5
EBUILD libssh-0.8.5.ebuild 2959 BLAKE2B c9acac4ed8b93e0742a99e1b8514cbb505a58f78f142ddcca4bac35c03d8299343b1550556b309b17e9c4dd55f73c1d535f6670a41b42b40125b74fef93e042c SHA512 b314908c959cdd0443ef505f2000dc5b47f41bc4cbe0c1ad4906a03af486cae314c1482769614deba1d5b77e0e5a30b182095459180febbf56f2e5f0be390424
-EBUILD libssh-0.8.6.ebuild 2942 BLAKE2B fba9d98b846f549a2b52f130154e7421d7a4ee2b1a342cbbb2ed75e84c484b566bfe0b9ec6a73045c34ccf92c4ead34d0c93939613c9f699074d3df73a5f7deb SHA512 c85cd243150daaeddaf15f29e97898a1301cbc22edc0ef5708ada5d30690d865c767a2ada377e6217e79a0e2b9b4e7faa281fb096c1d384fb4a8cd1b7ad22707
-EBUILD libssh-0.8.7.ebuild 2898 BLAKE2B fbbba7c5130f3f6f6fec9d7a215a67f569b2ad1d667ba5ed923087141d963aa15bca24746d2424481e3927bd4c43084ffa4334426add7627f3845d57ebfc17f4 SHA512 837a9c9e4f1ff69972496cfa83a2ad50246822e3964c72948542a51bafc24b6e4ffd8360b5e0ffe710d5cd7aa7b6fd7ea03629aee25bc92af7da1322330c404c
-EBUILD libssh-9999.ebuild 2897 BLAKE2B 45f5872ca4ccd8b8e51d45ee218dfe82367cee5018dfd34e59e8f453ec1d480244632431e3d911efb55ec1c8d2707114292804bcb18e909a2132f2a3ac72eb7f SHA512 4e974acf3d5a821f11822d4e36a8ed8b965ebe1b047992a7b1b344764043d8f81f925269766e98bc61a61615b6d61f24bed7cd5e9a19795bffe75f810f284dd6
+EBUILD libssh-0.8.6.ebuild 2939 BLAKE2B 16b54d58cd6aa7923efca0b1132fc7f5bed7e12545eaaa2201f663728d3f7fb5c7b236a6b51489b14f0d5b14893206675e7cd370e2d5e54a448075552e3fc3a8 SHA512 6900dd493a183bde532051377e6bc4f35ab24d36c36198bc0ba23ba31883367cd7c2dff0fc5597575fd416d399f1b281f0c777bb26911b25aa447df11bd66c32
+EBUILD libssh-0.8.7.ebuild 3091 BLAKE2B ebd0ec869401d1dccab35911777e785afa7700969bd2ac0ca4f9e8e53685b36f0f4af952e1544a77fadd3708f5a5e7f4811a68ca35a87168bf7b0920dfe938c9 SHA512 930688de59ddbef12c114005e2e7e5cc39b3b1066463433a68486030d64ecd43382d2483fe0eb93f7378849a111bf37d5a05d8c4e4f4b2b78e7417a206a2994a
+EBUILD libssh-9999.ebuild 3090 BLAKE2B ec389c91318025f582a7639e6abf61082d8ffeb81c91e861100ccd13dc13ff940710379079165f826524ecd761fecd29cd0e09c5a789e473a262a95eba01eace SHA512 2c8a24d0037737ee7125e505ff8e4c0a0a256e42ebd5f6ed0544ff8c171e1622bbdd2ebf07547a07e337fae3a225fbc1037979287f5edb399dba0a58fd88782f
MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.8.6.ebuild b/net-libs/libssh/libssh-0.8.6.ebuild
index 6f55d3dc320e..51ecadb40e69 100644
--- a/net-libs/libssh/libssh-0.8.6.ebuild
+++ b/net-libs/libssh/libssh-0.8.6.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+ KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
fi
LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh/libssh-0.8.7.ebuild b/net-libs/libssh/libssh-0.8.7.ebuild
index 4a55b7bbf1e7..a2353f90c6bd 100644
--- a/net-libs/libssh/libssh-0.8.7.ebuild
+++ b/net-libs/libssh/libssh-0.8.7.ebuild
@@ -59,6 +59,14 @@ src_prepare() {
sed -i \
-e '/torture_keyfiles/d' \
tests/unittests/CMakeLists.txt || die
+
+ # disable tests that take too long (bug #677006)
+ if use sparc; then
+ sed -i \
+ -e '/torture_threads_pki_rsa/d' \
+ -e '/torture_pki_dsa/d' \
+ tests/unittests/CMakeLists.txt || die
+ fi
}
multilib_src_configure() {
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 5137fc6f8d22..d88693448ce5 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -57,6 +57,14 @@ src_prepare() {
sed -i \
-e '/torture_keyfiles/d' \
tests/unittests/CMakeLists.txt || die
+
+ # disable tests that take too long (bug #677006)
+ if use sparc; then
+ sed -i \
+ -e '/torture_threads_pki_rsa/d' \
+ -e '/torture_pki_dsa/d' \
+ tests/unittests/CMakeLists.txt || die
+ fi
}
multilib_src_configure() {