summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2009-12-14 19:14:29 +0000
committerPeter Volkov <pva@gentoo.org>2009-12-14 19:14:29 +0000
commitf8212514dbf9196505580424996939eeec23fd9a (patch)
tree691314676ce1a268dad0fce21ddffa8fd9a944c8 /net-libs/libssh2
parentalpha/ia64/m68k/s390/sh/sparc stable wrt #288026 (diff)
downloadgentoo-2-f8212514dbf9196505580424996939eeec23fd9a.tar.gz
gentoo-2-f8212514dbf9196505580424996939eeec23fd9a.tar.bz2
gentoo-2-f8212514dbf9196505580424996939eeec23fd9a.zip
Disable ssh2.sh test in case FEATURES=userpriv, bug #286741, thank Kent Fredric for report.
(Portage version: 2.1.7.13/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libssh2')
-rw-r--r--net-libs/libssh2/ChangeLog6
-rw-r--r--net-libs/libssh2/libssh2-1.2.2.ebuild13
2 files changed, 16 insertions, 3 deletions
diff --git a/net-libs/libssh2/ChangeLog b/net-libs/libssh2/ChangeLog
index 3081981e18b5..cf988f9f5b26 100644
--- a/net-libs/libssh2/ChangeLog
+++ b/net-libs/libssh2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/libssh2
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.23 2009/11/23 00:27:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.24 2009/12/14 19:14:29 pva Exp $
+
+ 14 Dec 2009; Peter Volkov <pva@gentoo.org> 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)
diff --git a/net-libs/libssh2/libssh2-1.2.2.ebuild b/net-libs/libssh2/libssh2-1.2.2.ebuild
index 8dd4728f53ad..2fa416320a7f 100644
--- a/net-libs/libssh2/libssh2-1.2.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.2.2.ebuild,v 1.1 2009/11/23 00:27:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.2.2.ebuild,v 1.2 2009/12/14 19:14:29 pva Exp $
EAPI="2"
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}"
src_configure() {
local myconf
- if use gcrypt ; then
+ if use gcrypt; then
myconf="--with-libgcrypt"
else
myconf="--with-openssl"
@@ -32,6 +32,15 @@ src_configure() {
${myconf}
}
+src_test() {
+ if [[ ${EUID} -ne 0 ]]; then #286741
+ ewarn "Some tests require real user that is allowed to login."
+ ewarn "ssh2.sh test disabled."
+ sed -e 's:ssh2.sh::' -i tests/Makefile
+ fi
+ emake check || die
+}
+
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
dodoc README