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
commit374f8ef93a6b3f11cc19fc229c1d98413169c380 (patch)
tree1cee92d30e31815aefed3b063713bcfcb6879901 /net-libs/libssh2
parentstable ppc64, bug 296226 (diff)
downloadhistorical-374f8ef93a6b3f11cc19fc229c1d98413169c380.tar.gz
historical-374f8ef93a6b3f11cc19fc229c1d98413169c380.tar.bz2
historical-374f8ef93a6b3f11cc19fc229c1d98413169c380.zip
Disable ssh2.sh test in case FEATURES=userpriv, bug #286741, thank Kent Fredric for report.
Package-Manager: portage-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/Manifest4
-rw-r--r--net-libs/libssh2/libssh2-1.2.2.ebuild13
3 files changed, 18 insertions, 5 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/Manifest b/net-libs/libssh2/Manifest
index c9378f03381d..f0f9ccf7d77b 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -9,6 +9,6 @@ DIST libssh2-1.2.2.tar.gz 535430 RMD160 21e90f957019c11d0447352c5ac19c9dc3f8dd5c
EBUILD libssh2-0.18.ebuild 775 RMD160 dc339e1c1550144039a1d1e989d4c027169022b6 SHA1 65bc6ffccd63486726ca38442a5e19cfb3ba392f SHA256 c493d2ce17ace2366319d6bc9e77c22b4416c99bf2b43aaeccfa8a3bb4d48eb9
EBUILD libssh2-1.1.ebuild 879 RMD160 e13ac3abe4686540823c7141c9317fbf1633a893 SHA1 88555278bfc9c90371207e7248438055cf9f26a6 SHA256 90b4d0849069342bd72a6f6a725427b0240dc347d86b67d9471efadb96c4825f
EBUILD libssh2-1.2.1.ebuild 885 RMD160 8ed0a23b535dfc742a0722df6da9bc21c585ae67 SHA1 e35e205089860ce00bb52295d015ac75a27f3a0e SHA256 af30df00f94b663bf5ce76392e84576ba92464a40cbe5c2c1fa42d46d9e25191
-EBUILD libssh2-1.2.2.ebuild 882 RMD160 c20646ed313757cab04722d0e1a831ebcff90f74 SHA1 5d4fa64e033a8d9813f9ad12c7ecf367abc59c66 SHA256 501b607f5e40be108dc7425c6a0e514961e03e2444a2037acf01321156fd2e72
-MISC ChangeLog 3166 RMD160 7eb2f12e9643dcc731536a75e28a7f58ef519e9b SHA1 c75c29c753ebec320a411ae3ea90b3b0a6809cf4 SHA256 2a237af38e56b2b6fb6ec49b0a788fabaf8a3e41b12288f5f278a9d614dba86a
+EBUILD libssh2-1.2.2.ebuild 1098 RMD160 bdbc80b1516fd2858237a248d270245a96e1503d SHA1 719e1c9d4854d14a82450827c906477fcee65916 SHA256 c105f4038420a95be9cdd6ba1ec38e7f3f30454a64656bc17dbff3110488bb2c
+MISC ChangeLog 3330 RMD160 afcb0bac2151067ebd7d5a0148904bcbe008d991 SHA1 318ba6b58d1e7e9d4be54fec6673e3d6c7f21271 SHA256 9897dac1f8d397a25979b618fb8c94ce2ccd312cfd897bce65831953b8a96384
MISC metadata.xml 254 RMD160 999b0e56d48f4d85cef9cd4560ee0d251581421b SHA1 73eb56da4bf79beda2ad262cd42a41ba2c21bb66 SHA256 776a37a5fdfe9fc7935617b72ec8def2a97350c40c658ee8dafe14b5dbf2633b
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