Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d5676846742b4f67a20743dd9569ab8899767fc0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d5676846742b4f67a20743dd9569ab8899767fc0)
  • Date: Sat, 22 Nov 2014 11:28:12 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

libs/ldns/CONFIGURE | 16 ++++++++++++++--
libs/ldns/DEPENDS | 6 +++++-
libs/ldns/DETAILS | 2 +-
libs/ldns/HISTORY | 5 +++++
4 files changed, 25 insertions(+), 4 deletions(-)

New commits:
commit d5676846742b4f67a20743dd9569ab8899767fc0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ldns: made GOST support optional for openssl 1.0; added missing options

diff --git a/libs/ldns/CONFIGURE b/libs/ldns/CONFIGURE
index 89a33cc..b9daa76 100755
--- a/libs/ldns/CONFIGURE
+++ b/libs/ldns/CONFIGURE
@@ -1,8 +1,20 @@
. "$GRIMOIRE/FUNCTIONS" &&

+config_query_option LDNS_OPTS "Enable ECDSA support?" y \
+ "--enable-ecdsa" \
+ "--disable-ecdsa" &&
+
+config_query_option LDNS_OPTS "Enable SHA256 and SHA512 RRSIG support?" y \
+ "--enable-sha2" \
+ "--disable-sha2" &&
+
+config_query_option LDNS_OPTS "Enable DANE support?" y \
+ "--enable-dane" \
+ "--disable-dane" &&
+
if spell_ok openssl && is_version_less $(installed_version openssl) 1.0; then
- message "${MESSAGE_COLOR}WARNING: GOST support requires OpenSSL 1.0, which
is not installed." &&
- message "Select it below to replace current
${DEFAULT_COLOR}$(installed_version openssl)${MESSAGE_COLOR} version with one
from OpenSSL 1.0 branch.${DEFAULT_COLOR}"
+ message "${MESSAGE_COLOR}WARNING: GOST support requires OpenSSL 1.0, which
is not installed. If you need it," &&
+ message "select 1.0 below to replace current
${DEFAULT_COLOR}$(installed_version openssl)${MESSAGE_COLOR} version with one
from OpenSSL 1.0 branch.${DEFAULT_COLOR}"
fi &&

config_query_list LDNS_OPENSSL "Which OpenSSL branch?" \
diff --git a/libs/ldns/DEPENDS b/libs/ldns/DEPENDS
index f1886f2..03e6093 100755
--- a/libs/ldns/DEPENDS
+++ b/libs/ldns/DEPENDS
@@ -2,7 +2,11 @@ depends make &&
depends libtool &&

if [[ $LDNS_OPENSSL == "1.0" ]]; then
- depends -sub "1.0" openssl '--enable-gost'
+ depends -sub "1.0" openssl &&
+
+ config_query_option LDNS_OPTS "Enable GOST support?" y \
+ "--enable-gost" \
+ "--disable-gost"
else
depends openssl '--disable-gost'
fi &&
diff --git a/libs/ldns/DETAILS b/libs/ldns/DETAILS
index 9fa2a14..af90557 100755
--- a/libs/ldns/DETAILS
+++ b/libs/ldns/DETAILS
@@ -1,6 +1,6 @@
SPELL=ldns
VERSION=1.6.17
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.nlnetlabs.nl/downloads/$SPELL/$SOURCE
diff --git a/libs/ldns/HISTORY b/libs/ldns/HISTORY
index 8ae97eb..352fc25 100644
--- a/libs/ldns/HISTORY
+++ b/libs/ldns/HISTORY
@@ -1,3 +1,8 @@
+2014-11-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * CONFIGURE: added missing options; corrected GOST notice
+ * DEPENDS: made GOST support optional for openssl 1.0 as well
+
2014-10-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* DEPENDS, CONFIGURE: moved openssl branch selection to CONFIGURE to



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d5676846742b4f67a20743dd9569ab8899767fc0), Vlad Glagolev, 11/22/2014

Archive powered by MHonArc 2.6.24.

Top of Page