New commits:
commit 2186be58927b01d80e044baf5190b90c2af4746d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
powertop: version 2.7, also fixing build since upstream of old version
seems changed
(cherry picked from commit 36e3200a294aa84fd2b780b4feb93fa09bc8a2d3)
commit 56150db0a0821a184ecb130bc02e9f63cc27c5aa
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
samba: install pkgconfig files
(cherry picked from commit 8a826942549e91c5f645c5a76404e537e500391d)
commit 7fb98c9fa7a1b0bba29a141e053b689255690f44
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux 4.0.1
(cherry picked from commit b60471794cc8cd16ac6fda1e0877b38d0f040edd)
commit e99a4245dea5397fb48d191afa515bc492c01508
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
cherrypy: => 3.7.0
(cherry picked from commit b4cc2db0bb878ac298b24af3e5a2eb1ddeca819e)
commit 7577b5fc7c69317833a42aa8230056d4b16f8a6d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libssh: remove broken option for libgcrypt
(cherry picked from commit 535bc75b354b9736db63671974f96e33ed1a63f5)
commit 413c5d7fcab616abc3a1d28c83032e0a6168a198
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
remove redundant PATCH_LEVEL
(cherry picked from commit f667bac90e3505b0ca8f941944bf972b594b9d20)
commit 37807c06e3112e70d5fca9875ba9b12cef1f4dfa
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
remove redundant PATCHLEVEL
(cherry picked from commit 8c4fe2ef2f349acc82bf0abe0f2d4a6a1bb39bcc)
commit 939b675d10be90ace6336d2017e63c4aaa01a4f3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
graphics/lcms: fix CVE-2013-4276
(cherry picked from commit e37ceb8db7cb8fd23cd146397006e7c2869a6eda)
commit f9bd56f0fa97666738baaca128f3b0e7497006c6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
add security fixes from LFS
this fixes CVE-2012-4447, CVE-2013-1960, CVE-2013-1961, CVE-2013-4231,
CVE-2013-4232, CVE-2013-4244.
(cherry picked from commit 61d0f00b8d7b5903d4179bc8c121c5980d7cec3f)
diff --git a/crypto/libssh/BUILD b/crypto/libssh/BUILD
index a1c4818..e013b8d 100755
--- a/crypto/libssh/BUILD
+++ b/crypto/libssh/BUILD
@@ -1,4 +1 @@
-if [[ "$SSH_CRYPTO" == libgcrypt ]];then
- OPTS+=" -DWITH_GCRYPT=1"
-fi &&
cmake_build
diff --git a/crypto/libssh/CONFIGURE b/crypto/libssh/CONFIGURE
deleted file mode 100755
index 5ec87e7..0000000
--- a/crypto/libssh/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query_list SSH_CRYPTO "which crypto library" libgcrypt SSL
diff --git a/crypto/libssh/DEPENDS b/crypto/libssh/DEPENDS
index 323d272..7969f33 100755
--- a/crypto/libssh/DEPENDS
+++ b/crypto/libssh/DEPENDS
@@ -1,3 +1,3 @@
depends cmake &&
depends zlib &&
-depends $SSH_CRYPTO
+depends SSL
diff --git a/crypto/libssh/HISTORY b/crypto/libssh/HISTORY
index ba72955..d208316 100644
--- a/crypto/libssh/HISTORY
+++ b/crypto/libssh/HISTORY
@@ -1,3 +1,8 @@
+2015-04-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS, BUILD: only use SSL, not libgcrypt, as that
+ is broken/unsupported upstream
+ * CONFIGURE: removed
+
2015-01-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.6.4