New commits:
commit 16dbf1204d3dd2e7b0a6d5ca22332de255d82555
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
crypto/gnutls: build with openssl compatibility only in branches other
than stable-next
diff --git a/crypto/gnutls/BUILD b/crypto/gnutls/BUILD
index 3d4a2cd..7cf3bf0 100755
--- a/crypto/gnutls/BUILD
+++ b/crypto/gnutls/BUILD
@@ -1,2 +1,4 @@
-OPTS="--enable-openssl-compatibility ${OPTS}" &&
+if [[ "$GNUTLS_BRANCH" != stable-next ]]; then
+ OPTS="--enable-openssl-compatibility ${OPTS}"
+fi &&
default_build
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 9411bbf..86c1c04 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,5 +1,6 @@
2016-05-10 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS, PREPARE: added stable-next branch, version 3.5.0
+ * BUILD: only enable openssl compatibility if branch is not
stable-next
2016-04-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: increment SECURITY_PATCH for both branches
[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (16dbf1204d3dd2e7b0a6d5ca22332de255d82555),
Pavel Vinogradov, 05/10/2016