deps: updated for KDE 4.14.3 LTS update March 2013

grantlee: required by new kdepim.
librevenge: required by new libwpd.
libwpd: required by new calligra.
libodfgen: required by new calligra.

3 files changed, 60 insertions, 10 deletions

diff --git a/deps/libssh/libssh.SlackBuild b/deps/libssh/libssh.SlackBuild
index 7812e4e..ef701ca 100755
--- a/deps/libssh/libssh.SlackBuild
+++ b/deps/libssh/libssh.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2011, 2012, 2014  Eric Hameleers, Eindhoven, NL
+# Copyright 2011, 2012, 2014, 2015  Eric Hameleers, Eindhoven, NL
 # Copyright 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -23,21 +23,20 @@
 
 
 PKGNAM=libssh
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.6.4}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 # Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i486 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
 if [ "$ARCH" = "i486" ]; then
@@ -68,8 +67,8 @@ rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
-# These fail to build and are not packaged anyway:
-#zcat $CWD/libssh.no.example.build.diff.gz | patch -p1 --verbose || exit 1
+# Fix a compilation issue (backport from libssh git):
+cat $CWD/libssh_libgcrypt.patch | patch -p1 --verbose || exit 1
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
diff --git a/deps/libssh/libssh.no.example.build.diff.gz b/deps/libssh/libssh.no.example.build.diff.gz
deleted file mode 100644
index c1ef0eb..0000000
--- a/deps/libssh/libssh.no.example.build.diff.gz
+++ /dev/null
diff --git a/deps/libssh/libssh_libgcrypt.patch b/deps/libssh/libssh_libgcrypt.patch
new file mode 100644
index 0000000..622c338
--- /dev/null
+++ b/deps/libssh/libssh_libgcrypt.patch
@@ -0,0 +1,51 @@
+From 3880a8ed80a4b1e2c052bd62f328bba2f869d5ae Mon Sep 17 00:00:00 2001
+From: Aris Adamantiadis <aris@0xbadc0de.be>
+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
+