Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (981741d3d3b358ae54a3299a150c4238dcce0f1b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (981741d3d3b358ae54a3299a150c4238dcce0f1b)
  • Date: Thu, 23 Jul 2009 11:40:16 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

crypto/openssl/BUILD | 3 +++
crypto/openssl/HISTORY | 4 ++++
2 files changed, 7 insertions(+)

New commits:
commit 981741d3d3b358ae54a3299a150c4238dcce0f1b
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

openssl: unset OPTS for the wget build

diff --git a/crypto/openssl/BUILD b/crypto/openssl/BUILD
index be76e84..8db61e8 100755
--- a/crypto/openssl/BUILD
+++ b/crypto/openssl/BUILD
@@ -32,6 +32,8 @@ make && {
summon wget &&
RUN_COMPILER_DIR="${RUN_COMPILER_DIR:-/var/lib/sorcery/build}" &&
PATH="${PATH//$RUN_COMPILER_DIR:/}" &&
+ (
+ unset OPTS &&
delve -c start BUILD wget && # this links against old
libraries still
local TEMPWGET_DIR="$BUILD_DIRECTORY/wget-$(gaze version wget |
head -n 3 | tail -n 1 | awk '{ print $4 }')" &&
@@ -43,6 +45,7 @@ make && {
install -m 755 wget /usr/bin/wget && # and installed
cd - &&
ldconfig
+ )
fi
} &&

diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index b78af56..2b06315 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2009-07-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: do wget build in subshell, unsetting OPTS, otherwise the wget
+ build fails due to unrecognized option --openssldir=/etc/ssl
+
2009-03-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.9.8k, SECURITY_PATCH+=1:
http://www.openssl.org/news/secadv_20090325.txt



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (981741d3d3b358ae54a3299a150c4238dcce0f1b), Arwed von Merkatz, 07/23/2009

Archive powered by MHonArc 2.6.24.

Top of Page