[gentoo-commits] gentoo-x86 commit in net-libs/libssh: metadata.xml libssh-0.6.0.ebuild ChangeLog libssh-0.6.0_rc3-r1.ebuild

[gentoo-commits] gentoo-x86 commit in net-libs/libssh: metadata.xml libssh-0.6.0.ebuild ChangeLog libssh-0.6.0_rc3-r1.ebuild

[Lars Wendler (polynomial-c)]

polynomial-c    14/01/09 07:56:12

  Modified:             metadata.xml libssh-0.6.0.ebuild ChangeLog
  Removed:              libssh-0.6.0_rc3-r1.ebuild
  Log:
  Reintroduced gcrypt USE flag. Added kerberos USE flag to control gssapi feature. Removed old
  
  (Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

Revision  Changes    Path
1.8                  net-libs/libssh/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/metadata.xml?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/metadata.xml?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/metadata.xml?r1=1.7&r2=1.8

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/libssh/metadata.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- metadata.xml	20 Dec 2013 14:33:33 -0000	1.7
+++ metadata.xml	9 Jan 2014 07:56:12 -0000	1.8
@@ -5,6 +5,8 @@
 <herd>kde</herd>
 <longdescription>access a working SSH implementation by means of a library</longdescription>
 <use>
+  <flag name='gcrypt'>Prefer <pkg>dev-libs/libgcrypt</pkg> over
+    <pkg>dev-libs/openssl</pkg> for encryption</flag>
   <flag name='pcap'>Build with PCAP output support</flag>
   <flag name='sftp'>Build with SFTP support</flag>
   <flag name='ssh1'>Build with SSH1 support</flag>



1.2                  net-libs/libssh/libssh-0.6.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild?r1=1.1&r2=1.2

Index: libssh-0.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libssh-0.6.0.ebuild	8 Jan 2014 12:29:58 -0000	1.1
+++ libssh-0.6.0.ebuild	9 Jan 2014 07:56:12 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild,v 1.1 2014/01/08 12:29:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild,v 1.2 2014/01/09 07:56:12 polynomial-c Exp $
 
 EAPI=5
 
@@ -14,12 +14,14 @@
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples pcap +sftp ssh1 server static-libs test zlib"
+IUSE="debug doc examples gcrypt kerberos pcap +sftp ssh1 server static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
 RDEPEND="
 	zlib? ( >=sys-libs/zlib-1.2 )
-	>=dev-libs/openssl-0.9.8
+	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5 )
+	kerberos? ( virtual/krb5 )
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
@@ -32,6 +34,7 @@
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.5.0-tests.patch"
+	"${FILESDIR}/${PN}-0.6.0-libgcrypt-1.6.0.patch"
 )
 
 src_prepare() {
@@ -47,6 +50,8 @@
 	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 kerberos gssapi)
 		$(cmake-utils_use_with pcap)
 		$(cmake-utils_use_with server)
 		$(cmake-utils_use_with sftp)
@@ -55,7 +60,6 @@
 		$(cmake-utils_use_with test STATIC_LIB)
 		$(cmake-utils_use_with test TESTING)
 		$(cmake-utils_use_with zlib)
-		-DWITH_GCRYPT=OFF
 	)
 
 	cmake-utils_src_configure



1.97                 net-libs/libssh/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/ChangeLog?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/ChangeLog?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/ChangeLog?r1=1.96&r2=1.97

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- ChangeLog	8 Jan 2014 12:29:58 -0000	1.96
+++ ChangeLog	9 Jan 2014 07:56:12 -0000	1.97
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/libssh
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.96 2014/01/08 12:29:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.97 2014/01/09 07:56:12 polynomial-c Exp $
+
+  09 Jan 2014; Lars Wendler <polynomial-c@gentoo.org>
+  -libssh-0.6.0_rc3-r1.ebuild, libssh-0.6.0.ebuild,
+  +files/libssh-0.6.0-libgcrypt-1.6.0.patch,
+  -files/libssh-0.6.0_rc3-memleak_fix.patch,
+  -files/libssh-0.6.0_rc3-x2goclient_crash_fix-1.patch,
+  -files/libssh-0.6.0_rc3-x2goclient_crash_fix-2.patch, metadata.xml:
+  Reintroduced gcrypt USE flag. Added kerberos USE flag to control gssapi
+  feature. Removed old.
 
 *libssh-0.6.0 (08 Jan 2014)