gentoo resync : 15.12.2019

5 files changed, 2 insertions, 302 deletions

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index a85d62fa914e..64d85d5b4cfe 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,10 +1,6 @@
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
 AUX libssh2-1.9.0-libdir.patch 573 BLAKE2B 5464910fdb5a9461ad4ad6e94c0c682bb1106d437a47a035cb107c9dbec6d2d9e89f791b4f7309fdba307b898f229dff8bba5b5af5b8c6af2ca6ddc21d949695 SHA512 5b389312a4b0bdb6d724f54ce9659612b11f86add4b185b10ee4277b641b26c63256264e11225ea5f28775f0ac9367b391fe77470f34851aeca2e3b5e3408446
-AUX libssh2-1.9.0-missing.patch 4796 BLAKE2B 185428de9298fc210c30a1b826b958ebde761a6b258d2b6a79c2162533c81c6f9dfa5a1c574b239067a7bf79bda36656498cea78b0da797579b5cb6711a6dfe0 SHA512 65d75ecdc041cfb627c49f992804201dc234ba63558e2cbac066efbe0c4de03900668f61f87674ea9ef5beeb217d82cb441018f11e703545ba9349a4f05c8ae6
-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
-EBUILD libssh2-1.9.0-r1.ebuild 1449 BLAKE2B 88a40f3252d4f95efa3642f3d2729f49d93b0e63ca56ed6bc5f61dc277c1460491658bbe50259e28c6fef0fc1dd3281943a6c86bdc6dc096f37fff355df8ba8b SHA512 1e2bd2ce469fa46a148af4f0db6b1924692c0c0ca47b7e125f431055d5ae968fddcd73254eda1bc04f22af43a3fce83fda8c82cd5f7b6ab6e7da6c8dbdc4c739
-EBUILD libssh2-1.9.0.ebuild 1397 BLAKE2B b3f23ca2f291f72f439d0dcbc2693719c9183775f4f80ffda6e74733ce2f552e1201586f8d50cc056eb33e194f26c148df264d409dd17edbf662984867eb5720 SHA512 c41a5133c1703771bb12c4f7f65d7ae27332b502fe436536b939a5b23c63f9564e36cf9348a2abf119d959c40ff7b184f3ab40193a9a5a4f593401cb69624a09
-EBUILD libssh2-1.9.0_p20190913.ebuild 1523 BLAKE2B 943fc640d29668e7bb7135373e7201d19ae149aede6e34eb5ee6695825676ff52b1af9d3785788a7498f0f3b1e9f34f01389b0cc7fce4d9a5b3cf38ee0873326 SHA512 dee2f7df1b7a87777e7f085de08712e5c232387e1f823ba36b512bec3191b6cce81e04f79ea7dac3d571a313bd96bc7dd384a00ba9632d8ef9255d0b9d422835
+EBUILD libssh2-1.9.0_p20190913.ebuild 1520 BLAKE2B f37b7a9c8e0712f0b8a4573265814b29a4ba23771f02aa915ad93cb9a35046107cd4fb1903145a6f06e076a93c77e0ef1c26564be7befb30e1f71678a0f20719 SHA512 1ee3c6eb7293b1aaf130631e89fe46971f812296254e8a7f75ebe5ebc853724d17e6407fd89ef4de47b1fd5276439adebec155da30c5e7830e910c42d9a7773e
 EBUILD libssh2-9999.ebuild 1237 BLAKE2B 0a4ace453cacc7e735fc5df42d1bbadfb3a231954a94e992b8c7141037cd07b73a3f262f3ad9dcad9e98d51fe024a41220e0d34593f96e563c26f632e0f172f7 SHA512 f8f597a5adee5b882d3e6d22ce1dd739d5f1a57da4466bfedeebe1d7bfecddac296f687cf4982ece60f5e3e0b52eb4ae8fda30a2e6e4d091f479fbb0872116e2
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
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 7cc58d239638..000000000000
--- 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 <libssh2.h>
-+
-+#include <stdio.h>
-+
-+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 <libssh2.h>
-+
-+#include <stdio.h>
-+
-+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 <libssh2.h>
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+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");
-+        return 1;
-+    }
-+
-+    if(strstr(userauth_list, "publickey") == NULL) {
-+        fprintf(stderr, "'publickey' was expected in userauth list: %s\n",
-+                userauth_list);
-+        return 1;
-+    }
-+
-+    if(read_file(KEY_FILE_ED25519_PRIVATE, &buffer, &len)) {
-+        fprintf(stderr, "Reading key file failed.");
-+        return 1;
-+    }
-+
-+    rc = libssh2_userauth_publickey_frommemory(session, USERNAME, strlen(USERNAME),
-+                                               NULL, 0, buffer, len, NULL);
-+
-+    free(buffer);
-+
-+    if(rc != 0) {
-+        print_last_session_error("libssh2_userauth_publickey_fromfile_ex");
-+        return 1;
-+    }
-+
-+    return 0;
-+}
-+
-+int read_file(const char *path, char **out_buffer, size_t *out_len)
-+{
-+    int rc;
-+    FILE *fp = NULL;
-+    char *buffer = NULL;
-+    size_t len = 0;
-+
-+    if(out_buffer == NULL || out_len == NULL || path == NULL) {
-+        fprintf(stderr, "invalid params.");
-+        return 1;
-+    }
-+
-+    *out_buffer = NULL;
-+    *out_len = 0;
-+
-+    fp = fopen(path, "r");
-+
-+    if(!fp) {
-+       fprintf(stderr, "File could not be read.");
-+       return 1;
-+    }
-+
-+    fseek(fp, 0L, SEEK_END);
-+    len = ftell(fp);
-+    rewind(fp);
-+
-+    buffer = calloc(1, len + 1);
-+    if(!buffer) {
-+       fclose(fp);
-+       fprintf(stderr, "Could not alloc memory.");
-+       return 1;
-+    }
-+
-+    if(1 != fread(buffer, len, 1, fp)) {
-+       fclose(fp);
-+       free(buffer);
-+       fprintf(stderr, "Could not read file into memory.");
-+       return 1;
-+    }
-+
-+    fclose(fp);
-+
-+    *out_buffer = buffer;
-+    *out_len = len;
-+
-+    return 0;
-+}
diff --git a/net-libs/libssh2/libssh2-1.9.0-r1.ebuild b/net-libs/libssh2/libssh2-1.9.0-r1.ebuild
deleted file mode 100644
index a5602949511d..000000000000
--- a/net-libs/libssh2/libssh2-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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-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
-}
diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild b/net-libs/libssh2/libssh2-1.9.0.ebuild
deleted file mode 100644
index 73a2130ed835..000000000000
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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-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-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
-}
diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index 83b60bec30e5..5ba34d956653 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"