From e28664086310ccabcd4c5364a7010ce7d773bb1a Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 13 May 2019 14:49:44 +0000 Subject: [PATCH] bump(net-libs/libssh2): sync with upstream --- .../metadata/md5-cache/net-libs/libssh2-1.7.0 | 13 - .../md5-cache/net-libs/libssh2-1.8.0-r1 | 13 + .../md5-cache/net-libs/libssh2-1.8.0-r2 | 15 + .../metadata/md5-cache/net-libs/libssh2-1.8.2 | 15 + .../metadata/md5-cache/net-libs/libssh2-9999 | 16 +- .../portage-stable/net-libs/libssh2/ChangeLog | 147 ------- .../net-libs/libssh2/ChangeLog-2015 | 399 ------------------ .../portage-stable/net-libs/libssh2/Manifest | 9 +- .../files/libssh2-1.4.2-pkgconfig.patch | 10 - .../libssh2-1.8.0-libgcrypt-prefix.patch | 30 ++ .../files/libssh2-1.8.0-mansyntax_sh.patch | 41 ++ .../libssh2-1.8.0-openssl11-memleak.patch | 23 + .../files/libssh2-1.8.0-openssl11.patch | 70 +++ .../net-libs/libssh2/libssh2-1.7.0.ebuild | 44 -- .../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 +++ .../net-libs/libssh2/libssh2-9999.ebuild | 74 ++-- .../net-libs/libssh2/metadata.xml | 9 +- 19 files changed, 435 insertions(+), 661 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.7.0 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.8.0-r1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.8.0-r2 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.8.2 delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/ChangeLog-2015 delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-libgcrypt-prefix.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.7.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.8.0-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.8.0-r2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.8.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.7.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.7.0 deleted file mode 100644 index 4ef36d3f12..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.7.0 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=!gcrypt? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Library implementing the SSH2 protocol -EAPI=5 -HOMEPAGE=http://www.libssh2.org/ -IUSE=gcrypt libressl static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -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 -LICENSE=BSD -RDEPEND=!gcrypt? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) -SLOT=0 -SRC_URI=http://www.libssh2.org/download/libssh2-1.7.0.tar.gz -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 696393cddf6200db17a31641f597b403 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=65edbae0ad3d4fa38ef3f27a462279b9 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.8.0-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.8.0-r1 new file mode 100644 index 0000000000..8f22ad114d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.8.0-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install test +DEPEND=!gcrypt? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +DESCRIPTION=Library implementing the SSH2 protocol +EAPI=6 +HOMEPAGE=https://www.libssh2.org +IUSE=gcrypt libressl static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +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 +LICENSE=BSD +RDEPEND=!gcrypt? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +SLOT=0 +SRC_URI=https://www.libssh2.org/download/libssh2-1.8.0.tar.gz +_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs f164325a2cdb5b3ea39311d483988861 +_md5_=385a3f8d1aeeb95399d1cfe3f0bbbbb3 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.8.0-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.8.0-r2 new file mode 100644 index 0000000000..88ac62f143 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.8.0-r2 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6 +DESCRIPTION=Library implementing the SSH2 protocol +EAPI=6 +HOMEPAGE=https://www.libssh2.org +IUSE=gcrypt libressl mbedtls zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +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 +LICENSE=BSD +RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +REQUIRED_USE=?? ( gcrypt mbedtls ) +RESTRICT=test +SLOT=0 +SRC_URI=https://www.libssh2.org/download/libssh2-1.8.0.tar.gz +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b +_md5_=e8a08b4137d22c4200d3676c28201734 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.8.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.8.2 new file mode 100644 index 0000000000..2657243b35 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-1.8.2 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6 +DESCRIPTION=Library implementing the SSH2 protocol +EAPI=6 +HOMEPAGE=https://www.libssh2.org +IUSE=gcrypt libressl mbedtls zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +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 +LICENSE=BSD +RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +REQUIRED_USE=?? ( gcrypt mbedtls ) +RESTRICT=test +SLOT=0 +SRC_URI=https://www.libssh2.org/download/libssh2-1.8.2.tar.gz +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b +_md5_=40014421d467dc0e9381c23535ea6135 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-9999 index fa51f04394..8a9a69e21d 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-9999 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/libssh2-9999 @@ -1,11 +1,13 @@ DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=!gcrypt? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] +DEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 DESCRIPTION=Library implementing the SSH2 protocol -EAPI=5 -HOMEPAGE=http://www.libssh2.org/ -IUSE=gcrypt libressl static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +EAPI=6 +HOMEPAGE=https://www.libssh2.org +IUSE=gcrypt libressl mbedtls zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 LICENSE=BSD -RDEPEND=!gcrypt? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +REQUIRED_USE=?? ( gcrypt mbedtls ) +RESTRICT=test SLOT=0 -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 696393cddf6200db17a31641f597b403 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 0d4635eeb5a96cd5315597a47eba25c9 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=95e8d40b44b8a9e48dc957a97cc82ec9 +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b +_md5_=413d1d7dd464397185cb78f1f395f4da diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/ChangeLog b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/ChangeLog deleted file mode 100644 index 5a23c7ae9c..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/ChangeLog +++ /dev/null @@ -1,147 +0,0 @@ -# ChangeLog for net-libs/libssh2 -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*libssh2-9999 (09 Aug 2015) -*libssh2-1.6.0 (09 Aug 2015) -*libssh2-1.5.0 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson - +files/libssh2-1.4.2-pkgconfig.patch, +libssh2-1.5.0.ebuild, - +libssh2-1.6.0.ebuild, +libssh2-9999.ebuild, +metadata.xml: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - -*libssh2-1.6.0-r1 (20 Sep 2015) - - 20 Sep 2015; Julian Ospald +libssh2-1.6.0-r1.ebuild, - libssh2-9999.ebuild: - add libressl support - - 24 Jan 2016; Michał Górny metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - -*libssh2-1.7.0 (27 Feb 2016) - - 27 Feb 2016; Jeroen Roovers +libssh2-1.7.0.ebuild: - Version bump (bug #575474). - - Package-Manager: portage-2.2.27 - - 27 Feb 2016; Jeroen Roovers libssh2-1.7.0.ebuild: - Stable for PPC64 (bug #575474). - - Package-Manager: portage-2.2.27 - RepoMan-Options: --ignore-arches - - 27 Feb 2016; Jeroen Roovers libssh2-1.7.0.ebuild: - Stable for HPPA (bug #575474). - - Package-Manager: portage-2.2.27 - RepoMan-Options: --ignore-arches - - 02 Mar 2016; Agostino Sarubbo libssh2-1.7.0.ebuild: - amd64 stable wrt bug #575474 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="amd64" - Signed-off-by: Agostino Sarubbo - - 13 Mar 2016; Markus Meier libssh2-1.7.0.ebuild: - arm stable, bug #575474 - - Package-Manager: portage-2.2.27 - RepoMan-Options: --include-arches="arm" - - 15 Mar 2016; Agostino Sarubbo libssh2-1.7.0.ebuild: - x86 stable wrt bug #575474 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="x86" - Signed-off-by: Agostino Sarubbo - - 15 Mar 2016; Tobias Klausmann libssh2-1.7.0.ebuild: - 1.7.0-r0: add alpha keyword - - Gentoo-Bug: 575474 - - Package-Manager: portage-2.2.28 - - 16 Mar 2016; Agostino Sarubbo libssh2-1.7.0.ebuild: - ppc stable wrt bug #575474 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="ppc" - Signed-off-by: Agostino Sarubbo - - 19 Mar 2016; Agostino Sarubbo libssh2-1.7.0.ebuild: - sparc stable wrt bug #575474 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="sparc" - Signed-off-by: Agostino Sarubbo - - 20 Mar 2016; Agostino Sarubbo libssh2-1.7.0.ebuild: - ia64 stable wrt bug #575474 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="ia64" - Signed-off-by: Agostino Sarubbo - - 26 Mar 2016; Jeroen Roovers -libssh2-1.5.0.ebuild, - -libssh2-1.6.0.ebuild, -libssh2-1.6.0-r1.ebuild: - Old. - - Package-Manager: portage-2.2.28 - diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/ChangeLog-2015 deleted file mode 100644 index 057a71f117..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/ChangeLog-2015 +++ /dev/null @@ -1,399 +0,0 @@ -# ChangeLog for net-libs/libssh2 -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.109 2015/07/20 06:10:12 vapier Exp $ - - 20 Jul 2015; Mike Frysinger libssh2-1.5.0.ebuild: - Mark arm64/s390/sh stable. - - 17 Jun 2015; Mike Frysinger libssh2-1.6.0.ebuild: - Add arm64 love. - -*libssh2-1.6.0 (13 Jun 2015) - - 13 Jun 2015; Jeroen Roovers +libssh2-1.6.0.ebuild: - Version bump. - -*libssh2-9999 (27 May 2015) - - 27 May 2015; Michał Górny +libssh2-9999.ebuild: - Add a live ebuild - - 30 Mar 2015; Jeroen Roovers -libssh2-1.4.3.ebuild, - -libssh2-1.4.3-r1.ebuild: - Old. - - 30 Mar 2015; Agostino Sarubbo libssh2-1.5.0.ebuild: - Stable for alpha, wrt bug #542914 - - 30 Mar 2015; Agostino Sarubbo libssh2-1.5.0.ebuild: - Stable for sparc, wrt bug #542914 - - 28 Mar 2015; Markus Meier libssh2-1.5.0.ebuild: - arm stable, bug #542914 - - 26 Mar 2015; Agostino Sarubbo libssh2-1.5.0.ebuild: - Stable for ppc64, wrt bug #542914 - - 26 Mar 2015; Agostino Sarubbo libssh2-1.5.0.ebuild: - Stable for ppc, wrt bug #542914 - - 25 Mar 2015; Agostino Sarubbo libssh2-1.5.0.ebuild: - Stable for ia64, wrt bug #542914 - - 13 Mar 2015; Agostino Sarubbo libssh2-1.5.0.ebuild: - Stable for x86, wrt bug #542914 - - 13 Mar 2015; Agostino Sarubbo libssh2-1.5.0.ebuild: - Stable for amd64, wrt bug #542914 - - 12 Mar 2015; Jeroen Roovers libssh2-1.5.0.ebuild: - Stable for HPPA (bug #542914). - -*libssh2-1.5.0 (12 Mar 2015) - - 12 Mar 2015; Jeroen Roovers +libssh2-1.5.0.ebuild, - metadata.xml: - Version bump (bug #542914). - - 02 Mar 2015; Agostino Sarubbo libssh2-1.4.3-r1.ebuild: - Stable for ppc, wrt bug #526056 - - 16 Jan 2015; Raúl Porcel libssh2-1.4.3-r1.ebuild: - alpha/ia64/s390/sparc stable wrt #526056 - - 02 Dec 2014; Pacho Ramos libssh2-1.4.3-r1.ebuild: - amd64/x86 stable, bug #526056 - - 15 Nov 2014; Jeroen Roovers libssh2-1.4.3-r1.ebuild: - Run some eclass _src_prepare() (bug #529364). - - 04 Nov 2014; Markus Meier libssh2-1.4.3-r1.ebuild: - arm stable, bug #526056 - - 26 Oct 2014; Jeroen Roovers libssh2-1.4.3-r1.ebuild: - Stable for HPPA (bug #526056). - - 12 Oct 2014; Jeroen Roovers libssh2-1.4.3-r1.ebuild: - Do not run mansyntax.sh test (bug #449328). - - 18 Jul 2014; Jeroen Roovers -libssh2-1.4.2.ebuild, - files/libssh2-1.4.2-pkgconfig.patch: - Clean up patch. - - 18 Jun 2014; Michał Górny libssh2-1.4.3-r1.ebuild: - Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug - #513718. - -*libssh2-1.4.3-r1 (13 Jun 2014) - - 13 Jun 2014; Michał Górny +libssh2-1.4.3-r1.ebuild: - Enable multilib support, required for net-misc/curl. - - 01 Mar 2014; Michał Górny libssh2-1.4.2.ebuild, - libssh2-1.4.3.ebuild: - Update libgcrypt dep to use slot :0. - - 06 Aug 2013; Agostino Sarubbo libssh2-1.4.3.ebuild: - Stable for s390, wrt bug #476220 - - 04 Aug 2013; Agostino Sarubbo libssh2-1.4.3.ebuild: - Stable for ia64, wrt bug #476220 - - 03 Aug 2013; Agostino Sarubbo libssh2-1.4.3.ebuild: - Stable for sparc, wrt bug #476220 - - 14 Jul 2013; Agostino Sarubbo libssh2-1.4.3.ebuild: - Stable for arm, wrt bug #476220 - - 14 Jul 2013; Agostino Sarubbo libssh2-1.4.3.ebuild: - Stable for alpha, wrt bug #476220 - - 13 Jul 2013; Agostino Sarubbo libssh2-1.4.3.ebuild: - Stable for ppc64, wrt bug #476220 - - 13 Jul 2013; Agostino Sarubbo libssh2-1.4.3.ebuild: - Stable for ppc, wrt bug #476220 - - 13 Jul 2013; Agostino Sarubbo libssh2-1.4.3.ebuild: - Stable for x86, wrt bug #476220 - - 12 Jul 2013; Agostino Sarubbo libssh2-1.4.3.ebuild: - Stable for amd64, wrt bug #476220 - - 09 Jul 2013; Jeroen Roovers libssh2-1.4.3.ebuild: - Stable for HPPA (bug #476220). - -*libssh2-1.4.3 (09 Dec 2012) - - 09 Dec 2012; Tim Harder +libssh2-1.4.3.ebuild: - Version bump. - - 19 Nov 2012; Justin Lecher libssh2-1.4.2.ebuild, - metadata.xml: - Keyworded for ~*-linux, tested by me - - 27 Aug 2012; Tim Harder -libssh2-1.4.0.ebuild, - -files/libssh2-1.4.0-pkgconfig.patch, -libssh2-1.4.1.ebuild: - Remove old. - - 26 Aug 2012; Raúl Porcel libssh2-1.4.2.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #422139 - - 04 Aug 2012; Anthony G. Basile libssh2-1.4.2.ebuild: - Stable arm, bug #422139 - - 03 Aug 2012; Markos Chandras libssh2-1.4.2.ebuild: - Stable on amd64 wrt bug #422139 - - 03 Aug 2012; Anthony G. Basile libssh2-1.4.2.ebuild: - Stable ppc ppc64, bug #422139 - - 01 Aug 2012; Jeroen Roovers libssh2-1.4.2.ebuild: - Stable for HPPA (bug #422139). - - 01 Aug 2012; Jeff Horelick libssh2-1.4.2.ebuild: - marked x86 per bug 422139 - - 23 Jul 2012; Jeremy Olexa libssh2-1.4.2.ebuild: - add ~ppc-macos, bug 427508 - -*libssh2-1.4.2 (20 May 2012) - - 20 May 2012; Tim Harder +libssh2-1.4.2.ebuild, - +files/libssh2-1.4.2-pkgconfig.patch: - Version bump. - - 10 May 2012; Tim Harder -libssh2-1.3.0.ebuild: - Remove old. - - 06 May 2012; Raúl Porcel libssh2-1.4.0.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #409601 - - 26 Apr 2012; Alexis Ballier libssh2-1.4.1.ebuild: - keyword ~amd64-fbsd - -*libssh2-1.4.1 (04 Apr 2012) - - 04 Apr 2012; Tim Harder +libssh2-1.4.1.ebuild: - Version bump. - - 31 Mar 2012; Markus Meier libssh2-1.4.0.ebuild: - arm stable, bug #409601 - - 28 Mar 2012; Jeff Horelick libssh2-1.4.0.ebuild: - marked x86 per bug 409601 - - 26 Mar 2012; Tim Harder libssh2-1.4.0.ebuild, - +files/libssh2-1.4.0-pkgconfig.patch: - Remove LDFLAGS from pkg-config Libs (bug #409661). - - 25 Mar 2012; Brent Baude libssh2-1.4.0.ebuild: - Marking libssh2-1.4.0 ppc64 for bug 409601 - - 25 Mar 2012; Jeroen Roovers libssh2-1.4.0.ebuild: - Stable for HPPA (bug #409601). - - 25 Mar 2012; Agostino Sarubbo libssh2-1.4.0.ebuild: - Stable for amd64, wrt bug #409601 - - 25 Mar 2012; Brent Baude libssh2-1.4.0.ebuild: - Marking libssh2-1.4.0 ppc for bug 409601 - - 08 Mar 2012; Jeroen Roovers -libssh2-1.2.2.ebuild: - Old. - - 08 Mar 2012; Brent Baude libssh2-1.3.0.ebuild: - Marking libssh2-1.3.0 ppc64 for bug 390555 - -*libssh2-1.4.0 (07 Feb 2012) - - 07 Feb 2012; Tim Harder +libssh2-1.4.0.ebuild: - Version bump. - - 06 Feb 2012; Brent Baude libssh2-1.3.0.ebuild: - Marking libssh2-1.3.0 ppc for bug 390555 - - 04 Dec 2011; Raúl Porcel libssh2-1.3.0.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #390555 - - 28 Nov 2011; Tim Harder libssh2-1.3.0.ebuild: - Fix autotools-utils usage (bug #392167). - - 27 Nov 2011; Tim Harder libssh2-1.3.0.ebuild: - Build in the source tree. - - 27 Nov 2011; Tim Harder -libssh2-1.2.5.ebuild, - -libssh2-1.2.6.ebuild, -libssh2-1.2.7.ebuild, -libssh2-1.2.8-r1.ebuild, - -files/libssh2-1.2.8-version.patch, -libssh2-1.2.9.ebuild: - Remove old. - - 23 Nov 2011; Markus Meier libssh2-1.3.0.ebuild: - arm stable, bug #390555 - - 17 Nov 2011; Pawel Hajdan jr libssh2-1.3.0.ebuild: - x86 stable wrt bug #390555 - - 15 Nov 2011; Markos Chandras libssh2-1.3.0.ebuild: - Stable on amd64 wrt bug #390555 - - 15 Nov 2011; Jeroen Roovers libssh2-1.3.0.ebuild: - Stable for HPPA (bug #390555). - -*libssh2-1.3.0 (21 Sep 2011) - - 21 Sep 2011; Tim Harder +libssh2-1.3.0.ebuild: - Version bump. Add workaround for failing tests (bug #333319). - -*libssh2-1.2.9 (20 Aug 2011) - - 20 Aug 2011; Jeroen Roovers +libssh2-1.2.9.ebuild: - Version bump. - -*libssh2-1.2.8-r1 (10 May 2011) - - 10 May 2011; Jeroen Roovers -libssh2-1.2.8.ebuild, - +libssh2-1.2.8-r1.ebuild, +files/libssh2-1.2.8-version.patch: - Fix "VERSION" in autoconf script thanks to Lars, patch by Stratos Psomadakis - (bug #366599). - -*libssh2-1.2.8 (08 May 2011) - - 08 May 2011; Jeroen Roovers +libssh2-1.2.8.ebuild: - Version bump. Add USE=static-libs. - -*libssh2-1.2.7 (04 Oct 2010) - - 04 Oct 2010; Jeroen Roovers +libssh2-1.2.7.ebuild: - Version bump (bug #339683). - - 02 Oct 2010; Fabian Groffen libssh2-1.2.6.ebuild: - Marked ~x64-macos, bug #333981 - -*libssh2-1.2.6 (06 Jul 2010) - - 06 Jul 2010; Jeroen Roovers +libssh2-1.2.6.ebuild: - Version bump by Tim Harder (bug #327115). - -*libssh2-1.2.5 (26 May 2010) - - 26 May 2010; Jeroen Roovers +libssh2-1.2.5.ebuild: - Version bump thanks to Emmanuel Andry (bug #321567). - - 28 Mar 2010; Raúl Porcel libssh2-1.2.2.ebuild: - alpha/ia64/s390/sh stable wrt #298456 - - 09 Feb 2010; Tiago Cunha libssh2-1.2.2.ebuild: - stable sparc, bug 298456 - - 10 Jan 2010; Markus Meier libssh2-1.2.2.ebuild: - arm/x86 stable, bug #298456 - - 07 Jan 2010; Brent Baude libssh2-1.2.2.ebuild: - Marking libssh2-1.2.2 ppc for bug 298456 - - 06 Jan 2010; Brent Baude libssh2-1.2.2.ebuild: - Marking libssh2-1.2.2 ppc64 for bug 298456 - - 06 Jan 2010; Tomáš Chvátal libssh2-1.2.2.ebuild: - Stable for AMD64 (bug #298456). - - 05 Jan 2010; Jeroen Roovers libssh2-1.2.2.ebuild: - Stable for HPPA (bug #298456). - - 14 Dec 2009; Peter Volkov libssh2-1.2.2.ebuild: - Disable ssh2.sh test in case FEATURES=userpriv, bug #286741, thank Kent - Fredric for report. - -*libssh2-1.2.2 (23 Nov 2009) - - 23 Nov 2009; Jeroen Roovers +libssh2-1.2.2.ebuild: - Version bump. - -*libssh2-1.2.1 (06 Oct 2009) - - 06 Oct 2009; Patrick Lauer +libssh2-1.2.1.ebuild: - Bump. fixes #287386 - - 26 Jun 2009; Peter Volkov -libssh2-0.14.ebuild, - -libssh2-0.15.ebuild, -libssh2-0.17.ebuild, libssh2-0.18.ebuild, - -libssh2-1.0.ebuild, libssh2-1.1.ebuild, metadata.xml: - Renamed libgcrypt USE flag into gcrypt, bug #274555, thank Tristan Heaven - for report. Cleaned old. - - 23 Apr 2009; Raúl Porcel libssh2-0.18.ebuild: - arm/s390/sh stable - -*libssh2-1.1 (18 Apr 2009) - - 18 Apr 2009; Patrick Lauer +libssh2-1.1.ebuild: - Bump to 1.1, EAPI2ified, modified ebuild by Tim Harder. Closes #265823 - - 09 Apr 2009; Raúl Porcel libssh2-0.18.ebuild, - libssh2-1.0.ebuild: - Add ~arm/~s390/~sh wrt #215709 - -*libssh2-1.0 (29 Mar 2009) - - 29 Mar 2009; Patrick Lauer +libssh2-1.0.ebuild: - Bump to 1.0. Fixes #261612 - - 24 Jan 2009; Alexis Ballier libssh2-0.18.ebuild: - keyword ~x86-fbsd - - 25 Aug 2008; Jeroen Roovers libssh2-0.18.ebuild: - Stable for HPPA (bug #233122). - - 02 Aug 2008; Markus Rothe libssh2-0.18.ebuild: - Stable on ppc64; bug #233122 - - 01 Aug 2008; nixnut libssh2-0.18.ebuild: - Stable on ppc wrt bug 233122 - - 30 Jul 2008; Dawid Węgliński libssh2-0.18.ebuild: - Stable on amd64 (bug #233122) - - 29 Jul 2008; Raúl Porcel libssh2-0.18.ebuild: - alpha/ia64/sparc/x86 stable wrt #233122 - - 29 Apr 2008; libssh2-0.18.ebuild: - Add ~mips, bug #215709 - - 04 Apr 2008; Brent Baude libssh2-0.18.ebuild: - Marking libssh2-0.18 ~ppc - - 04 Apr 2008; Brent Baude libssh2-0.18.ebuild: - keyworded ~arch for ppc64, bug 215709 - - 01 Apr 2008; Raúl Porcel libssh2-0.18.ebuild: - Add ~alpha/~ia64/~sparc wrt #215709 - - 01 Apr 2008; Jeroen Roovers libssh2-0.18.ebuild: - Marked ~hppa. - -*libssh2-0.18 (23 Dec 2007) - - 23 Dec 2007; Cédric Krier +libssh2-0.18.ebuild: - Version bump - - 13 Sep 2007; Daniel Black libssh2-0.17.ebuild: - added ~amd64 keyword - works with curl-7.17.0-r1 - -*libssh2-0.17 (29 Aug 2007) - - 29 Aug 2007; Cédric Krier +libssh2-0.17.ebuild: - Version bump - -*libssh2-0.15 (01 Jul 2007) - - 01 Jul 2007; Cédric Krier +libssh2-0.15.ebuild: - Version bump - -*libssh2-0.14 (27 Nov 2006) - - 27 Nov 2006; Markus Ullmann - +files/libssh2-0.14-banner-wait.patch, - +files/libssh2-0.14-channel-failure.patch, - +files/libssh2-0.14-configure.patch, - +files/libssh2-0.14-peer-shutdown.patch, +metadata.xml, - +libssh2-0.14.ebuild: - Import from sunrise for bug 113844 thanks to Joe and cedk diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/Manifest index 2deb0aee94..f5809249d6 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/Manifest @@ -1,7 +1,2 @@ -AUX libssh2-1.4.2-pkgconfig.patch 288 SHA256 0a4fde85a0772a6ecc793493c19f58416847ca30135f64e7e0c08a3197ea2abe SHA512 a2a29069a85fd1e1fabe0fac92ea5666a82da53bf822e105ff0b918188196bdbdf271e2b7a8e636b9746fb75226192c0bdd8a0f4598e46604a64b6f0727fbfec WHIRLPOOL c59b318376ebe979aca73721b4be23374f6d2f44533044d689f94ad145d2b70acbf584a3c6e1a4bcf57805a350259603204ec140b8388d98bc1fcbad94f3f1c6 -DIST libssh2-1.7.0.tar.gz 811714 SHA256 e4561fd43a50539a8c2ceb37841691baf03ecb7daf043766da1b112e4280d584 SHA512 0f9dfd83196129568c00383e2e4fea29b3d8c4f3b1690f550a6748d1db68cc437b4ed083f5d3d4646365fdc839819619aea96eeaef5ab072c7023d13f08b5153 WHIRLPOOL dceefdc11b6b88f4320bfdd01044dc9c81e4d1e3e54a9e2ec8f6869ba091668e5957a3e2a56934196c87f1877d61ebe0b45f450ca12bf1802da9812db8a4ffb6 -EBUILD libssh2-1.7.0.ebuild 1217 SHA256 093a9cdfa5d4321c1a70af780f96476245fff9900f5cf86e2c3000b20d2f6028 SHA512 90610f804de1cd56abcac75e5f3257c490943bb8e336f53d7dfe08fb7a00607e04a2519868bf0e8f2d64b0c80f2ea83e99e966179652f79fb166e75b74e7bbad WHIRLPOOL 79e3546af0873bbda3c4bb0c2c142c026e49679b469e980eb3958f386e7241a18bc252d9df279658e8a4c737873953f7244bdc8fa73d24701c108aaf846f7ffa -EBUILD libssh2-9999.ebuild 1209 SHA256 4ecdc32c964c25f8d9285513722ca2501a363ba880133b54a190734b8222cf6d SHA512 f271019ce0cca1a4667782911291ba10b8422a2417c42e94c856e559a70893db9ed2f5c37ec41faa1de8cb5278fc5581c054a276ec5b9d5e5d068ae23b09399b WHIRLPOOL d0242dc2f6ad3c85f75f290fc08de96f6309aafe4b1099ed12e4604ef1a02f4d8f8b43a1fda88ff72ca8650702acc5cd954343b12616d605b4fb210cd695d450 -MISC ChangeLog 4896 SHA256 a77758fa916830c2f32c8c7be26eda64f234bb7249209c96375cfe6a523463e4 SHA512 bd4cae4f0306095564b2a3b9884680be25d0289e1914e05cb33775de350b0cef756d6a2925a22ffb42f9f7adc5e7c182a1f26f254af224c9fbf391da97c08821 WHIRLPOOL 06cafe1426287aa27ba2b18d30aab36d8fefb4767e6bb71b6081e95427abeda96490e6be68a996a12a5d3cc0e06b082368a2a8e37621d743a4218783c857a6ad -MISC ChangeLog-2015 13302 SHA256 34f5839998ce4cd9ad8b2782504071bc970c51e410a20e6ad25325e3d05439e1 SHA512 e5761b40bbd899eef35bf5fd7c3f16d54dddb46a48e0f74b2296ed2dc94d33e9045d17c542762922e9be54844afc8b77dc8f37648464ab2df16999c3916987a1 WHIRLPOOL d5c73508c9008f46297da236d4dec27e02171e869687f9e0067b889b539d440723613f0816c44541ac7830a211a14c028fe3ee919ee56d2101a9f55bb3b13cd4 -MISC metadata.xml 387 SHA256 e28876588c38761f1ff35f200658eaabdfaf1f63e8b7ad9b7b5900d607d0987c SHA512 c98134dddb94e8d6db6750b27d6b5b92b778b8bdb00b6abb1448124eb88ac638c0599fcf6e7cdcd4e26e9e2b181471fe1456c4ccf422036f481f092d61a95ae9 WHIRLPOOL a85fa9c9d6feb23ef68da416fc02e85309f138b52654c05d86e93aac3db50a00647fcb525941f562bf0a01ca1f7bb157151268bcc7629f5c4b0ef73357ddeca6 +DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558 +DIST libssh2-1.8.2.tar.gz 859587 BLAKE2B 58e0854e83001c424a767ceb4ddfb535373320d8319aa632244dc14434276db7c8b7a77d4a5f22fe8e397f1050b33516d2fca1162658a9f414166f560bc1f358 SHA512 390ab4ad93bb738415ec11a6eb92806c9b9e9e5d8ee7c442d841a58b4292c1c447a9bc99e153ba464e2e11f9c0d1913469303598c3046722d1ae821991e8cb93 diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch deleted file mode 100644 index f741a256f7..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libssh2.pc.in -+++ b/libssh2.pc.in -@@ -12,6 +12,6 @@ - Description: Library for SSH-based communication - Version: @LIBSSH2VER@ - Requires.private: @LIBSREQUIRED@ --Libs: -L${libdir} -lssh2 @LDFLAGS@ @LIBS@ -+Libs: -L${libdir} -lssh2 @LIBS@ - Libs.private: @LIBS@ - Cflags: -I${includedir} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-libgcrypt-prefix.patch b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-libgcrypt-prefix.patch new file mode 100644 index 0000000000..10065626fe --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-libgcrypt-prefix.patch @@ -0,0 +1,30 @@ +--- 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/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch new file mode 100644 index 0000000000..3a33bf7441 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch @@ -0,0 +1,41 @@ +--- 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 ++: diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch new file mode 100644 index 0000000000..d7d41f976c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch @@ -0,0 +1,23 @@ +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/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch new file mode 100644 index 0000000000..0824dd0617 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch @@ -0,0 +1,70 @@ +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 with OPENSSL_API_COMPAT=0x10100000L, OpenSSL_add_all_algorithms +and OpenSSL_add_all_ciphers don't exist. The corresponding functionality is +handled automatically with OpenSSL 1.1. +--- + src/openssl.c | 4 ++++ + src/openssl.h | 6 ++++++ + 2 files changed, 10 insertions(+) + +diff --git a/src/openssl.c b/src/openssl.c +index f10f2921..25cef082 100644 +--- a/src/openssl.c ++++ b/src/openssl.c +@@ -1056,6 +1056,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session, + "Unable to extract public key from private key " + "file: Unable to open private key file"); + } ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (!EVP_get_cipherbyname("des")) { + /* If this cipher isn't loaded it's a pretty good indication that none + * are. I have *NO DOUBT* that there's a better way to deal with this +@@ -1064,6 +1065,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session, + */ + OpenSSL_add_all_ciphers(); + } ++#endif + BIO_reset(bp); + pk = PEM_read_bio_PrivateKey(bp, NULL, NULL, (void*)passphrase); + BIO_free(bp); +@@ -1132,6 +1134,7 @@ _libssh2_pub_priv_keyfilememory(LIBSSH2_SESSION *session, + if (!bp) { + return -1; + } ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (!EVP_get_cipherbyname("des")) { + /* If this cipher isn't loaded it's a pretty good indication that none + * are. I have *NO DOUBT* that there's a better way to deal with this +@@ -1140,6 +1143,7 @@ _libssh2_pub_priv_keyfilememory(LIBSSH2_SESSION *session, + */ + OpenSSL_add_all_ciphers(); + } ++#endif + BIO_reset(bp); + pk = PEM_read_bio_PrivateKey(bp, NULL, NULL, (void*)passphrase); + BIO_free(bp); +diff --git a/src/openssl.h b/src/openssl.h +index 2bd80b96..d8874286 100644 +--- a/src/openssl.h ++++ b/src/openssl.h +@@ -226,10 +226,16 @@ int _libssh2_md5_init(libssh2_md5_ctx *ctx); + #define libssh2_hmac_cleanup(ctx) HMAC_cleanup(ctx) + #endif + ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#define libssh2_crypto_init() \ ++ ENGINE_load_builtin_engines(); \ ++ ENGINE_register_all_complete() ++#else + #define libssh2_crypto_init() \ + OpenSSL_add_all_algorithms(); \ + ENGINE_load_builtin_engines(); \ + ENGINE_register_all_complete() ++#endif + + #define libssh2_crypto_exit() + diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.7.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.7.0.ebuild deleted file mode 100644 index 18083a7ae9..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.7.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=true -inherit autotools-multilib - -DESCRIPTION="Library implementing the SSH2 protocol" -HOMEPAGE="http://www.libssh2.org/" -SRC_URI="http://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 static-libs test zlib" - -DEPEND=" - !gcrypt? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) - ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND}" - -DOCS=( README ) - -src_prepare() { - sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die - autotools-multilib_src_prepare -} - -multilib_src_configure() { - # Disable tests that require extra permissions (bug #333319) - use test && local -x ac_cv_path_SSHD= - - local myeconfargs=( - $(use_with zlib libz) - $(usex gcrypt --with-libgcrypt --with-openssl) - ) - autotools-utils_src_configure -} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.8.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.8.0-r1.ebuild new file mode 100644 index 0000000000..3a4f0b2a6f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.8.0-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit 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 static-libs test zlib" + +RDEPEND=" + !gcrypt? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + ) + gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${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.patch + "${FILESDIR}"/${PN}-1.8.0-openssl11-memleak.patch +) + +multilib_src_configure() { + # Disable tests that require extra permissions (bug #333319) + use test && local -x ac_cv_path_SSHD= + + ECONF_SOURCE=${S} econf \ + $(use_with zlib libz) \ + $(usex gcrypt --with-libgcrypt --with-openssl) \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.8.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.8.0-r2.ebuild new file mode 100644 index 0000000000..7eb5156df2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.8.0-r2.ebuild @@ -0,0 +1,61 @@ +# 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 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-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 +} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.8.2.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.8.2.ebuild new file mode 100644 index 0000000000..3e9d5fcb91 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.8.2.ebuild @@ -0,0 +1,61 @@ +# 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 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-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 +} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-9999.ebuild index 8d3718bc08..d1797b7dcf 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-9999.ebuild @@ -1,48 +1,58 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 - -AUTOTOOLS_AUTORECONF=true -EGIT_REPO_URI="https://github.com/libssh2/libssh2" -inherit autotools-multilib git-r3 +EAPI=6 +inherit git-r3 cmake-multilib DESCRIPTION="Library implementing the SSH2 protocol" -HOMEPAGE="http://www.libssh2.org/" -SRC_URI="" +HOMEPAGE="https://www.libssh2.org" +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 mbedtls )" +RESTRICT="test" -DEPEND=" - !gcrypt? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) - ) +RDEPEND=" gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND}" + !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} +" -DOCS=( README ) - -PATCHES=( "${FILESDIR}"/${PN}-1.4.2-pkgconfig.patch ) - -src_prepare() { - sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die - ln -s ../src/libssh2_config.h.in example/libssh2_config.h.in || die - autotools-multilib_src_prepare -} +PATCHES=( + "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch +) multilib_src_configure() { - # Disable tests that require extra permissions (bug #333319) - use test && local -x ac_cv_path_SSHD= + local crypto_backend=OpenSSL + if use gcrypt; then + crypto_backend=Libgcrypt + elif use mbedtls; then + crypto_backend=mbedTLS + fi - local myeconfargs=( - $(use_with zlib libz) - $(usex gcrypt --with-libgcrypt --with-openssl) + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DCRYPTO_BACKEND=${crypto_backend} + -DENABLE_ZLIB_COMPRESSION=$(usex zlib) ) - autotools-utils_src_configure + 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 } diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/metadata.xml b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/metadata.xml index 8c74898a7f..2149f2ed0c 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/metadata.xml @@ -3,9 +3,14 @@ netmon@gentoo.org -Gentoo network monitoring and analysis project + + + mgorny@gentoo.org + Michał Górny -Use dev-libs/libgcrypt instead of dev-libs/openssl + 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