Skip to Content.
Sympa Menu

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

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 (212e924e9b3d3bc20af44f53e6f42a3c765a9f79)
  • Date: Fri, 31 Oct 2014 07:18:08 -0500

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

libs/neon/DEPENDS | 2 +-
libs/neon/DETAILS | 3 +--
libs/neon/HISTORY | 8 ++++----
libs/neon/REPAIR^all^PRE_SUB_DEPENDS | 2 +-
libs/neon/SUB_DEPENDS | 16 +++++++++++-----
5 files changed, 18 insertions(+), 13 deletions(-)

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

neon: => 0.30.1

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

Revert "neon: depends SSL"

This reverts commit 585743763a6e85e421c862849f732c1ff3821b9c.

bad scripting is bad

diff --git a/libs/neon/DEPENDS b/libs/neon/DEPENDS
index 48f7586..0fcfab3 100755
--- a/libs/neon/DEPENDS
+++ b/libs/neon/DEPENDS
@@ -15,7 +15,7 @@ optional_depends gettext \
case $NEON_SSL in
none) OPTS="--without-ssl $OPTS"
;;
- SSL) depends openssl "--with-ssl=openssl"
+ openssl) depends SSL "--with-ssl=openssl"
;;
gnutls) depends gnutls "--with-ssl=gnutls"
;;
diff --git a/libs/neon/DETAILS b/libs/neon/DETAILS
index 1a63d7f..729bc18 100755
--- a/libs/neon/DETAILS
+++ b/libs/neon/DETAILS
@@ -1,7 +1,6 @@
SPELL=neon
- VERSION=0.30.0
+ VERSION=0.30.1
SECURITY_PATCH=2
- PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/libs/neon/HISTORY b/libs/neon/HISTORY
index 4bb4d8b..a722e3c 100644
--- a/libs/neon/HISTORY
+++ b/libs/neon/HISTORY
@@ -1,7 +1,7 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
-
- * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+2014-10-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.30.1
+ * {SUB_,}DEPENDS, CONFIGURE, {REPAIR^all^,}PRE_SUB_DEPENDS: switched
to
+ SSL provider

2014-04-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1; don't duplicate manuals
diff --git a/libs/neon/REPAIR^all^PRE_SUB_DEPENDS
b/libs/neon/REPAIR^all^PRE_SUB_DEPENDS
index 0a4cde4..3af2a25 100755
--- a/libs/neon/REPAIR^all^PRE_SUB_DEPENDS
+++ b/libs/neon/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,6 +1,6 @@
case $THIS_SUB_DEPENDS in
DAV) is_depends_enabled $SPELL expat || is_depends_enabled $SPELL libxml2;;
- SSL) is_depends_enabled $SPELL openssl || is_depends_enabled $SPELL gnutls
;;
+ SSL) is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL) ||
is_depends_enabled $SPELL gnutls ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/libs/neon/SUB_DEPENDS b/libs/neon/SUB_DEPENDS
index ddaac5b..28e3fd5 100755
--- a/libs/neon/SUB_DEPENDS
+++ b/libs/neon/SUB_DEPENDS
@@ -15,13 +15,19 @@ case $THIS_SUB_DEPENDS in

# Re-query with only the SSL options
config_query_list NEON_SSL "Which SSL backend do you want for SSL
support?" \
- SSL gnutls &&
+ openssl \
+ gnutls &&

config_query_option NEON_OPTS "Enable SSL library thread-safety using
POSIX threads?" y \
- "--enable-threadsafe-ssl=posix" \
- "--disable-threadsafe-ssl" &&
- depends "${NEON_SSL}" "--with-ssl=${NEON_SSL}"
- ;;
+ "--enable-threadsafe-ssl=posix" \
+ "--disable-threadsafe-ssl" &&
+
+ case $NEON_SSL in
+ openssl) depends SSL "--with-ssl=openssl"
+ ;;
+ gnutls) depends gnutls "--with-ssl=gnutls"
+ ;;
+ esac ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac



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

Archive powered by MHonArc 2.6.24.

Top of Page