Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f27f3844cdc18c715fdd278e260ddca66494cb85
commit f27f3844cdc18c715fdd278e260ddca66494cb85 Author: kikadf <[email protected]> Date: Wed Jan 28 11:47:14 2015 +0100 libssh-0.6.4-1-x86_64 * Sec fix release bump diff --git a/source/lib/libssh/FrugalBuild b/source/lib/libssh/FrugalBuild index cd557e4..5c37e72 100644 --- a/source/lib/libssh/FrugalBuild +++ b/source/lib/libssh/FrugalBuild @@ -4,7 +4,7 @@ options+=('asneeded') pkgname=libssh -pkgver=0.6.3 +pkgver=0.6.4 pkgrel=1 pkgdesc="The SSH library" url="http://www.libssh.org/" @@ -12,9 +12,12 @@ depends=('openssl>=1.0.0' 'zlib' 'libgcrypt>=1.6.1') makedepends=('doxygen') groups=('lib') archs=('i686' 'x86_64' 'arm') -up2date="Flasttar http://git.libssh.org/projects/libssh.git/" -source=(http://git.libssh.org/projects/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('e94cac7fd974343a636427da1c40c3e6b0730c0b') +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') _F_cmake_confopts="-DWITH_SSH1=ON -DWITH_GCRYPT=ON -DWITH_INTERNAL_DOC=ON" Finclude cmake + # optimization OK diff --git a/source/lib/libssh/libssh-0.6.4-libgcrypt-fix.patch b/source/lib/libssh/libssh-0.6.4-libgcrypt-fix.patch new file mode 100644 index 0000000..142f9b9 --- /dev/null +++ b/source/lib/libssh/libssh-0.6.4-libgcrypt-fix.patch @@ -0,0 +1,50 @@ +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
