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

2023-11-22 Thread Michał Górny
commit: df67a06d2f264ab561b18161aee35d0d3c2e2545
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Nov 22 12:04:34 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Nov 22 12:06:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df67a06d

net-libs/libssh2: Stabilize 1.11.0-r2 hppa, #909341

Signed-off-by: Michał Górny  gentoo.org>

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

diff --git a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild 
b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
index 2afaa2f4cbe9..c57fb3d7df6f 100644
--- a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"



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

2023-11-22 Thread Michał Górny
commit: ebf900073f8df62e868177f1c98ee7bc44d78214
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Nov 22 12:04:35 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Nov 22 12:06:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf90007

net-libs/libssh2: Stabilize 1.11.0-r2 sparc, #909341

Signed-off-by: Michał Górny  gentoo.org>

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

diff --git a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild 
b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
index b84509d8e6b6..eb37955cf515 100644
--- a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"



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

2023-11-22 Thread Michał Górny
commit: cdee95b85c140058351858fc6442de4a754540ef
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Nov 22 12:04:34 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Nov 22 12:06:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdee95b8

net-libs/libssh2: Stabilize 1.11.0-r2 ppc64, #909341

Signed-off-by: Michał Górny  gentoo.org>

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

diff --git a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild 
b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
index c57fb3d7df6f..b84509d8e6b6 100644
--- a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"



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

2023-11-22 Thread Michał Górny
commit: d5c867ff83d0a9ed3d64430154804be9f1f1548d
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Nov 22 12:06:04 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Nov 22 12:06:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c867ff

net-libs/libssh2: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 net-libs/libssh2/libssh2-1.11.0-r1.ebuild | 65 ---
 1 file changed, 65 deletions(-)

diff --git a/net-libs/libssh2/libssh2-1.11.0-r1.ebuild 
b/net-libs/libssh2/libssh2-1.11.0-r1.ebuild
deleted file mode 100644
index 11816607f618..
--- a/net-libs/libssh2/libssh2-1.11.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="https://www.libssh2.org;
-SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="gcrypt mbedtls test zlib"
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   !gcrypt? (
-   mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
-   !mbedtls? (
-   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-   )
-   )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-   ${RDEPEND}
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.11.0-mansyntax_sh.patch
-)
-
-multilib_src_configure() {
-   local crypto_backend=OpenSSL
-   if use gcrypt; then
-   crypto_backend=Libgcrypt
-   elif use mbedtls; then
-   crypto_backend=mbedTLS
-   fi
-
-   local mycmakeargs=(
-   -DBUILD_SHARED_LIBS=ON
-   -DBUILD_TESTING=$(usex test)
-   -DCRYPTO_BACKEND=${crypto_backend}
-   -DENABLE_ZLIB_COMPRESSION=$(usex zlib)
-   )
-
-   if use test ; then
-   # Pass separately to avoid unused var warnings w/ USE=-test
-   mycmakeargs+=(
-   -DRUN_SSHD_TESTS=OFF
-   -DRUN_DOCKER_TESTS=OFF
-   )
-   fi
-
-   cmake_src_configure
-}
-
-multilib_src_install_all() {
-   einstalldocs
-}



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

2023-09-02 Thread Andreas Sturmlechner
commit: e34e106c9ff5de63b4823f2fe74474cb3d61da9e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  2 17:10:13 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep  2 18:01:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e34e106c

net-libs/libssh2: drop 1.10.0

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

 net-libs/libssh2/Manifest  |  1 -
 .../libssh2/files/libssh2-1.10.0-libressl.patch| 33 -
 net-libs/libssh2/libssh2-1.10.0.ebuild | 56 --
 3 files changed, 90 deletions(-)

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index db369a27d8b1..d161b27f79f4 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,2 +1 @@
-DIST libssh2-1.10.0.tar.gz 965044 BLAKE2B 
0e6f571cc723e0050bf7ba7492f361ef222547dcbc311019cb6762f01405b4906e0418207a7d484c5170bee5e6f666827a7ea0d0cf233f684f999f896ce0b415
 SHA512 
e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30
 DIST libssh2-1.11.0.tar.xz 686796 BLAKE2B 
36903798c72f7261d9e997254169c10a4e69166017445276de8b0066fff15cd4dae4119a8d6cbbab8859d765b2d7f34f2911bbaf83c8d6ac5d1feead6b5de64e
 SHA512 
6d50c71b778ca0f769fcc9d2cc257ab669cd0b6c35e8b0e047b6b38aea10638974cc591ba27c25bb7dd523020b4a8a62e2c1ae368287d9dc254d5e24d4a7cee7

diff --git a/net-libs/libssh2/files/libssh2-1.10.0-libressl.patch 
b/net-libs/libssh2/files/libssh2-1.10.0-libressl.patch
deleted file mode 100644
index 9cecabd5d01e..
--- a/net-libs/libssh2/files/libssh2-1.10.0-libressl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/903001
-https://github.com/libssh2/libssh2/pull/700
-https://github.com/libssh2/libssh2/commit/b952674f120748174ed2c0fb93e7bd78cf355cac
-
-From f0681a4573d7c7f7484d3157ddff7063a200295b Mon Sep 17 00:00:00 2001
-From: Viktor Szakats 
-Date: Thu, 19 May 2022 13:25:06 +
-Subject: [PATCH] openssl: add support for LibreSSL 3.5.x
-
-LibreSSL 3.5.0 made more structures opaque, so let's enable existing
-support for that when building against these LibreSSL versions.
-
-Ref: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.5.0-relnotes.txt

- src/openssl.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/openssl.h b/src/openssl.h
-index 658b040..09bfd7c 100644
 a/src/openssl.h
-+++ b/src/openssl.h
-@@ -57,8 +57,9 @@
- #include 
- #include 
- 
--#if OPENSSL_VERSION_NUMBER >= 0x1010L && \
--!defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER >= 0x1010L && \
-+!defined(LIBRESSL_VERSION_NUMBER)) || \
-+LIBRESSL_VERSION_NUMBER >= 0x305fL
- # define HAVE_OPAQUE_STRUCTS 1
- #endif
- 

diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild 
b/net-libs/libssh2/libssh2-1.10.0.ebuild
deleted file mode 100644
index a4c6f0460f8e..
--- a/net-libs/libssh2/libssh2-1.10.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-multilib
-
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="https://www.libssh2.org;
-SRC_URI="https://www.libssh2.org/download/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="gcrypt mbedtls zlib"
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-# Tests try to set containers up using docker (and fail for some reason).
-RESTRICT="test"
-
-RDEPEND="
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   !gcrypt? (
-   mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
-   !mbedtls? (
-   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-   )
-   )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-   ${RDEPEND}
-"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-libressl.patch #903001
-)
-
-multilib_src_configure() {
-   local crypto_backend=OpenSSL
-   if use gcrypt; then
-   crypto_backend=Libgcrypt
-   elif use mbedtls; then
-   crypto_backend=mbedTLS
-   fi
-
-   local mycmakeargs=(
-   -DBUILD_SHARED_LIBS=ON
-   -DCRYPTO_BACKEND=${crypto_backend}
-   -DENABLE_ZLIB_COMPRESSION=$(usex zlib)
-   )
-   cmake_src_configure
-}
-
-multilib_src_install_all() {
-   einstalldocs
-   find "${ED}" -name '*.la' -delete || die
-}



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

2023-08-29 Thread Sam James
commit: baf04cfbd54e003f98659e5ebfc3c572b3d0d24a
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 30 02:33:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 30 02:33:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baf04cfb

net-libs/libssh2: Stabilize 1.11.0-r2 x86, #909341

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

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

diff --git a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild 
b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
index da5228f8a21b..9812ad3167c2 100644
--- a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"



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

2023-08-29 Thread Sam James
commit: dd44760df198ef5bffb772d4bbd7441812221c8e
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 30 02:33:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 30 02:33:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd44760d

net-libs/libssh2: Stabilize 1.11.0-r2 amd64, #909341

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

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

diff --git a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild 
b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
index 9812ad3167c2..2afaa2f4cbe9 100644
--- a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"



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

2023-08-29 Thread Sam James
commit: 86b41ec51f65e3f6c09afc90ce75e3fe607c80a7
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 30 02:08:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 30 02:08:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b41ec5

net-libs/libssh2: Stabilize 1.11.0-r2 arm, #909341

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

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

diff --git a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild 
b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
index 561e2a9ec8dc..501a0ecf59fe 100644
--- a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"



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

2023-08-29 Thread Sam James
commit: c0aff9316aab6b5acc5e2f427ad2690c002072e4
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 30 02:08:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 30 02:08:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0aff931

net-libs/libssh2: Stabilize 1.11.0-r2 ppc, #909341

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

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

diff --git a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild 
b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
index 3a3eb7de4d75..da5228f8a21b 100644
--- a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"



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

2023-08-29 Thread Sam James
commit: 723fb2cd00afa7c4530d51decbc54cd8f2c7993a
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 30 02:08:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 30 02:08:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=723fb2cd

net-libs/libssh2: Stabilize 1.11.0-r2 arm64, #909341

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

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

diff --git a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild 
b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
index 501a0ecf59fe..3a3eb7de4d75 100644
--- a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"



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

2023-08-29 Thread Sam James
commit: b31e7e4664d8f8c61fb4fd6443b29d70702663f7
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Tue Aug 29 16:42:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 29 23:20:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b31e7e46

net-libs/libssh2: fix conflicting types (32-bit build)

Closes: https://bugs.gentoo.org/911279
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/32510
Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh2/files/libssh2-1.11.0-size_t.patch | 95 ++
 net-libs/libssh2/libssh2-1.11.0-r2.ebuild  | 66 +++
 2 files changed, 161 insertions(+)

diff --git a/net-libs/libssh2/files/libssh2-1.11.0-size_t.patch 
b/net-libs/libssh2/files/libssh2-1.11.0-size_t.patch
new file mode 100644
index ..ade3cdee8a49
--- /dev/null
+++ b/net-libs/libssh2/files/libssh2-1.11.0-size_t.patch
@@ -0,0 +1,95 @@
+https://bugs.gentoo.org/911279
+Upstream: https://github.com/libssh2/libssh2/issues/1053
+Commit: 
https://github.com/libssh2/libssh2/commit/1153ebdeba563ac657b525edd6bf6da68b1fe5e2
+From: Viktor Szakats 
+Date: Tue, 30 May 2023 17:28:03 +
+Subject: [PATCH] mbedtls: use more `size_t` to sync up with `crypto.h`
+
+Ref: 5a96f494ee0b00282afb2db2e091246fc5e1774a #846 #879
+
+Fixes #1053
+Closes #1054
+--- a/src/mbedtls.c
 b/src/mbedtls.c
+@@ -186,7 +186,7 @@ _libssh2_mbedtls_cipher_dtor(_libssh2_cipher_ctx *ctx)
+ int
+ _libssh2_mbedtls_hash_init(mbedtls_md_context_t *ctx,
+mbedtls_md_type_t mdtype,
+-   const unsigned char *key, unsigned long keylen)
++   const unsigned char *key, size_t keylen)
+ {
+ const mbedtls_md_info_t *md_info;
+ int ret, hmac;
+@@ -221,7 +221,7 @@ _libssh2_mbedtls_hash_final(mbedtls_md_context_t *ctx, 
unsigned char *hash)
+ }
+ 
+ int
+-_libssh2_mbedtls_hash(const unsigned char *data, unsigned long datalen,
++_libssh2_mbedtls_hash(const unsigned char *data, size_t datalen,
+   mbedtls_md_type_t mdtype, unsigned char *hash)
+ {
+ const mbedtls_md_info_t *md_info;
+@@ -497,8 +497,9 @@ int
+ _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx,
+  size_t hash_len,
+  const unsigned char *sig,
+- unsigned long sig_len,
+- const unsigned char *m, unsigned long m_len)
++ size_t sig_len,
++ const unsigned char *m,
++ size_t m_len)
+ {
+ int ret;
+ int md_type;
+@@ -548,8 +549,9 @@ _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx,
+ int
+ _libssh2_mbedtls_rsa_sha1_verify(libssh2_rsa_ctx * rsactx,
+  const unsigned char *sig,
+- unsigned long sig_len,
+- const unsigned char *m, unsigned long m_len)
++ size_t sig_len,
++ const unsigned char *m,
++ size_t m_len)
+ {
+ return _libssh2_mbedtls_rsa_sha2_verify(rsactx, SHA_DIGEST_LENGTH,
+ sig, sig_len, m, m_len);
+--- a/src/mbedtls.h
 b/src/mbedtls.h
+@@ -478,12 +478,12 @@ _libssh2_mbedtls_cipher_dtor(_libssh2_cipher_ctx *ctx);
+ int
+ _libssh2_mbedtls_hash_init(mbedtls_md_context_t *ctx,
+mbedtls_md_type_t mdtype,
+-   const unsigned char *key, unsigned long keylen);
++   const unsigned char *key, size_t keylen);
+ 
+ int
+ _libssh2_mbedtls_hash_final(mbedtls_md_context_t *ctx, unsigned char *hash);
+ int
+-_libssh2_mbedtls_hash(const unsigned char *data, unsigned long datalen,
++_libssh2_mbedtls_hash(const unsigned char *data, size_t datalen,
+   mbedtls_md_type_t mdtype, unsigned char *hash);
+ 
+ _libssh2_bn *
+@@ -526,9 +526,8 @@ 
_libssh2_mbedtls_rsa_new_private_frommemory(libssh2_rsa_ctx **rsa,
+ int
+ _libssh2_mbedtls_rsa_sha1_verify(libssh2_rsa_ctx *rsa,
+  const unsigned char *sig,
+- unsigned long sig_len,
+- const unsigned char *m,
+- unsigned long m_len);
++ size_t sig_len,
++ const unsigned char *m, size_t m_len);
+ int
+ _libssh2_mbedtls_rsa_sha1_sign(LIBSSH2_SESSION *session,
+libssh2_rsa_ctx *rsa,
+@@ -540,8 +539,8 @@ int
+ _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx,
+  size_t hash_len,
+  const unsigned char *sig,
+- unsigned long sig_len,
+-  

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

2023-08-01 Thread Sam James
commit: 2576cc8201b327f5af1a65735036955902ea59cd
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug  1 07:16:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug  1 07:16:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2576cc82

net-libs/libssh2: don't drop .a

It breaks the installed CMake config file.

Closes: https://bugs.gentoo.org/911386
Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh2/{libssh2-1.11.0.ebuild => libssh2-1.11.0-r1.ebuild} | 1 -
 net-libs/libssh2/libssh2-.ebuild | 1 -
 2 files changed, 2 deletions(-)

diff --git a/net-libs/libssh2/libssh2-1.11.0.ebuild 
b/net-libs/libssh2/libssh2-1.11.0-r1.ebuild
similarity index 97%
rename from net-libs/libssh2/libssh2-1.11.0.ebuild
rename to net-libs/libssh2/libssh2-1.11.0-r1.ebuild
index 02fa622e27d5..11816607f618 100644
--- a/net-libs/libssh2/libssh2-1.11.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0-r1.ebuild
@@ -62,5 +62,4 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
einstalldocs
-   find "${ED}" -name '*.a' -delete || die
 }

diff --git a/net-libs/libssh2/libssh2-.ebuild 
b/net-libs/libssh2/libssh2-.ebuild
index 1c3811f85a82..70a9e03a7d0b 100644
--- a/net-libs/libssh2/libssh2-.ebuild
+++ b/net-libs/libssh2/libssh2-.ebuild
@@ -62,5 +62,4 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
einstalldocs
-   find "${ED}" -name '*.a' -delete || die
 }



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

2023-06-29 Thread Sam James
commit: 6e3fe00dd3c80e38dabb3614c17fd24e1a797b70
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 29 06:17:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 29 06:17:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e3fe00d

net-libs/libssh2: Stabilize 1.11.0 amd64, #909341

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

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

diff --git a/net-libs/libssh2/libssh2-1.11.0.ebuild 
b/net-libs/libssh2/libssh2-1.11.0.ebuild
index 7e0d142ae351..02fa622e27d5 100644
--- a/net-libs/libssh2/libssh2-1.11.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"



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

2023-06-28 Thread Sam James
commit: 0b925dd64a00d6ca7c72a69db111c8f2fb92355b
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 28 21:22:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 28 21:22:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b925dd6

net-libs/libssh2: Stabilize 1.11.0 hppa, #909341

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

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

diff --git a/net-libs/libssh2/libssh2-1.11.0.ebuild 
b/net-libs/libssh2/libssh2-1.11.0.ebuild
index 64b6d92d8d29..7e0d142ae351 100644
--- a/net-libs/libssh2/libssh2-1.11.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"



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

2023-06-28 Thread Sam James
commit: 954932c357cd6000190675d83dfdf310cf4a1584
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 28 21:14:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 28 21:14:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=954932c3

net-libs/libssh2: Stabilize 1.11.0 arm, #909341

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

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

diff --git a/net-libs/libssh2/libssh2-1.11.0.ebuild 
b/net-libs/libssh2/libssh2-1.11.0.ebuild
index 7525c75c83a0..64b6d92d8d29 100644
--- a/net-libs/libssh2/libssh2-1.11.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"



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

2023-06-28 Thread Sam James
commit: dbe42f09ea459c7e751753a4de6a708044348c45
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 28 21:14:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 28 21:14:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbe42f09

net-libs/libssh2: Stabilize 1.11.0 arm64, #909341

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

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

diff --git a/net-libs/libssh2/libssh2-1.11.0.ebuild 
b/net-libs/libssh2/libssh2-1.11.0.ebuild
index 47e484c63efd..7525c75c83a0 100644
--- a/net-libs/libssh2/libssh2-1.11.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"



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

2023-06-28 Thread Sam James
commit: 3aa48502617739c34edc3ea5c8884866f54bc877
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 28 21:14:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 28 21:14:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aa48502

net-libs/libssh2: Stabilize 1.11.0 ppc64, #909341

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

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

diff --git a/net-libs/libssh2/libssh2-1.11.0.ebuild 
b/net-libs/libssh2/libssh2-1.11.0.ebuild
index f46409a021c7..47e484c63efd 100644
--- a/net-libs/libssh2/libssh2-1.11.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"



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

2023-06-28 Thread Sam James
commit: b3b9da65b3c494ad9f5c05109ceaf344750baf68
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 28 21:14:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 28 21:14:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b9da65

net-libs/libssh2: Stabilize 1.11.0 sparc, #909341

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

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

diff --git a/net-libs/libssh2/libssh2-1.11.0.ebuild 
b/net-libs/libssh2/libssh2-1.11.0.ebuild
index 30a399914f72..f46409a021c7 100644
--- a/net-libs/libssh2/libssh2-1.11.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"



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

2023-06-23 Thread Conrad Kostecki
commit: bfdbba524846dd707241179cf7797245d7c41626
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Jun  1 15:46:16 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Jun 23 21:28:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfdbba52

net-libs/libssh2: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31268
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch | 8 
 1 file changed, 8 deletions(-)

diff --git a/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch 
b/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch
deleted file mode 100644
index c8b791f01789..
--- a/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch
+++ /dev/null
@@ -1,8 +0,0 @@
 a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -179,5 +179,4 @@ mark_as_advanced(SH_EXECUTABLE MAN_EXECUTABLE 
GREP_EXECUTABLE)
- if(SH_EXECUTABLE AND MAN_EXECUTABLE AND GREP_EXECUTABLE)
-   set(cmd "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
-   set(cmd "${cmd} ${CMAKE_CURRENT_SOURCE_DIR}/mansyntax.sh")
--  add_test(mansyntax ${SH_EXECUTABLE} -c "${cmd}")
- endif()



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

2023-05-30 Thread Sam James
commit: 7049f7be8adf93a95f4e50855e5a4d2f96d8ab34
Author: Sam James  gentoo  org>
AuthorDate: Wed May 31 03:34:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 31 03:34:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7049f7be

net-libs/libssh2: fix DoubleEmptyLine

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

 net-libs/libssh2/libssh2-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-libs/libssh2/libssh2-.ebuild 
b/net-libs/libssh2/libssh2-.ebuild
index 8a5ad181cafd..1c3811f85a82 100644
--- a/net-libs/libssh2/libssh2-.ebuild
+++ b/net-libs/libssh2/libssh2-.ebuild
@@ -57,7 +57,6 @@ multilib_src_configure() {
)
fi
 
-
cmake_src_configure
 }
 



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

2023-05-30 Thread Sam James
commit: 8d5428f7bbd5dc4fe9e8cb36c9383a86adbb96a0
Author: Sam James  gentoo  org>
AuthorDate: Wed May 31 03:33:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 31 03:33:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d5428f7

net-libs/libssh2: conditionally set test options

Closes: https://bugs.gentoo.org/907443
Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh2/libssh2-1.11.0.ebuild | 11 +--
 net-libs/libssh2/libssh2-.ebuild   | 12 +++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/net-libs/libssh2/libssh2-1.11.0.ebuild 
b/net-libs/libssh2/libssh2-1.11.0.ebuild
index 2f60c46c3928..30a399914f72 100644
--- a/net-libs/libssh2/libssh2-1.11.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0.ebuild
@@ -47,9 +47,16 @@ multilib_src_configure() {
-DBUILD_TESTING=$(usex test)
-DCRYPTO_BACKEND=${crypto_backend}
-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
-   -DRUN_SSHD_TESTS=OFF
-   -DRUN_DOCKER_TESTS=OFF
)
+
+   if use test ; then
+   # Pass separately to avoid unused var warnings w/ USE=-test
+   mycmakeargs+=(
+   -DRUN_SSHD_TESTS=OFF
+   -DRUN_DOCKER_TESTS=OFF
+   )
+   fi
+
cmake_src_configure
 }
 

diff --git a/net-libs/libssh2/libssh2-.ebuild 
b/net-libs/libssh2/libssh2-.ebuild
index 290d28ce2558..8a5ad181cafd 100644
--- a/net-libs/libssh2/libssh2-.ebuild
+++ b/net-libs/libssh2/libssh2-.ebuild
@@ -48,10 +48,20 @@ multilib_src_configure() {
-DRUN_SSHD_TESTS=OFF
-DRUN_DOCKER_TESTS=OFF
)
+
+   if use test ; then
+   # Pass separately to avoid unused var warnings w/ USE=-test
+   mycmakeargs+=(
+   -DRUN_SSHD_TESTS=OFF
+   -DRUN_DOCKER_TESTS=OFF
+   )
+   fi
+
+
cmake_src_configure
 }
 
 multilib_src_install_all() {
einstalldocs
-   find "${ED}" -name '*.la' -delete || die
+   find "${ED}" -name '*.a' -delete || die
 }



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

2023-05-30 Thread Sam James
commit: e7fd1ad3b98eefd030d9437a74b6c645487fbaa6
Author: Sam James  gentoo  org>
AuthorDate: Tue May 30 18:40:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 30 18:40:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7fd1ad3

net-libs/libssh2: add 1.11.0

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

 net-libs/libssh2/Manifest   |  1 +
 .../libssh2/files/libssh2-1.11.0-mansyntax_sh.patch | 10 ++
 .../{libssh2-.ebuild => libssh2-1.11.0.ebuild}  | 21 +
 net-libs/libssh2/libssh2-.ebuild|  9 ++---
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 95b30d057e33..db369a27d8b1 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1 +1,2 @@
 DIST libssh2-1.10.0.tar.gz 965044 BLAKE2B 
0e6f571cc723e0050bf7ba7492f361ef222547dcbc311019cb6762f01405b4906e0418207a7d484c5170bee5e6f666827a7ea0d0cf233f684f999f896ce0b415
 SHA512 
e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30
+DIST libssh2-1.11.0.tar.xz 686796 BLAKE2B 
36903798c72f7261d9e997254169c10a4e69166017445276de8b0066fff15cd4dae4119a8d6cbbab8859d765b2d7f34f2911bbaf83c8d6ac5d1feead6b5de64e
 SHA512 
6d50c71b778ca0f769fcc9d2cc257ab669cd0b6c35e8b0e047b6b38aea10638974cc591ba27c25bb7dd523020b4a8a62e2c1ae368287d9dc254d5e24d4a7cee7

diff --git a/net-libs/libssh2/files/libssh2-1.11.0-mansyntax_sh.patch 
b/net-libs/libssh2/files/libssh2-1.11.0-mansyntax_sh.patch
new file mode 100644
index ..8d8e93cda47e
--- /dev/null
+++ b/net-libs/libssh2/files/libssh2-1.11.0-mansyntax_sh.patch
@@ -0,0 +1,10 @@
+--- a/tests/CMakeLists.txt
 b/tests/CMakeLists.txt
+@@ -63,7 +63,6 @@ if(SH_EXECUTABLE)
+ mark_as_advanced(SSHD_EXECUTABLE)
+   endif()
+ 
+-  add_test(NAME mansyntax COMMAND ${SH_EXECUTABLE} -c 
"${CMAKE_CURRENT_SOURCE_DIR}/mansyntax.sh")
+ endif()
+ 
+ add_library(runner STATIC ${librunner_la_SOURCES})

diff --git a/net-libs/libssh2/libssh2-.ebuild 
b/net-libs/libssh2/libssh2-1.11.0.ebuild
similarity index 65%
copy from net-libs/libssh2/libssh2-.ebuild
copy to net-libs/libssh2/libssh2-1.11.0.ebuild
index 7aa0edfae11e..2f60c46c3928 100644
--- a/net-libs/libssh2/libssh2-.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0.ebuild
@@ -3,18 +3,18 @@
 
 EAPI=8
 
-inherit cmake-multilib git-r3
+inherit cmake-multilib
 
 DESCRIPTION="Library implementing the SSH2 protocol"
 HOMEPAGE="https://www.libssh2.org;
-EGIT_REPO_URI="https://github.com/libssh2/libssh2;
+SRC_URI="https://www.libssh2.org/download/${P}.tar.xz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE="gcrypt mbedtls zlib"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
@@ -26,10 +26,12 @@ RDEPEND="
)
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+   ${RDEPEND}
+"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
+   "${FILESDIR}"/${PN}-1.11.0-mansyntax_sh.patch
 )
 
 multilib_src_configure() {
@@ -42,13 +44,16 @@ multilib_src_configure() {
 
local mycmakeargs=(
-DBUILD_SHARED_LIBS=ON
+   -DBUILD_TESTING=$(usex test)
-DCRYPTO_BACKEND=${crypto_backend}
-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+   -DRUN_SSHD_TESTS=OFF
+   -DRUN_DOCKER_TESTS=OFF
)
cmake_src_configure
 }
 
 multilib_src_install_all() {
einstalldocs
-   find "${ED}" -name '*.la' -delete || die
+   find "${ED}" -name '*.a' -delete || die
 }

diff --git a/net-libs/libssh2/libssh2-.ebuild 
b/net-libs/libssh2/libssh2-.ebuild
index 7aa0edfae11e..290d28ce2558 100644
--- a/net-libs/libssh2/libssh2-.ebuild
+++ b/net-libs/libssh2/libssh2-.ebuild
@@ -12,9 +12,9 @@ EGIT_REPO_URI="https://github.com/libssh2/libssh2;
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="gcrypt mbedtls zlib"
+IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
@@ -29,7 +29,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
+   "${FILESDIR}"/${PN}-1.11.0-mansyntax_sh.patch
 )
 
 multilib_src_configure() {
@@ -42,8 +42,11 @@ multilib_src_configure() {
 
local mycmakeargs=(
-DBUILD_SHARED_LIBS=ON
+   -DBUILD_TESTING=$(usex test)
-DCRYPTO_BACKEND=${crypto_backend}
-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+   

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

2023-04-29 Thread Michał Górny
commit: 31aac77f7d43a553ddd20a1ca65e1fa4aa74ecd8
Author: orbea  riseup  net>
AuthorDate: Fri Apr 28 17:20:46 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Apr 29 17:51:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31aac77f

net-libs/libssh2: add upstream libressl patch

This patch has been accepted upstream and fixes the build libressl >=
3.5.0.

Bug: https://bugs.gentoo.org/903001
Upstream-PR: https://github.com/libssh2/libssh2/pull/700
Upstream-Commit: 
https://github.com/libssh2/libssh2/commit/b952674f120748174ed2c0fb93e7bd78cf355cac
Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30795
Signed-off-by: Michał Górny  gentoo.org>

 .../libssh2/files/libssh2-1.10.0-libressl.patch| 33 ++
 net-libs/libssh2/libssh2-1.10.0.ebuild |  6 +++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/net-libs/libssh2/files/libssh2-1.10.0-libressl.patch 
b/net-libs/libssh2/files/libssh2-1.10.0-libressl.patch
new file mode 100644
index ..9cecabd5d01e
--- /dev/null
+++ b/net-libs/libssh2/files/libssh2-1.10.0-libressl.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/903001
+https://github.com/libssh2/libssh2/pull/700
+https://github.com/libssh2/libssh2/commit/b952674f120748174ed2c0fb93e7bd78cf355cac
+
+From f0681a4573d7c7f7484d3157ddff7063a200295b Mon Sep 17 00:00:00 2001
+From: Viktor Szakats 
+Date: Thu, 19 May 2022 13:25:06 +
+Subject: [PATCH] openssl: add support for LibreSSL 3.5.x
+
+LibreSSL 3.5.0 made more structures opaque, so let's enable existing
+support for that when building against these LibreSSL versions.
+
+Ref: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.5.0-relnotes.txt
+---
+ src/openssl.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/openssl.h b/src/openssl.h
+index 658b040..09bfd7c 100644
+--- a/src/openssl.h
 b/src/openssl.h
+@@ -57,8 +57,9 @@
+ #include 
+ #include 
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L && \
+-!defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x1010L && \
++!defined(LIBRESSL_VERSION_NUMBER)) || \
++LIBRESSL_VERSION_NUMBER >= 0x305fL
+ # define HAVE_OPAQUE_STRUCTS 1
+ #endif
+ 

diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild 
b/net-libs/libssh2/libssh2-1.10.0.ebuild
index 0b459297cb05..00504d7654e5 100644
--- a/net-libs/libssh2/libssh2-1.10.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,10 @@ DEPEND="
${RDEPEND}
 "
 
+PATCHES=(
+   "${FILESDIR}"/${P}-libressl.patch #903001
+)
+
 multilib_src_configure() {
local crypto_backend=OpenSSL
if use gcrypt; then



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

2023-04-13 Thread Sam James
commit: f7aa70157eaa0561b4eb24135380ce0e072576de
Author: orbea  riseup  net>
AuthorDate: Tue Apr 11 23:34:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 00:27:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7aa7015

net-libs/libssh2: Update live patch

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30562
Signed-off-by: Sam James  gentoo.org>

 .../libssh2/files/libssh2-1.8.0-mansyntax_sh.patch | 49 --
 1 file changed, 8 insertions(+), 41 deletions(-)

diff --git a/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch 
b/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch
index 3a33bf744167..c8b791f01789 100644
--- a/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch
+++ b/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch
@@ -1,41 +1,8 @@
 a/tests/mansyntax.sh
-+++ b/tests/mansyntax.sh
-@@ -1,37 +1,2 @@
- #!/bin/sh
--set -e
--
--# Written by Mikhail Gusarov
--#
--# Run syntax checks for all manpages in the documentation tree.
--#
--
--srcdir=${srcdir:-$PWD}
--dstdir=${builddir:-$PWD}
--mandir=${srcdir}/../docs
--
--#
--# Only test if suitable man is available
--#
--if ! man --help | grep -q warnings; then
--  echo "man version not suitable, skipping tests"
--  exit 0
--fi
--
--ec=0
--
--trap "rm -f $dstdir/man3" EXIT
--
--ln -sf "$mandir" "$dstdir/man3"
--
--for manpage in $mandir/libssh2_*.*; do
--  echo "$manpage"
--  warnings=$(LANG=en_US.UTF-8 MANWIDTH=80 man -M "$dstdir" --warnings \
---E UTF-8 -l "$manpage" 2>&1 >/dev/null)
--  if [ -n "$warnings" ]; then
--echo "$warnings"
--ec=1
--  fi
--done
--
--exit $ec
-+:
+--- a/tests/CMakeLists.txt
 b/tests/CMakeLists.txt
+@@ -179,5 +179,4 @@ mark_as_advanced(SH_EXECUTABLE MAN_EXECUTABLE 
GREP_EXECUTABLE)
+ if(SH_EXECUTABLE AND MAN_EXECUTABLE AND GREP_EXECUTABLE)
+   set(cmd "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
+   set(cmd "${cmd} ${CMAKE_CURRENT_SOURCE_DIR}/mansyntax.sh")
+-  add_test(mansyntax ${SH_EXECUTABLE} -c "${cmd}")
+ endif()



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

2023-03-22 Thread Andreas Sturmlechner
commit: 7f5c5dd2c21315b97d77427dbf32baccf8c8cf2e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar 15 10:16:38 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 22 18:52:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f5c5dd2

net-libs/libssh2: update EAPI 7 -> 8

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

 net-libs/libssh2/libssh2-.ebuild | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/net-libs/libssh2/libssh2-.ebuild 
b/net-libs/libssh2/libssh2-.ebuild
index 55e28471bb49..7aa0edfae11e 100644
--- a/net-libs/libssh2/libssh2-.ebuild
+++ b/net-libs/libssh2/libssh2-.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit git-r3 cmake-multilib
+EAPI=8
+
+inherit cmake-multilib git-r3
 
 DESCRIPTION="Library implementing the SSH2 protocol"
 HOMEPAGE="https://www.libssh2.org;
@@ -25,9 +26,7 @@ RDEPEND="
)
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
-DEPEND="
-   ${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch



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

2022-07-28 Thread Sam James
commit: 8ad15630cbe976b138f05b723770be27c30de250
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 28 13:45:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 28 13:59:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ad15630

net-libs/libssh2: add github upstream metadata

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

 net-libs/libssh2/metadata.xml | 25 ++---
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml
index f072d7197066..1f00f91c1cd3 100644
--- a/net-libs/libssh2/metadata.xml
+++ b/net-libs/libssh2/metadata.xml
@@ -1,15 +1,18 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-net...@gentoo.org
-
-
-   mgo...@gentoo.org
-   Michał Górny
-
-
-   Use dev-libs/libgcrypt instead of 
dev-libs/openssl
-   Use net-libs/mbedtls instead of 
dev-libs/openssl
-
+   
+   net...@gentoo.org
+   
+   
+   mgo...@gentoo.org
+   Michał Górny
+   
+   
+   Use dev-libs/libgcrypt instead 
of dev-libs/openssl
+   Use net-libs/mbedtls instead of 
dev-libs/openssl
+   
+   
+   libssh2/libssh2
+   
 



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

2021-11-15 Thread Michał Górny
commit: 071f81847bccf95001e3f3fd23f92c105c9532fe
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Nov 15 08:43:26 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Nov 15 08:45:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071f8184

net-libs/libssh2: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 net-libs/libssh2/Manifest  |  1 -
 net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild | 58 --
 2 files changed, 59 deletions(-)

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index e3b31020b5f6..95b30d057e33 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,2 +1 @@
 DIST libssh2-1.10.0.tar.gz 965044 BLAKE2B 
0e6f571cc723e0050bf7ba7492f361ef222547dcbc311019cb6762f01405b4906e0418207a7d484c5170bee5e6f666827a7ea0d0cf233f684f999f896ce0b415
 SHA512 
e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30
-DIST libssh2-1.9.0_p20200614.tar.gz 482698 BLAKE2B 
a93c3e61ecba564263e5aa1c10769bd07b5d16def9e6948262e5bbe32d86ae39784b63c608ad4d8a4aa0fcb14c8b55742f90cd2856e043bea5b3d052a31dc871
 SHA512 
fa34c598149d28b12f5cefbee4816f30a807a1bde89faa3be469f690057cf2ea7dd1a83191b2a2cae3794e307d676efebd7a31d70d9587e42e0926f82a1ae73d

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
deleted file mode 100644
index 5b45044a02c4..
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
+++ /dev/null
@@ -1,58 +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
-
-EGIT_COMMIT=6c7769dcc422250d14af1b06fce378b6ee009440
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="https://www.libssh2.org;
-SRC_URI="https://github.com/libssh2/libssh2/archive/${EGIT_COMMIT}.tar.gz -> 
${P}.tar.gz"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="gcrypt mbedtls zlib"
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="test"
-
-RDEPEND="
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   !gcrypt? (
-   mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
-   !mbedtls? (
-   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-   )
-   )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-   ${RDEPEND}
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
-)
-
-multilib_src_configure() {
-   local crypto_backend=OpenSSL
-   if use gcrypt; then
-   crypto_backend=Libgcrypt
-   elif use mbedtls; then
-   crypto_backend=mbedTLS
-   fi
-
-   local mycmakeargs=(
-   -DBUILD_SHARED_LIBS=ON
-   -DCRYPTO_BACKEND=${crypto_backend}
-   -DENABLE_ZLIB_COMPRESSION=$(usex zlib)
-   )
-   cmake_src_configure
-}
-
-multilib_src_install_all() {
-   einstalldocs
-   find "${ED}" -name '*.la' -delete || die
-}



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

2021-10-15 Thread Sam James
commit: 95a1a5bc23749a307bfcb5c47c15f849b1064360
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Oct 14 14:17:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 15 19:11:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95a1a5bc

net-libs/libssh2: stable 1.10.0 for hppa, bug #817122

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

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

diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild 
b/net-libs/libssh2/libssh2-1.10.0.ebuild
index 6ae3ecb5306..ff53c923466 100644
--- a/net-libs/libssh2/libssh2-1.10.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 # Tests try to set containers up using docker (and fail for some reason).



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

2021-10-10 Thread Sam James
commit: 04d626b7a7b3a2f57ef8434ab1d1df583e8ab654
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 10 20:36:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 10 20:36:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d626b7

net-libs/libssh2: Stabilize 1.10.0 arm64, #817122

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

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

diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild 
b/net-libs/libssh2/libssh2-1.10.0.ebuild
index 454d6212fb9..6ae3ecb5306 100644
--- a/net-libs/libssh2/libssh2-1.10.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 # Tests try to set containers up using docker (and fail for some reason).



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

2021-10-10 Thread Agostino Sarubbo
commit: 9d424f80f817a3f4aa233c2df6784eea0eedcbf1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct 10 15:36:55 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct 10 15:36:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d424f80

net-libs/libssh2: x86 stable wrt bug #817122

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

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

diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild 
b/net-libs/libssh2/libssh2-1.10.0.ebuild
index 75b4dd60cde..454d6212fb9 100644
--- a/net-libs/libssh2/libssh2-1.10.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 # Tests try to set containers up using docker (and fail for some reason).



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

2021-10-10 Thread Agostino Sarubbo
commit: f6f68499e92244c3930039aca3a03079eb7591e0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct 10 15:35:49 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct 10 15:35:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6f68499

net-libs/libssh2: sparc stable wrt bug #817122

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

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

diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild 
b/net-libs/libssh2/libssh2-1.10.0.ebuild
index f08c86345e5..75b4dd60cde 100644
--- a/net-libs/libssh2/libssh2-1.10.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 # Tests try to set containers up using docker (and fail for some reason).



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

2021-10-10 Thread Agostino Sarubbo
commit: b67714c5dbf97e0220f0f75963004a74c841d53d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct 10 15:31:43 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct 10 15:31:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67714c5

net-libs/libssh2: amd64 stable wrt bug #817122

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

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

diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild 
b/net-libs/libssh2/libssh2-1.10.0.ebuild
index cda865755e0..f08c86345e5 100644
--- a/net-libs/libssh2/libssh2-1.10.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 # Tests try to set containers up using docker (and fail for some reason).



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

2021-10-09 Thread Sam James
commit: cdbe4e8ecff1998ade400c2f4d65224b7638ee41
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  9 19:21:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  9 19:21:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdbe4e8e

net-libs/libssh2: Stabilize 1.10.0 ppc, #817122

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

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

diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild 
b/net-libs/libssh2/libssh2-1.10.0.ebuild
index 0cbdb043067..cda865755e0 100644
--- a/net-libs/libssh2/libssh2-1.10.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 # Tests try to set containers up using docker (and fail for some reason).



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

2021-10-09 Thread Sam James
commit: 6a07e66c6997a7b88b1a87bb486711a94a5dd051
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  9 19:20:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  9 19:20:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a07e66c

net-libs/libssh2: Stabilize 1.10.0 ppc64, #817122

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

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

diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild 
b/net-libs/libssh2/libssh2-1.10.0.ebuild
index 3565e6ad2c9..0cbdb043067 100644
--- a/net-libs/libssh2/libssh2-1.10.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 # Tests try to set containers up using docker (and fail for some reason).



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

2021-10-09 Thread Sam James
commit: 93a448e842378935bfa2a4108407d3c4f288bf49
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  9 19:16:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  9 19:18:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a448e8

net-libs/libssh2: Stabilize 1.10.0 arm, #817122

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

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

diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild 
b/net-libs/libssh2/libssh2-1.10.0.ebuild
index 309a9aac840..3565e6ad2c9 100644
--- a/net-libs/libssh2/libssh2-1.10.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 # Tests try to set containers up using docker (and fail for some reason).



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

2021-08-29 Thread Michał Górny
commit: 85e2d4f804565db912462b845284e997148d2885
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug 29 21:37:15 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug 29 21:49:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85e2d4f8

net-libs/libssh2: Bump to 1.10.0

Signed-off-by: Michał Górny  gentoo.org>

 net-libs/libssh2/Manifest  |  1 +
 net-libs/libssh2/libssh2-1.10.0.ebuild | 53 ++
 2 files changed, 54 insertions(+)

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 72c8716d2b8..e3b31020b5f 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1 +1,2 @@
+DIST libssh2-1.10.0.tar.gz 965044 BLAKE2B 
0e6f571cc723e0050bf7ba7492f361ef222547dcbc311019cb6762f01405b4906e0418207a7d484c5170bee5e6f666827a7ea0d0cf233f684f999f896ce0b415
 SHA512 
e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30
 DIST libssh2-1.9.0_p20200614.tar.gz 482698 BLAKE2B 
a93c3e61ecba564263e5aa1c10769bd07b5d16def9e6948262e5bbe32d86ae39784b63c608ad4d8a4aa0fcb14c8b55742f90cd2856e043bea5b3d052a31dc871
 SHA512 
fa34c598149d28b12f5cefbee4816f30a807a1bde89faa3be469f690057cf2ea7dd1a83191b2a2cae3794e307d676efebd7a31d70d9587e42e0926f82a1ae73d

diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild 
b/net-libs/libssh2/libssh2-1.10.0.ebuild
new file mode 100644
index 000..309a9aac840
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.10.0.ebuild
@@ -0,0 +1,53 @@
+# 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="Library implementing the SSH2 protocol"
+HOMEPAGE="https://www.libssh2.org;
+SRC_URI="https://www.libssh2.org/download/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="gcrypt mbedtls zlib"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+# Tests try to set containers up using docker (and fail for some reason).
+RESTRICT="test"
+
+RDEPEND="
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   !gcrypt? (
+   mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
+   !mbedtls? (
+   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+   )
+   )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+   ${RDEPEND}
+"
+
+multilib_src_configure() {
+   local crypto_backend=OpenSSL
+   if use gcrypt; then
+   crypto_backend=Libgcrypt
+   elif use mbedtls; then
+   crypto_backend=mbedTLS
+   fi
+
+   local mycmakeargs=(
+   -DBUILD_SHARED_LIBS=ON
+   -DCRYPTO_BACKEND=${crypto_backend}
+   -DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+   )
+   cmake_src_configure
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   find "${ED}" -name '*.la' -delete || die
+}



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

2021-06-21 Thread Marek Szuba
commit: a336cae862e3df9e7befaa0bbb995cfbe08d9932
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jun 21 13:37:27 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jun 21 14:04:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a336cae8

net-libs/libssh2: keyword 1.9.0_p20200614-r1 for ~riscv

Builds and installs fine against both openssl and libgcrypt,
unfortunately the test suite requires Docker but at least SFTP
support in app-misc/mc - which uses it - works.

Signed-off-by: Marek Szuba  gentoo.org>

 net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
index 38c16aa85e4..5b45044a02c 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2021-05-02 Thread Mikle Kolyada
commit: 96949e6b84f5d4072d6db265c57af4cad897b9ce
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 10:15:51 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 10:16:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96949e6b

net-libs/libssh2: remove libressl support

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

 net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild | 5 ++---
 net-libs/libssh2/libssh2-.ebuild   | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
index 1ee9017fd30..38c16aa85e4 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="gcrypt libressl mbedtls zlib"
+IUSE="gcrypt mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
 
@@ -23,8 +23,7 @@ RDEPEND="
!gcrypt? (
mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
!mbedtls? (
-   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
)
)
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )

diff --git a/net-libs/libssh2/libssh2-.ebuild 
b/net-libs/libssh2/libssh2-.ebuild
index 9144d257666..275a78e9da5 100644
--- a/net-libs/libssh2/libssh2-.ebuild
+++ b/net-libs/libssh2/libssh2-.ebuild
@@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/libssh2/libssh2;
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="gcrypt libressl mbedtls zlib"
+IUSE="gcrypt mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
 
@@ -21,8 +21,7 @@ RDEPEND="
!gcrypt? (
mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
!mbedtls? (
-   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
)
)
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )



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

2021-05-01 Thread Sam James
commit: d28a53a4d43ffab7891fd07e044883fc1ddb764f
Author: Sam James  gentoo  org>
AuthorDate: Sat May  1 18:20:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  1 18:24:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d28a53a4

net-libs/libssh2: drop redundant USE=libressl in metadata.xml

It was/is a global USE flag anyway and these
didn't add anything.

Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James  gentoo.org>

 net-libs/libssh2/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml
index 2149f2ed0c6..fb1e9fa2788 100644
--- a/net-libs/libssh2/metadata.xml
+++ b/net-libs/libssh2/metadata.xml
@@ -10,7 +10,6 @@
 
 
Use dev-libs/libgcrypt instead of 
dev-libs/openssl
-   Use dev-libs/libressl instead of 
dev-libs/openssl
Use net-libs/mbedtls instead of 
dev-libs/openssl
 
 



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

2021-03-25 Thread Ben Kohler
commit: ad7f65ff32154b1ea6cd2e350c788997e8381c80
Author: Ben Kohler  gentoo  org>
AuthorDate: Thu Mar 25 18:59:03 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Thu Mar 25 19:03:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad7f65ff

net-libs/libssh2: slot operator dep on mbedtls

Closes: https://bugs.gentoo.org/717696
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Ben Kohler  gentoo.org>

 ...bssh2-1.9.0_p20200614.ebuild => libssh2-1.9.0_p20200614-r1.ebuild} | 4 ++--
 net-libs/libssh2/libssh2-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
similarity index 93%
rename from net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
rename to net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
index edff9820da9..3e48a3afea4 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.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
@@ -21,7 +21,7 @@ RESTRICT="test"
 RDEPEND="
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
!gcrypt? (
-   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
!mbedtls? (
!libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )

diff --git a/net-libs/libssh2/libssh2-.ebuild 
b/net-libs/libssh2/libssh2-.ebuild
index ecb95eb5807..9144d257666 100644
--- a/net-libs/libssh2/libssh2-.ebuild
+++ b/net-libs/libssh2/libssh2-.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 @@ RESTRICT="test"
 RDEPEND="
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
!gcrypt? (
-   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
!mbedtls? (
!libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )



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

2020-11-23 Thread Michał Górny
commit: 6eada3a14154e7e7efa9a3ce3037184e91ddcfcd
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Nov 23 08:28:56 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Nov 23 17:05:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eada3a1

net-libs/libssh2: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 net-libs/libssh2/Manifest |  1 -
 net-libs/libssh2/files/libssh2-1.9.0-libdir.patch | 17 ---
 net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild   | 60 ---
 3 files changed, 78 deletions(-)

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index c7f7bbe4ad7..72c8716d2b8 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,2 +1 @@
-DIST libssh2-1.9.0_p20190913.tar.gz 467616 BLAKE2B 
2df7569aa118cf339340f32a106a547265a777af5834e0e22d18ac71946747e708c48d3125489b277b5c266d66cb35e7e224425bfc6a9b2e37e5d267fd7792b2
 SHA512 
0e095770b059b28aebd47a1219873bfe3b6e5775bbee5d526a7b6a287090e474ceac91c03b1b8a619a2a77916a110d8d20db22edc3cbfd1772190fb394a53f8a
 DIST libssh2-1.9.0_p20200614.tar.gz 482698 BLAKE2B 
a93c3e61ecba564263e5aa1c10769bd07b5d16def9e6948262e5bbe32d86ae39784b63c608ad4d8a4aa0fcb14c8b55742f90cd2856e043bea5b3d052a31dc871
 SHA512 
fa34c598149d28b12f5cefbee4816f30a807a1bde89faa3be469f690057cf2ea7dd1a83191b2a2cae3794e307d676efebd7a31d70d9587e42e0926f82a1ae73d

diff --git a/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch 
b/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch
deleted file mode 100644
index e04acb0904b..000
--- a/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
 a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -392,7 +392,7 @@
- ## During package installation, install Libssh2Config.cmake
- install(EXPORT Libssh2Config
-   NAMESPACE Libssh2::
--  DESTINATION lib/cmake/libssh2)
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2)
- 
- ## During build, register directly from build tree
- # create Libssh2Config.cmake
-@@ -424,4 +424,4 @@
-   COMPATIBILITY SameMajorVersion)
- install(
-   FILES ${CMAKE_CURRENT_BINARY_DIR}/Libssh2ConfigVersion.cmake
--  DESTINATION lib/cmake/libssh2)
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2)

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
deleted file mode 100644
index 9850017d570..000
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ /dev/null
@@ -1,60 +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
-
-EGIT_COMMIT=336bd86d2ca4030b808d76e56a0387914982e289
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="https://www.libssh2.org;
-SRC_URI="https://github.com/libssh2/libssh2/archive/${EGIT_COMMIT}.tar.gz -> 
${P}.tar.gz"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="gcrypt libressl mbedtls zlib"
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="test"
-
-RDEPEND="
-   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   !gcrypt? (
-   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-   !mbedtls? (
-   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-   )
-   )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-   ${RDEPEND}
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
-   "${FILESDIR}"/${PN}-1.9.0-libdir.patch
-)
-
-multilib_src_configure() {
-   local crypto_backend=OpenSSL
-   if use gcrypt; then
-   crypto_backend=Libgcrypt
-   elif use mbedtls; then
-   crypto_backend=mbedTLS
-   fi
-
-   local mycmakeargs=(
-   -DBUILD_SHARED_LIBS=ON
-   -DCRYPTO_BACKEND=${crypto_backend}
-   -DENABLE_ZLIB_COMPRESSION=$(usex zlib)
-   )
-   cmake_src_configure
-}
-
-multilib_src_install_all() {
-   einstalldocs
-   find "${ED}" -name '*.la' -delete || die
-}



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

2020-11-23 Thread Sergei Trofimovich
commit: 375c9412cf1718917464e398767cebc66cc299d9
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Nov 23 08:00:09 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov 23 08:00:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=375c9412

net-libs/libssh2: stable 1.9.0_p20200614 for hppa

stable wrt bug #754822

Package-Manager: Portage-3.0.10, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
index c36244c8e4d..edff9820da9 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2020-11-17 Thread Agostino Sarubbo
commit: 607f299bbd36858e404c601b305f0def5a94a374
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 17 19:15:07 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 17 19:15:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=607f299b

net-libs/libssh2: x86 stable wrt bug #754822

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
index 940711fc9a0..c36244c8e4d 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2020-11-17 Thread Agostino Sarubbo
commit: 67a9cb061520f2ed9aff8283f2fce9671b0f4ef4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 17 19:09:33 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 17 19:09:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a9cb06

net-libs/libssh2: sparc stable wrt bug #754822

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
index fd28953c8a2..940711fc9a0 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2020-11-17 Thread Agostino Sarubbo
commit: 4ac035735c3e7d10b2f82b23cefe9ab961d51ee6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 17 19:04:34 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 17 19:04:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac03573

net-libs/libssh2: s390 stable wrt bug #754822

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
index 2919a3cfa88..fd28953c8a2 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2020-11-17 Thread Agostino Sarubbo
commit: 44fc28d09dce74eec8d9bf3df963b3ce190e1d4b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 17 18:53:54 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 17 18:55:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44fc28d0

net-libs/libssh2: ppc64 stable wrt bug #754822

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
index 9794aee9612..2919a3cfa88 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2020-11-17 Thread Agostino Sarubbo
commit: 52003d0e9606d0e3519698fd215319e71e946c59
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 17 18:47:58 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 17 18:47:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52003d0e

net-libs/libssh2: ppc stable wrt bug #754822

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
index df58b9f388d..9794aee9612 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2020-11-16 Thread Sam James
commit: 7a633f2751fce27ecfee05621db9124d8f0c4bf9
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 16 22:16:26 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 16 22:16:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a633f27

net-libs/libssh2: Stabilize 1.9.0_p20200614 amd64, #754822

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
index bcd26fd6caf..df58b9f388d 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2020-11-15 Thread Sam James
commit: fa6995aa50fa16b56dd8cc1d54aaf8d49cbc72ec
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 16 02:53:16 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 16 02:53:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa6995aa

net-libs/libssh2: Stabilize 1.9.0_p20200614 arm, #754822

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
index 90f394060b5..bcd26fd6caf 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2020-11-15 Thread Sam James
commit: 0c1663859c54d812caa7b51d94ec72737a393ed5
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 16 02:50:37 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 16 02:50:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c166385

net-libs/libssh2: Stabilize 1.9.0_p20200614 arm64, #754822

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
index 0e9aa105228..90f394060b5 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2020-10-15 Thread Jeroen Roovers
commit: 87d1a1c7bc76c6b305cbbbe19d9df0c05ded6589
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Oct 15 19:26:36 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Oct 15 19:27:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d1a1c7

net-libs/libssh2: Version 1.9.0_p20200614

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-libs/libssh2/Manifest   |  1 +
 net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild | 59 +
 2 files changed, 60 insertions(+)

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index b76adc58a3d..c7f7bbe4ad7 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1 +1,2 @@
 DIST libssh2-1.9.0_p20190913.tar.gz 467616 BLAKE2B 
2df7569aa118cf339340f32a106a547265a777af5834e0e22d18ac71946747e708c48d3125489b277b5c266d66cb35e7e224425bfc6a9b2e37e5d267fd7792b2
 SHA512 
0e095770b059b28aebd47a1219873bfe3b6e5775bbee5d526a7b6a287090e474ceac91c03b1b8a619a2a77916a110d8d20db22edc3cbfd1772190fb394a53f8a
+DIST libssh2-1.9.0_p20200614.tar.gz 482698 BLAKE2B 
a93c3e61ecba564263e5aa1c10769bd07b5d16def9e6948262e5bbe32d86ae39784b63c608ad4d8a4aa0fcb14c8b55742f90cd2856e043bea5b3d052a31dc871
 SHA512 
fa34c598149d28b12f5cefbee4816f30a807a1bde89faa3be469f690057cf2ea7dd1a83191b2a2cae3794e307d676efebd7a31d70d9587e42e0926f82a1ae73d

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
new file mode 100644
index 000..0e9aa105228
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+EGIT_COMMIT=6c7769dcc422250d14af1b06fce378b6ee009440
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="https://www.libssh2.org;
+SRC_URI="https://github.com/libssh2/libssh2/archive/${EGIT_COMMIT}.tar.gz -> 
${P}.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="gcrypt libressl mbedtls zlib"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="test"
+
+RDEPEND="
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   !gcrypt? (
+   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   !mbedtls? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   )
+   )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+   ${RDEPEND}
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
+)
+
+multilib_src_configure() {
+   local crypto_backend=OpenSSL
+   if use gcrypt; then
+   crypto_backend=Libgcrypt
+   elif use mbedtls; then
+   crypto_backend=mbedTLS
+   fi
+
+   local mycmakeargs=(
+   -DBUILD_SHARED_LIBS=ON
+   -DCRYPTO_BACKEND=${crypto_backend}
+   -DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+   )
+   cmake_src_configure
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   find "${ED}" -name '*.la' -delete || die
+}



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

2020-06-08 Thread Michał Górny
commit: 51e85ff55bbda8f037c853712b899dd725eb875f
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jun  8 08:43:49 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jun  8 08:56:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e85ff5

net-libs/libssh2: Port to cmake.eclass

Signed-off-by: Michał Górny  gentoo.org>

 net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild | 3 ++-
 net-libs/libssh2/libssh2-.ebuild| 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index f75ac77f2f1..9850017d570 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 EGIT_COMMIT=336bd86d2ca4030b808d76e56a0387914982e289
@@ -50,7 +51,7 @@ multilib_src_configure() {
-DCRYPTO_BACKEND=${crypto_backend}
-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 multilib_src_install_all() {

diff --git a/net-libs/libssh2/libssh2-.ebuild 
b/net-libs/libssh2/libssh2-.ebuild
index 5bf05457d9a..ecb95eb5807 100644
--- a/net-libs/libssh2/libssh2-.ebuild
+++ b/net-libs/libssh2/libssh2-.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+CMAKE_ECLASS=cmake
 inherit git-r3 cmake-multilib
 
 DESCRIPTION="Library implementing the SSH2 protocol"
@@ -47,7 +48,7 @@ multilib_src_configure() {
-DCRYPTO_BACKEND=${crypto_backend}
-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 multilib_src_install_all() {



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

2019-12-03 Thread Michał Górny
commit: b063d55eca178357c621fde6573db3a78045
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Dec  3 08:48:24 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Dec  3 09:48:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b063

net-libs/libssh2: Remove old

Bug: https://bugs.gentoo.org/699856
Signed-off-by: Michał Górny  gentoo.org>

 net-libs/libssh2/Manifest  |   1 -
 net-libs/libssh2/files/libssh2-1.9.0-missing.patch | 181 -
 net-libs/libssh2/libssh2-1.9.0-r1.ebuild   |  58 ---
 net-libs/libssh2/libssh2-1.9.0.ebuild  |  57 ---
 4 files changed, 297 deletions(-)

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index c7f0147cb86..b76adc58a3d 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,2 +1 @@
-DIST libssh2-1.9.0.tar.gz 888551 BLAKE2B 
7bce5cd38b88654f0ca0f8b562e4bddc56346e3359e5873000cad7619607b2ec01c3945112dd8815d5de6daf650a750a4727cebe7d8996cc62f07ded06f3235f
 SHA512 
41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17
 DIST libssh2-1.9.0_p20190913.tar.gz 467616 BLAKE2B 
2df7569aa118cf339340f32a106a547265a777af5834e0e22d18ac71946747e708c48d3125489b277b5c266d66cb35e7e224425bfc6a9b2e37e5d267fd7792b2
 SHA512 
0e095770b059b28aebd47a1219873bfe3b6e5775bbee5d526a7b6a287090e474ceac91c03b1b8a619a2a77916a110d8d20db22edc3cbfd1772190fb394a53f8a

diff --git a/net-libs/libssh2/files/libssh2-1.9.0-missing.patch 
b/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
deleted file mode 100644
index 7cc58d23963..000
--- a/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
+++ /dev/null
@@ -1,181 +0,0 @@
 /dev/null
-+++ b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key.c
-@@ -0,0 +1,37 @@
-+#include "session_fixture.h"
-+
-+#include 
-+
-+#include 
-+
-+static const char *USERNAME = "libssh2"; /* configured in Dockerfile */
-+static const char *KEY_FILE_PRIVATE = "key_ed25519";
-+static const char *KEY_FILE_PUBLIC = "key_ed25519.pub"; /* configured in 
Dockerfile */
-+
-+int test(LIBSSH2_SESSION *session)
-+{
-+int rc;
-+const char *userauth_list = NULL;
-+
-+userauth_list = libssh2_userauth_list(session, USERNAME, 
strlen(USERNAME));
-+if(userauth_list == NULL) {
-+print_last_session_error("libssh2_userauth_list");
-+return 1;
-+}
-+
-+if(strstr(userauth_list, "publickey") == NULL) {
-+fprintf(stderr, "'publickey' was expected in userauth list: %s\n",
-+userauth_list);
-+return 1;
-+}
-+
-+rc = libssh2_userauth_publickey_fromfile_ex(
-+session, USERNAME, strlen(USERNAME), KEY_FILE_PUBLIC, 
KEY_FILE_PRIVATE,
-+NULL);
-+if(rc != 0) {
-+print_last_session_error("libssh2_userauth_publickey_fromfile_ex");
-+return 1;
-+}
-+
-+return 0;
-+}
 /dev/null
-+++ b/tests/test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c
-@@ -0,0 +1,38 @@
-+#include "session_fixture.h"
-+
-+#include 
-+
-+#include 
-+
-+static const char *USERNAME = "libssh2"; /* configured in Dockerfile */
-+static const char *PASSWORD = "libssh2";
-+static const char *KEY_FILE_PRIVATE = "key_ed25519_encrypted";
-+static const char *KEY_FILE_PUBLIC = "key_ed25519_encrypted.pub"; /* 
configured in Dockerfile */
-+
-+int test(LIBSSH2_SESSION *session)
-+{
-+int rc;
-+const char *userauth_list = NULL;
-+
-+userauth_list = libssh2_userauth_list(session, USERNAME, 
strlen(USERNAME));
-+if(userauth_list == NULL) {
-+print_last_session_error("libssh2_userauth_list");
-+return 1;
-+}
-+
-+if(strstr(userauth_list, "publickey") == NULL) {
-+fprintf(stderr, "'publickey' was expected in userauth list: %s\n",
-+userauth_list);
-+return 1;
-+}
-+
-+rc = libssh2_userauth_publickey_fromfile_ex(
-+session, USERNAME, strlen(USERNAME), KEY_FILE_PUBLIC, 
KEY_FILE_PRIVATE,
-+PASSWORD);
-+if(rc != 0) {
-+print_last_session_error("libssh2_userauth_publickey_fromfile_ex");
-+return 1;
-+}
-+
-+return 0;
-+}
 /dev/null
-+++ b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c
-@@ -0,0 +1,97 @@
-+#include "session_fixture.h"
-+
-+#include 
-+
-+#include 
-+#include 
-+
-+static const char *USERNAME = "libssh2"; /* configured in Dockerfile */
-+static const char *KEY_FILE_ED25519_PRIVATE = "key_ed25519";
-+
-+int read_file(const char *path, char **buf, size_t *len);
-+
-+int test(LIBSSH2_SESSION *session)
-+{
-+int rc;
-+FILE *fp = NULL;
-+char *buffer = NULL;
-+size_t len = 0;
-+const char *userauth_list = NULL;
-+
-+userauth_list = libssh2_userauth_list(session, USERNAME, 
strlen(USERNAME));
-+if(userauth_list == NULL) {
-+print_last_session_error("libssh2_userauth_list");
-+

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

2019-11-27 Thread Mikle Kolyada
commit: 3bf6297ed119235a6b03e8a7e248b06ccf829dd9
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Nov 27 12:59:51 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Nov 27 12:59:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bf6297e

net-libs/libssh2: arm stable wrt bug #699856

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index 291c9822de2..1e5b2d50b9f 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-11-27 Thread Mikle Kolyada
commit: 09bd059079f5fe2b4f2fcf0c5729847fc8571903
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Nov 27 13:00:21 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Nov 27 13:00:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09bd0590

net-libs/libssh2: sh stable wrt bug #699856

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index 1e5b2d50b9f..5ba34d95665 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-11-22 Thread Matt Turner
commit: 5d53a73b344c7eea722e6d34cd8b41ba0305c14d
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Nov 22 16:23:41 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Nov 22 16:23:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d53a73b

net-libs/libssh2-1.9.0_p20190913: alpha stable, bug 699856

Signed-off-by: Matt Turner  gentoo.org>

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index 83b60bec30e..291c9822de2 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-11-14 Thread Agostino Sarubbo
commit: 816558e28ce14582e5c18ff70f1c10f57134f556
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Nov 14 11:55:15 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Nov 14 11:55:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=816558e2

net-libs/libssh2: ia64 stable wrt bug #699856

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index 76ecec8b350..83b60bec30e 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-11-13 Thread Sergei Trofimovich
commit: e64d4a76ad1acd7ebf1fb1b5c21daf357126d3a5
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Nov 12 18:20:22 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Nov 13 21:37:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e64d4a76

net-libs/libssh2: stable 1.9.0_p20190913 for hppa, bug #699856

Package-Manager: Portage-2.3.76, 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/libssh2/libssh2-1.9.0_p20190913.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index b74afa72337..76ecec8b350 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-11-12 Thread Agostino Sarubbo
commit: 6e18438de4cb1a406c3cfc4cee4a671913f5f49c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 13 07:43:35 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 13 07:43:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e18438d

net-libs/libssh2: amd64 stable wrt bug #699856

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index 06c102277eb..b74afa72337 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-11-12 Thread Agostino Sarubbo
commit: 8704904202fa7ede2bc1c10fa9e27950a62d9762
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 13 07:38:57 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 13 07:38:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87049042

net-libs/libssh2: ppc stable wrt bug #699856

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index 00ee8627cee..06c102277eb 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-11-12 Thread Aaron Bauman
commit: 69fca1ea62b8e9c5d40a18b5cb736bcd19b8f81e
Author: Aaron Bauman  gentoo  org>
AuthorDate: Tue Nov 12 21:55:23 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue Nov 12 21:55:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69fca1ea

net-libs/libssh2: arm64 stable (bug #699856)

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index fc40378716c..00ee8627cee 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-11-12 Thread Agostino Sarubbo
commit: 06a79768838cbbc0efbacb79176a53a32bcc61b7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 12 15:07:20 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 12 15:08:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a79768

net-libs/libssh2: ppc64 stable wrt bug #699856

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index a5eb093487e..fc40378716c 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-11-12 Thread Agostino Sarubbo
commit: 3f5a9f378541c591b8c269a933d8e2292f531b8c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 12 10:16:20 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 12 10:16:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f5a9f37

net-libs/libssh2: s390 stable wrt bug #699856

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index 0ada7a73572..a5eb093487e 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-11-12 Thread Agostino Sarubbo
commit: 7b5b03541df358be0e73c12df167e0ab0a187a7a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 12 10:04:41 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 12 10:04:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b5b0354

net-libs/libssh2: x86 stable wrt bug #699856

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index 0635b1d4318..0ada7a73572 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-11-11 Thread Sergei Trofimovich
commit: c912518123c9471ef1c179110edb4c7aad8dc13f
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Nov 12 06:31:43 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Nov 12 07:24:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9125181

net-libs/libssh2: stable 1.9.0_p20190913 for sparc, bug #699856

Package-Manager: Portage-2.3.76, 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/libssh2/libssh2-1.9.0_p20190913.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index 536f4bf5ed2..0635b1d4318 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-11-11 Thread Michał Górny
commit: 3b4cfaf2877f50ad8f5d66927f26d833c8249960
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Nov 11 17:59:42 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Nov 11 18:03:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b4cfaf2

net-libs/libssh2: Bump to 1.9.0_p20190913 snapshot

Bug: https://bugs.gentoo.org/699856
Signed-off-by: Michał Górny  gentoo.org>

 net-libs/libssh2/Manifest   |  1 +
 net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild | 59 +
 2 files changed, 60 insertions(+)

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index c124fff5db1..c7f0147cb86 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1 +1,2 @@
 DIST libssh2-1.9.0.tar.gz 888551 BLAKE2B 
7bce5cd38b88654f0ca0f8b562e4bddc56346e3359e5873000cad7619607b2ec01c3945112dd8815d5de6daf650a750a4727cebe7d8996cc62f07ded06f3235f
 SHA512 
41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17
+DIST libssh2-1.9.0_p20190913.tar.gz 467616 BLAKE2B 
2df7569aa118cf339340f32a106a547265a777af5834e0e22d18ac71946747e708c48d3125489b277b5c266d66cb35e7e224425bfc6a9b2e37e5d267fd7792b2
 SHA512 
0e095770b059b28aebd47a1219873bfe3b6e5775bbee5d526a7b6a287090e474ceac91c03b1b8a619a2a77916a110d8d20db22edc3cbfd1772190fb394a53f8a

diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild 
b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
new file mode 100644
index 000..536f4bf5ed2
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-multilib
+
+EGIT_COMMIT=336bd86d2ca4030b808d76e56a0387914982e289
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="https://www.libssh2.org;
+SRC_URI="https://github.com/libssh2/libssh2/archive/${EGIT_COMMIT}.tar.gz -> 
${P}.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="gcrypt libressl mbedtls zlib"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="test"
+
+RDEPEND="
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   !gcrypt? (
+   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   !mbedtls? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   )
+   )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+   ${RDEPEND}
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
+   "${FILESDIR}"/${PN}-1.9.0-libdir.patch
+)
+
+multilib_src_configure() {
+   local crypto_backend=OpenSSL
+   if use gcrypt; then
+   crypto_backend=Libgcrypt
+   elif use mbedtls; then
+   crypto_backend=mbedTLS
+   fi
+
+   local mycmakeargs=(
+   -DBUILD_SHARED_LIBS=ON
+   -DCRYPTO_BACKEND=${crypto_backend}
+   -DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   find "${ED}" -name '*.la' -delete || die
+}



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

2019-10-27 Thread Jeroen Roovers
commit: 73f52c13f609bcbaccd9a28021a8ed087a10fe21
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Oct 27 08:26:01 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Oct 27 08:26:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73f52c13

net-libs/libssh2: Old

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

 net-libs/libssh2/Manifest  |  2 -
 .../files/libssh2-1.8.0-libgcrypt-prefix.patch | 30 --
 .../files/libssh2-1.8.0-openssl11-memleak.patch| 23 ---
 .../libssh2/files/libssh2-1.8.0-openssl11.patch| 70 --
 net-libs/libssh2/libssh2-1.8.0-r1.ebuild   | 46 --
 net-libs/libssh2/libssh2-1.8.0-r2.ebuild   | 61 ---
 net-libs/libssh2/libssh2-1.8.2.ebuild  | 61 ---
 7 files changed, 293 deletions(-)

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 3750c1955eb..c124fff5db1 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,3 +1 @@
-DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 
618c4a19789f2e5eda85852760d5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352
 SHA512 
289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
-DIST libssh2-1.8.2.tar.gz 859587 BLAKE2B 
58e0854e83001c424a767ceb4ddfb535373320d8319aa632244dc14434276db7c8b7a77d4a5f22fe8e397f1050b33516d2fca1162658a9f414166f560bc1f358
 SHA512 
390ab4ad93bb738415ec11a6eb92806c9b9e9e5d8ee7c442d841a58b4292c1c447a9bc99e153ba464e2e11f9c0d1913469303598c3046722d1ae821991e8cb93
 DIST libssh2-1.9.0.tar.gz 888551 BLAKE2B 
7bce5cd38b88654f0ca0f8b562e4bddc56346e3359e5873000cad7619607b2ec01c3945112dd8815d5de6daf650a750a4727cebe7d8996cc62f07ded06f3235f
 SHA512 
41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17

diff --git a/net-libs/libssh2/files/libssh2-1.8.0-libgcrypt-prefix.patch 
b/net-libs/libssh2/files/libssh2-1.8.0-libgcrypt-prefix.patch
deleted file mode 100644
index 10065626fe2..000
--- a/net-libs/libssh2/files/libssh2-1.8.0-libgcrypt-prefix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
 a/acinclude.m4
-+++ b/acinclude.m4
-@@ -412,9 +412,9 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [
- 
-   old_LDFLAGS=$LDFLAGS
-   old_CFLAGS=$CFLAGS
--  if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then
--LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib"
--CFLAGS="$CFLAGS -I$use_libgcrypt/include"
-+  if test -n "$with_libgcrypt_prefix" && test "$use_libgcrypt" != "no"; then
-+LDFLAGS="$LDFLAGS -L$with_libgcrypt_prefix/lib"
-+CFLAGS="$CFLAGS -I$with_libgcrypt_prefix/include"
-   fi
-   AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [
- #include 
 a/configure
-+++ b/configure
-@@ -14250,9 +14235,9 @@
- 
-   old_LDFLAGS=$LDFLAGS
-   old_CFLAGS=$CFLAGS
--  if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then
--LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib"
--CFLAGS="$CFLAGS -I$use_libgcrypt/include"
-+  if test -n "$with_libgcrypt_prefix" && test "$use_libgcrypt" != "no"; then
-+LDFLAGS="$LDFLAGS -L$with_libgcrypt_prefix/lib"
-+CFLAGS="$CFLAGS -I$with_libgcrypt_prefix/include"
-   fi
- 
- 

diff --git a/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch 
b/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch
deleted file mode 100644
index d7d41f976cc..000
--- a/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 97518ca8bda91ce12c503197a98fa71690cb67f9 Mon Sep 17 00:00:00 2001
-From: Will Cosgrove 
-Date: Fri, 12 May 2017 16:34:26 -0700
-Subject: [PATCH] Fix memory leak of crypt_ctx->h using openSSL 1.1+ (#177)
-
-Need to use EVP_CIPHER_CTX_free instead of EVP_CIPHER_CTX_reset.

- src/openssl.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/openssl.h b/src/openssl.h
-index 6aa12192..2bd80b96 100644
 a/src/openssl.h
-+++ b/src/openssl.h
-@@ -267,7 +267,7 @@ int _libssh2_md5_init(libssh2_md5_ctx *ctx);
- #define _libssh2_cipher_3des EVP_des_ede3_cbc
- 
- #ifdef HAVE_OPAQUE_STRUCTS
--#define _libssh2_cipher_dtor(ctx) EVP_CIPHER_CTX_reset(*(ctx))
-+#define _libssh2_cipher_dtor(ctx) EVP_CIPHER_CTX_free(*(ctx))
- #else
- #define _libssh2_cipher_dtor(ctx) EVP_CIPHER_CTX_cleanup(ctx)
- #endif

diff --git a/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch 
b/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch
deleted file mode 100644
index 0824dd06176..000
--- a/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From c423b543ca45d6caca7b94763bf65ff79d07e811 Mon Sep 17 00:00:00 2001
-From: Marcel Raad 
-Date: Wed, 24 May 2017 19:21:22 +0200
-Subject: [PATCH] openssl: fix build with OpenSSL 1.1 API (#176)
-
-When building 

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

2019-09-13 Thread Mikle Kolyada
commit: e104390bcefbb5819f876bafef69d527f63f66f4
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Sep 13 18:36:20 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Sep 13 18:36:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e104390b

net-libs/libssh2: arm stable wrt bug #690884

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild 
b/net-libs/libssh2/libssh2-1.9.0.ebuild
index f895820a008..528f7488e0e 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-09-13 Thread Mikle Kolyada
commit: c3f431aa34861b449b41c0c677ea8ee8a791831f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Sep 13 18:36:00 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Sep 13 18:36:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f431aa

net-libs/libssh2: sh stable wrt bug #690884

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild 
b/net-libs/libssh2/libssh2-1.9.0.ebuild
index 6962cd5ca67..f895820a008 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-09-03 Thread Jeroen Roovers
commit: 21a59db6d2b6d68098c822ac04305b07db980a2e
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Sep  4 05:15:01 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Sep  4 05:23:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a59db6

net-libs/libssh2: Fix libdir in Libssh2ConfigVersion.cmake

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Bug: https://bugs.gentoo.org/693460
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-libs/libssh2/files/libssh2-1.9.0-libdir.patch | 17 +++
 net-libs/libssh2/libssh2-1.9.0-r1.ebuild  | 58 +++
 2 files changed, 75 insertions(+)

diff --git a/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch 
b/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch
new file mode 100644
index 000..e04acb0904b
--- /dev/null
+++ b/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch
@@ -0,0 +1,17 @@
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -392,7 +392,7 @@
+ ## During package installation, install Libssh2Config.cmake
+ install(EXPORT Libssh2Config
+   NAMESPACE Libssh2::
+-  DESTINATION lib/cmake/libssh2)
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2)
+ 
+ ## During build, register directly from build tree
+ # create Libssh2Config.cmake
+@@ -424,4 +424,4 @@
+   COMPATIBILITY SameMajorVersion)
+ install(
+   FILES ${CMAKE_CURRENT_BINARY_DIR}/Libssh2ConfigVersion.cmake
+-  DESTINATION lib/cmake/libssh2)
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2)

diff --git a/net-libs/libssh2/libssh2-1.9.0-r1.ebuild 
b/net-libs/libssh2/libssh2-1.9.0-r1.ebuild
new file mode 100644
index 000..92f1a88bf9c
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.9.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-multilib
+
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="https://www.libssh2.org;
+SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+IUSE="gcrypt libressl mbedtls zlib"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="test"
+
+RDEPEND="
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   !gcrypt? (
+   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   !mbedtls? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   )
+   )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+   ${RDEPEND}
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
+   "${FILESDIR}"/${PN}-1.9.0-libdir.patch
+   "${FILESDIR}"/${PN}-1.9.0-missing.patch
+)
+
+multilib_src_configure() {
+   local crypto_backend=OpenSSL
+   if use gcrypt; then
+   crypto_backend=Libgcrypt
+   elif use mbedtls; then
+   crypto_backend=mbedTLS
+   fi
+
+   local mycmakeargs=(
+   -DBUILD_SHARED_LIBS=ON
+   -DCRYPTO_BACKEND=${crypto_backend}
+   -DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   find "${ED}" -name '*.la' -delete || die
+}



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

2019-08-01 Thread Sergei Trofimovich
commit: 4f12e9e602afe1ca7e784f3a55d642f3379e8143
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Aug  1 06:23:22 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug  1 06:23:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f12e9e6

net-libs/libssh2: stable 1.9.0 for hppa, bug #690884

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild 
b/net-libs/libssh2/libssh2-1.9.0.ebuild
index 35737d4bde4..6962cd5ca67 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-07-31 Thread Agostino Sarubbo
commit: 1c729daede035c4b87dd3542b265fd4e753c7dec
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 31 13:13:12 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 31 13:13:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c729dae

net-libs/libssh2: ia64 stable wrt bug #690884

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild 
b/net-libs/libssh2/libssh2-1.9.0.ebuild
index 41e8f42eaea..35737d4bde4 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-07-31 Thread Agostino Sarubbo
commit: 06ab3905136022b6e3f160cc71536ef29e6724d5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 31 12:09:51 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 31 12:09:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06ab3905

net-libs/libssh2: alpha stable wrt bug #690884

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild 
b/net-libs/libssh2/libssh2-1.9.0.ebuild
index 5c47710d79c..41e8f42eaea 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-07-31 Thread Agostino Sarubbo
commit: 92fff2edf73b71f3e71e5715233d9e617c845f72
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 31 11:02:20 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 31 11:02:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92fff2ed

net-libs/libssh2: x86 stable wrt bug #690884

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild 
b/net-libs/libssh2/libssh2-1.9.0.ebuild
index a2841e5e7c6..5c47710d79c 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-07-31 Thread Agostino Sarubbo
commit: 372a5f763e30591b9f5318546a862bdc0f732607
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 31 10:59:34 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 31 10:59:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=372a5f76

net-libs/libssh2: amd64 stable wrt bug #690884

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild 
b/net-libs/libssh2/libssh2-1.9.0.ebuild
index d06294060fd..a2841e5e7c6 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-07-31 Thread Agostino Sarubbo
commit: 9f89276d6e76c8c82bb39bdd768b86af529f51cd
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 31 10:55:35 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 31 10:55:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f89276d

net-libs/libssh2: ppc64 stable wrt bug #690884

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild 
b/net-libs/libssh2/libssh2-1.9.0.ebuild
index b36366a1c5c..d06294060fd 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-07-31 Thread Agostino Sarubbo
commit: fc7bcfd18673222e5f33343a5d999264426cd53b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 31 10:53:20 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 31 10:53:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7bcfd1

net-libs/libssh2: ppc stable wrt bug #690884

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild 
b/net-libs/libssh2/libssh2-1.9.0.ebuild
index 1d838d7d344..b36366a1c5c 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-07-31 Thread Agostino Sarubbo
commit: aa48cf40b939d154475b6a9bffdff8925f1b980f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 31 09:04:30 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 31 09:04:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa48cf40

net-libs/libssh2: s390 stable wrt bug #690884

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild 
b/net-libs/libssh2/libssh2-1.9.0.ebuild
index 47eb8eef493..1d838d7d344 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-07-29 Thread Aaron Bauman
commit: 0386acebb04aedc5a2eb62dc9934c6221ba4ea7e
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 22:48:41 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 22:50:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0386aceb

net-libs/libssh2: arm64 stable (bug #690884)

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

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

diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild 
b/net-libs/libssh2/libssh2-1.9.0.ebuild
index 55f39cb41e7..47eb8eef493 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-07-29 Thread Sergei Trofimovich
commit: 3a629cfdf3107485c98f20299d94ab6e91d5b9d6
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Jul 29 16:09:08 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jul 29 19:23:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a629cfd

net-libs/libssh2: stable 1.9.0 for sparc, bug #690884

Package-Manager: Portage-2.3.66, 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/libssh2/libssh2-1.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild 
b/net-libs/libssh2/libssh2-1.9.0.ebuild
index 12ad74fa242..55f39cb41e7 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-06-24 Thread Jeroen Roovers
commit: 6b96296c587c1909b642b0d22a33e3060776e45e
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jun 24 13:28:57 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jun 24 13:30:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b96296c

Revert "net-libs/libssh2: Clean up patch"

This reverts commit a55608f44e799e4fab03882909992053b8e25b90.

Fixes: https://bugs.gentoo.org/688604
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-libs/libssh2/files/libssh2-1.9.0-missing.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-libs/libssh2/files/libssh2-1.9.0-missing.patch 
b/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
index 2216a2fa66f..7cc58d23963 100644
--- a/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
+++ b/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ tests/test_public_key_auth_succeeds_with_correct_ed25519_key.c
 b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key.c
 @@ -0,0 +1,37 @@
 +#include "session_fixture.h"
 +
@@ -39,7 +39,7 @@
 +return 0;
 +}
 --- /dev/null
-+++ tests/test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c
 b/tests/test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c
 @@ -0,0 +1,38 @@
 +#include "session_fixture.h"
 +
@@ -80,7 +80,7 @@
 +return 0;
 +}
 --- /dev/null
-+++ tests/test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c
 b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c
 @@ -0,0 +1,97 @@
 +#include "session_fixture.h"
 +



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

2019-06-24 Thread Jeroen Roovers
commit: a55608f44e799e4fab03882909992053b8e25b90
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jun 24 09:16:12 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jun 24 09:16:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a55608f4

net-libs/libssh2: Clean up patch

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-libs/libssh2/files/libssh2-1.9.0-missing.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-libs/libssh2/files/libssh2-1.9.0-missing.patch 
b/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
index 7cc58d23963..2216a2fa66f 100644
--- a/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
+++ b/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key.c
 tests/test_public_key_auth_succeeds_with_correct_ed25519_key.c
 @@ -0,0 +1,37 @@
 +#include "session_fixture.h"
 +
@@ -39,7 +39,7 @@
 +return 0;
 +}
 --- /dev/null
-+++ b/tests/test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c
 tests/test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c
 @@ -0,0 +1,38 @@
 +#include "session_fixture.h"
 +
@@ -80,7 +80,7 @@
 +return 0;
 +}
 --- /dev/null
-+++ b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c
 tests/test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c
 @@ -0,0 +1,97 @@
 +#include "session_fixture.h"
 +



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

2019-06-24 Thread Jeroen Roovers
commit: bf0f75b200b1451f24710ed87ceff7fefa065606
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jun 24 09:06:13 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jun 24 09:08:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf0f75b2

net-libs/libssh2: Version 1.9.0

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-libs/libssh2/Manifest  |   1 +
 net-libs/libssh2/files/libssh2-1.9.0-missing.patch | 181 +
 .../{libssh2-.ebuild => libssh2-1.9.0.ebuild}  |  11 +-
 net-libs/libssh2/libssh2-.ebuild   |   4 +-
 4 files changed, 188 insertions(+), 9 deletions(-)

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index f5809249d6d..3750c1955eb 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,2 +1,3 @@
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 
618c4a19789f2e5eda85852760d5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352
 SHA512 
289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
 DIST libssh2-1.8.2.tar.gz 859587 BLAKE2B 
58e0854e83001c424a767ceb4ddfb535373320d8319aa632244dc14434276db7c8b7a77d4a5f22fe8e397f1050b33516d2fca1162658a9f414166f560bc1f358
 SHA512 
390ab4ad93bb738415ec11a6eb92806c9b9e9e5d8ee7c442d841a58b4292c1c447a9bc99e153ba464e2e11f9c0d1913469303598c3046722d1ae821991e8cb93
+DIST libssh2-1.9.0.tar.gz 888551 BLAKE2B 
7bce5cd38b88654f0ca0f8b562e4bddc56346e3359e5873000cad7619607b2ec01c3945112dd8815d5de6daf650a750a4727cebe7d8996cc62f07ded06f3235f
 SHA512 
41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17

diff --git a/net-libs/libssh2/files/libssh2-1.9.0-missing.patch 
b/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
new file mode 100644
index 000..7cc58d23963
--- /dev/null
+++ b/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
@@ -0,0 +1,181 @@
+--- /dev/null
 b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key.c
+@@ -0,0 +1,37 @@
++#include "session_fixture.h"
++
++#include 
++
++#include 
++
++static const char *USERNAME = "libssh2"; /* configured in Dockerfile */
++static const char *KEY_FILE_PRIVATE = "key_ed25519";
++static const char *KEY_FILE_PUBLIC = "key_ed25519.pub"; /* configured in 
Dockerfile */
++
++int test(LIBSSH2_SESSION *session)
++{
++int rc;
++const char *userauth_list = NULL;
++
++userauth_list = libssh2_userauth_list(session, USERNAME, 
strlen(USERNAME));
++if(userauth_list == NULL) {
++print_last_session_error("libssh2_userauth_list");
++return 1;
++}
++
++if(strstr(userauth_list, "publickey") == NULL) {
++fprintf(stderr, "'publickey' was expected in userauth list: %s\n",
++userauth_list);
++return 1;
++}
++
++rc = libssh2_userauth_publickey_fromfile_ex(
++session, USERNAME, strlen(USERNAME), KEY_FILE_PUBLIC, 
KEY_FILE_PRIVATE,
++NULL);
++if(rc != 0) {
++print_last_session_error("libssh2_userauth_publickey_fromfile_ex");
++return 1;
++}
++
++return 0;
++}
+--- /dev/null
 b/tests/test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c
+@@ -0,0 +1,38 @@
++#include "session_fixture.h"
++
++#include 
++
++#include 
++
++static const char *USERNAME = "libssh2"; /* configured in Dockerfile */
++static const char *PASSWORD = "libssh2";
++static const char *KEY_FILE_PRIVATE = "key_ed25519_encrypted";
++static const char *KEY_FILE_PUBLIC = "key_ed25519_encrypted.pub"; /* 
configured in Dockerfile */
++
++int test(LIBSSH2_SESSION *session)
++{
++int rc;
++const char *userauth_list = NULL;
++
++userauth_list = libssh2_userauth_list(session, USERNAME, 
strlen(USERNAME));
++if(userauth_list == NULL) {
++print_last_session_error("libssh2_userauth_list");
++return 1;
++}
++
++if(strstr(userauth_list, "publickey") == NULL) {
++fprintf(stderr, "'publickey' was expected in userauth list: %s\n",
++userauth_list);
++return 1;
++}
++
++rc = libssh2_userauth_publickey_fromfile_ex(
++session, USERNAME, strlen(USERNAME), KEY_FILE_PUBLIC, 
KEY_FILE_PRIVATE,
++PASSWORD);
++if(rc != 0) {
++print_last_session_error("libssh2_userauth_publickey_fromfile_ex");
++return 1;
++}
++
++return 0;
++}
+--- /dev/null
 b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c
+@@ -0,0 +1,97 @@
++#include "session_fixture.h"
++
++#include 
++
++#include 
++#include 
++
++static const char *USERNAME = "libssh2"; /* configured in Dockerfile */
++static const char *KEY_FILE_ED25519_PRIVATE = "key_ed25519";
++
++int read_file(const char *path, char **buf, size_t *len);
++
++int test(LIBSSH2_SESSION 

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

2019-06-04 Thread Agostino Sarubbo
commit: a3261e901b0b380719c632f52aa1bedf7c6e551f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun  4 18:51:35 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun  4 18:51:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3261e90

net-libs/libssh2: s390 stable wrt bug #685612

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="s390"

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

diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild 
b/net-libs/libssh2/libssh2-1.8.2.ebuild
index ac870e1233e..6a224aa0c02 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-05-26 Thread Sergei Trofimovich
commit: a08331fbc5fa5a6c484044418584bc6f375a3451
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 26 07:02:18 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 26 07:03:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a08331fb

net-libs/libssh2: stable 1.8.2 for hppa, bug #685612

Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild 
b/net-libs/libssh2/libssh2-1.8.2.ebuild
index df52717f790..ac870e1233e 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-05-14 Thread Sergei Trofimovich
commit: 2e7c95edd6ca6e061295a885e18706f83cc49b73
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon May 13 14:37:24 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue May 14 08:07:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e7c95ed

net-libs/libssh2: stable 1.8.2 for sparc, bug #685612

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

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

diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild 
b/net-libs/libssh2/libssh2-1.8.2.ebuild
index 1e3a3dd1a7a..df52717f790 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-05-13 Thread Aaron Bauman
commit: e2846395549231ed198fa4456e3da9ab1abeaadb
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon May 13 19:31:13 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon May 13 19:31:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2846395

net-libs/libssh2: arm64 stable (bug #685612)

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

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

diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild 
b/net-libs/libssh2/libssh2-1.8.2.ebuild
index 3e9d5fcb91e..1e3a3dd1a7a 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-05-13 Thread Mikle Kolyada
commit: 3fb1291cf582b175f72a833a4fa952cf8e293b9e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May 13 09:52:25 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May 13 09:52:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb1291c

net-libs/libssh2: amd64 stable wrt bug #685612

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

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

diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild 
b/net-libs/libssh2/libssh2-1.8.2.ebuild
index 4f3d9bb44d6..3e9d5fcb91e 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-05-12 Thread Thomas Deutschmann
commit: 87137117528c2795bdbcebc17995fad9a87b5dc3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon May 13 01:35:03 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon May 13 01:40:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87137117

net-libs/libssh2: x86 stable (bug #685612)

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

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

diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild 
b/net-libs/libssh2/libssh2-1.8.2.ebuild
index 6a61e3c877d..4f3d9bb44d6 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-05-12 Thread Sergei Trofimovich
commit: 6a882ce3a1d6ff7085a6c29cadca16da48e789c0
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 12 22:00:25 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 12 22:00:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a882ce3

net-libs/libssh2: stable 1.8.2 for ppc64, bug #685612

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

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

diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild 
b/net-libs/libssh2/libssh2-1.8.2.ebuild
index 2ded404102f..6a61e3c877d 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-05-12 Thread Sergei Trofimovich
commit: 3421e4e8ad9dfeee98082b5a7c566280ca2f5b58
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 12 21:56:04 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 12 21:56:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3421e4e8

net-libs/libssh2: stable 1.8.2 for ppc, bug #685612

Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild 
b/net-libs/libssh2/libssh2-1.8.2.ebuild
index 8c48c85fe11..2ded404102f 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-05-12 Thread Sergei Trofimovich
commit: bab98e2cc50a8033c0974eec45b2738c35cd9ad7
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 12 21:27:30 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 12 21:29:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab98e2c

net-libs/libssh2: stable 1.8.2 for ia64, bug #685612

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

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

diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild 
b/net-libs/libssh2/libssh2-1.8.2.ebuild
index 7eb5156df2c..8c48c85fe11 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-04-27 Thread David Seifert
commit: 354f82013dd455c6629fa35b1193464f45afeffb
Author: David Seifert  gentoo  org>
AuthorDate: Sat Apr 27 16:35:04 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Apr 27 20:27:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=354f8201

net-libs/libssh2: [QA] Fix USE=libressl semantics

Closes: https://bugs.gentoo.org/684000
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: David Seifert  gentoo.org>

 net-libs/libssh2/libssh2-1.8.0-r2.ebuild | 16 +---
 net-libs/libssh2/libssh2-1.8.2.ebuild| 14 --
 net-libs/libssh2/libssh2-.ebuild | 14 --
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild 
b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
index bdab253bbee..7eb5156df2c 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,16 +12,18 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
-REQUIRED_USE="
-   ?? ( gcrypt libressl mbedtls )
-"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
 
 RDEPEND="
-   !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   !gcrypt? (
+   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   !mbedtls? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   )
+   )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="

diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild 
b/net-libs/libssh2/libssh2-1.8.2.ebuild
index 75e39f52b68..7eb5156df2c 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -12,16 +12,18 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
-REQUIRED_USE="
-   ?? ( gcrypt libressl mbedtls )
-"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
 
 RDEPEND="
-   !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   !gcrypt? (
+   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   !mbedtls? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   )
+   )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="

diff --git a/net-libs/libssh2/libssh2-.ebuild 
b/net-libs/libssh2/libssh2-.ebuild
index 456ca920385..d1797b7dcfa 100644
--- a/net-libs/libssh2/libssh2-.ebuild
+++ b/net-libs/libssh2/libssh2-.ebuild
@@ -12,16 +12,18 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
 IUSE="gcrypt libressl mbedtls zlib"
-REQUIRED_USE="
-   ?? ( gcrypt libressl mbedtls )
-"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
 
 RDEPEND="
-   !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   !gcrypt? (
+   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   !mbedtls? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   )
+   )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="



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

2019-03-26 Thread Jeroen Roovers
commit: 5e3b13af1d3fa9c55111734ea47afeb6d1ac7bf3
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Mar 26 07:38:28 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Mar 26 07:39:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e3b13af

net-libs/libssh2: Version 1.8.2

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Bug: https://bugs.gentoo.org/show_bug.cgi?id=680904
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-libs/libssh2/Manifest   | 2 +-
 net-libs/libssh2/{libssh2-1.8.1.ebuild => libssh2-1.8.2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index d4134bebb47..f5809249d6d 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,2 +1,2 @@
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 
618c4a19789f2e5eda85852760d5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352
 SHA512 
289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
-DIST libssh2-1.8.1.tar.gz 858088 BLAKE2B 
4e7358c55355265ec3c7d7ce749b01d74bc1c37ba73467401c24f0abb2b22da12ba938393f3cf7278ef30900c0cfa700ab71c4fd32a1d41eaeb6fb47669c1ee1
 SHA512 
f09ad9ed04d25305b966e7f8c210082fe06c2b236dcd5018b009bd0bd6aaff123d16559d280892a5060760ed055ffe295bc02dc6e8dd1e7b8383c6c703f09290
+DIST libssh2-1.8.2.tar.gz 859587 BLAKE2B 
58e0854e83001c424a767ceb4ddfb535373320d8319aa632244dc14434276db7c8b7a77d4a5f22fe8e397f1050b33516d2fca1162658a9f414166f560bc1f358
 SHA512 
390ab4ad93bb738415ec11a6eb92806c9b9e9e5d8ee7c442d841a58b4292c1c447a9bc99e153ba464e2e11f9c0d1913469303598c3046722d1ae821991e8cb93

diff --git a/net-libs/libssh2/libssh2-1.8.1.ebuild 
b/net-libs/libssh2/libssh2-1.8.2.ebuild
similarity index 100%
rename from net-libs/libssh2/libssh2-1.8.1.ebuild
rename to net-libs/libssh2/libssh2-1.8.2.ebuild



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

2019-03-18 Thread Jeroen Roovers
commit: 90a3eef594bfb10cc5f79612714b6d03e816608e
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Mar 18 22:20:40 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Mar 18 22:20:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90a3eef5

net-libs/libssh2: Update live ebuild

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-libs/libssh2/libssh2-.ebuild | 64 
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/net-libs/libssh2/libssh2-.ebuild 
b/net-libs/libssh2/libssh2-.ebuild
index 4ed00d50973..456ca920385 100644
--- a/net-libs/libssh2/libssh2-.ebuild
+++ b/net-libs/libssh2/libssh2-.ebuild
@@ -1,50 +1,56 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools git-r3 multilib-minimal
+inherit git-r3 cmake-multilib
 
-EGIT_REPO_URI="https://github.com/libssh2/libssh2;
 DESCRIPTION="Library implementing the SSH2 protocol"
 HOMEPAGE="https://www.libssh2.org;
-SRC_URI=""
+EGIT_REPO_URI="https://github.com/libssh2/libssh2;
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="gcrypt libressl static-libs test zlib"
+IUSE="gcrypt libressl mbedtls zlib"
+REQUIRED_USE="
+   ?? ( gcrypt libressl mbedtls )
+"
+RESTRICT="test"
 
-DEPEND="
-   !gcrypt? (
-   !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] 
)
-   libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-   )
+RDEPEND="
+   !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
-RDEPEND="${DEPEND}"
-
-DOCS=( NEWS README )
-
-src_prepare() {
-   default
-
-   sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die
-   ln -s ../src/libssh2_config.h.in example/libssh2_config.h.in || die
+DEPEND="
+   ${RDEPEND}
+"
 
-   eautoreconf
-}
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
+)
 
 multilib_src_configure() {
-   # Disable tests that require extra permissions (bug #19)
-   use test && local -x ac_cv_path_SSHD=
-
-   local crypto
+   local crypto_backend=OpenSSL
if use gcrypt; then
-   crypto=libgcrypt
-   else
-   crypto=openssl
+   crypto_backend=Libgcrypt
+   elif use mbedtls; then
+   crypto_backend=mbedTLS
fi
 
-   ECONF_SOURCE="${S}" econf --with-crypto=${crypto}
+   local mycmakeargs=(
+   -DBUILD_SHARED_LIBS=ON
+   -DCRYPTO_BACKEND=${crypto_backend}
+   -DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   find "${ED}" -name '*.la' -delete || die
+   mv "${ED}"/usr/share/doc/${PN}/* "${ED}"/usr/share/doc/${PF}/ || die
+   rm -r "${ED}"/usr/share/doc/${PN}/ || die
 }



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

2019-03-18 Thread Jeroen Roovers
commit: b63b26650737258c12032376fe9c80beb97b07be
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Mar 18 22:07:02 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Mar 18 22:07:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b63b2665

net-libs/libssh2: Version 1.8.1

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Bug: https://bugs.gentoo.org/680904
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-libs/libssh2/Manifest |  1 +
 net-libs/libssh2/libssh2-1.8.1.ebuild | 59 +++
 2 files changed, 60 insertions(+)

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index b0d04fff42b..d4134bebb47 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1 +1,2 @@
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 
618c4a19789f2e5eda85852760d5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352
 SHA512 
289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
+DIST libssh2-1.8.1.tar.gz 858088 BLAKE2B 
4e7358c55355265ec3c7d7ce749b01d74bc1c37ba73467401c24f0abb2b22da12ba938393f3cf7278ef30900c0cfa700ab71c4fd32a1d41eaeb6fb47669c1ee1
 SHA512 
f09ad9ed04d25305b966e7f8c210082fe06c2b236dcd5018b009bd0bd6aaff123d16559d280892a5060760ed055ffe295bc02dc6e8dd1e7b8383c6c703f09290

diff --git a/net-libs/libssh2/libssh2-1.8.1.ebuild 
b/net-libs/libssh2/libssh2-1.8.1.ebuild
new file mode 100644
index 000..75e39f52b68
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.8.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="https://www.libssh2.org;
+SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+IUSE="gcrypt libressl mbedtls zlib"
+REQUIRED_USE="
+   ?? ( gcrypt libressl mbedtls )
+"
+RESTRICT="test"
+
+RDEPEND="
+   !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+   ${RDEPEND}
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.8.0-libgcrypt-prefix.patch
+   "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
+   "${FILESDIR}"/${PN}-1.8.0-openssl11-memleak.patch
+   "${FILESDIR}"/${PN}-1.8.0-openssl11.patch
+)
+
+multilib_src_configure() {
+   local crypto_backend=OpenSSL
+   if use gcrypt; then
+   crypto_backend=Libgcrypt
+   elif use mbedtls; then
+   crypto_backend=mbedTLS
+   fi
+
+   local mycmakeargs=(
+   -DBUILD_SHARED_LIBS=ON
+   -DCRYPTO_BACKEND=${crypto_backend}
+   -DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   find "${ED}" -name '*.la' -delete || die
+   mv "${ED}"/usr/share/doc/${PN}/* "${ED}"/usr/share/doc/${PF}/ || die
+   rm -r "${ED}"/usr/share/doc/${PN}/ || die
+}



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

2018-10-18 Thread Fabian Groffen
commit: 9696ec756b59edb614660e62ddacc99c32a4d278
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Oct 19 05:54:40 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Oct 19 05:54:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9696ec75

net-libs/libssh2: fix Prefix install, thanks Olivier Huber

Closes: https://bugs.gentoo.org/668858
Signed-off-by: Fabian Groffen  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 net-libs/libssh2/libssh2-1.8.0-r2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild 
b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
index 501d50e4569..bdab253bbee 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
@@ -53,7 +53,7 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
einstalldocs
-   find "${D}" -name '*.la' -delete || die
-   mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/ || die
-   rm -r "${D}"/usr/share/doc/${PN}/ || die
+   find "${ED}" -name '*.la' -delete || die
+   mv "${ED}"/usr/share/doc/${PN}/* "${ED}"/usr/share/doc/${PF}/ || die
+   rm -r "${ED}"/usr/share/doc/${PN}/ || die
 }



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

2018-10-05 Thread Jeroen Roovers
commit: 9e69c9a316fd7c0d34c954d01b843158ee5b6ab2
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Oct  5 18:20:43 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Oct  5 18:20:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e69c9a3

net-libs/libssh2: Add RESTRICT=test

Many of the tests require app-emulation/docker to be set up and working.

Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-libs/libssh2/libssh2-1.8.0-r2.ebuild | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild 
b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
index 76496b69216..501d50e4569 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils multilib-minimal
+inherit cmake-multilib
 
 DESCRIPTION="Library implementing the SSH2 protocol"
 HOMEPAGE="https://www.libssh2.org;
@@ -11,10 +11,11 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
-IUSE="gcrypt libressl mbedtls test zlib"
+IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="
?? ( gcrypt libressl mbedtls )
 "
+RESTRICT="test"
 
 RDEPEND="
!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
@@ -23,7 +24,9 @@ RDEPEND="
mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+   ${RDEPEND}
+"
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.8.0-libgcrypt-prefix.patch



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

2018-10-02 Thread Jeroen Roovers
commit: a64f398c715c6b0eea88e44cdef4104e1d76ba95
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Oct  2 10:12:05 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Oct  2 10:18:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64f398c

net-libs/libssh2: Set MULTILIB_USEDEP on mbedtls dep.

Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Jeroen Roovers  gentoo.org>

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

diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild 
b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
index daf148cbce6..76496b69216 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-   mbedtls? ( net-libs/mbedtls )
+   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/libssh2/

2018-10-01 Thread Jeroen Roovers
commit: d866d4705e1e4a092579a31df2815e3407950a19
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Oct  1 11:45:43 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Oct  1 11:46:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d866d470

net-libs/libssh2: Add USE=mbedtls, switch to cmake for building

* Add support for net-libs/mbedtls
* Switch to cmake as the autotools build is even more broken
* Remove USE=static-libs as that inhibits building shared libs
* Use REQUIRED_USE to force choosing a crypto backend

Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-libs/libssh2/libssh2-1.8.0-r2.ebuild | 56 
 net-libs/libssh2/metadata.xml|  2 ++
 2 files changed, 58 insertions(+)

diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild 
b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
new file mode 100644
index 000..daf148cbce6
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="https://www.libssh2.org;
+SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+IUSE="gcrypt libressl mbedtls test zlib"
+REQUIRED_USE="
+   ?? ( gcrypt libressl mbedtls )
+"
+
+RDEPEND="
+   !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   mbedtls? ( net-libs/mbedtls )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.8.0-libgcrypt-prefix.patch
+   "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
+   "${FILESDIR}"/${PN}-1.8.0-openssl11-memleak.patch
+   "${FILESDIR}"/${PN}-1.8.0-openssl11.patch
+)
+
+multilib_src_configure() {
+   local crypto_backend=OpenSSL
+   if use gcrypt; then
+   crypto_backend=Libgcrypt
+   elif use mbedtls; then
+   crypto_backend=mbedTLS
+   fi
+
+   local mycmakeargs=(
+   -DBUILD_SHARED_LIBS=ON
+   -DCRYPTO_BACKEND=${crypto_backend}
+   -DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   find "${D}" -name '*.la' -delete || die
+   mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/ || die
+   rm -r "${D}"/usr/share/doc/${PN}/ || die
+}

diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml
index e9e734ab02f..2149f2ed0c6 100644
--- a/net-libs/libssh2/metadata.xml
+++ b/net-libs/libssh2/metadata.xml
@@ -10,5 +10,7 @@
 
 
Use dev-libs/libgcrypt instead of 
dev-libs/openssl
+   Use dev-libs/libressl instead of 
dev-libs/openssl
+   Use net-libs/mbedtls instead of 
dev-libs/openssl
 
 



  1   2   >