Skip to Content.
Sympa Menu

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

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 (f4246a87686df486c978deaadd8c386655e18a4f)
  • Date: Fri, 24 Oct 2014 03:34:11 -0500

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

libs/ldns/CONFIGURE | 11 +++++++++++
libs/ldns/DEPENDS | 15 ++++-----------
libs/ldns/DETAILS | 1 +
libs/ldns/HISTORY | 7 +++++--
4 files changed, 21 insertions(+), 13 deletions(-)

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

ldns: corrected openssl's subdependency behaviour

commit e71f539d2d5e26638dd3ecb2734b31ebe18b1ff1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "ldns: depends SSL"

This reverts commit 6491d676c0455bb018a8380b3dc4923de1f734fa.

scripted replacement doesn't work here

diff --git a/libs/ldns/CONFIGURE b/libs/ldns/CONFIGURE
index ad2ad73..89a33cc 100755
--- a/libs/ldns/CONFIGURE
+++ b/libs/ldns/CONFIGURE
@@ -1,3 +1,14 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
+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}"
+fi &&
+
+config_query_list LDNS_OPENSSL "Which OpenSSL branch?" \
+ 0.9 \
+ 1.0 &&
+
config_query_option LDNS_DRILL "Build and install drill?" n \
"--with-drill" "--without-drill" &&

diff --git a/libs/ldns/DEPENDS b/libs/ldns/DEPENDS
index 6c552da..f1886f2 100755
--- a/libs/ldns/DEPENDS
+++ b/libs/ldns/DEPENDS
@@ -1,19 +1,12 @@
-. "$GRIMOIRE/FUNCTIONS" &&
-
depends make &&
depends libtool &&
-depends SSL &&

-if spell_ok SSL && is_version_less $(installed_version openssl) 1.0; then
- message "${MESSAGE_COLOR}WARNING: GOST support requires OpenSSL 1.0, which
is not installed."
- message "Answer 'y' to replace current version $(installed_version SSL)
with one from OpenSSL 1.0 branch.${DEFAULT_COLOR}"
+if [[ $LDNS_OPENSSL == "1.0" ]]; then
+ depends -sub "1.0" openssl '--enable-gost'
+else
+ depends openssl '--disable-gost'
fi &&

-optional_depends -sub "1.0" SSL \
- "--enable-gost" \
- "--disable-gost" \
- "for GOST support" &&
-
optional_depends -sub PYTHON swig \
"--with-pyldns" \
"--without-pyldns" \
diff --git a/libs/ldns/DETAILS b/libs/ldns/DETAILS
index d39fe25..9fa2a14 100755
--- a/libs/ldns/DETAILS
+++ b/libs/ldns/DETAILS
@@ -1,5 +1,6 @@
SPELL=ldns
VERSION=1.6.17
+ PATCHLEVEL=1
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 8a4b125..8ae97eb 100644
--- a/libs/ldns/HISTORY
+++ b/libs/ldns/HISTORY
@@ -1,5 +1,8 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2014-10-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * DEPENDS, CONFIGURE: moved openssl branch selection to CONFIGURE to
+ avoid sub-dependency error when cast of the spell queues 1.0 branch
+ of openssl in global sub_depends file for next recast

2014-05-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.6.17



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f4246a87686df486c978deaadd8c386655e18a4f), Vlad Glagolev, 10/24/2014

Archive powered by MHonArc 2.6.24.

Top of Page