summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorEric Sandall2019-07-06 00:14:49 +0000
committerEric Sandall2019-07-06 00:15:11 +0000
commit188bb2fc15680b0dd8b856198a2299f2e64807f5 (patch)
treea8db240c0d8500f23d64dc0482f4b835d80dd671 /crypto
parentd504b6109a0e35fbca79489de4cd23122bd49c42 (diff)
gnutls: Set 3.6.8 as new stable, 3.5.19 to stable-old, remove 3.4.17
3.5.19 no longer compiles on test grimoire with gcc 9.1.0. Remove stable-next from PREPARE.
Diffstat (limited to 'crypto')
-rwxr-xr-xcrypto/gnutls/DETAILS6
-rw-r--r--crypto/gnutls/HISTORY5
-rwxr-xr-xcrypto/gnutls/PREPARE5
3 files changed, 8 insertions, 8 deletions
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index ecbce7ee0f..9f552fea0f 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -6,14 +6,10 @@ fi
case $GNUTLS_BRANCH in
stable-old)
- VERSION=3.4.17
- SECURITY_PATCH=18
- ;;
- stable)
VERSION=3.5.19
SECURITY_PATCH=5
;;
- stable-next)
+ stable)
VERSION=3.6.8
SECURITY_PATCH=2
;;
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 7e45805b6d..0f144e14f5 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,8 @@
+2019-07-05 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Set 3.6.8 as new stable, 3.5.19 to stable-old, remove 3.4.17
+ 3.5.19 no longer compiles on test grimoire with gcc 9.1.0.
+ * PREPARE: Remove stable-next.
+
2019-05-29 Pavel Vinogradov <public@sourcemage.org>
* DETAILS: version 3.6.8, SOURCE_DIRECTORY is now the same for all
* DEPENDS: gettext -> GETTEXT
diff --git a/crypto/gnutls/PREPARE b/crypto/gnutls/PREPARE
index 39f5698185..2865db7c9d 100755
--- a/crypto/gnutls/PREPARE
+++ b/crypto/gnutls/PREPARE
@@ -1,8 +1,7 @@
. ${GRIMOIRE}/FUNCTIONS &&
# backporting legacy branch selection
-if [[ "$GNUTLS_BRANCH" != stable ]] && [[ "$GNUTLS_BRANCH" != stable-old ]] &&
- [[ "$GNUTLS_BRANCH" != stable-next ]]; then
+if [[ "$GNUTLS_BRANCH" != stable ]] && [[ "$GNUTLS_BRANCH" != stable-old ]]; then
GNUTLS_BRANCH="stable"
fi &&
-prepare_select_branch stable stable-old stable-next
+prepare_select_branch stable stable-old