gentoo resync 08.09.2018

6 files changed, 125 insertions, 4 deletions

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index ae63b8b88f4a..b0281846c7cf 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -7,8 +7,10 @@ AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a28
 DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f8311c30364bbf06d4f01121a58f5b560e0a1d9071655ce9b310fa3f3f801e11e880ca3eacde66efa0f49dc51b2b SHA512 94b8183e5c83e339303c1a160c92ccff6159471ac7d189ab66cf6d606d2e803fd616519f079aef1577c947d3a14e315332b05ea08e44d0ab550edbcb768dbea7
 DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775
 DIST libssh-0.8.1.tar.xz 409572 BLAKE2B 65bf38c5bba803a588ff4a1cc5f774cacc43c500bf0aaa77674f9120eccda26027e446aeb9e61a2418eb81077fdb0aa55d8e014f6d466877a9cd96b665c5e7ce SHA512 6630d0b101dc109116ba7a6cffb00db1bc9b5bc6004c843c5361d3d97c6cf4c323129ebf3bbf25ab2fc1961b74520490d7a16999504849c07b26a25679724b93
-EBUILD libssh-0.7.4.ebuild 2481 BLAKE2B da53e49934deb1984710a1a10f5955fa25b4b0c953566d287ff11e7a90f1991f4f5d58784cb78dc620fc522b0713be1ded8545898909a19bf18cae79e5f6e569 SHA512 e89b9b43fcef2b218cf099dbdee607fbddec3d25ffb11371029b98492ed151dc84d4f0c53050f10b48330c29066c898c83f233858edb2b19fdfa95acc1f6a369
-EBUILD libssh-0.7.5-r2.ebuild 2691 BLAKE2B bd987e06bd7418f27ddd0bec9917df13958547bde473965ac53928d68802e311c6e26a023c0de0a81c01e8861b9c8acf5553a508538e2ab09da6df826ffd644a SHA512 4c64f74e75efe58acfcb5bd75de8341428c50a837441416719fae63dee449405aeb8df2d4bbd83725aba8df35e1b63715501049f730397a55200fcbc0d83c2ee
-EBUILD libssh-0.8.1.ebuild 2877 BLAKE2B 11cd07217c02f8dbc5efa1da22d84abb4aebc3f452693f0462d8160cb804aa4af541bf7140fa2571bf1e7427d9ffab157c00ae37cc260d507b6f057caf5f1fb4 SHA512 e7f0a748700a9a0e6c4a107cf25242657285657c885078317eac21b419c03a6c174652da07882dac1bb672d042f7a68ce925c47af5e0a44084b06b03f5fe88ba
-EBUILD libssh-9999.ebuild 2877 BLAKE2B 11cd07217c02f8dbc5efa1da22d84abb4aebc3f452693f0462d8160cb804aa4af541bf7140fa2571bf1e7427d9ffab157c00ae37cc260d507b6f057caf5f1fb4 SHA512 e7f0a748700a9a0e6c4a107cf25242657285657c885078317eac21b419c03a6c174652da07882dac1bb672d042f7a68ce925c47af5e0a44084b06b03f5fe88ba
+DIST libssh-0.8.2.tar.xz 408412 BLAKE2B bbd531ed511baa84d40c2e156cc63fca09345196e24e485930d8f42fed451529ea6ec2ce6f50276dfa56d5523062bbc45774891ad47ce7c748e8b95bc28b9f8c SHA512 ef9877d2a35f1871139c12452c917a3888172ea29f71d880e824de182695e5a8786bb39ca2f4874a160e156648d52065a8b2e7c040220badf65eee35dcfddeb9
+EBUILD libssh-0.7.4.ebuild 2510 BLAKE2B f644104dcf0707121f141a2b75bdb57935daf4a01d897b5ffb96d6875e681aecfd9730cd02d6330acdf96256f012643659951ca4cd97e2126bf6991fa88ab14e SHA512 1a7bf07e67bb6caf4a183095347fc512dcfcb98a729db2cc1416f39a3bb201ad3046eec7c82c3aa07c7a9f3c5e6b3d3e908a4d32252b0697bdc76173f287a8df
+EBUILD libssh-0.7.5-r2.ebuild 2720 BLAKE2B 76d98f803d58cdea91439451e4842c3079bc19c052845d4f18d27fbd94faf4f3028c244b9ccacbfc27edf87490cbad7af73c3f540f012b3c597ca3596f65c20e SHA512 80148669a5bdb2b0a1cdfdd295ef833ccd51270cfdc2986109b2a6b1bad5da3908642c89e929fed5dc2fda20d8104b3dace60c0d87c7c6450bace22d091efc82
+EBUILD libssh-0.8.1.ebuild 2906 BLAKE2B ad375e522342393de0dc8d96c49cce0044f35710394a071d825ff138c76a52eb7d08df05b98a13386072a2ec9cc48ebe14971772cb53b538bdc1d8784c381778 SHA512 be74166f6b03ef623420f0b0263c5ceb6bb42068bedaf442958ba1cc394e05245ba891b598450a7b813ca03a246701f924ddb1fb382af074ab556b465a1723a1
+EBUILD libssh-0.8.2.ebuild 2906 BLAKE2B ad375e522342393de0dc8d96c49cce0044f35710394a071d825ff138c76a52eb7d08df05b98a13386072a2ec9cc48ebe14971772cb53b538bdc1d8784c381778 SHA512 be74166f6b03ef623420f0b0263c5ceb6bb42068bedaf442958ba1cc394e05245ba891b598450a7b813ca03a246701f924ddb1fb382af074ab556b465a1723a1
+EBUILD libssh-9999.ebuild 2906 BLAKE2B ad375e522342393de0dc8d96c49cce0044f35710394a071d825ff138c76a52eb7d08df05b98a13386072a2ec9cc48ebe14971772cb53b538bdc1d8784c381778 SHA512 be74166f6b03ef623420f0b0263c5ceb6bb42068bedaf442958ba1cc394e05245ba891b598450a7b813ca03a246701f924ddb1fb382af074ab556b465a1723a1
 MISC metadata.xml 687 BLAKE2B 788f87388b4ab449521ab57684fa2c52393697e4e9826640473a1bc08bd886d384354362424c64a01a8d091c157610dbb4cebf80243bb4b73d125f47996f4f5f SHA512 95ca85fe4d9070acfeeb6a81505236e004d1e93464f9ba17d6d45968a4ab855121d67b4e09a54812063e924aa8b3a8e7ca3f13b68dc243b4fc0d062fb600fea8
diff --git a/net-libs/libssh/libssh-0.7.4.ebuild b/net-libs/libssh/libssh-0.7.4.ebuild
index 3b45d1fa582c..f33086923326 100644
--- a/net-libs/libssh/libssh-0.7.4.ebuild
+++ b/net-libs/libssh/libssh-0.7.4.ebuild
@@ -64,6 +64,7 @@ multilib_src_configure() {
 		-DWITH_SERVER="$(usex server)"
 		-DWITH_SFTP="$(usex sftp)"
 		-DWITH_SSH1="$(usex ssh1)"
+		-DWITH_STACK_PROTECTOR=OFF
 		-DWITH_STATIC_LIB="$(usex static-libs)"
 		-DWITH_STATIC_LIB="$(usex test)"
 		-DWITH_TESTING="$(usex test)"
diff --git a/net-libs/libssh/libssh-0.7.5-r2.ebuild b/net-libs/libssh/libssh-0.7.5-r2.ebuild
index ea3291593f7f..95aba9f77ea6 100644
--- a/net-libs/libssh/libssh-0.7.5-r2.ebuild
+++ b/net-libs/libssh/libssh-0.7.5-r2.ebuild
@@ -67,6 +67,7 @@ multilib_src_configure() {
 		-DWITH_SERVER="$(usex server)"
 		-DWITH_SFTP="$(usex sftp)"
 		-DWITH_SSH1="$(usex ssh1)"
+		-DWITH_STACK_PROTECTOR=OFF
 		-DWITH_STATIC_LIB="$(usex static-libs)"
 		-DWITH_STATIC_LIB="$(usex test)"
 		-DWITH_TESTING="$(usex test)"
diff --git a/net-libs/libssh/libssh-0.8.1.ebuild b/net-libs/libssh/libssh-0.8.1.ebuild
index 8aaceace64c1..641c1853e986 100644
--- a/net-libs/libssh/libssh-0.8.1.ebuild
+++ b/net-libs/libssh/libssh-0.8.1.ebuild
@@ -76,6 +76,7 @@ multilib_src_configure() {
 		-DWITH_PCAP="$(usex pcap)"
 		-DWITH_SERVER="$(usex server)"
 		-DWITH_SFTP="$(usex sftp)"
+		-DWITH_STACK_PROTECTOR=OFF
 		-DWITH_STATIC_LIB="$(usex static-libs)"
 		-DWITH_STATIC_LIB="$(usex test)"
 		-DWITH_ZLIB="$(usex zlib)"
diff --git a/net-libs/libssh/libssh-0.8.2.ebuild b/net-libs/libssh/libssh-0.8.2.ebuild
new file mode 100644
index 000000000000..641c1853e986
--- /dev/null
+++ b/net-libs/libssh/libssh-0.8.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-${PV/_rc/rc}"
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/"
+
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
+else
+	inherit eapi7-ver
+	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+RDEPEND="
+	!gcrypt? (
+		!mbedtls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+		)
+	)
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+
+DOCS=( AUTHORS README ChangeLog )
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.0-tests.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# just install the examples do not compile them
+	sed -i \
+		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
+		CMakeLists.txt || die
+
+	# keyfile torture test is currently broken
+	sed -i \
+		-e '/torture_keyfiles/d' \
+		tests/unittests/CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DUNIT_TESTING="$(usex test)"
+		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
+		-DWITH_DEBUG_CRYPTO="$(usex debug)"
+		-DWITH_GCRYPT="$(usex gcrypt)"
+		-DWITH_GSSAPI="$(usex gssapi)"
+		-DWITH_MBEDTLS="$(usex mbedtls)"
+		-DWITH_NACL=no
+		-DWITH_PCAP="$(usex pcap)"
+		-DWITH_SERVER="$(usex server)"
+		-DWITH_SFTP="$(usex sftp)"
+		-DWITH_STACK_PROTECTOR=OFF
+		-DWITH_STATIC_LIB="$(usex static-libs)"
+		-DWITH_STATIC_LIB="$(usex test)"
+		-DWITH_ZLIB="$(usex zlib)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	if multilib_is_native_abi && use doc ; then
+		docinto html
+		dodoc -r doc/html/.
+	fi
+
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh.a
+
+	# compatibility symlink until all consumers have been updated
+	# to no longer use libssh_threads.so
+	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,cpp}
+	fi
+}
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 8aaceace64c1..641c1853e986 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -76,6 +76,7 @@ multilib_src_configure() {
 		-DWITH_PCAP="$(usex pcap)"
 		-DWITH_SERVER="$(usex server)"
 		-DWITH_SFTP="$(usex sftp)"
+		-DWITH_STACK_PROTECTOR=OFF
 		-DWITH_STATIC_LIB="$(usex static-libs)"
 		-DWITH_STATIC_LIB="$(usex test)"
 		-DWITH_ZLIB="$(usex zlib)"