Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=992edb10fd2ec3c48aa75156e4a7e2cb4ba16b66
commit 992edb10fd2ec3c48aa75156e4a7e2cb4ba16b66 Author: crazy <[email protected]> Date: Wed Oct 7 22:38:31 2015 +0200 libssh-0.7.2-1-x86_64 * pkgver++ * removed unused patch diff --git a/source/lib/libssh/FrugalBuild b/source/lib/libssh/FrugalBuild index 5c37e72..faa298e 100644 --- a/source/lib/libssh/FrugalBuild +++ b/source/lib/libssh/FrugalBuild @@ -4,19 +4,17 @@ options+=('asneeded') pkgname=libssh -pkgver=0.6.4 +pkgver=0.7.2 pkgrel=1 pkgdesc="The SSH library" url="http://www.libssh.org/"; -depends=('openssl>=1.0.0' 'zlib' 'libgcrypt>=1.6.1') +depends=('openssl>=1.0.2' 'zlib' 'libgcrypt>=1.6.1') makedepends=('doxygen') groups=('lib') archs=('i686' 'x86_64' 'arm') up2date="Flasttar https://red.libssh.org/projects/libssh/files"; -source=(http://git.libssh.org/projects/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2 - libssh-0.6.4-libgcrypt-fix.patch) -sha1sums=('1a1c92850dea8347d22212ab760914757d58283a' \ - '3f9f868b5cd3487b4c6be6508f84e0b774c0dd68') +source=(http://git.libssh.org/projects/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('bf9fa390d1056262578d6ede731b1f843bc88a05') _F_cmake_confopts="-DWITH_SSH1=ON -DWITH_GCRYPT=ON -DWITH_INTERNAL_DOC=ON" Finclude cmake diff --git a/source/lib/libssh/libssh-0.6.4-libgcrypt-fix.patch b/source/lib/libssh/libssh-0.6.4-libgcrypt-fix.patch deleted file mode 100644 index 142f9b9..0000000 --- a/source/lib/libssh/libssh-0.6.4-libgcrypt-fix.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3880a8ed80a4b1e2c052bd62f328bba2f869d5ae Mon Sep 17 00:00:00 2001 -From: Aris Adamantiadis <[email protected]> -Date: Mon, 29 Dec 2014 15:06:33 +0000 -Subject: Fix the dh.c build with libgcrypt - -Fixes bug reported by gentoo at https://bugs.gentoo.org/show_bug.cgi?id=533424 -The function was only used by EDCSA backend which are not supported by the libgcrypt code anyway. ---- -diff --git a/include/libssh/dh.h b/include/libssh/dh.h -index f28b916..89872e3 100644 ---- a/include/libssh/dh.h -+++ b/include/libssh/dh.h -@@ -49,7 +49,9 @@ int hashbufin_add_cookie(ssh_session session, unsigned char *cookie); - int hashbufout_add_cookie(ssh_session session); - int generate_session_keys(ssh_session session); - bignum make_string_bn(ssh_string string); -+#ifdef HAVE_LIBCRYPTO - void make_string_bn_inplace(ssh_string string, bignum bnout); -+#endif /* HAVE_LIBCRYPTO */ - ssh_string make_bignum_string(bignum num); - - #endif /* DH_H_ */ -diff --git a/src/dh.c b/src/dh.c -index 84355d4..010a1dd 100644 ---- a/src/dh.c -+++ b/src/dh.c -@@ -407,14 +407,17 @@ bignum make_string_bn(ssh_string string){ - return bn; - } - -+#ifdef HAVE_LIBCRYPTO -+/** @internal -+ * @brief converts the content of a SSH string in an already allocated bignum -+ * @warning only available with OpenSSL builds -+ */ - void make_string_bn_inplace(ssh_string string, bignum bnout) { - unsigned int len = ssh_string_len(string); --#ifdef HAVE_LIBGCRYPT -- #error "unsupported" --#elif defined HAVE_LIBCRYPTO - bignum_bin2bn(string->data, len, bnout); --#endif - } -+#endif /* HAVE_LIBCRYPTO */ -+ - - ssh_string dh_get_e(ssh_session session) { - return make_bignum_string(session->next_crypto->e); --- -cgit v0.9.1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
