Skip to Content.
Sympa Menu

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

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 (a241320033fda80b2ed46f1c01343c5a25937f7b)
  • Date: Fri, 6 Mar 2015 14:28:59 -0600

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

crypto/libressl/HISTORY | 1 +
crypto/libressl/PREPARE | 4 ++++
crypto/openssl/HISTORY | 6 ++++++
crypto/openssl/PREPARE | 5 -----
crypto/openssl/PRE_REMOVE | 25 +++++++++++++++++++++++++
crypto/openssl/REPAIR^none^PRE_REMOVE | 25 +++++++++++++++++++++++++
crypto/openssl/UP_TRIGGERS | 6 ++++++
7 files changed, 67 insertions(+), 5 deletions(-)

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

libressl: added proper upgrading procedure from openssl

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

openssl: added proper upgrading procedure to libressl

diff --git a/crypto/libressl/HISTORY b/crypto/libressl/HISTORY
index ae8b794..176af7c 100644
--- a/crypto/libressl/HISTORY
+++ b/crypto/libressl/HISTORY
@@ -3,6 +3,7 @@
CVE-2014-8275, CVE-2014-3572); added missing licenses; updated long
description
* INSTALL: added, to install config file
+ * PREPARE: added, for proper upgrading procedure from openssl

2015-03-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.1.4; added forgotten SECURITY_PATCH for
diff --git a/crypto/libressl/PREPARE b/crypto/libressl/PREPARE
new file mode 100755
index 0000000..eb0676c
--- /dev/null
+++ b/crypto/libressl/PREPARE
@@ -0,0 +1,4 @@
+if spell_ok openssl; then
+ # should be replaced with something less hacky
+ export WGET_RECAST_REQUIRED="y"
+fi
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 9f30f37..1e19e22 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,9 @@
+2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * PROVIDES: changed mode to 755
+ * PREPARE: move triggering to UP_TRIGGERS
+ * {REPAIR^none^,}PRE_REMOVE: added, for proper upgrading procedure to
+ libressl
+
2015-01-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.8ze, 1.0.1l

diff --git a/crypto/openssl/PREPARE b/crypto/openssl/PREPARE
index e142d81..60fb53b 100755
--- a/crypto/openssl/PREPARE
+++ b/crypto/openssl/PREPARE
@@ -1,6 +1 @@
config_query_list OPENSSL_BRANCH "Which branch of OpenSSL do you want to
build?" DEFAULT 0.9 1.0
-if spell_ok libressl;then
- for each in $(show_up_depends libressl 1); do
- up_trigger $each cast_self
- done
-fi
diff --git a/crypto/openssl/PRE_REMOVE b/crypto/openssl/PRE_REMOVE
new file mode 100755
index 0000000..adceeb8
--- /dev/null
+++ b/crypto/openssl/PRE_REMOVE
@@ -0,0 +1,25 @@
+# check for exported variable by libressl
+if [[ -n "$WGET_RECAST_REQUIRED" ]] && is_depends_enabled wget
$(get_spell_provider wget SSL); then
+ message "${MESSAGE_COLOR}Building static wget now so that it doesn't get
borked${DEFAULT_COLOR}" &&
+
+ # make sure wget sources are in-place
+ summon wget &&
+
+ RUN_COMPILER_DIR="${RUN_COMPILER_DIR:-/var/lib/sorcery/build}" &&
+ PATH="${PATH//$RUN_COMPILER_DIR:/}" &&
+ (
+ # this links statically against old libraries still
+ export OPTS="--with-ssl=openssl --disable-pcre" && # TODO: our pcre
spell doesn't install a static library yet
+ export CUSTOM_CFLAGS="-static" &&
+ # $4 is grimoire version, not installed version -- internal sorcery
interface, too?
+ local TMP_WGET_DIR="$BUILD_DIRECTORY/wget-$(gaze version wget | awk '{if
(NR == 3) print $4}')" &&
+
+ delve -c start config_loc wget &&
+ # LDFLAGS+="-ldl" is required for static linking
+ sedit "s:@LIBS@:@LIBS@ -ldl:" "$TMP_WGET_DIR/src/Makefile.in" &&
+ # get a new wget binary built
+ delve BUILD wget &&
+ # and installed
+ install -vm 755 "$TMP_WGET_DIR/src/wget" "$INSTALL_ROOT/usr/bin/wget"
+ ) || exit 1 # for some reason 'return 1' doesn't work here
+fi
diff --git a/crypto/openssl/PROVIDES b/crypto/openssl/PROVIDES
old mode 100644
new mode 100755
diff --git a/crypto/openssl/REPAIR^none^PRE_REMOVE
b/crypto/openssl/REPAIR^none^PRE_REMOVE
new file mode 100755
index 0000000..adceeb8
--- /dev/null
+++ b/crypto/openssl/REPAIR^none^PRE_REMOVE
@@ -0,0 +1,25 @@
+# check for exported variable by libressl
+if [[ -n "$WGET_RECAST_REQUIRED" ]] && is_depends_enabled wget
$(get_spell_provider wget SSL); then
+ message "${MESSAGE_COLOR}Building static wget now so that it doesn't get
borked${DEFAULT_COLOR}" &&
+
+ # make sure wget sources are in-place
+ summon wget &&
+
+ RUN_COMPILER_DIR="${RUN_COMPILER_DIR:-/var/lib/sorcery/build}" &&
+ PATH="${PATH//$RUN_COMPILER_DIR:/}" &&
+ (
+ # this links statically against old libraries still
+ export OPTS="--with-ssl=openssl --disable-pcre" && # TODO: our pcre
spell doesn't install a static library yet
+ export CUSTOM_CFLAGS="-static" &&
+ # $4 is grimoire version, not installed version -- internal sorcery
interface, too?
+ local TMP_WGET_DIR="$BUILD_DIRECTORY/wget-$(gaze version wget | awk '{if
(NR == 3) print $4}')" &&
+
+ delve -c start config_loc wget &&
+ # LDFLAGS+="-ldl" is required for static linking
+ sedit "s:@LIBS@:@LIBS@ -ldl:" "$TMP_WGET_DIR/src/Makefile.in" &&
+ # get a new wget binary built
+ delve BUILD wget &&
+ # and installed
+ install -vm 755 "$TMP_WGET_DIR/src/wget" "$INSTALL_ROOT/usr/bin/wget"
+ ) || exit 1 # for some reason 'return 1' doesn't work here
+fi
diff --git a/crypto/openssl/UP_TRIGGERS b/crypto/openssl/UP_TRIGGERS
index db2fa68..bfc94e2 100755
--- a/crypto/openssl/UP_TRIGGERS
+++ b/crypto/openssl/UP_TRIGGERS
@@ -7,4 +7,10 @@ if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}"
] || \
for each in $(show_up_depends $SPELL 1); do
up_trigger $each cast_self
done
+fi &&
+
+if spell_ok libressl; then
+ for each in $(show_up_depends libressl 1); do
+ up_trigger $each cast_self
+ done
fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (a241320033fda80b2ed46f1c01343c5a25937f7b), Vlad Glagolev, 03/06/2015

Archive powered by MHonArc 2.6.24.

Top of Page