[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2024-01-03 Thread Andreas Sturmlechner
commit: e1565810cb6fde75c0271f52eaf08f28d1548b66
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan  3 22:28:41 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan  3 23:00:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1565810

net-libs/libssh: Cleanup vulnerable 0.10.5

Bug: https://bugs.gentoo.org/920291
Bug: https://bugs.gentoo.org/920724
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest |   1 -
 net-libs/libssh/libssh-0.10.5.ebuild | 135 ---
 2 files changed, 136 deletions(-)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 6b97980c35e1..0524c3caf805 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,2 +1 @@
-DIST libssh-0.10.5.tar.xz 557776 BLAKE2B 
de147f25fa9116743b5b2d08548c2b28b31d7b76b10e249b0a52fa19dfa09762d37ad5a5d1eaf7db89d8713144b8d3608aa2b48ce29ed324e4154493a9fcebfe
 SHA512 
2b758f9df2b5937865d4aee775ffeafafe3ae6739a89dfc470e38c7394e3c3cb5fcf8f842fdae04929890ee7e47bf8f50e3a38e82dfd26a009f3aae009d589e0
 DIST libssh-0.10.6.tar.xz 561036 BLAKE2B 
6ae1c611b685fa8ec5e5fb159f93493edf4d8ae8536300cd9a357daadc28ca2fbd8a64a22157744bc97e2e672b0b84b58e1167d7369fe88306b3581098af9f57
 SHA512 
40c62d63c44e882999b71552c237d73fc7364313bd00b15a211a34aeff1b73693da441d2c8d4e40108d00fb7480ec7c5b6d472f9c0784b2359a179632ab0d6c1

diff --git a/net-libs/libssh/libssh-0.10.5.ebuild 
b/net-libs/libssh/libssh-0.10.5.ebuild
deleted file mode 100644
index c8f8901c99d8..
--- a/net-libs/libssh/libssh-0.10.5.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/;
-
-if [[ ${PV} == ** ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
-else
-   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs 
test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   !gcrypt? (
-   !mbedtls? (
-   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-   )
-   )
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-   test? (
-   >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
-   elibc_musl? ( sys-libs/argp-standalone )
-   )
-"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-
-DOCS=( AUTHORS CHANGELOG README )
-
-src_prepare() {
-   cmake_src_prepare
-
-   # just install the examples, do not compile them
-   cmake_comment_add_subdirectory examples
-
-   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-   -i ConfigureChecks.cmake || die
-
-   if use test; then
-   local skip_tests=(
-   # keyfile torture test is currently broken
-   -e "/torture_keyfiles/d"
-
-   # Tries to expand ~ which fails w/ portage homedir
-   # (torture_path_expand_tilde_unix and 
torture_config_make_absolute_no_sshdir)
-   -e "/torture_misc/d"
-   -e "/torture_config/d"
-   )
-
-   # Disable tests that take too long (bug #677006)
-   if use sparc; then
-   skip_tests+=(
-   -e "/torture_threads_pki_rsa/d"
-   -e "/torture_pki_dsa/d"
-   )
-   fi
-
-   if (( ${#skip_tests[@]} )) ; then
-   sed -i "${skip_tests[@]}" 
tests/unittests/CMakeLists.txt || die
-   fi
-
-   if use elibc_musl; then
-   sed -e "/SOLARIS/d" \
-   -i tests/CMakeLists.txt || die
-   fi
-   fi
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   -DWITH_NACL=OFF
-   -DWITH_STACK_PROTECTOR=OFF
-   -DWITH_STACK_PROTECTOR_STRONG=OFF
-   -DWITH_DEBUG_CALLTRACE=$(usex debug)
-   -DWITH_DEBUG_CRYPTO=$(usex debug)
-   -DWITH_GCRYPT=$(usex gcrypt)
-   -DWITH_GSSAPI=$(usex gssapi)
-   

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2023-12-26 Thread Sam James
commit: 156dbd4101cc6af9139015424941e46bb1892abc
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 26 17:34:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 26 17:34:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=156dbd41

net-libs/libssh: Stabilize 0.10.6 ppc64, #920726

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.10.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.6.ebuild 
b/net-libs/libssh/libssh-0.10.6.ebuild
index fa41abf7d309..21f555ebd82e 100644
--- a/net-libs/libssh/libssh-0.10.6.ebuild
+++ b/net-libs/libssh/libssh-0.10.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2023-12-26 Thread Sam James
commit: 0af9e4993519deea80cbf349777661b2f26732c4
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 26 17:34:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 26 17:34:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af9e499

net-libs/libssh: Stabilize 0.10.6 arm64, #920726

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.10.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.6.ebuild 
b/net-libs/libssh/libssh-0.10.6.ebuild
index 4872d7623ddf..d5968a7c59b3 100644
--- a/net-libs/libssh/libssh-0.10.6.ebuild
+++ b/net-libs/libssh/libssh-0.10.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2023-12-26 Thread Sam James
commit: 5bdc67dadb612e0f8600b3e0a205a4826395fd78
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 26 17:34:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 26 17:34:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdc67da

net-libs/libssh: Stabilize 0.10.6 arm, #920726

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.10.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.6.ebuild 
b/net-libs/libssh/libssh-0.10.6.ebuild
index 21f555ebd82e..8ac02072dd64 100644
--- a/net-libs/libssh/libssh-0.10.6.ebuild
+++ b/net-libs/libssh/libssh-0.10.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2023-12-26 Thread Sam James
commit: 6e3ec01067d2301f0088d96b9c5b1a0f7e9c6e01
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 26 17:34:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 26 17:34:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e3ec010

net-libs/libssh: Stabilize 0.10.6 sparc, #920726

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.10.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.6.ebuild 
b/net-libs/libssh/libssh-0.10.6.ebuild
index d5968a7c59b3..fa41abf7d309 100644
--- a/net-libs/libssh/libssh-0.10.6.ebuild
+++ b/net-libs/libssh/libssh-0.10.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2023-12-18 Thread Sam James
commit: 18f1b347bcee162d7fc7a405aa355ad1ba965b51
Author: Christopher Fore  posteo  net>
AuthorDate: Tue Dec 19 00:17:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 19 05:31:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18f1b347

net-libs/libssh: add 0.10.6

This addresses the Terrapin vulnerability

Bug: https://bugs.gentoo.org/920291
Signed-off-by: Christopher Fore  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/34359
Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/Manifest |   1 +
 net-libs/libssh/libssh-0.10.6.ebuild | 135 +++
 2 files changed, 136 insertions(+)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index d42dff9ecbb9..6b97980c35e1 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1 +1,2 @@
 DIST libssh-0.10.5.tar.xz 557776 BLAKE2B 
de147f25fa9116743b5b2d08548c2b28b31d7b76b10e249b0a52fa19dfa09762d37ad5a5d1eaf7db89d8713144b8d3608aa2b48ce29ed324e4154493a9fcebfe
 SHA512 
2b758f9df2b5937865d4aee775ffeafafe3ae6739a89dfc470e38c7394e3c3cb5fcf8f842fdae04929890ee7e47bf8f50e3a38e82dfd26a009f3aae009d589e0
+DIST libssh-0.10.6.tar.xz 561036 BLAKE2B 
6ae1c611b685fa8ec5e5fb159f93493edf4d8ae8536300cd9a357daadc28ca2fbd8a64a22157744bc97e2e672b0b84b58e1167d7369fe88306b3581098af9f57
 SHA512 
40c62d63c44e882999b71552c237d73fc7364313bd00b15a211a34aeff1b73693da441d2c8d4e40108d00fb7480ec7c5b6d472f9c0784b2359a179632ab0d6c1

diff --git a/net-libs/libssh/libssh-0.10.6.ebuild 
b/net-libs/libssh/libssh-0.10.6.ebuild
new file mode 100644
index ..4872d7623ddf
--- /dev/null
+++ b/net-libs/libssh/libssh-0.10.6.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/;
+
+if [[ ${PV} == ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
+else
+   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs 
test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !gcrypt? (
+   !mbedtls? (
+   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+   )
+   )
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+   test? (
+   >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
+   elibc_musl? ( sys-libs/argp-standalone )
+   )
+"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+DOCS=( AUTHORS CHANGELOG README )
+
+src_prepare() {
+   cmake_src_prepare
+
+   # just install the examples, do not compile them
+   cmake_comment_add_subdirectory examples
+
+   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+   -i ConfigureChecks.cmake || die
+
+   if use test; then
+   local skip_tests=(
+   # keyfile torture test is currently broken
+   -e "/torture_keyfiles/d"
+
+   # Tries to expand ~ which fails w/ portage homedir
+   # (torture_path_expand_tilde_unix and 
torture_config_make_absolute_no_sshdir)
+   -e "/torture_misc/d"
+   -e "/torture_config/d"
+   )
+
+   # Disable tests that take too long (bug #677006)
+   if use sparc; then
+   skip_tests+=(
+   -e "/torture_threads_pki_rsa/d"
+   -e "/torture_pki_dsa/d"
+   )
+   fi
+
+   if (( ${#skip_tests[@]} )) ; then
+   sed -i "${skip_tests[@]}" 
tests/unittests/CMakeLists.txt || die
+   fi
+
+   if use elibc_musl; then
+   sed -e "/SOLARIS/d" \
+   -i tests/CMakeLists.txt || die
+   fi
+   fi
+}
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DWITH_NACL=OFF
+   -DWITH_STACK_PROTECTOR=OFF
+   -DWITH_STACK_PROTECTOR_STRONG=OFF
+   -DWITH_DEBUG_CALLTRACE=$(usex debug)
+   -DWITH_DEBUG_CRYPTO=$(usex debug)
+   -DWITH_GCRYPT=$(usex gcrypt)
+

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2023-05-12 Thread Sam James
commit: d206ad0d4ddf422920be6cccd199b5f639abb17a
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 21:53:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 21:53:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d206ad0d

net-libs/libssh: Stabilize 0.10.5 x86, #906154

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.10.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.5.ebuild 
b/net-libs/libssh/libssh-0.10.5.ebuild
index be74c57c146b..40178aac1889 100644
--- a/net-libs/libssh/libssh-0.10.5.ebuild
+++ b/net-libs/libssh/libssh-0.10.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2023-05-12 Thread Sam James
commit: 8e1780954942bdb333977a800c6fbf3f561cbf01
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 21:53:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 21:53:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e178095

net-libs/libssh: Stabilize 0.10.5 sparc, #906154

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.10.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.5.ebuild 
b/net-libs/libssh/libssh-0.10.5.ebuild
index 1c5a682428cb..5e17aad60325 100644
--- a/net-libs/libssh/libssh-0.10.5.ebuild
+++ b/net-libs/libssh/libssh-0.10.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2023-05-12 Thread Sam James
commit: 5ae0c72c817f74a675a9bb5efc7e09093067c478
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 21:53:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 21:53:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae0c72c

net-libs/libssh: Stabilize 0.10.5 ppc, #906154

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.10.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.5.ebuild 
b/net-libs/libssh/libssh-0.10.5.ebuild
index 5e17aad60325..be74c57c146b 100644
--- a/net-libs/libssh/libssh-0.10.5.ebuild
+++ b/net-libs/libssh/libssh-0.10.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2023-05-12 Thread Sam James
commit: b2f08b8c9d52bec86635da6eff3cc7569345b069
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 21:53:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 21:53:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f08b8c

net-libs/libssh: Stabilize 0.10.5 hppa, #906154

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.10.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.5.ebuild 
b/net-libs/libssh/libssh-0.10.5.ebuild
index 40178aac1889..c8f8901c99d8 100644
--- a/net-libs/libssh/libssh-0.10.5.ebuild
+++ b/net-libs/libssh/libssh-0.10.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2023-05-12 Thread Sam James
commit: 1d37f725937623163c0f63c8df6d65b8714b40e1
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 20:28:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 20:28:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d37f725

net-libs/libssh: Stabilize 0.10.5 amd64, #906154

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.10.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.5.ebuild 
b/net-libs/libssh/libssh-0.10.5.ebuild
index 14e05439f7e2..5b475378f949 100644
--- a/net-libs/libssh/libssh-0.10.5.ebuild
+++ b/net-libs/libssh/libssh-0.10.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2023-05-12 Thread Sam James
commit: bd94c925a80ab1507f0fdea142fa8275840475c6
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 20:28:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 20:28:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd94c925

net-libs/libssh: Stabilize 0.10.5 arm64, #906154

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.10.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.5.ebuild 
b/net-libs/libssh/libssh-0.10.5.ebuild
index a3d4f6194454..14e05439f7e2 100644
--- a/net-libs/libssh/libssh-0.10.5.ebuild
+++ b/net-libs/libssh/libssh-0.10.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2023-05-12 Thread Sam James
commit: b71c2e9228fd37853cdbe6501172cf315aea1ef5
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 20:28:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 20:28:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71c2e92

net-libs/libssh: Stabilize 0.10.5 arm, #906154

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.10.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.5.ebuild 
b/net-libs/libssh/libssh-0.10.5.ebuild
index 4872d7623ddf..a3d4f6194454 100644
--- a/net-libs/libssh/libssh-0.10.5.ebuild
+++ b/net-libs/libssh/libssh-0.10.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2023-05-12 Thread Sam James
commit: 20cf00a994003f5430416fd9681a9ab4ae1afd72
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 20:29:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 20:29:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20cf00a9

net-libs/libssh: Stabilize 0.10.5 ppc64, #906154

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.10.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.5.ebuild 
b/net-libs/libssh/libssh-0.10.5.ebuild
index 5b475378f949..1c5a682428cb 100644
--- a/net-libs/libssh/libssh-0.10.5.ebuild
+++ b/net-libs/libssh/libssh-0.10.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-10-06 Thread Andreas Sturmlechner
commit: 67ea346d4b4b3f506dfb7bdec920267965a679e7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct  6 09:13:38 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct  6 09:14:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67ea346d

net-libs/libssh: add cpe upstream metadata

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml
index 150ff493cf1a..ef1bf6cb8f62 100644
--- a/net-libs/libssh/metadata.xml
+++ b/net-libs/libssh/metadata.xml
@@ -15,5 +15,6 @@


libssh/libssh-mirror
+   cpe:/a:libssh:libssh

 



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/, net-libs/libssh/files/

2022-09-30 Thread Andreas Sturmlechner
commit: 06f2d87af6e41e33a345f1bf49173f682ff8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Sep 30 11:51:03 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Sep 30 13:33:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f2d87a

net-libs/libssh: drop 0.9.6

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest   |   1 -
 net-libs/libssh/files/libssh-0.8.0-tests.patch |  11 ---
 net-libs/libssh/libssh-0.9.6.ebuild| 124 -
 3 files changed, 136 deletions(-)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 5ba4cc28088f..a4166a8ad16b 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,2 +1 @@
 DIST libssh-0.10.4.tar.xz 554920 BLAKE2B 
9349a688bdbd7c0d3bc93d6d0d6d55122ae9f918b922baeae8a7c6d4ae3ec340e6607afdd8a47055176f31531aefa94b6cc2bda25d59625fe1a7f83823dd75f9
 SHA512 
01ee52d480201d9886c15e81137c185334b404d1c8e8b743ddf58e95fe8619c8c013616a49807bdfde72fa177cd35f3c22b66cbf5d720b5abfacdf7601ed
-DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B 
e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d
 SHA512 
4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1

diff --git a/net-libs/libssh/files/libssh-0.8.0-tests.patch 
b/net-libs/libssh/files/libssh-0.8.0-tests.patch
deleted file mode 100644
index 7ce84f89983b..
--- a/net-libs/libssh/files/libssh-0.8.0-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 libssh-0.8.0/tests/unittests/torture_misc.c
-+++ libssh-0.8.0/tests/unittests/torture_misc.c
-@@ -361,7 +361,7 @@
- #ifdef _WIN32
- cmocka_unit_test(torture_path_expand_tilde_win),
- #else
--cmocka_unit_test(torture_path_expand_tilde_unix),
-+//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),

diff --git a/net-libs/libssh/libssh-0.9.6.ebuild 
b/net-libs/libssh/libssh-0.9.6.ebuild
deleted file mode 100644
index e90e4d2cfed3..
--- a/net-libs/libssh/libssh-0.9.6.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/;
-
-if [[ "${PV}" == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
-else
-   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs 
test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-
-BDEPEND="
-   doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
-   !gcrypt? (
-   !mbedtls? (
-   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-   )
-   )
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-   test? (
-   >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
-   elibc_musl? ( sys-libs/argp-standalone ) )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-RESTRICT+=" !test? ( test )"
-
-src_prepare() {
-   cmake_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
-
-   # 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
-
-   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-   -i ConfigureChecks.cmake || die
-
-   if use test && use elibc_musl; then
-   sed -e "/SOLARIS/d" \
-   -i tests/CMakeLists.txt || die
-   fi
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   -DWITH_NACL=OFF
-   -DWITH_STACK_PROTECTOR=OFF
-   

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-09-30 Thread Agostino Sarubbo
commit: a5636099f0f5a9d4c6bd37085d714f4f84209a5d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Sep 30 11:49:29 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Sep 30 11:49:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5636099

net-libs/libssh: Stabilize 0.10.4 ppc64, #873439

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.4.ebuild 
b/net-libs/libssh/libssh-0.10.4.ebuild
index d73da0cf1ee1..a9eb0f3c9971 100644
--- a/net-libs/libssh/libssh-0.10.4.ebuild
+++ b/net-libs/libssh/libssh-0.10.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-09-30 Thread Agostino Sarubbo
commit: aec750c3aea0d40b03c69816ded9f78610305687
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Sep 30 11:48:37 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Sep 30 11:48:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec750c3

net-libs/libssh: Stabilize 0.10.4 ppc, #873439

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.4.ebuild 
b/net-libs/libssh/libssh-0.10.4.ebuild
index a720b2847321..d73da0cf1ee1 100644
--- a/net-libs/libssh/libssh-0.10.4.ebuild
+++ b/net-libs/libssh/libssh-0.10.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-09-30 Thread Agostino Sarubbo
commit: b07c5a6e1eab95b1ff8aceb661c7ba6556f8b999
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Sep 30 11:47:40 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Sep 30 11:47:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b07c5a6e

net-libs/libssh: Stabilize 0.10.4 arm64, #873439

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.4.ebuild 
b/net-libs/libssh/libssh-0.10.4.ebuild
index 33a83a595668..a720b2847321 100644
--- a/net-libs/libssh/libssh-0.10.4.ebuild
+++ b/net-libs/libssh/libssh-0.10.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-09-29 Thread Sam James
commit: 36506b6fa2b704b670be69b22410dacaafb083c3
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 29 19:59:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 29 19:59:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36506b6f

net-libs/libssh: Stabilize 0.10.4 x86, #873439

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.4.ebuild 
b/net-libs/libssh/libssh-0.10.4.ebuild
index 772d931c2d7f..74e9cf9c2445 100644
--- a/net-libs/libssh/libssh-0.10.4.ebuild
+++ b/net-libs/libssh/libssh-0.10.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-09-29 Thread Sam James
commit: de4b6c211482d7fa1603bd2e9f11be81eb2b8f17
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 29 19:59:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 29 19:59:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de4b6c21

net-libs/libssh: Stabilize 0.10.4 amd64, #873439

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.4.ebuild 
b/net-libs/libssh/libssh-0.10.4.ebuild
index 74e9cf9c2445..33a83a595668 100644
--- a/net-libs/libssh/libssh-0.10.4.ebuild
+++ b/net-libs/libssh/libssh-0.10.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-09-29 Thread Arthur Zamarin
commit: 11d54ef9bb15c37fb04d14479e6a40d296c75208
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Sep 29 16:33:08 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Sep 29 16:33:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11d54ef9

net-libs/libssh: Stabilize 0.10.4 arm, #873439

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-libs/libssh/libssh-0.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.4.ebuild 
b/net-libs/libssh/libssh-0.10.4.ebuild
index c8592e03bb83..c277d70cae42 100644
--- a/net-libs/libssh/libssh-0.10.4.ebuild
+++ b/net-libs/libssh/libssh-0.10.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-09-29 Thread Arthur Zamarin
commit: c34f4a48c59e2da6cba047d4bb787d28338b1978
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Sep 29 16:33:10 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Sep 29 16:33:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c34f4a48

net-libs/libssh: Stabilize 0.10.4 sparc, #873439

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-libs/libssh/libssh-0.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.4.ebuild 
b/net-libs/libssh/libssh-0.10.4.ebuild
index c277d70cae42..ee829ae1bd2a 100644
--- a/net-libs/libssh/libssh-0.10.4.ebuild
+++ b/net-libs/libssh/libssh-0.10.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-09-29 Thread Arthur Zamarin
commit: 80880ddb76cc51b528517dd5c2232d7ca760db75
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Sep 29 16:33:11 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Sep 29 16:33:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80880ddb

net-libs/libssh: Stabilize 0.10.4 hppa, #873439

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-libs/libssh/libssh-0.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.10.4.ebuild 
b/net-libs/libssh/libssh-0.10.4.ebuild
index ee829ae1bd2a..772d931c2d7f 100644
--- a/net-libs/libssh/libssh-0.10.4.ebuild
+++ b/net-libs/libssh/libssh-0.10.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-09-14 Thread Andreas Sturmlechner
commit: 1e81a73223484601852a1a10d34033172a61ee68
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 14 07:35:00 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 14 07:35:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e81a732

net-libs/libssh: drop 0.10.2, 0.10.3

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest |   2 -
 net-libs/libssh/libssh-0.10.2.ebuild | 135 ---
 net-libs/libssh/libssh-0.10.3.ebuild | 135 ---
 3 files changed, 272 deletions(-)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index cdfc84157310..5ba4cc28088f 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,4 +1,2 @@
-DIST libssh-0.10.2.tar.xz 554240 BLAKE2B 
5732ed9709735ced62c6a1c0fc32f4c35d26bf26fd8a086ce145f7f6c679468c146a1c1a8f85035dc73971f60bd59b0a784e5fe0afc2575de947b386a4cef804
 SHA512 
8855ebb9ea97e6ad03dec800e0885381c5397a04f5578f0b79b82e49458766f7b6c394713c4fbdc8ff6bb8d3b4c3b8b4f7b797f39ddbc95caf205ee6d89d3278
-DIST libssh-0.10.3.tar.xz 554928 BLAKE2B 
5bb1feecf77ec038b89cec1058d0c401d2f3ecca6975ee098dc9eb4d3b981b807d54291f915f8f7e236dc06ac864289f99d92ea1d6983afda1044a690c8207e6
 SHA512 
dfc992a4d16bf3de6ed01b1d0d73e061f61acf6785b2c81a722154219a286fc2b8952dec0e842bcbc14ce2734078161a820d44091f01851c8538f8f381655253
 DIST libssh-0.10.4.tar.xz 554920 BLAKE2B 
9349a688bdbd7c0d3bc93d6d0d6d55122ae9f918b922baeae8a7c6d4ae3ec340e6607afdd8a47055176f31531aefa94b6cc2bda25d59625fe1a7f83823dd75f9
 SHA512 
01ee52d480201d9886c15e81137c185334b404d1c8e8b743ddf58e95fe8619c8c013616a49807bdfde72fa177cd35f3c22b66cbf5d720b5abfacdf7601ed
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B 
e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d
 SHA512 
4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1

diff --git a/net-libs/libssh/libssh-0.10.2.ebuild 
b/net-libs/libssh/libssh-0.10.2.ebuild
deleted file mode 100644
index c8592e03bb83..
--- a/net-libs/libssh/libssh-0.10.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/;
-
-if [[ ${PV} == ** ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
-else
-   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs 
test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   !gcrypt? (
-   !mbedtls? (
-   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-   )
-   )
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-   test? (
-   >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
-   elibc_musl? ( sys-libs/argp-standalone )
-   )
-"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-
-DOCS=( AUTHORS CHANGELOG README )
-
-src_prepare() {
-   cmake_src_prepare
-
-   # just install the examples, do not compile them
-   cmake_comment_add_subdirectory examples
-
-   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-   -i ConfigureChecks.cmake || die
-
-   if use test; then
-   local skip_tests=(
-   # keyfile torture test is currently broken
-   -e "/torture_keyfiles/d"
-
-   # Tries to expand ~ which fails w/ portage homedir
-   # (torture_path_expand_tilde_unix and 
torture_config_make_absolute_no_sshdir)
-   -e "/torture_misc/d"
-   -e "/torture_config/d"
-   )
-
-   # Disable tests that take too long (bug #677006)
-   if use sparc; then
-   skip_tests+=(
-   -e "/torture_threads_pki_rsa/d"
-   -e "/torture_pki_dsa/d"
-   )
-   fi
-
-   if (( ${#skip_tests[@]} )) ; then
-   sed -i "${skip_tests[@]}" 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/files/

2022-09-14 Thread Andreas Sturmlechner
commit: 0ccf7873277a0f7f8debb5743c47d3f3499f5026
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Sep 14 06:38:09 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 14 07:35:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ccf7873

net-libs/libssh: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Portage 3.0.35 / pkgdev 0.2.1 / pkgcheck 0.10.14
Closes: https://github.com/gentoo/gentoo/pull/27247
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/libssh-0.10.1-disable-broken-test.patch  | 28 --
 1 file changed, 28 deletions(-)

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
deleted file mode 100644
index 0e91bedaef6e..
--- a/net-libs/libssh/files/libssh-0.10.1-disable-broken-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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),
-



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-09-07 Thread Sam James
commit: 6ef24325d8f18829452b53afacbffbdbd1d538c6
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep  8 04:09:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  8 04:09:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef24325

net-libs/libssh: add 0.10.4

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/Manifest |   1 +
 net-libs/libssh/libssh-0.10.4.ebuild | 135 +++
 2 files changed, 136 insertions(+)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 54feb53a3260..cdfc84157310 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,3 +1,4 @@
 DIST libssh-0.10.2.tar.xz 554240 BLAKE2B 
5732ed9709735ced62c6a1c0fc32f4c35d26bf26fd8a086ce145f7f6c679468c146a1c1a8f85035dc73971f60bd59b0a784e5fe0afc2575de947b386a4cef804
 SHA512 
8855ebb9ea97e6ad03dec800e0885381c5397a04f5578f0b79b82e49458766f7b6c394713c4fbdc8ff6bb8d3b4c3b8b4f7b797f39ddbc95caf205ee6d89d3278
 DIST libssh-0.10.3.tar.xz 554928 BLAKE2B 
5bb1feecf77ec038b89cec1058d0c401d2f3ecca6975ee098dc9eb4d3b981b807d54291f915f8f7e236dc06ac864289f99d92ea1d6983afda1044a690c8207e6
 SHA512 
dfc992a4d16bf3de6ed01b1d0d73e061f61acf6785b2c81a722154219a286fc2b8952dec0e842bcbc14ce2734078161a820d44091f01851c8538f8f381655253
+DIST libssh-0.10.4.tar.xz 554920 BLAKE2B 
9349a688bdbd7c0d3bc93d6d0d6d55122ae9f918b922baeae8a7c6d4ae3ec340e6607afdd8a47055176f31531aefa94b6cc2bda25d59625fe1a7f83823dd75f9
 SHA512 
01ee52d480201d9886c15e81137c185334b404d1c8e8b743ddf58e95fe8619c8c013616a49807bdfde72fa177cd35f3c22b66cbf5d720b5abfacdf7601ed
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B 
e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d
 SHA512 
4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1

diff --git a/net-libs/libssh/libssh-0.10.4.ebuild 
b/net-libs/libssh/libssh-0.10.4.ebuild
new file mode 100644
index ..c8592e03bb83
--- /dev/null
+++ b/net-libs/libssh/libssh-0.10.4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/;
+
+if [[ ${PV} == ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
+else
+   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs 
test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !gcrypt? (
+   !mbedtls? (
+   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+   )
+   )
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+   test? (
+   >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
+   elibc_musl? ( sys-libs/argp-standalone )
+   )
+"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+DOCS=( AUTHORS CHANGELOG README )
+
+src_prepare() {
+   cmake_src_prepare
+
+   # just install the examples, do not compile them
+   cmake_comment_add_subdirectory examples
+
+   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+   -i ConfigureChecks.cmake || die
+
+   if use test; then
+   local skip_tests=(
+   # keyfile torture test is currently broken
+   -e "/torture_keyfiles/d"
+
+   # Tries to expand ~ which fails w/ portage homedir
+   # (torture_path_expand_tilde_unix and 
torture_config_make_absolute_no_sshdir)
+   -e "/torture_misc/d"
+   -e "/torture_config/d"
+   )
+
+   # Disable tests that take too long (bug #677006)
+   if use sparc; then
+   skip_tests+=(
+   -e "/torture_threads_pki_rsa/d"
+   -e "/torture_pki_dsa/d"
+   )
+   fi
+
+   if (( ${#skip_tests[@]} )) ; then
+   sed -i "${skip_tests[@]}" 
tests/unittests/CMakeLists.txt || die
+   fi
+
+   if use elibc_musl; then
+   sed -e 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-09-07 Thread Andreas Sturmlechner
commit: 4b02f305b37030084cc24cd8a7938de3802e7014
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep  7 12:37:30 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep  7 12:39:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b02f305

net-libs/libssh: drop 0.10.1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest |   1 -
 net-libs/libssh/libssh-0.10.1.ebuild | 127 ---
 2 files changed, 128 deletions(-)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 2b2dfe6d4024..54feb53a3260 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,4 +1,3 @@
-DIST libssh-0.10.1.tar.xz 553808 BLAKE2B 
1e0a648153122619e473481484af70b9c388e75a6586a7b5ea605fede4a592f2f1ae2978c19762ac396d3dff2a3dd03451ee293c9fbd4f861a1bb5668e2489b7
 SHA512 
d56b2809527d4f3c1d1b8f7a7cd49321df8abe4fde011dfe7323e7552641b36a607f3b1b37c26703adae01d0176fc3d71c6c207598aaae5ebdf10237742e
 DIST libssh-0.10.2.tar.xz 554240 BLAKE2B 
5732ed9709735ced62c6a1c0fc32f4c35d26bf26fd8a086ce145f7f6c679468c146a1c1a8f85035dc73971f60bd59b0a784e5fe0afc2575de947b386a4cef804
 SHA512 
8855ebb9ea97e6ad03dec800e0885381c5397a04f5578f0b79b82e49458766f7b6c394713c4fbdc8ff6bb8d3b4c3b8b4f7b797f39ddbc95caf205ee6d89d3278
 DIST libssh-0.10.3.tar.xz 554928 BLAKE2B 
5bb1feecf77ec038b89cec1058d0c401d2f3ecca6975ee098dc9eb4d3b981b807d54291f915f8f7e236dc06ac864289f99d92ea1d6983afda1044a690c8207e6
 SHA512 
dfc992a4d16bf3de6ed01b1d0d73e061f61acf6785b2c81a722154219a286fc2b8952dec0e842bcbc14ce2734078161a820d44091f01851c8538f8f381655253
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B 
e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d
 SHA512 
4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1

diff --git a/net-libs/libssh/libssh-0.10.1.ebuild 
b/net-libs/libssh/libssh-0.10.1.ebuild
deleted file mode 100644
index 25b41a81f804..
--- a/net-libs/libssh/libssh-0.10.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/;
-
-if [[ ${PV} == ** ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
-else
-   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs 
test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   !gcrypt? (
-   !mbedtls? (
-   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-   )
-   )
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-   test? (
-   >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
-   elibc_musl? ( sys-libs/argp-standalone )
-   )
-"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-
-DOCS=( AUTHORS CHANGELOG README )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # just install the examples, do not compile them
-   cmake_comment_add_subdirectory examples
-
-   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-   -i ConfigureChecks.cmake || die
-
-   if use test; then
-   # keyfile torture test is currently broken
-   sed -e "/torture_keyfiles/d" \
-   -i tests/unittests/CMakeLists.txt || 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 elibc_musl; then
-   sed -e "/SOLARIS/d" \
-   -i tests/CMakeLists.txt || die
-   fi
-   fi
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   -DWITH_NACL=OFF
-   -DWITH_STACK_PROTECTOR=OFF
-   -DWITH_STACK_PROTECTOR_STRONG=OFF
-   -DWITH_DEBUG_CALLTRACE=$(usex debug)
-

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-09-07 Thread Andreas Sturmlechner
commit: 2a7eaccc299a0ddace71e92f79c9916fee4a70ec
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep  7 12:37:10 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep  7 12:39:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a7eaccc

net-libs/libssh: add 0.10.3

Changelog: Fixed possible infinite loop in known hosts checking

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest |   1 +
 net-libs/libssh/libssh-0.10.3.ebuild | 135 +++
 2 files changed, 136 insertions(+)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index e75dd2adba4e..2b2dfe6d4024 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,3 +1,4 @@
 DIST libssh-0.10.1.tar.xz 553808 BLAKE2B 
1e0a648153122619e473481484af70b9c388e75a6586a7b5ea605fede4a592f2f1ae2978c19762ac396d3dff2a3dd03451ee293c9fbd4f861a1bb5668e2489b7
 SHA512 
d56b2809527d4f3c1d1b8f7a7cd49321df8abe4fde011dfe7323e7552641b36a607f3b1b37c26703adae01d0176fc3d71c6c207598aaae5ebdf10237742e
 DIST libssh-0.10.2.tar.xz 554240 BLAKE2B 
5732ed9709735ced62c6a1c0fc32f4c35d26bf26fd8a086ce145f7f6c679468c146a1c1a8f85035dc73971f60bd59b0a784e5fe0afc2575de947b386a4cef804
 SHA512 
8855ebb9ea97e6ad03dec800e0885381c5397a04f5578f0b79b82e49458766f7b6c394713c4fbdc8ff6bb8d3b4c3b8b4f7b797f39ddbc95caf205ee6d89d3278
+DIST libssh-0.10.3.tar.xz 554928 BLAKE2B 
5bb1feecf77ec038b89cec1058d0c401d2f3ecca6975ee098dc9eb4d3b981b807d54291f915f8f7e236dc06ac864289f99d92ea1d6983afda1044a690c8207e6
 SHA512 
dfc992a4d16bf3de6ed01b1d0d73e061f61acf6785b2c81a722154219a286fc2b8952dec0e842bcbc14ce2734078161a820d44091f01851c8538f8f381655253
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B 
e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d
 SHA512 
4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1

diff --git a/net-libs/libssh/libssh-0.10.3.ebuild 
b/net-libs/libssh/libssh-0.10.3.ebuild
new file mode 100644
index ..c8592e03bb83
--- /dev/null
+++ b/net-libs/libssh/libssh-0.10.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/;
+
+if [[ ${PV} == ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
+else
+   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs 
test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !gcrypt? (
+   !mbedtls? (
+   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+   )
+   )
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+   test? (
+   >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
+   elibc_musl? ( sys-libs/argp-standalone )
+   )
+"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+DOCS=( AUTHORS CHANGELOG README )
+
+src_prepare() {
+   cmake_src_prepare
+
+   # just install the examples, do not compile them
+   cmake_comment_add_subdirectory examples
+
+   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+   -i ConfigureChecks.cmake || die
+
+   if use test; then
+   local skip_tests=(
+   # keyfile torture test is currently broken
+   -e "/torture_keyfiles/d"
+
+   # Tries to expand ~ which fails w/ portage homedir
+   # (torture_path_expand_tilde_unix and 
torture_config_make_absolute_no_sshdir)
+   -e "/torture_misc/d"
+   -e "/torture_config/d"
+   )
+
+   # Disable tests that take too long (bug #677006)
+   if use sparc; then
+   skip_tests+=(
+   -e "/torture_threads_pki_rsa/d"
+   -e "/torture_pki_dsa/d"
+   )
+   fi
+
+   if (( ${#skip_tests[@]} )) ; then
+   sed -i "${skip_tests[@]}" 
tests/unittests/CMakeLists.txt || die
+ 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-09-02 Thread Sam James
commit: 44207f33399f9bb406432c3d3689a4362bfb1b23
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  3 03:48:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  3 03:48:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44207f33

net-libs/libssh: add 0.10.2

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/Manifest   |  1 +
 .../{libssh-.ebuild => libssh-0.10.2.ebuild}   | 28 ++
 net-libs/libssh/libssh-.ebuild | 28 ++
 3 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 4a35ffc7b747..e75dd2adba4e 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,2 +1,3 @@
 DIST libssh-0.10.1.tar.xz 553808 BLAKE2B 
1e0a648153122619e473481484af70b9c388e75a6586a7b5ea605fede4a592f2f1ae2978c19762ac396d3dff2a3dd03451ee293c9fbd4f861a1bb5668e2489b7
 SHA512 
d56b2809527d4f3c1d1b8f7a7cd49321df8abe4fde011dfe7323e7552641b36a607f3b1b37c26703adae01d0176fc3d71c6c207598aaae5ebdf10237742e
+DIST libssh-0.10.2.tar.xz 554240 BLAKE2B 
5732ed9709735ced62c6a1c0fc32f4c35d26bf26fd8a086ce145f7f6c679468c146a1c1a8f85035dc73971f60bd59b0a784e5fe0afc2575de947b386a4cef804
 SHA512 
8855ebb9ea97e6ad03dec800e0885381c5397a04f5578f0b79b82e49458766f7b6c394713c4fbdc8ff6bb8d3b4c3b8b4f7b797f39ddbc95caf205ee6d89d3278
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B 
e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d
 SHA512 
4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1

diff --git a/net-libs/libssh/libssh-.ebuild 
b/net-libs/libssh/libssh-0.10.2.ebuild
similarity index 84%
copy from net-libs/libssh/libssh-.ebuild
copy to net-libs/libssh/libssh-0.10.2.ebuild
index 25b41a81f804..c8592e03bb83 100644
--- a/net-libs/libssh/libssh-.ebuild
+++ b/net-libs/libssh/libssh-0.10.2.ebuild
@@ -45,10 +45,6 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 DOCS=( AUTHORS CHANGELOG README )
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch
-)
-
 src_prepare() {
cmake_src_prepare
 
@@ -59,14 +55,26 @@ src_prepare() {
-i ConfigureChecks.cmake || die
 
if use test; then
-   # keyfile torture test is currently broken
-   sed -e "/torture_keyfiles/d" \
-   -i tests/unittests/CMakeLists.txt || die
+   local skip_tests=(
+   # keyfile torture test is currently broken
+   -e "/torture_keyfiles/d"
+
+   # Tries to expand ~ which fails w/ portage homedir
+   # (torture_path_expand_tilde_unix and 
torture_config_make_absolute_no_sshdir)
+   -e "/torture_misc/d"
+   -e "/torture_config/d"
+   )
 
-   # disable tests that take too long (bug #677006)
+   # 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
+   skip_tests+=(
+   -e "/torture_threads_pki_rsa/d"
+   -e "/torture_pki_dsa/d"
+   )
+   fi
+
+   if (( ${#skip_tests[@]} )) ; then
+   sed -i "${skip_tests[@]}" 
tests/unittests/CMakeLists.txt || die
fi
 
if use elibc_musl; then

diff --git a/net-libs/libssh/libssh-.ebuild 
b/net-libs/libssh/libssh-.ebuild
index 25b41a81f804..c8592e03bb83 100644
--- a/net-libs/libssh/libssh-.ebuild
+++ b/net-libs/libssh/libssh-.ebuild
@@ -45,10 +45,6 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 DOCS=( AUTHORS CHANGELOG README )
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch
-)
-
 src_prepare() {
cmake_src_prepare
 
@@ -59,14 +55,26 @@ src_prepare() {
-i ConfigureChecks.cmake || die
 
if use test; then
-   # keyfile torture test is currently broken
-   sed -e "/torture_keyfiles/d" \
-   -i tests/unittests/CMakeLists.txt || die
+   local skip_tests=(
+   # keyfile torture test is currently broken
+   -e "/torture_keyfiles/d"
+
+   # Tries to expand ~ which fails w/ portage homedir
+   # (torture_path_expand_tilde_unix and 
torture_config_make_absolute_no_sshdir)
+   -e "/torture_misc/d"
+   -e "/torture_config/d"
+   )
 
-   # disable tests that take too long (bug #677006)
+   # Disable tests that 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/, net-libs/libssh/files/

2022-08-30 Thread Sam James
commit: ebc896b71d4c22a1ed82a068845d682fdc55a3ed
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 30 22:21:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 30 22:21:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebc896b7

net-libs/libssh: drop 0.10.0-r1

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/Manifest   |   1 -
 .../files/libssh-0.10.0-fix-musl-gnu-source.patch  |  58 --
 net-libs/libssh/libssh-0.10.0-r1.ebuild| 126 -
 3 files changed, 185 deletions(-)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index f4d48d1a6473..4a35ffc7b747 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,3 +1,2 @@
-DIST libssh-0.10.0.tar.xz 553384 BLAKE2B 
4a57e2095a4f56d06b2be591e02c9b9ded5e1fa28ed2774389a2902a8277f6e6b99014f8868f0740ca2900409d33b968f65c9eaa312e259926436afb49fc108c
 SHA512 
d97235f78b94a980aabc844ee7614108944967441219f0c2417b207734d5200eb26efd5fd6de0da97a34fb612b843dc0a3b32a3364c1d8333e4c49680212
 DIST libssh-0.10.1.tar.xz 553808 BLAKE2B 
1e0a648153122619e473481484af70b9c388e75a6586a7b5ea605fede4a592f2f1ae2978c19762ac396d3dff2a3dd03451ee293c9fbd4f861a1bb5668e2489b7
 SHA512 
d56b2809527d4f3c1d1b8f7a7cd49321df8abe4fde011dfe7323e7552641b36a607f3b1b37c26703adae01d0176fc3d71c6c207598aaae5ebdf10237742e
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B 
e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d
 SHA512 
4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1

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..
--- 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 
-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 
-Reviewed-by: Andreas Schneider 
 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
-$
-@@ -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 
- #include 
- #include 
-GitLab

diff --git a/net-libs/libssh/libssh-0.10.0-r1.ebuild 
b/net-libs/libssh/libssh-0.10.0-r1.ebuild
deleted file mode 100644
index 0a5989b9a16b..
--- a/net-libs/libssh/libssh-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/;
-
-if [[ ${PV} == ** ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
-else
-   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs 
test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/files/, net-libs/libssh/

2022-08-30 Thread Sam James
commit: 68be73afc06c27f724acbaa6ff5b20dacc3f
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 30 22:20:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 30 22:21:19 2022 +
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-.ebuild => libssh-0.10.1.ebuild}   | 31 +-
 net-libs/libssh/libssh-.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 
d97235f78b94a980aabc844ee7614108944967441219f0c2417b207734d5200eb26efd5fd6de0da97a34fb612b843dc0a3b32a3364c1d8333e4c49680212
+DIST libssh-0.10.1.tar.xz 553808 BLAKE2B 
1e0a648153122619e473481484af70b9c388e75a6586a7b5ea605fede4a592f2f1ae2978c19762ac396d3dff2a3dd03451ee293c9fbd4f861a1bb5668e2489b7
 SHA512 
d56b2809527d4f3c1d1b8f7a7cd49321df8abe4fde011dfe7323e7552641b36a607f3b1b37c26703adae01d0176fc3d71c6c207598aaae5ebdf10237742e
 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 ..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-.ebuild 
b/net-libs/libssh/libssh-0.10.1.ebuild
similarity index 85%
copy from net-libs/libssh/libssh-.ebuild
copy to net-libs/libssh/libssh-0.10.1.ebuild
index 9b897cf8885e..25b41a81f804 100644
--- a/net-libs/libssh/libssh-.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" 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-08-30 Thread Sam James
commit: 13bf24e42e252dde22b93b2635230c83a0f70a5d
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 30 20:27:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 30 20:27:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13bf24e4

net-libs/libssh: add gitlab upstream metadata

Interestingly, even https://www.libssh.org/development/report-a-bug/
says to report bugs there.

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/metadata.xml | 27 +++
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml
index 2f3dde22b5cf..150ff493cf1a 100644
--- a/net-libs/libssh/metadata.xml
+++ b/net-libs/libssh/metadata.xml
@@ -1,16 +1,19 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   k...@gentoo.org
-   Gentoo KDE Project
-
-
-   Use dev-libs/libgcrypt as TLS 
provider
-   Enable gssapi support
-   Use net-libs/mbedtls as TLS 
provider
-   Build with PCAP output support
-   Build with SSH server support
-   Build with SFTP support
-
+   
+   k...@gentoo.org
+   Gentoo KDE Project
+   
+   
+   Use dev-libs/libgcrypt as TLS 
provider
+   Enable gssapi support
+   Use net-libs/mbedtls as TLS 
provider
+   Build with PCAP output support
+   Build with SSH server support
+   Build with SFTP support
+   
+   
+   libssh/libssh-mirror
+   
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/, net-libs/libssh/files/

2022-08-30 Thread Sam James
commit: 53106843b6fec1b6a390bf6f3953ae49452407dc
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 30 20:30:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 30 20:30:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53106843

net-libs/libssh: fix build with musl

Revbump as GNU_SOURCE can change runtime behaviour
(and indeed that was partly the issue in contention here,
although a build failure prevented it getting that far
usually.)

Signed-off-by: Sam James  gentoo.org>

 .../files/libssh-0.10.0-fix-musl-gnu-source.patch  | 58 ++
 ...ibssh-0.10.0.ebuild => libssh-0.10.0-r1.ebuild} |  4 ++
 2 files changed, 62 insertions(+)

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
new file mode 100644
index ..be234bab53c9
--- /dev/null
+++ b/net-libs/libssh/files/libssh-0.10.0-fix-musl-gnu-source.patch
@@ -0,0 +1,58 @@
+https://gitlab.com/libssh/libssh-mirror/-/commit/8cf9c8162fc317761f19c35f60fc0cae7337ceea
+https://gitlab.com/libssh/libssh-mirror/-/issues/141
+
+From: Jakub Jelen 
+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 
+Reviewed-by: Andreas Schneider 
+--- 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
+$
+@@ -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 
+ #include 
+ #include 
+GitLab

diff --git a/net-libs/libssh/libssh-0.10.0.ebuild 
b/net-libs/libssh/libssh-0.10.0-r1.ebuild
similarity index 98%
rename from net-libs/libssh/libssh-0.10.0.ebuild
rename to net-libs/libssh/libssh-0.10.0-r1.ebuild
index 9b897cf8885e..0a5989b9a16b 100644
--- a/net-libs/libssh/libssh-0.10.0.ebuild
+++ b/net-libs/libssh/libssh-0.10.0-r1.ebuild
@@ -47,6 +47,10 @@ DOCS=( AUTHORS CHANGELOG README )
 
 PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 
+PATCHES=(
+   "${FILESDIR}"/${P}-fix-musl-gnu-source.patch
+)
+
 src_prepare() {
cmake_src_prepare
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-08-26 Thread Andreas Sturmlechner
commit: 71d83777398994660c70bba48700a7baf8741aa7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 26 20:45:57 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 26 20:53:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d83777

net-libs/libssh: add 0.10.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest |   1 +
 net-libs/libssh/libssh-0.10.0.ebuild | 122 +++
 2 files changed, 123 insertions(+)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 5e3e1048991f..e353f0232c89 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1 +1,2 @@
+DIST libssh-0.10.0.tar.xz 553384 BLAKE2B 
4a57e2095a4f56d06b2be591e02c9b9ded5e1fa28ed2774389a2902a8277f6e6b99014f8868f0740ca2900409d33b968f65c9eaa312e259926436afb49fc108c
 SHA512 
d97235f78b94a980aabc844ee7614108944967441219f0c2417b207734d5200eb26efd5fd6de0da97a34fb612b843dc0a3b32a3364c1d8333e4c49680212
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B 
e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d
 SHA512 
4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1

diff --git a/net-libs/libssh/libssh-0.10.0.ebuild 
b/net-libs/libssh/libssh-0.10.0.ebuild
new file mode 100644
index ..9b897cf8885e
--- /dev/null
+++ b/net-libs/libssh/libssh-0.10.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/;
+
+if [[ ${PV} == ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
+else
+   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs 
test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !gcrypt? (
+   !mbedtls? (
+   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+   )
+   )
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+   test? (
+   >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
+   elibc_musl? ( sys-libs/argp-standalone )
+   )
+"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+DOCS=( AUTHORS CHANGELOG README )
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
+
+src_prepare() {
+   cmake_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
+
+   # 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
+
+   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+   -i ConfigureChecks.cmake || die
+
+   if use test && use elibc_musl; then
+   sed -e "/SOLARIS/d" \
+   -i tests/CMakeLists.txt || die
+   fi
+}
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DWITH_NACL=OFF
+   -DWITH_STACK_PROTECTOR=OFF
+   -DWITH_STACK_PROTECTOR_STRONG=OFF
+   -DWITH_DEBUG_CALLTRACE=$(usex debug)
+   -DWITH_DEBUG_CRYPTO=$(usex debug)
+   -DWITH_GCRYPT=$(usex gcrypt)
+   -DWITH_GSSAPI=$(usex gssapi)
+   -DWITH_MBEDTLS=$(usex mbedtls)
+   -DWITH_PCAP=$(usex pcap)
+   -DWITH_SERVER=$(usex server)
+   -DWITH_SFTP=$(usex sftp)
+   -DBUILD_STATIC_LIB=$(usex static-libs)
+   -DUNIT_TESTING=$(usex test)
+   -DWITH_ZLIB=$(usex zlib)
+   )
+
+   multilib_is_native_abi || mycmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
+
+   cmake_src_configure
+}
+
+multilib_src_compile() {
+   cmake_src_compile
+   multilib_is_native_abi && use doc && cmake_src_compile docs
+}
+
+multilib_src_install() {
+   cmake_src_install
+  

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-08-26 Thread Andreas Sturmlechner
commit: 6dc73921a467924e32b4c3c65cf2b99c972b0bea
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 26 20:44:55 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 26 20:52:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc73921

net-libs/libssh: update EAPI 7 -> 8, update DOCS

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/libssh-.ebuild | 40 ++
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/net-libs/libssh/libssh-.ebuild 
b/net-libs/libssh/libssh-.ebuild
index d49e399b64d4..9b897cf8885e 100644
--- a/net-libs/libssh/libssh-.ebuild
+++ b/net-libs/libssh/libssh-.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake-multilib
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
 HOMEPAGE="https://www.libssh.org/;
 
-if [[ "${PV}" == * ]] ; then
+if [[ ${PV} == ** ]] ; then
inherit git-r3
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
@@ -22,10 +22,8 @@ IUSE="debug doc examples gcrypt gssapi mbedtls pcap server 
+sftp static-libs tes
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
 REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="!test? ( test )"
 
-BDEPEND="
-   doc? ( app-doc/doxygen[dot] )
-"
 RDEPEND="
!gcrypt? (
!mbedtls? (
@@ -40,15 +38,15 @@ RDEPEND="
 DEPEND="${RDEPEND}
test? (
>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
-   elibc_musl? ( sys-libs/argp-standalone ) )
+   elibc_musl? ( sys-libs/argp-standalone )
+   )
 "
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
-DOCS=( AUTHORS README ChangeLog )
+DOCS=( AUTHORS CHANGELOG README )
 
 PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 
-RESTRICT+=" !test? ( test )"
-
 src_prepare() {
cmake_src_prepare
 
@@ -79,17 +77,17 @@ multilib_src_configure() {
-DWITH_NACL=OFF
-DWITH_STACK_PROTECTOR=OFF
-DWITH_STACK_PROTECTOR_STRONG=OFF
-   -DWITH_DEBUG_CALLTRACE="$(usex debug)"
-   -DWITH_DEBUG_CRYPTO="$(usex debug)"
-   -DWITH_GCRYPT="$(usex gcrypt)"
-   -DWITH_GSSAPI="$(usex gssapi)"
-   -DWITH_MBEDTLS="$(usex mbedtls)"
-   -DWITH_PCAP="$(usex pcap)"
-   -DWITH_SERVER="$(usex server)"
-   -DWITH_SFTP="$(usex sftp)"
-   -DBUILD_STATIC_LIB="$(usex static-libs)"
-   -DUNIT_TESTING="$(usex test)"
-   -DWITH_ZLIB="$(usex zlib)"
+   -DWITH_DEBUG_CALLTRACE=$(usex debug)
+   -DWITH_DEBUG_CRYPTO=$(usex debug)
+   -DWITH_GCRYPT=$(usex gcrypt)
+   -DWITH_GSSAPI=$(usex gssapi)
+   -DWITH_MBEDTLS=$(usex mbedtls)
+   -DWITH_PCAP=$(usex pcap)
+   -DWITH_SERVER=$(usex server)
+   -DWITH_SFTP=$(usex sftp)
+   -DBUILD_STATIC_LIB=$(usex static-libs)
+   -DUNIT_TESTING=$(usex test)
+   -DWITH_ZLIB=$(usex zlib)
)
 
multilib_is_native_abi || mycmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
@@ -104,7 +102,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
cmake_src_install
-   multilib_is_native_abi && use doc && HTML_DOCS=( 
"${BUILD_DIR}"/doc/html/. )
+   multilib_is_native_abi && use doc && local HTML_DOCS=( 
"${BUILD_DIR}"/doc/html/. )
 
use static-libs && dolib.a src/libssh.a
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-06-27 Thread Sam James
commit: 3feebf96ee8ee9375f291bf2d9c128c1fa758052
Author: Cristian Othón Martínez Vera  cfuga  mx>
AuthorDate: Mon Jun 27 19:23:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 27 23:03:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3feebf96

net-libs/libssh: fix musl build with USE="test"

* add sys-libs/argp-standalone as dependency
* force cmake to lookup for the argp library

Signed-off-by: Cristian Othón Martínez Vera  cfuga.mx>
Bug: https://bugs.gentoo.org/836705
Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.9.6.ebuild |  9 -
 net-libs/libssh/libssh-.ebuild  | 11 +--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/net-libs/libssh/libssh-0.9.6.ebuild 
b/net-libs/libssh/libssh-0.9.6.ebuild
index 5bfd45be2d12..5283a50c1f61 100644
--- a/net-libs/libssh/libssh-0.9.6.ebuild
+++ b/net-libs/libssh/libssh-0.9.6.ebuild
@@ -39,7 +39,9 @@ RDEPEND="
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+   test? (
+   >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
+   elibc_musl? ( sys-libs/argp-standalone ) )
 "
 
 DOCS=( AUTHORS README ChangeLog )
@@ -66,6 +68,11 @@ src_prepare() {
 
sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-i ConfigureChecks.cmake || die
+
+   if use test && use elibc_musl; then
+   sed -e "/SOLARIS/d" \
+   -i tests/CMakeLists.txt || die
+   fi
 }
 
 multilib_src_configure() {

diff --git a/net-libs/libssh/libssh-.ebuild 
b/net-libs/libssh/libssh-.ebuild
index 2801869f419f..7b1299b71476 100644
--- a/net-libs/libssh/libssh-.ebuild
+++ b/net-libs/libssh/libssh-.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
@@ -39,7 +39,9 @@ RDEPEND="
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+   test? (
+   >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
+   elibc_musl? ( sys-libs/argp-standalone ) )
 "
 
 DOCS=( AUTHORS README ChangeLog )
@@ -66,6 +68,11 @@ src_prepare() {
 
sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-i ConfigureChecks.cmake || die
+
+   if use test && use elibc_musl; then
+   sed -e "/SOLARIS/d" \
+   -i tests/CMakeLists.txt || die
+   fi
 }
 
 multilib_src_configure() {



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-05-13 Thread WANG Xuerui
commit: 328108bd52ccea6ed31b56166deb3da1495a8b0d
Author: WANG Xuerui  gentoo  org>
AuthorDate: Fri May 13 13:53:20 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Fri May 13 14:01:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=328108bd

net-libs/libssh: keyword 0.9.6 for ~loong

USE=mbedtls fails tests, hence package.use.mask-ed. Otherwise tests pass
on real hardware.

Signed-off-by: WANG Xuerui  gentoo.org>

 net-libs/libssh/libssh-0.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.6.ebuild 
b/net-libs/libssh/libssh-0.9.6.ebuild
index 3aeecf20fd7c..5bfd45be2d12 100644
--- a/net-libs/libssh/libssh-0.9.6.ebuild
+++ b/net-libs/libssh/libssh-0.9.6.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-05-13 Thread WANG Xuerui
commit: a9504b7a00745607bb0cd984b79e739858a1df66
Author: WANG Xuerui  gentoo  org>
AuthorDate: Fri May 13 13:54:22 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Fri May 13 14:01:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9504b7a

net-libs/libssh: forward ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 net-libs/libssh/libssh-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/libssh/libssh-.ebuild 
b/net-libs/libssh/libssh-.ebuild
index ba3c105ee10e..2801869f419f 100644
--- a/net-libs/libssh/libssh-.ebuild
+++ b/net-libs/libssh/libssh-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2022-01-27 Thread Sam James
commit: 44b60ee36b9c13380fe928ad47850fe910cf2b7d
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 27 19:03:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 27 19:03:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b60ee3

net-libs/libssh: Stabilize 0.9.6 hppa, #831982

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.9.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/libssh/libssh-0.9.6.ebuild 
b/net-libs/libssh/libssh-0.9.6.ebuild
index 627887023589..3aeecf20fd7c 100644
--- a/net-libs/libssh/libssh-0.9.6.ebuild
+++ b/net-libs/libssh/libssh-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2021-09-04 Thread Andreas Sturmlechner
commit: 85b0e294af7943ec6bc8e0d6e13162bc98ccf23e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  4 21:56:51 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep  4 22:00:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85b0e294

net-libs/libssh: Cleanup vulnerable 0.9.5

Bug: https://bugs.gentoo.org/810517
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest|   1 -
 net-libs/libssh/libssh-0.9.5.ebuild | 118 
 2 files changed, 119 deletions(-)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 6639cb4ed9d..5e3e1048991 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,2 +1 @@
-DIST libssh-0.9.5.tar.xz 502876 BLAKE2B 
8ea07bf25218563cbbdab31683e679f71298e2c7c9bb2430195e84892838cd55b9025ed292de65c4942ecec7d4037d5b92a414232fca6c8e41821776f4cf815c
 SHA512 
64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B 
e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d
 SHA512 
4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1

diff --git a/net-libs/libssh/libssh-0.9.5.ebuild 
b/net-libs/libssh/libssh-0.9.5.ebuild
deleted file mode 100644
index 62788702358..000
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/;
-
-if [[ "${PV}" == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
-else
-   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs 
test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-
-BDEPEND="
-   doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
-   !gcrypt? (
-   !mbedtls? (
-   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-   )
-   )
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-RESTRICT+=" !test? ( test )"
-
-src_prepare() {
-   cmake_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
-
-   # 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
-
-   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-   -i ConfigureChecks.cmake || die
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   -DWITH_NACL=OFF
-   -DWITH_STACK_PROTECTOR=OFF
-   -DWITH_STACK_PROTECTOR_STRONG=OFF
-   -DWITH_DEBUG_CALLTRACE="$(usex debug)"
-   -DWITH_DEBUG_CRYPTO="$(usex debug)"
-   -DWITH_GCRYPT="$(usex gcrypt)"
-   -DWITH_GSSAPI="$(usex gssapi)"
-   -DWITH_MBEDTLS="$(usex mbedtls)"
-   -DWITH_PCAP="$(usex pcap)"
-   -DWITH_SERVER="$(usex server)"
-   -DWITH_SFTP="$(usex sftp)"
-   -DBUILD_STATIC_LIB="$(usex static-libs)"
-   -DUNIT_TESTING="$(usex test)"
-   -DWITH_ZLIB="$(usex zlib)"
-   )
-
-   multilib_is_native_abi || mycmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-   cmake_src_configure
-}
-
-multilib_src_compile() {
-   cmake_src_compile
-   multilib_is_native_abi && use doc && cmake_src_compile docs
-}
-
-multilib_src_install() {
-   cmake_src_install
-   multilib_is_native_abi && use doc && HTML_DOCS=( 
"${BUILD_DIR}"/doc/html/. )
-
-   use 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2021-09-03 Thread Sam James
commit: be57b363db4ef63208f545d08ae19bfdb209d580
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep  3 21:17:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep  3 21:17:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be57b363

net-libs/libssh: Stabilize 0.9.6 arm, #810529

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.6.ebuild 
b/net-libs/libssh/libssh-0.9.6.ebuild
index 529b8e10d48..fbc2d19da63 100644
--- a/net-libs/libssh/libssh-0.9.6.ebuild
+++ b/net-libs/libssh/libssh-0.9.6.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2021-09-03 Thread Agostino Sarubbo
commit: 7c2bfc14591e52bd202705f450752a8a84a0a9d0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Sep  3 06:39:15 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Sep  3 06:39:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c2bfc14

net-libs/libssh: x86 stable wrt bug #810529

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.6.ebuild 
b/net-libs/libssh/libssh-0.9.6.ebuild
index b7a64463a75..529b8e10d48 100644
--- a/net-libs/libssh/libssh-0.9.6.ebuild
+++ b/net-libs/libssh/libssh-0.9.6.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2021-09-03 Thread Agostino Sarubbo
commit: 063c6200e2ec34dd7dabaf44e9b300b3bf653ed3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Sep  3 06:32:54 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Sep  3 06:32:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=063c6200

net-libs/libssh: amd64 stable wrt bug #810529

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.6.ebuild 
b/net-libs/libssh/libssh-0.9.6.ebuild
index d97989ff863..b7a64463a75 100644
--- a/net-libs/libssh/libssh-0.9.6.ebuild
+++ b/net-libs/libssh/libssh-0.9.6.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2021-09-01 Thread Agostino Sarubbo
commit: 977e1a6791a47460b8ad3a44acf87c04afa8aab0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep  1 09:32:47 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep  1 09:32:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=977e1a67

net-libs/libssh: ppc64 stable wrt bug #810529

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.6.ebuild 
b/net-libs/libssh/libssh-0.9.6.ebuild
index efecd20f07c..d97989ff863 100644
--- a/net-libs/libssh/libssh-0.9.6.ebuild
+++ b/net-libs/libssh/libssh-0.9.6.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2021-09-01 Thread Agostino Sarubbo
commit: d487a1716dad8d53266437fe2c99c94b85d3417d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep  1 08:20:05 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep  1 08:20:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d487a171

net-libs/libssh: sparc stable wrt bug #810529

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.6.ebuild 
b/net-libs/libssh/libssh-0.9.6.ebuild
index e9ecd1fb694..efecd20f07c 100644
--- a/net-libs/libssh/libssh-0.9.6.ebuild
+++ b/net-libs/libssh/libssh-0.9.6.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2021-09-01 Thread Agostino Sarubbo
commit: 09a9239d32927e9ac5568554440b75beca10a123
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep  1 08:18:35 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep  1 08:18:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a9239d

net-libs/libssh: ppc stable wrt bug #810529

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.6.ebuild 
b/net-libs/libssh/libssh-0.9.6.ebuild
index d1c1e18fe74..e9ecd1fb694 100644
--- a/net-libs/libssh/libssh-0.9.6.ebuild
+++ b/net-libs/libssh/libssh-0.9.6.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2021-08-26 Thread Lars Wendler
commit: 3019db6eff789ef6351db4dc014af45dda09e7dd
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Aug 26 19:29:59 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Aug 26 19:29:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3019db6e

net-libs/libssh: Security bump to version 0.9.6 (CVE-2021-3634)

Bug: https://bugs.gentoo.org/810517
Signed-off-by: Lars Wendler  gentoo.org>

 net-libs/libssh/Manifest|   1 +
 net-libs/libssh/libssh-0.9.6.ebuild | 118 
 2 files changed, 119 insertions(+)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 25541f2bebd..6639cb4ed9d 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1 +1,2 @@
 DIST libssh-0.9.5.tar.xz 502876 BLAKE2B 
8ea07bf25218563cbbdab31683e679f71298e2c7c9bb2430195e84892838cd55b9025ed292de65c4942ecec7d4037d5b92a414232fca6c8e41821776f4cf815c
 SHA512 
64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18
+DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B 
e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d
 SHA512 
4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1

diff --git a/net-libs/libssh/libssh-0.9.6.ebuild 
b/net-libs/libssh/libssh-0.9.6.ebuild
new file mode 100644
index 000..d1c1e18fe74
--- /dev/null
+++ b/net-libs/libssh/libssh-0.9.6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/;
+
+if [[ "${PV}" == * ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
+else
+   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs 
test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+
+BDEPEND="
+   doc? ( app-doc/doxygen[dot] )
+"
+RDEPEND="
+   !gcrypt? (
+   !mbedtls? (
+   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+   )
+   )
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
+
+RESTRICT+=" !test? ( test )"
+
+src_prepare() {
+   cmake_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
+
+   # 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
+
+   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+   -i ConfigureChecks.cmake || die
+}
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DWITH_NACL=OFF
+   -DWITH_STACK_PROTECTOR=OFF
+   -DWITH_STACK_PROTECTOR_STRONG=OFF
+   -DWITH_DEBUG_CALLTRACE="$(usex debug)"
+   -DWITH_DEBUG_CRYPTO="$(usex debug)"
+   -DWITH_GCRYPT="$(usex gcrypt)"
+   -DWITH_GSSAPI="$(usex gssapi)"
+   -DWITH_MBEDTLS="$(usex mbedtls)"
+   -DWITH_PCAP="$(usex pcap)"
+   -DWITH_SERVER="$(usex server)"
+   -DWITH_SFTP="$(usex sftp)"
+   -DBUILD_STATIC_LIB="$(usex static-libs)"
+   -DUNIT_TESTING="$(usex test)"
+   -DWITH_ZLIB="$(usex zlib)"
+   )
+
+   multilib_is_native_abi || mycmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
+
+   cmake_src_configure
+}
+
+multilib_src_compile() {
+   cmake_src_compile
+   multilib_is_native_abi && use doc && cmake_src_compile docs
+}
+
+multilib_src_install() {
+   cmake_src_install
+   multilib_is_native_abi && use doc && HTML_DOCS=( 
"${BUILD_DIR}"/doc/html/. )
+
+   use static-libs && dolib.a src/libssh.a
+
+   # 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2021-08-04 Thread Yixun Lan
commit: 219df8ec777f25669b0054f0e855dc6ebc5692c0
Author: Yixun Lan  gentoo  org>
AuthorDate: Thu Aug  5 02:40:21 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Thu Aug  5 02:40:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=219df8ec

net-libs/libssh: keyword ~riscv

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Yixun Lan  gentoo.org>

 net-libs/libssh/libssh-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.5.ebuild 
b/net-libs/libssh/libssh-0.9.5.ebuild
index 61f0a49332a..62788702358 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2021-05-02 Thread Mikle Kolyada
commit: 0f9f18e687a278c9a3559f1e7ddbdfd377d5eee3
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 10:14:46 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 10:16:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9f18e6

net-libs/libssh: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-libs/libssh/libssh-0.9.5.ebuild | 7 +++
 net-libs/libssh/libssh-.ebuild  | 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/net-libs/libssh/libssh-0.9.5.ebuild 
b/net-libs/libssh/libssh-0.9.5.ebuild
index 8b9314b6fd3..61f0a49332a 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
+IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs 
test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
 REQUIRED_USE="?? ( gcrypt mbedtls )"
@@ -30,8 +30,7 @@ BDEPEND="
 RDEPEND="
!gcrypt? (
!mbedtls? (
-   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
)
)
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )

diff --git a/net-libs/libssh/libssh-.ebuild 
b/net-libs/libssh/libssh-.ebuild
index 8496b7dfd38..ba3c105ee10 100644
--- a/net-libs/libssh/libssh-.ebuild
+++ b/net-libs/libssh/libssh-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
+IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs 
test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
 REQUIRED_USE="?? ( gcrypt mbedtls )"
@@ -30,8 +30,7 @@ BDEPEND="
 RDEPEND="
!gcrypt? (
!mbedtls? (
-   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
)
)
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-10-15 Thread Andreas Sturmlechner
commit: db2e4f147fa025f4a824b3c92125ca3d518a1038
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct 15 19:00:53 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct 15 19:00:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db2e4f14

net-libs/libssh: Cleanup vulnerable 0.9.4

Bug: https://bugs.gentoo.org/734624
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest|   1 -
 net-libs/libssh/libssh-0.9.4.ebuild | 119 
 2 files changed, 120 deletions(-)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 025f4211600..25541f2bebd 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,2 +1 @@
-DIST libssh-0.9.4.tar.xz 500776 BLAKE2B 
56b21faac5d24f38c4fe695b31ec879ebab74f7cbfb8b8d336dee37766b7b0802ccac9b02726515ee29d44e18e832cfa322085d5669de1df94e5a428cf9add0f
 SHA512 
38705c19c293ea5e6d286d22eb17021dbe58d88c1e647b699933aa0db9ca1174d43d1ff76c1a1b17bf2cc1a8297ec02f1a67dd9e969676dd69cf6fbdae9bc8d4
 DIST libssh-0.9.5.tar.xz 502876 BLAKE2B 
8ea07bf25218563cbbdab31683e679f71298e2c7c9bb2430195e84892838cd55b9025ed292de65c4942ecec7d4037d5b92a414232fca6c8e41821776f4cf815c
 SHA512 
64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18

diff --git a/net-libs/libssh/libssh-0.9.4.ebuild 
b/net-libs/libssh/libssh-0.9.4.ebuild
deleted file mode 100644
index 31c86bf94ce..000
--- a/net-libs/libssh/libssh-0.9.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/;
-
-if [[ "${PV}" == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
-else
-   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-
-BDEPEND="
-   doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
-   !gcrypt? (
-   !mbedtls? (
-   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-   )
-   )
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-RESTRICT+=" !test? ( test )"
-
-src_prepare() {
-   cmake_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
-
-   # 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
-
-   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-   -i ConfigureChecks.cmake || die
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   -DWITH_NACL=OFF
-   -DWITH_STACK_PROTECTOR=OFF
-   -DWITH_STACK_PROTECTOR_STRONG=OFF
-   -DWITH_DEBUG_CALLTRACE="$(usex debug)"
-   -DWITH_DEBUG_CRYPTO="$(usex debug)"
-   -DWITH_GCRYPT="$(usex gcrypt)"
-   -DWITH_GSSAPI="$(usex gssapi)"
-   -DWITH_MBEDTLS="$(usex mbedtls)"
-   -DWITH_PCAP="$(usex pcap)"
-   -DWITH_SERVER="$(usex server)"
-   -DWITH_SFTP="$(usex sftp)"
-   -DBUILD_STATIC_LIB="$(usex static-libs)"
-   -DUNIT_TESTING="$(usex test)"
-   -DWITH_ZLIB="$(usex zlib)"
-   )
-
-   multilib_is_native_abi || mycmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-   cmake_src_configure
-}
-
-multilib_src_compile() {
-   cmake_src_compile
-   multilib_is_native_abi && use doc && cmake_src_compile docs
-}
-
-multilib_src_install() {
-   cmake_src_install
-   

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-10-15 Thread Sergei Trofimovich
commit: 0beeeadc6e38c4935acf9a0272d34a4cd8509285
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Oct 15 14:21:41 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct 15 18:40:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0beeeadc

net-libs/libssh: stable 0.9.5 for hppa, bug #734624

Package-Manager: Portage-3.0.8, Repoman-3.0.1
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-libs/libssh/libssh-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.5.ebuild 
b/net-libs/libssh/libssh-0.9.5.ebuild
index 8b9314b6fd3..31c86bf94ce 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-10-03 Thread Sam James
commit: 42d37d09228f45c74f875e7b045d15ea96324572
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  3 15:03:23 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  3 15:03:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d37d09

net-libs/libssh: Stabilize 0.9.5 amd64, #734624

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.5.ebuild 
b/net-libs/libssh/libssh-0.9.5.ebuild
index 0d406c74782..8b9314b6fd3 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-10-02 Thread Sam James
commit: a001db83c7844472114f8c1bd44299ef0cad15cd
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  2 21:51:26 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  2 21:51:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a001db83

net-libs/libssh: Stabilize 0.9.5 x86, #734624

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.5.ebuild 
b/net-libs/libssh/libssh-0.9.5.ebuild
index f009e141c59..0d406c74782 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-10-02 Thread Sam James
commit: 240516ab8843a2a41ca702301ccf71efde148c78
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  2 21:34:59 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  2 21:34:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=240516ab

net-libs/libssh: Stabilize 0.9.5 arm, #734624

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.5.ebuild 
b/net-libs/libssh/libssh-0.9.5.ebuild
index 45690e9c25c..f009e141c59 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-10-01 Thread Sergei Trofimovich
commit: 827d361c09c3e8dc54dbe8a7e0ad552972cf579f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Oct  1 22:46:20 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct  1 22:55:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=827d361c

net-libs/libssh: stable 0.9.5 for ppc64

stable wrt bug #734624

Package-Manager: Portage-3.0.8, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-libs/libssh/libssh-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.5.ebuild 
b/net-libs/libssh/libssh-0.9.5.ebuild
index f8f234b154a..45690e9c25c 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-09-29 Thread Sergei Trofimovich
commit: 6fd34064a99a1974aabf70f0b8251985ff810a59
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Sep 29 19:32:23 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Sep 29 21:25:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd34064

net-libs/libssh: stable 0.9.5 for sparc, bug #734624

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-libs/libssh/libssh-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.5.ebuild 
b/net-libs/libssh/libssh-0.9.5.ebuild
index 42cd0db266c..f8f234b154a 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-09-29 Thread Sam James
commit: 383b4d69ccd0883dcc40f20e3fc438c1ee06716d
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 29 18:45:49 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 29 18:45:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383b4d69

net-libs/libssh: Stabilize 0.9.5 arm64, #734624

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.5.ebuild 
b/net-libs/libssh/libssh-0.9.5.ebuild
index 8e52b10c611..42cd0db266c 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-09-29 Thread Sam James
commit: 7779ea933754f1bd10f5bc9e13e09cbad31840b1
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 29 11:41:11 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 29 11:41:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7779ea93

net-libs/libssh: Stabilize 0.9.5 ppc, #734624

Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh/libssh-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.5.ebuild 
b/net-libs/libssh/libssh-0.9.5.ebuild
index 8496b7dfd38..8e52b10c611 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-09-13 Thread Andreas Sturmlechner
commit: 24fb76a05cf3e9d78bbca9e4c27f098327ea5f15
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep 13 18:15:24 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 13 18:25:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24fb76a0

net-libs/libssh: 0.9.5 version bump

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest|   1 +
 net-libs/libssh/libssh-0.9.5.ebuild | 119 
 2 files changed, 120 insertions(+)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 54bf89c2d6b..025f4211600 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1 +1,2 @@
 DIST libssh-0.9.4.tar.xz 500776 BLAKE2B 
56b21faac5d24f38c4fe695b31ec879ebab74f7cbfb8b8d336dee37766b7b0802ccac9b02726515ee29d44e18e832cfa322085d5669de1df94e5a428cf9add0f
 SHA512 
38705c19c293ea5e6d286d22eb17021dbe58d88c1e647b699933aa0db9ca1174d43d1ff76c1a1b17bf2cc1a8297ec02f1a67dd9e969676dd69cf6fbdae9bc8d4
+DIST libssh-0.9.5.tar.xz 502876 BLAKE2B 
8ea07bf25218563cbbdab31683e679f71298e2c7c9bb2430195e84892838cd55b9025ed292de65c4942ecec7d4037d5b92a414232fca6c8e41821776f4cf815c
 SHA512 
64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18

diff --git a/net-libs/libssh/libssh-0.9.5.ebuild 
b/net-libs/libssh/libssh-0.9.5.ebuild
new file mode 100644
index 000..8496b7dfd38
--- /dev/null
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/;
+
+if [[ "${PV}" == * ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
+else
+   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+
+BDEPEND="
+   doc? ( app-doc/doxygen[dot] )
+"
+RDEPEND="
+   !gcrypt? (
+   !mbedtls? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+   )
+   )
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
+
+RESTRICT+=" !test? ( test )"
+
+src_prepare() {
+   cmake_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
+
+   # 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
+
+   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+   -i ConfigureChecks.cmake || die
+}
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DWITH_NACL=OFF
+   -DWITH_STACK_PROTECTOR=OFF
+   -DWITH_STACK_PROTECTOR_STRONG=OFF
+   -DWITH_DEBUG_CALLTRACE="$(usex debug)"
+   -DWITH_DEBUG_CRYPTO="$(usex debug)"
+   -DWITH_GCRYPT="$(usex gcrypt)"
+   -DWITH_GSSAPI="$(usex gssapi)"
+   -DWITH_MBEDTLS="$(usex mbedtls)"
+   -DWITH_PCAP="$(usex pcap)"
+   -DWITH_SERVER="$(usex server)"
+   -DWITH_SFTP="$(usex sftp)"
+   -DBUILD_STATIC_LIB="$(usex static-libs)"
+   -DUNIT_TESTING="$(usex test)"
+   -DWITH_ZLIB="$(usex zlib)"
+   )
+
+   multilib_is_native_abi || mycmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
+
+   cmake_src_configure
+}
+
+multilib_src_compile() {
+   cmake_src_compile
+   multilib_is_native_abi && use doc && cmake_src_compile docs
+}
+
+multilib_src_install() {
+   cmake_src_install
+   multilib_is_native_abi && use doc && 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-05-03 Thread Andreas Sturmlechner
commit: b28a4b37ca764e4379e2bc1ecf2232827b9c8802
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May  3 21:59:37 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May  3 22:24:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28a4b37

net-libs/libssh: Add slot operator on net-libs/mbedtls

Reported-by: Ben Kohler  gentoo.org>
Closes: https://bugs.gentoo.org/717686
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/libssh-0.9.4.ebuild | 2 +-
 net-libs/libssh/libssh-.ebuild  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-libs/libssh/libssh-0.9.4.ebuild 
b/net-libs/libssh/libssh-0.9.4.ebuild
index 466de82b14e..31c86bf94ce 100644
--- a/net-libs/libssh/libssh-0.9.4.ebuild
+++ b/net-libs/libssh/libssh-0.9.4.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
)
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}

diff --git a/net-libs/libssh/libssh-.ebuild 
b/net-libs/libssh/libssh-.ebuild
index 8ddb3caa00d..8496b7dfd38 100644
--- a/net-libs/libssh/libssh-.ebuild
+++ b/net-libs/libssh/libssh-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ RDEPEND="
)
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-04-11 Thread Andreas Sturmlechner
commit: c02c48f3a322d3f3da001b0eccbd11d5cde95d7b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr 11 16:16:02 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr 11 16:16:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c02c48f3

net-libs/libssh: Drop 0.9.3

Bug: https://bugs.gentoo.org/716788
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest|   1 -
 net-libs/libssh/libssh-0.9.3.ebuild | 119 
 2 files changed, 120 deletions(-)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 5c688658993..54bf89c2d6b 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,2 +1 @@
-DIST libssh-0.9.3.tar.xz 500068 BLAKE2B 
9532db5f0fd9a6f4167f57dc25a1131f7483aff2f0fa659d967b21a7eff8507843c09dae1fe8161c9b41aed1bb1dae6d619a35122812d3d9b4c71f78ff1817e2
 SHA512 
6e59718565daeca6d224426cc1095a112deff9af8e0b021917e04f08bb7409263c35724de95f591f38e26f0fb3c69b679b6775edc21dec158d241b076c6f
 DIST libssh-0.9.4.tar.xz 500776 BLAKE2B 
56b21faac5d24f38c4fe695b31ec879ebab74f7cbfb8b8d336dee37766b7b0802ccac9b02726515ee29d44e18e832cfa322085d5669de1df94e5a428cf9add0f
 SHA512 
38705c19c293ea5e6d286d22eb17021dbe58d88c1e647b699933aa0db9ca1174d43d1ff76c1a1b17bf2cc1a8297ec02f1a67dd9e969676dd69cf6fbdae9bc8d4

diff --git a/net-libs/libssh/libssh-0.9.3.ebuild 
b/net-libs/libssh/libssh-0.9.3.ebuild
deleted file mode 100644
index 6504f87e91a..000
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/;
-
-if [[ "${PV}" == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
-else
-   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-
-BDEPEND="
-   doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
-   !gcrypt? (
-   !mbedtls? (
-   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-   )
-   )
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-RESTRICT+=" !test? ( test )"
-
-src_prepare() {
-   cmake_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
-
-   # 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
-
-   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-   -i ConfigureChecks.cmake || die
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   -DWITH_NACL=OFF
-   -DWITH_STACK_PROTECTOR=OFF
-   -DWITH_STACK_PROTECTOR_STRONG=OFF
-   -DWITH_DEBUG_CALLTRACE="$(usex debug)"
-   -DWITH_DEBUG_CRYPTO="$(usex debug)"
-   -DWITH_GCRYPT="$(usex gcrypt)"
-   -DWITH_GSSAPI="$(usex gssapi)"
-   -DWITH_MBEDTLS="$(usex mbedtls)"
-   -DWITH_PCAP="$(usex pcap)"
-   -DWITH_SERVER="$(usex server)"
-   -DWITH_SFTP="$(usex sftp)"
-   -DBUILD_STATIC_LIB="$(usex static-libs)"
-   -DUNIT_TESTING="$(usex test)"
-   -DWITH_ZLIB="$(usex zlib)"
-   )
-
-   multilib_is_native_abi || mycmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-   cmake_src_configure
-}
-
-multilib_src_compile() {
-   cmake_src_compile
-   multilib_is_native_abi && use doc && cmake_src_compile docs
-}
-
-multilib_src_install() {
-   cmake_src_install
-   

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-04-11 Thread Agostino Sarubbo
commit: e617411e0f271e7de5f22694b53683de4948ec86
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr 11 16:12:27 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr 11 16:12:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e617411e

net-libs/libssh: x86 stable wrt bug #716788

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.4.ebuild 
b/net-libs/libssh/libssh-0.9.4.ebuild
index 2cba432bc17..466de82b14e 100644
--- a/net-libs/libssh/libssh-0.9.4.ebuild
+++ b/net-libs/libssh/libssh-0.9.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-04-11 Thread Agostino Sarubbo
commit: 5f9231e138ab4c3aecaf47ae9f11371ac9787a7b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr 11 16:10:19 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr 11 16:10:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f9231e1

net-libs/libssh: ppc64 stable wrt bug #716788

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.4.ebuild 
b/net-libs/libssh/libssh-0.9.4.ebuild
index 4a77e2334fb..2cba432bc17 100644
--- a/net-libs/libssh/libssh-0.9.4.ebuild
+++ b/net-libs/libssh/libssh-0.9.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-04-11 Thread Agostino Sarubbo
commit: 986e9f51d0efe67bdc464f1964be96debf7043eb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr 11 15:59:38 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr 11 15:59:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986e9f51

net-libs/libssh: ppc stable wrt bug #716788

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.4.ebuild 
b/net-libs/libssh/libssh-0.9.4.ebuild
index 581ba774c02..4a77e2334fb 100644
--- a/net-libs/libssh/libssh-0.9.4.ebuild
+++ b/net-libs/libssh/libssh-0.9.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-04-11 Thread Agostino Sarubbo
commit: ba7366392a237fbd437f1e17c9eaca26cfcae7a5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr 11 15:58:24 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr 11 15:58:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba736639

net-libs/libssh: arm stable wrt bug #716788

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.4.ebuild 
b/net-libs/libssh/libssh-0.9.4.ebuild
index efcf40e033a..581ba774c02 100644
--- a/net-libs/libssh/libssh-0.9.4.ebuild
+++ b/net-libs/libssh/libssh-0.9.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-04-11 Thread Agostino Sarubbo
commit: 3639b57eff777c0bd34e627a465ef806e7b6a30a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr 11 15:57:15 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr 11 15:57:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3639b57e

net-libs/libssh: amd64 stable wrt bug #716788

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.4.ebuild 
b/net-libs/libssh/libssh-0.9.4.ebuild
index 476f4bb8a1e..efcf40e033a 100644
--- a/net-libs/libssh/libssh-0.9.4.ebuild
+++ b/net-libs/libssh/libssh-0.9.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-04-10 Thread Mart Raudsepp
commit: b35de0e301b62a19074d2f6de6f3d2edfa882d6e
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Apr 10 17:49:10 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 10 17:49:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b35de0e3

net-libs/libssh: arm64 stable (bug #716788)

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 net-libs/libssh/libssh-0.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.4.ebuild 
b/net-libs/libssh/libssh-0.9.4.ebuild
index 8807dd21095..476f4bb8a1e 100644
--- a/net-libs/libssh/libssh-0.9.4.ebuild
+++ b/net-libs/libssh/libssh-0.9.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-04-10 Thread Sergei Trofimovich
commit: 9cf5e659a290c1f2ad53964b979335a2a6addec4
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Apr 10 16:15:19 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Apr 10 17:37:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cf5e659

net-libs/libssh: stable 0.9.4 for hppa/sparc, bug #716788

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-libs/libssh/libssh-0.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.4.ebuild 
b/net-libs/libssh/libssh-0.9.4.ebuild
index a57cb41c47e..8807dd21095 100644
--- a/net-libs/libssh/libssh-0.9.4.ebuild
+++ b/net-libs/libssh/libssh-0.9.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2020-04-09 Thread Lars Wendler
commit: 55ae3aadc8805c151eca047c662e0b56828299c4
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Apr  9 11:22:06 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Apr  9 11:22:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55ae3aad

net-libs/libssh: Security bump to version 0.9.4

Bug: https://bugs.gentoo.org/716788
Package-Manager: Portage-2.3.97, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 net-libs/libssh/Manifest|   1 +
 net-libs/libssh/libssh-0.9.4.ebuild | 119 
 2 files changed, 120 insertions(+)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 46c2c2c9b3f..5c688658993 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1 +1,2 @@
 DIST libssh-0.9.3.tar.xz 500068 BLAKE2B 
9532db5f0fd9a6f4167f57dc25a1131f7483aff2f0fa659d967b21a7eff8507843c09dae1fe8161c9b41aed1bb1dae6d619a35122812d3d9b4c71f78ff1817e2
 SHA512 
6e59718565daeca6d224426cc1095a112deff9af8e0b021917e04f08bb7409263c35724de95f591f38e26f0fb3c69b679b6775edc21dec158d241b076c6f
+DIST libssh-0.9.4.tar.xz 500776 BLAKE2B 
56b21faac5d24f38c4fe695b31ec879ebab74f7cbfb8b8d336dee37766b7b0802ccac9b02726515ee29d44e18e832cfa322085d5669de1df94e5a428cf9add0f
 SHA512 
38705c19c293ea5e6d286d22eb17021dbe58d88c1e647b699933aa0db9ca1174d43d1ff76c1a1b17bf2cc1a8297ec02f1a67dd9e969676dd69cf6fbdae9bc8d4

diff --git a/net-libs/libssh/libssh-0.9.4.ebuild 
b/net-libs/libssh/libssh-0.9.4.ebuild
new file mode 100644
index 000..a57cb41c47e
--- /dev/null
+++ b/net-libs/libssh/libssh-0.9.4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/;
+
+if [[ "${PV}" == * ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
+else
+   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+
+BDEPEND="
+   doc? ( app-doc/doxygen[dot] )
+"
+RDEPEND="
+   !gcrypt? (
+   !mbedtls? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+   )
+   )
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
+
+RESTRICT+=" !test? ( test )"
+
+src_prepare() {
+   cmake_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
+
+   # 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
+
+   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+   -i ConfigureChecks.cmake || die
+}
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DWITH_NACL=OFF
+   -DWITH_STACK_PROTECTOR=OFF
+   -DWITH_STACK_PROTECTOR_STRONG=OFF
+   -DWITH_DEBUG_CALLTRACE="$(usex debug)"
+   -DWITH_DEBUG_CRYPTO="$(usex debug)"
+   -DWITH_GCRYPT="$(usex gcrypt)"
+   -DWITH_GSSAPI="$(usex gssapi)"
+   -DWITH_MBEDTLS="$(usex mbedtls)"
+   -DWITH_PCAP="$(usex pcap)"
+   -DWITH_SERVER="$(usex server)"
+   -DWITH_SFTP="$(usex sftp)"
+   -DBUILD_STATIC_LIB="$(usex static-libs)"
+   -DUNIT_TESTING="$(usex test)"
+   -DWITH_ZLIB="$(usex zlib)"
+   )
+
+   multilib_is_native_abi || mycmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
+
+   cmake_src_configure
+}
+
+multilib_src_compile() {
+   cmake_src_compile
+   multilib_is_native_abi && use doc && cmake_src_compile docs
+}
+
+multilib_src_install() {
+   cmake_src_install
+   

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/, net-libs/libssh/files/

2020-01-26 Thread Andreas Sturmlechner
commit: 78a2814f6e83699b6d46d6d28097e5a5d0fbecc4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 26 10:53:50 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 26 10:54:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78a2814f

net-libs/libssh: Drop 0.9.0

Bug: https://bugs.gentoo.org/701598
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest  |   1 -
 net-libs/libssh/files/libssh-0.9.0-libressl.patch |  33 --
 net-libs/libssh/libssh-0.9.0.ebuild   | 117 --
 3 files changed, 151 deletions(-)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 514dfeaaa99..46c2c2c9b3f 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,2 +1 @@
-DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 
43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3
 SHA512 
8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
 DIST libssh-0.9.3.tar.xz 500068 BLAKE2B 
9532db5f0fd9a6f4167f57dc25a1131f7483aff2f0fa659d967b21a7eff8507843c09dae1fe8161c9b41aed1bb1dae6d619a35122812d3d9b4c71f78ff1817e2
 SHA512 
6e59718565daeca6d224426cc1095a112deff9af8e0b021917e04f08bb7409263c35724de95f591f38e26f0fb3c69b679b6775edc21dec158d241b076c6f

diff --git a/net-libs/libssh/files/libssh-0.9.0-libressl.patch 
b/net-libs/libssh/files/libssh-0.9.0-libressl.patch
deleted file mode 100644
index 355e832308e..000
--- a/net-libs/libssh/files/libssh-0.9.0-libressl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 08bdd5b26388f92867ab03e36d73e32481faed88 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin 
-Date: Mon, 1 Jul 2019 13:35:09 +0300
-Subject: [PATCH] libcrypto: fix compilation with LibreSSL
-
-LibreSSL does not support FIPS, so do not check it.
-
-Signed-off-by: Stefan Strogin 
-Upstream-Status: Submitted
-[https://www.libssh.org/archive/libssh/2019-07/000.html]

- include/libssh/libcrypto.h | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/libssh/libcrypto.h b/include/libssh/libcrypto.h
-index 541912b5..1a1df635 100644
 a/include/libssh/libcrypto.h
-+++ b/include/libssh/libcrypto.h
-@@ -112,7 +112,11 @@ typedef BN_CTX* bignum_CTX;
- 
- 
- /* Returns true if the OpenSSL is operating in FIPS mode */
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define ssh_fips_mode() (FIPS_mode() != 0)
-+#else
-+#define ssh_fips_mode() false
-+#endif
- 
- #endif /* HAVE_LIBCRYPTO */
- 
--- 
-2.22.0
-

diff --git a/net-libs/libssh/libssh-0.9.0.ebuild 
b/net-libs/libssh/libssh-0.9.0.ebuild
deleted file mode 100644
index 32102181030..000
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/;
-
-if [[ "${PV}" == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
-else
-   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
-RESTRICT="!test? ( test )"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-RDEPEND="
-   !gcrypt? (
-   !mbedtls? (
-   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-   )
-   )
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen[dot] )
-   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.8.0-tests.patch"
-   "${FILESDIR}/${PN}-0.9.0-libressl.patch"
-)
-
-src_prepare() {
-   cmake_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
-
-   # disable tests that take too long (bug #677006)
-   if use sparc; then
-   sed 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-12-30 Thread Agostino Sarubbo
commit: dad1d955361b442ca663975d538deb15c0e98d96
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec 30 15:52:59 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec 30 15:52:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad1d955

net-libs/libssh: ppc stable wrt bug #701598

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.3.ebuild 
b/net-libs/libssh/libssh-0.9.3.ebuild
index 2eb3278052b..d7405a073d5 100644
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-12-30 Thread Agostino Sarubbo
commit: 21e57c03fa730bce892d310230ba5f4a78205fe9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec 30 15:33:17 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec 30 15:33:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21e57c03

net-libs/libssh: ppc64 stable wrt bug #701598

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.3.ebuild 
b/net-libs/libssh/libssh-0.9.3.ebuild
index c015fb647b0..2eb3278052b 100644
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-12-28 Thread Sergei Trofimovich
commit: 26d138d831a0d6d6337af63d08a6ea55a9e0e608
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Dec 28 09:21:31 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Dec 28 10:17:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d138d8

net-libs/libssh: stable 0.9.3 for hppa, bug #701598

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-libs/libssh/libssh-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.3.ebuild 
b/net-libs/libssh/libssh-0.9.3.ebuild
index fcb0307f3fa..3ead343c58f 100644
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-12-24 Thread Aaron Bauman
commit: 4e46fd7f0de272087f575a11f28d51e4d31a0a4e
Author: Aaron Bauman  gentoo  org>
AuthorDate: Tue Dec 24 19:50:28 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue Dec 24 19:50:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e46fd7f

net-libs/libssh: arm64 stable (bug #701598)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.82, Repoman-2.3.20

 net-libs/libssh/libssh-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.3.ebuild 
b/net-libs/libssh/libssh-0.9.3.ebuild
index ebc3b072cb5..fcb0307f3fa 100644
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-12-24 Thread Mikle Kolyada
commit: 11e3379459e55699a32353879d7fad6e50fa9901
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Dec 24 14:05:42 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Dec 24 14:05:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e33794

net-libs/libssh: arm stable wrt bug #701598

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-libs/libssh/libssh-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.3.ebuild 
b/net-libs/libssh/libssh-0.9.3.ebuild
index 06898dc5da5..ebc3b072cb5 100644
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-12-21 Thread Andreas Sturmlechner
commit: 9d27bd3de444e1b380eafc9cd5c0592f23503dbc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 21 10:31:44 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 21 10:32:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d27bd3d

net-libs/libssh: Drop 0.9.2

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest|   1 -
 net-libs/libssh/libssh-0.9.2.ebuild | 116 
 2 files changed, 117 deletions(-)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 699fef0103e..514dfeaaa99 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,3 +1,2 @@
 DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 
43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3
 SHA512 
8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
-DIST libssh-0.9.2.tar.xz 495876 BLAKE2B 
82bdf6edcd99b49717c0f0d01c308422e0c7838828efd4958bb62516dd504069df09f007ab38fcac6fe501eb8270728691944f868cc285a63ddbc2adf6f2cb79
 SHA512 
93b689cd7f3bd32716d7821219e25f91214f71be3867c622ae0ae73cdb2d20af2daa9c3c8180b71434915154f2bc374df7193b3a67a9b9e8bf06e955419285d0
 DIST libssh-0.9.3.tar.xz 500068 BLAKE2B 
9532db5f0fd9a6f4167f57dc25a1131f7483aff2f0fa659d967b21a7eff8507843c09dae1fe8161c9b41aed1bb1dae6d619a35122812d3d9b4c71f78ff1817e2
 SHA512 
6e59718565daeca6d224426cc1095a112deff9af8e0b021917e04f08bb7409263c35724de95f591f38e26f0fb3c69b679b6775edc21dec158d241b076c6f

diff --git a/net-libs/libssh/libssh-0.9.2.ebuild 
b/net-libs/libssh/libssh-0.9.2.ebuild
deleted file mode 100644
index dc04b6aee9d..000
--- a/net-libs/libssh/libssh-0.9.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/;
-
-if [[ "${PV}" == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
-else
-   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-BDEPEND="
-   doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
-   !gcrypt? (
-   !mbedtls? (
-   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-   )
-   )
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-RESTRICT+=" !test? ( test )"
-
-src_prepare() {
-   cmake-utils_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
-
-   # 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
-
-   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-   -i ConfigureChecks.cmake || die
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   -DWITH_NACL=OFF
-   -DWITH_STACK_PROTECTOR=OFF
-   -DWITH_STACK_PROTECTOR_STRONG=OFF
-   -DWITH_DEBUG_CALLTRACE="$(usex debug)"
-   -DWITH_DEBUG_CRYPTO="$(usex debug)"
-   -DWITH_GCRYPT="$(usex gcrypt)"
-   -DWITH_GSSAPI="$(usex gssapi)"
-   -DWITH_MBEDTLS="$(usex mbedtls)"
-   -DWITH_PCAP="$(usex pcap)"
-   -DWITH_SERVER="$(usex server)"
-   -DWITH_SFTP="$(usex sftp)"
-   -DBUILD_SHARED_LIBS="$(usex !static-libs)"
-   -DUNIT_TESTING="$(usex test)"
-   -DWITH_ZLIB="$(usex zlib)"
-   )
-
-   multilib_is_native_abi || 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-12-21 Thread Andreas Sturmlechner
commit: d1d4a96d4d91b121d6c60a4c85ae66cd3bc69699
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 21 10:07:39 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 21 10:08:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1d4a96d

net-libs/libssh: Fix USE static-libs, drop obsolete test condition

Closes: https://bugs.gentoo.org/703400
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/libssh-0.9.3.ebuild | 6 --
 net-libs/libssh/libssh-.ebuild  | 6 --
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/net-libs/libssh/libssh-0.9.3.ebuild 
b/net-libs/libssh/libssh-0.9.3.ebuild
index 5361468d2fe..06898dc5da5 100644
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -21,7 +21,7 @@ SLOT="0/4" # subslot = soname major version
 IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
 
 BDEPEND="
doc? ( app-doc/doxygen[dot] )
@@ -81,7 +81,7 @@ multilib_src_configure() {
-DWITH_PCAP="$(usex pcap)"
-DWITH_SERVER="$(usex server)"
-DWITH_SFTP="$(usex sftp)"
-   -DBUILD_SHARED_LIBS="$(usex !static-libs)"
+   -DBUILD_STATIC_LIB="$(usex static-libs)"
-DUNIT_TESTING="$(usex test)"
-DWITH_ZLIB="$(usex zlib)"
)
@@ -100,6 +100,8 @@ multilib_src_install() {
cmake-utils_src_install
multilib_is_native_abi && use doc && HTML_DOCS=( 
"${BUILD_DIR}"/doc/html/. )
 
+   use static-libs && dolib.a src/libssh.a
+
# compatibility symlink until all consumers have been updated
# to no longer use libssh_threads.so
dosym libssh.so /usr/$(get_libdir)/libssh_threads.so

diff --git a/net-libs/libssh/libssh-.ebuild 
b/net-libs/libssh/libssh-.ebuild
index dc04b6aee9d..e86e51662ed 100644
--- a/net-libs/libssh/libssh-.ebuild
+++ b/net-libs/libssh/libssh-.ebuild
@@ -21,7 +21,7 @@ SLOT="0/4" # subslot = soname major version
 IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
 
 BDEPEND="
doc? ( app-doc/doxygen[dot] )
@@ -81,7 +81,7 @@ multilib_src_configure() {
-DWITH_PCAP="$(usex pcap)"
-DWITH_SERVER="$(usex server)"
-DWITH_SFTP="$(usex sftp)"
-   -DBUILD_SHARED_LIBS="$(usex !static-libs)"
+   -DBUILD_STATIC_LIB="$(usex static-libs)"
-DUNIT_TESTING="$(usex test)"
-DWITH_ZLIB="$(usex zlib)"
)
@@ -100,6 +100,8 @@ multilib_src_install() {
cmake-utils_src_install
multilib_is_native_abi && use doc && HTML_DOCS=( 
"${BUILD_DIR}"/doc/html/. )
 
+   use static-libs && dolib.a src/libssh.a
+
# compatibility symlink until all consumers have been updated
# to no longer use libssh_threads.so
dosym libssh.so /usr/$(get_libdir)/libssh_threads.so



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-12-20 Thread Agostino Sarubbo
commit: bbf1f90af548ff504d6b73448fc038abea09b1ab
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Dec 20 12:51:19 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Dec 20 12:51:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbf1f90a

net-libs/libssh: ia64 stable wrt bug #701598

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.3.ebuild 
b/net-libs/libssh/libssh-0.9.3.ebuild
index bf4342fd53a..5361468d2fe 100644
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-12-20 Thread Agostino Sarubbo
commit: 2fecb088317ebaad4be856dc56430340f15bea45
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Dec 20 12:50:49 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Dec 20 12:50:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fecb088

net-libs/libssh: x86 stable wrt bug #701598

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.3.ebuild 
b/net-libs/libssh/libssh-0.9.3.ebuild
index 6596441c89f..bf4342fd53a 100644
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-12-19 Thread Sergei Trofimovich
commit: a1c6b3919b930925bb6b3892679bdf3b607e312a
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Dec 19 16:13:21 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Dec 19 18:35:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1c6b391

net-libs/libssh: stable 0.9.3 for sparc, bug #701598

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-libs/libssh/libssh-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.3.ebuild 
b/net-libs/libssh/libssh-0.9.3.ebuild
index c866b9bf9f6..6596441c89f 100644
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-12-19 Thread Agostino Sarubbo
commit: bb35dc8589d9ff48b206f36a4e7cbc5d6e641320
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Dec 19 15:43:40 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Dec 19 15:43:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb35dc85

net-libs/libssh: amd64 stable wrt bug #701598

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.3.ebuild 
b/net-libs/libssh/libssh-0.9.3.ebuild
index dc04b6aee9d..c866b9bf9f6 100644
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-12-12 Thread Lars Wendler
commit: ead108fac74cf8a7b1b201848e872057718ed335
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Dec 12 17:00:22 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Dec 12 17:00:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ead108fa

net-libs/libssh: Security bump to version 0.9.3 (CVE-2019-14889)

Bug: https://bugs.gentoo.org/701598
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 net-libs/libssh/Manifest|   1 +
 net-libs/libssh/libssh-0.9.3.ebuild | 116 
 2 files changed, 117 insertions(+)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 38232228d2c..699fef0103e 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,2 +1,3 @@
 DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 
43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3
 SHA512 
8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
 DIST libssh-0.9.2.tar.xz 495876 BLAKE2B 
82bdf6edcd99b49717c0f0d01c308422e0c7838828efd4958bb62516dd504069df09f007ab38fcac6fe501eb8270728691944f868cc285a63ddbc2adf6f2cb79
 SHA512 
93b689cd7f3bd32716d7821219e25f91214f71be3867c622ae0ae73cdb2d20af2daa9c3c8180b71434915154f2bc374df7193b3a67a9b9e8bf06e955419285d0
+DIST libssh-0.9.3.tar.xz 500068 BLAKE2B 
9532db5f0fd9a6f4167f57dc25a1131f7483aff2f0fa659d967b21a7eff8507843c09dae1fe8161c9b41aed1bb1dae6d619a35122812d3d9b4c71f78ff1817e2
 SHA512 
6e59718565daeca6d224426cc1095a112deff9af8e0b021917e04f08bb7409263c35724de95f591f38e26f0fb3c69b679b6775edc21dec158d241b076c6f

diff --git a/net-libs/libssh/libssh-0.9.3.ebuild 
b/net-libs/libssh/libssh-0.9.3.ebuild
new file mode 100644
index 000..dc04b6aee9d
--- /dev/null
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/;
+
+if [[ "${PV}" == * ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
+else
+   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+
+BDEPEND="
+   doc? ( app-doc/doxygen[dot] )
+"
+RDEPEND="
+   !gcrypt? (
+   !mbedtls? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+   )
+   )
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
+
+RESTRICT+=" !test? ( test )"
+
+src_prepare() {
+   cmake-utils_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
+
+   # 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
+
+   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+   -i ConfigureChecks.cmake || die
+}
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DWITH_NACL=OFF
+   -DWITH_STACK_PROTECTOR=OFF
+   -DWITH_STACK_PROTECTOR_STRONG=OFF
+   -DWITH_DEBUG_CALLTRACE="$(usex debug)"
+   -DWITH_DEBUG_CRYPTO="$(usex debug)"
+   -DWITH_GCRYPT="$(usex gcrypt)"
+   -DWITH_GSSAPI="$(usex gssapi)"
+   -DWITH_MBEDTLS="$(usex mbedtls)"
+   -DWITH_PCAP="$(usex pcap)"
+   -DWITH_SERVER="$(usex server)"
+   -DWITH_SFTP="$(usex sftp)"
+   -DBUILD_SHARED_LIBS="$(usex !static-libs)"
+   -DUNIT_TESTING="$(usex test)"
+   -DWITH_ZLIB="$(usex zlib)"

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-11-11 Thread Andreas Sturmlechner
commit: a769fa034e44ddd9069c9c05a726ffedf934bc9b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 12 02:49:06 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 12 02:49:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a769fa03

net-libs/libssh: RESTRICT+=" !test? ( test )"

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/libssh-0.9.2.ebuild | 2 ++
 net-libs/libssh/libssh-.ebuild  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/net-libs/libssh/libssh-0.9.2.ebuild 
b/net-libs/libssh/libssh-0.9.2.ebuild
index 70e9e887037..dc04b6aee9d 100644
--- a/net-libs/libssh/libssh-0.9.2.ebuild
+++ b/net-libs/libssh/libssh-0.9.2.ebuild
@@ -46,6 +46,8 @@ DOCS=( AUTHORS README ChangeLog )
 
 PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 
+RESTRICT+=" !test? ( test )"
+
 src_prepare() {
cmake-utils_src_prepare
 

diff --git a/net-libs/libssh/libssh-.ebuild 
b/net-libs/libssh/libssh-.ebuild
index 70e9e887037..dc04b6aee9d 100644
--- a/net-libs/libssh/libssh-.ebuild
+++ b/net-libs/libssh/libssh-.ebuild
@@ -46,6 +46,8 @@ DOCS=( AUTHORS README ChangeLog )
 
 PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 
+RESTRICT+=" !test? ( test )"
+
 src_prepare() {
cmake-utils_src_prepare
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-11-11 Thread Andreas Sturmlechner
commit: 7c3ef4d6d4106d92d4cd8130c2f309e591ad07dd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 12 01:35:56 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 12 01:35:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c3ef4d6

net-libs/libssh: BDEPEND++

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/libssh-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-.ebuild 
b/net-libs/libssh/libssh-.ebuild
index 7731aab2388..e5e2972dc6d 100644
--- a/net-libs/libssh/libssh-.ebuild
+++ b/net-libs/libssh/libssh-.ebuild
@@ -23,6 +23,9 @@ IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap 
server +sftp static
 
 REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
 
+BDEPEND="
+   doc? ( app-doc/doxygen[dot] )
+"
 RDEPEND="
!gcrypt? (
!mbedtls? (
@@ -36,7 +39,6 @@ RDEPEND="
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen[dot] )
test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
 "
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-11-11 Thread Andreas Sturmlechner
commit: 6ac58b40926478ccd90660925d31f99cc75c9883
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 12 01:40:04 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 12 01:45:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ac58b40

net-libs/libssh: WITH_STATIC_LIB -> BUILD_SHARED_LIBS

Upstream commit 920c08eaf8fc8f51d6ce67ba0eb9bd989f997580

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/libssh-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-.ebuild 
b/net-libs/libssh/libssh-.ebuild
index e5e2972dc6d..70e9e887037 100644
--- a/net-libs/libssh/libssh-.ebuild
+++ b/net-libs/libssh/libssh-.ebuild
@@ -79,7 +79,7 @@ multilib_src_configure() {
-DWITH_PCAP="$(usex pcap)"
-DWITH_SERVER="$(usex server)"
-DWITH_SFTP="$(usex sftp)"
-   -DWITH_STATIC_LIB="$(usex static-libs)"
+   -DBUILD_SHARED_LIBS="$(usex !static-libs)"
-DUNIT_TESTING="$(usex test)"
-DWITH_ZLIB="$(usex zlib)"
)



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-11-11 Thread Andreas Sturmlechner
commit: ce5be80865d2e90cef379050be300be279d4d304
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 12 01:48:51 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 12 01:48:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce5be808

net-libs/libssh: Drop 0.9.1 w/ broken cmake module

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest|   1 -
 net-libs/libssh/libssh-0.9.1.ebuild | 112 
 2 files changed, 113 deletions(-)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 322b54170af..38232228d2c 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,3 +1,2 @@
 DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 
43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3
 SHA512 
8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
-DIST libssh-0.9.1.tar.xz 1246696 BLAKE2B 
3be87c3020930ddfb67b6eb2ded91e805fd17ec5493e443064ec1e7cb23797fc5128c4e39ff9c3067c3026ae370eebbdcc7706bd886a2a644b34b66cb494b6c4
 SHA512 
7776db347acb2d2d2ef3c19bc8ac61a4b18a4e61c1d7c2814fe44d3b7716e36d5440cdf170fb151af6c2bd9491921911b7f84732d781992c064667ea2ac3cab2
 DIST libssh-0.9.2.tar.xz 495876 BLAKE2B 
82bdf6edcd99b49717c0f0d01c308422e0c7838828efd4958bb62516dd504069df09f007ab38fcac6fe501eb8270728691944f868cc285a63ddbc2adf6f2cb79
 SHA512 
93b689cd7f3bd32716d7821219e25f91214f71be3867c622ae0ae73cdb2d20af2daa9c3c8180b71434915154f2bc374df7193b3a67a9b9e8bf06e955419285d0

diff --git a/net-libs/libssh/libssh-0.9.1.ebuild 
b/net-libs/libssh/libssh-0.9.1.ebuild
deleted file mode 100644
index 7731aab2388..000
--- a/net-libs/libssh/libssh-0.9.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/;
-
-if [[ "${PV}" == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
-else
-   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-RDEPEND="
-   !gcrypt? (
-   !mbedtls? (
-   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-   )
-   )
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen[dot] )
-   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-src_prepare() {
-   cmake-utils_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
-
-   # 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
-
-   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-   -i ConfigureChecks.cmake || die
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   -DWITH_NACL=OFF
-   -DWITH_STACK_PROTECTOR=OFF
-   -DWITH_STACK_PROTECTOR_STRONG=OFF
-   -DWITH_DEBUG_CALLTRACE="$(usex debug)"
-   -DWITH_DEBUG_CRYPTO="$(usex debug)"
-   -DWITH_GCRYPT="$(usex gcrypt)"
-   -DWITH_GSSAPI="$(usex gssapi)"
-   -DWITH_MBEDTLS="$(usex mbedtls)"
-   -DWITH_PCAP="$(usex pcap)"
-   -DWITH_SERVER="$(usex server)"
-   -DWITH_SFTP="$(usex sftp)"
-   -DWITH_STATIC_LIB="$(usex static-libs)"
-   -DUNIT_TESTING="$(usex test)"
-   -DWITH_ZLIB="$(usex zlib)"
-   )
-
-   multilib_is_native_abi || mycmakeargs+=( 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-11-11 Thread Andreas Sturmlechner
commit: 81ee08d271c4171b4d1c344df4ffcd1877eacfe4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 12 01:37:46 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 12 01:45:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ee08d2

net-libs/libssh: 0.9.2 version bump

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest|   1 +
 net-libs/libssh/libssh-0.9.2.ebuild | 114 
 2 files changed, 115 insertions(+)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 36083c78cc7..322b54170af 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,2 +1,3 @@
 DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 
43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3
 SHA512 
8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
 DIST libssh-0.9.1.tar.xz 1246696 BLAKE2B 
3be87c3020930ddfb67b6eb2ded91e805fd17ec5493e443064ec1e7cb23797fc5128c4e39ff9c3067c3026ae370eebbdcc7706bd886a2a644b34b66cb494b6c4
 SHA512 
7776db347acb2d2d2ef3c19bc8ac61a4b18a4e61c1d7c2814fe44d3b7716e36d5440cdf170fb151af6c2bd9491921911b7f84732d781992c064667ea2ac3cab2
+DIST libssh-0.9.2.tar.xz 495876 BLAKE2B 
82bdf6edcd99b49717c0f0d01c308422e0c7838828efd4958bb62516dd504069df09f007ab38fcac6fe501eb8270728691944f868cc285a63ddbc2adf6f2cb79
 SHA512 
93b689cd7f3bd32716d7821219e25f91214f71be3867c622ae0ae73cdb2d20af2daa9c3c8180b71434915154f2bc374df7193b3a67a9b9e8bf06e955419285d0

diff --git a/net-libs/libssh/libssh-0.9.2.ebuild 
b/net-libs/libssh/libssh-0.9.2.ebuild
new file mode 100644
index 000..70e9e887037
--- /dev/null
+++ b/net-libs/libssh/libssh-0.9.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/;
+
+if [[ "${PV}" == * ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
+else
+   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+
+BDEPEND="
+   doc? ( app-doc/doxygen[dot] )
+"
+RDEPEND="
+   !gcrypt? (
+   !mbedtls? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+   )
+   )
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
+
+src_prepare() {
+   cmake-utils_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
+
+   # 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
+
+   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+   -i ConfigureChecks.cmake || die
+}
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DWITH_NACL=OFF
+   -DWITH_STACK_PROTECTOR=OFF
+   -DWITH_STACK_PROTECTOR_STRONG=OFF
+   -DWITH_DEBUG_CALLTRACE="$(usex debug)"
+   -DWITH_DEBUG_CRYPTO="$(usex debug)"
+   -DWITH_GCRYPT="$(usex gcrypt)"
+   -DWITH_GSSAPI="$(usex gssapi)"
+   -DWITH_MBEDTLS="$(usex mbedtls)"
+   -DWITH_PCAP="$(usex pcap)"
+   -DWITH_SERVER="$(usex server)"
+   -DWITH_SFTP="$(usex sftp)"
+   -DBUILD_SHARED_LIBS="$(usex !static-libs)"
+   -DUNIT_TESTING="$(usex test)"
+   -DWITH_ZLIB="$(usex zlib)"
+   )
+
+   multilib_is_native_abi || mycmakeargs+=( 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-10-26 Thread Andreas Sturmlechner
commit: 92988303c06117b57c28b979571f2488069f7605
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 26 10:48:56 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 26 10:52:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92988303

net-libs/libssh: 0.9.1 version bump

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest|   1 +
 net-libs/libssh/libssh-0.9.1.ebuild | 112 
 2 files changed, 113 insertions(+)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 9d1285b15bf..36083c78cc7 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1 +1,2 @@
 DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 
43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3
 SHA512 
8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
+DIST libssh-0.9.1.tar.xz 1246696 BLAKE2B 
3be87c3020930ddfb67b6eb2ded91e805fd17ec5493e443064ec1e7cb23797fc5128c4e39ff9c3067c3026ae370eebbdcc7706bd886a2a644b34b66cb494b6c4
 SHA512 
7776db347acb2d2d2ef3c19bc8ac61a4b18a4e61c1d7c2814fe44d3b7716e36d5440cdf170fb151af6c2bd9491921911b7f84732d781992c064667ea2ac3cab2

diff --git a/net-libs/libssh/libssh-0.9.1.ebuild 
b/net-libs/libssh/libssh-0.9.1.ebuild
new file mode 100644
index 000..7731aab2388
--- /dev/null
+++ b/net-libs/libssh/libssh-0.9.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/;
+
+if [[ "${PV}" == * ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
+else
+   SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+
+RDEPEND="
+   !gcrypt? (
+   !mbedtls? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+   )
+   )
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+   doc? ( app-doc/doxygen[dot] )
+   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
+
+src_prepare() {
+   cmake-utils_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
+
+   # 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
+
+   sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+   -i ConfigureChecks.cmake || die
+}
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DWITH_NACL=OFF
+   -DWITH_STACK_PROTECTOR=OFF
+   -DWITH_STACK_PROTECTOR_STRONG=OFF
+   -DWITH_DEBUG_CALLTRACE="$(usex debug)"
+   -DWITH_DEBUG_CRYPTO="$(usex debug)"
+   -DWITH_GCRYPT="$(usex gcrypt)"
+   -DWITH_GSSAPI="$(usex gssapi)"
+   -DWITH_MBEDTLS="$(usex mbedtls)"
+   -DWITH_PCAP="$(usex pcap)"
+   -DWITH_SERVER="$(usex server)"
+   -DWITH_SFTP="$(usex sftp)"
+   -DWITH_STATIC_LIB="$(usex static-libs)"
+   -DUNIT_TESTING="$(usex test)"
+   -DWITH_ZLIB="$(usex zlib)"
+   )
+
+   multilib_is_native_abi || mycmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
+
+   cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+   cmake-utils_src_compile
+   multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+}
+
+multilib_src_install() {
+   cmake-utils_src_install
+   multilib_is_native_abi && use doc && HTML_DOCS=( 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/, net-libs/libssh/files/

2019-09-01 Thread Andreas Sturmlechner
commit: 5d77e9543c460f403fdae1832cd47b5505b02aa3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  1 20:05:17 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  1 20:43:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d77e954

net-libs/libssh: Drop 0.8.6 and 0.8.7

Package-Manager: Portage-2.3.74, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/Manifest   |   2 -
 .../files/libssh-0.8.3-strict-overflow.patch   |  21 
 net-libs/libssh/libssh-0.8.6.ebuild| 110 ---
 net-libs/libssh/libssh-0.8.7.ebuild| 117 -
 4 files changed, 250 deletions(-)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 5364d75e205..9d1285b15bf 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,3 +1 @@
-DIST libssh-0.8.6.tar.xz 433680 BLAKE2B 
f222e67676a90a2d2431463dc71859ad336a23a519b54e08fe368efe6322d0b9c8e393ec92d5246cb4721cd57bb955856fa6a2d92ffe71b6c35e2c94cde28762
 SHA512 
e91d1f4c1343aa232ade0fe4b5e9a92ca65e3716f4ebe2ec25b04def4fae5a3774349f05a6919836551f66fb0288ed6a3e19e0ab786c081616218be973356522
-DIST libssh-0.8.7.tar.xz 430104 BLAKE2B 
8ad9455d81120726434a418abb74bfee53279040541cda50117909d43088ea992b9dbc7164b079dbe970b4348b967ed0d3f6352df98f60d1e6d9f14a086b5a40
 SHA512 
13c3dccad81d521edf29c8a5e2c5f7fdd90507a0eda652b2b040a0a17bab88860873e089a46e181907ea3f449ca1847b1c84453b1960f456e391eefe5be983c5
 DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 
43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3
 SHA512 
8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865

diff --git a/net-libs/libssh/files/libssh-0.8.3-strict-overflow.patch 
b/net-libs/libssh/files/libssh-0.8.3-strict-overflow.patch
deleted file mode 100644
index 93b15ec061b..000
--- a/net-libs/libssh/files/libssh-0.8.3-strict-overflow.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Neither i nor j are ever counted downward for the array pointers, so assume
-they were intended to be signed integers.
-
-Fixes a compiler warning on HPPA triggering an error because of
--Werror=strict-overflow -Wstrict-overflow=2:
-
-src/connect.c:509:7: error: assuming signed overflow does not occur when
-simplifying conditional to constant [-Werror=strict-overflow]
- if(j != 0)
-   ^
 a/src/connect.c
-+++ b/src/connect.c
-@@ -471,7 +471,7 @@
- fd_set *readfds, struct timeval *timeout) {
-   fd_set origfds;
-   socket_t fd;
--  int i,j;
-+  unsigned int i,j;
-   int rc;
-   int base_tm, tm;
-   struct ssh_timestamp ts;

diff --git a/net-libs/libssh/libssh-0.8.6.ebuild 
b/net-libs/libssh/libssh-0.8.6.ebuild
deleted file mode 100644
index 65d029e138f..000
--- a/net-libs/libssh/libssh-0.8.6.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-${PV/_rc/rc}"
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/;
-
-if [[ "${PV}" == * ]] ; then
-   inherit git-r3
-   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"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-RDEPEND="
-   !gcrypt? (
-   !mbedtls? (
-   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-   )
-   )
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen[dot] )
-   test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.8.0-tests.patch"
-   "${FILESDIR}/${PN}-0.8.3-strict-overflow.patch"
-)
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   # just install the examples, do not compile them
-   cmake_comment_add_subdirectory examples
-
-   # keyfile torture test is currently broken
-   sed -i \
-   -e 

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-09-01 Thread Mikle Kolyada
commit: 687d390efdfb621b9aafe74ae892cfb214063169
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Sep  1 18:08:47 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Sep  1 18:08:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=687d390e

net-libs/libssh: arm stable wrt bug #691110

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-libs/libssh/libssh-0.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.0.ebuild 
b/net-libs/libssh/libssh-0.9.0.ebuild
index 1ba01cd47ea..164aae6d0c1 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${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"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-08-13 Thread Jeroen Roovers
commit: 89f11d6961fec82445487697cfcdc5521a16ee31
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Aug 13 06:25:06 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Aug 13 06:48:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f11d69

net-libs/libssh: Stable for hppa too

Package-Manager: Portage-2.3.71, Repoman-2.3.17
RepoMan-Options: --ignore-arches
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-libs/libssh/libssh-0.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.0.ebuild 
b/net-libs/libssh/libssh-0.9.0.ebuild
index 0d89cd0cb79..1ba01cd47ea 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${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"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-08-06 Thread Andreas Sturmlechner
commit: 8012c467e1936b5fca474a49be7bed4a3e16c8ec
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug  6 20:08:26 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug  6 20:10:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8012c467

net-libs/libssh: Install docs only if native abi

Thanks-to: John R. Graham  gentoo.org>
Closes: https://bugs.gentoo.org/691576
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libssh/libssh-0.9.0.ebuild | 2 +-
 net-libs/libssh/libssh-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/libssh/libssh-0.9.0.ebuild 
b/net-libs/libssh/libssh-0.9.0.ebuild
index 2d08ceb11b3..0d89cd0cb79 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -97,7 +97,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
cmake-utils_src_install
-   use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+   multilib_is_native_abi && use doc && HTML_DOCS=( 
"${BUILD_DIR}"/doc/html/. )
 
# compatibility symlink until all consumers have been updated
# to no longer use libssh_threads.so

diff --git a/net-libs/libssh/libssh-.ebuild 
b/net-libs/libssh/libssh-.ebuild
index 19777b48ff3..c6953a5d267 100644
--- a/net-libs/libssh/libssh-.ebuild
+++ b/net-libs/libssh/libssh-.ebuild
@@ -94,7 +94,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
cmake-utils_src_install
-   use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+   multilib_is_native_abi && use doc && HTML_DOCS=( 
"${BUILD_DIR}"/doc/html/. )
 
# compatibility symlink until all consumers have been updated
# to no longer use libssh_threads.so



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-08-02 Thread Sergei Trofimovich
commit: c985e401a483c4da412fd633e5c801fc97a4b0e2
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Aug  3 02:36:51 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug  3 02:36:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c985e401

net-libs/libssh: stable 0.9.0 for ia64, bug #691110

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-libs/libssh/libssh-0.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.0.ebuild 
b/net-libs/libssh/libssh-0.9.0.ebuild
index 6a62c77f19a..2d08ceb11b3 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${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"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-08-01 Thread Aaron Bauman
commit: e270bb48a5f47b9553260d31a38bc87643ddb827
Author: Aaron Bauman  gentoo  org>
AuthorDate: Thu Aug  1 19:23:21 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Aug  1 19:23:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e270bb48

net-libs/libssh: arm64 stable (bug #691110)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

 net-libs/libssh/libssh-0.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.0.ebuild 
b/net-libs/libssh/libssh-0.9.0.ebuild
index 421a6b889f8..6a62c77f19a 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${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"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-07-31 Thread Agostino Sarubbo
commit: 66b4751657f3ce389cc170ef8396c92f541a3506
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 31 15:01:54 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 31 15:01:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66b47516

net-libs/libssh: alpha stable wrt bug #691110

Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="alpha"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.0.ebuild 
b/net-libs/libssh/libssh-0.9.0.ebuild
index 42a9721acc3..421a6b889f8 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${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"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-07-31 Thread Agostino Sarubbo
commit: 4b75751f5b59865467eb3ae48e1cb0a069f5809b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 31 14:59:55 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 31 14:59:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b75751f

net-libs/libssh: sparc stable wrt bug #691110

Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.0.ebuild 
b/net-libs/libssh/libssh-0.9.0.ebuild
index 25964c4d0ef..42a9721acc3 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${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"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-07-31 Thread Agostino Sarubbo
commit: c79888ddb4ab5ee5f620eae38c0d27518c1cea90
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 31 13:09:59 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 31 13:09:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c79888dd

net-libs/libssh: x86 stable wrt bug #691110

Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.0.ebuild 
b/net-libs/libssh/libssh-0.9.0.ebuild
index 1c8694a33c2..25964c4d0ef 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${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"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-07-31 Thread Agostino Sarubbo
commit: 85c1fd0ca5ede5f0a069a65bdd424022f8c41fc1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 31 12:06:35 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 31 12:06:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85c1fd0c

net-libs/libssh: amd64 stable wrt bug #691110

Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.0.ebuild 
b/net-libs/libssh/libssh-0.9.0.ebuild
index 1e4a7303046..1c8694a33c2 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${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"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

2019-07-31 Thread Agostino Sarubbo
commit: 57acd351c5e91fd4c3e028d50d910d159c8b66a5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 31 11:59:39 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 31 11:59:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57acd351

net-libs/libssh: ppc64 stable wrt bug #691110

Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/libssh/libssh-0.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh/libssh-0.9.0.ebuild 
b/net-libs/libssh/libssh-0.9.0.ebuild
index 82b4aa12d7f..1e4a7303046 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == * ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git;
 else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${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"



  1   2   >