commit: ca3613078e0fe6f913bee37728bbf4dd45860a93 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sun Mar 20 16:59:29 2016 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sun Mar 20 17:23:17 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca361307
net-libs/libssh: Security cleanup (bug #575484). Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> net-libs/libssh/Manifest | 2 - .../libssh/files/libssh-0.6.5-compilefix.patch | 29 ------- net-libs/libssh/libssh-0.6.5.ebuild | 88 --------------------- net-libs/libssh/libssh-0.7.2.ebuild | 90 ---------------------- 4 files changed, 209 deletions(-) diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index c94a38d..9ef64dd 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1,3 +1 @@ -DIST libssh-0.6.5.tar.xz 281564 SHA256 0fd52763e033d5e9b1cd55f60a74e619731c5ba630938eec95682dbe4cf7dc2c SHA512 55d614ff311a29a20b93094ac1dd16a2ad1345368b874a0e385f0c235e8defde8816948ab04eab68ade477a0a6901b317c7884df1ba3078cf12db89dfc4169cc WHIRLPOOL 9801eee45a178306b0645d75c268df381d206a8c566695d8b6c228ea7f5638a313bdbdf990ad7bd299c24d280595007b44fd16449ee3a0643b6e2084bb148d09 -DIST libssh-0.7.2.tar.xz 350540 SHA256 a32c45b9674141cab4bde84ded7d53e931076c6b0f10b8fd627f3584faebae62 SHA512 9cb15254478e2522e736688052e0862c856e2c1321d090c9b9d9562504fcb59cee344c07576eeee9c6d0ac5ead137d9ff05216d973c457c6a17ffa9fba475f5a WHIRLPOOL bf878264b900bfbbfe76f08d1c22e5ca2f1300024fc561841ed3fbef374ceab7a08ba0211c093d90d7e4047a896cce9f73e78268300362beaec194025eda1ed8 DIST libssh-0.7.3.tar.xz 350464 SHA256 26ef46be555da21112c01e4b9f5e3abba9194485c8822ab55ba3d6496222af98 SHA512 6797ea9492c9d07e0169163e6559a7880dd368ee763eff297b3cbddda5e892703cf32506f9513e7d9b5135984e1e888c4893b342df07da1b7ee30968c9185869 WHIRLPOOL f22c3f4ef8c3cbf4e93c5603224ae4d0f598639a471bc002c0917243c487e1de61a79db09308bcb570791cd1ab3b95f43d44f92652a7f0ec596d552cab0031c5 diff --git a/net-libs/libssh/files/libssh-0.6.5-compilefix.patch b/net-libs/libssh/files/libssh-0.6.5-compilefix.patch deleted file mode 100644 index 658c159..0000000 --- a/net-libs/libssh/files/libssh-0.6.5-compilefix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6e0dee7845cea22f59bd353ef42b31cb67170030 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider <[email protected]> -Date: Thu, 2 Apr 2015 15:02:29 +0200 -Subject: poll: Fix compilation with struct ssh_timestamp - -Signed-off-by: Andreas Schneider <[email protected]> -(cherry picked from commit e0a73d3dbe909f8e2cb486ed344e5beb8148032e) ---- - src/poll.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/poll.c b/src/poll.c -index dfa687a..05faba7 100644 ---- a/src/poll.c -+++ b/src/poll.c -@@ -35,9 +35,9 @@ - #include "libssh/poll.h" - #include "libssh/socket.h" - #include "libssh/session.h" -+#include "libssh/misc.h" - #ifdef WITH_SERVER - #include "libssh/server.h" --#include "libssh/misc.h" - #endif - - --- -cgit v0.12 - diff --git a/net-libs/libssh/libssh-0.6.5.ebuild b/net-libs/libssh/libssh-0.6.5.ebuild deleted file mode 100644 index 30b9ff4..0000000 --- a/net-libs/libssh/libssh-0.6.5.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P=${PN}-${PV/_rc/rc} -inherit eutils cmake-multilib multilib - -DESCRIPTION="Access a working SSH implementation by means of a library" -HOMEPAGE="http://www.libssh.org/"; -SRC_URI="https://red.libssh.org/attachments/download/121/${MY_P}.tar.xz -> ${P}.tar.xz" - -LICENSE="LGPL-2.1" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -SLOT="0/4" # subslot = soname major version -IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib" -# Maintainer: check IUSE-defaults at DefineOptions.cmake - -RDEPEND=" - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) - gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) -" - -DOCS=( AUTHORS README ChangeLog ) - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-0.5.0-tests.patch - "${FILESDIR}"/${P}-compilefix.patch -) - -src_prepare() { - # just install the examples do not compile them - sed -i \ - -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \ - CMakeLists.txt || die - - cmake-utils_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - $(cmake-utils_use_with debug DEBUG_CALLTRACE) - $(cmake-utils_use_with debug DEBUG_CRYPTO) - $(cmake-utils_use_with gcrypt) - $(cmake-utils_use_with gssapi) - $(cmake-utils_use_with pcap) - $(cmake-utils_use_with server) - $(cmake-utils_use_with sftp) - $(cmake-utils_use_with ssh1) - $(cmake-utils_use_with static-libs STATIC_LIB) - $(cmake-utils_use_with test STATIC_LIB) - $(cmake-utils_use_with test TESTING) - $(cmake-utils_use_with 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 - - multilib_is_native_abi && use doc && dohtml -r doc/html/. - - use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a -} - -multilib_src_install_all() { - einstalldocs - - if use examples; then - docinto examples - dodoc examples/*.{c,h,cpp} - fi -} diff --git a/net-libs/libssh/libssh-0.7.2.ebuild b/net-libs/libssh/libssh-0.7.2.ebuild deleted file mode 100644 index 507ff40..0000000 --- a/net-libs/libssh/libssh-0.7.2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P=${PN}-${PV/_rc/rc} -inherit eutils cmake-multilib multilib - -DESCRIPTION="Access a working SSH implementation by means of a library" -HOMEPAGE="http://www.libssh.org/"; -SRC_URI="https://red.libssh.org/attachments/download/177/${MY_P}.tar.xz -> ${P}.tar.xz" - -LICENSE="LGPL-2.1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -SLOT="0/4" # subslot = soname major version -IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib" -# Maintainer: check IUSE-defaults at DefineOptions.cmake - -RDEPEND=" - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - !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}] ) - gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) -" - -DOCS=( AUTHORS README ChangeLog ) - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-0.5.0-tests.patch -) - -src_prepare() { - # just install the examples do not compile them - sed -i \ - -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \ - CMakeLists.txt || die - - cmake-utils_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - $(cmake-utils_use_with debug DEBUG_CALLTRACE) - $(cmake-utils_use_with debug DEBUG_CRYPTO) - $(cmake-utils_use_with gcrypt) - $(cmake-utils_use_with gssapi) - $(cmake-utils_use_with pcap) - $(cmake-utils_use_with server) - $(cmake-utils_use_with sftp) - $(cmake-utils_use_with ssh1) - $(cmake-utils_use_with static-libs STATIC_LIB) - $(cmake-utils_use_with test STATIC_LIB) - $(cmake-utils_use_with test TESTING) - $(cmake-utils_use_with 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 - - multilib_is_native_abi && use doc && dohtml -r doc/html/. - - use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a -} - -multilib_src_install_all() { - einstalldocs - - if use examples; then - docinto examples - dodoc examples/*.{c,h,cpp} - fi -}
