diff options
author | Vlad Glagolev | 2012-06-09 12:58:58 +0400 |
---|---|---|
committer | Vlad Glagolev | 2012-06-14 12:36:25 +0400 |
commit | cea97eeb95d497f7a00249ea99159c5bbb064dff (patch) | |
tree | ae6e9e52a3f9f38b906368e59ca1f4b6e2f97731 | |
parent | 1892ed57d844f2b42db685af8622e320b9c21c2f (diff) |
openssl: fixed UP_TRIGGERS
(cherry picked from commit 4c0aa23778f5308a77f9dd60abc3b03453f09c4f)
-rw-r--r-- | crypto/openssl/HISTORY | 3 | ||||
-rwxr-xr-x | crypto/openssl/UP_TRIGGERS | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY index 85a9b0dfa4..7fcc22ce49 100644 --- a/crypto/openssl/HISTORY +++ b/crypto/openssl/HISTORY @@ -1,3 +1,6 @@ +2012-06-09 Vlad Glagolev <stealth@sourcemage.org> + * UP_TRIGGERS: don't go below spell_ok if it fails check + 2012-05-10 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.9.8x, 1.0.0j, SECURITY_PATCH=19 http://www.openssl.org/news/secadv_20120510.txt diff --git a/crypto/openssl/UP_TRIGGERS b/crypto/openssl/UP_TRIGGERS index d9b53dc303..3edee7065d 100755 --- a/crypto/openssl/UP_TRIGGERS +++ b/crypto/openssl/UP_TRIGGERS @@ -1,7 +1,7 @@ # this makes ABI changes automatically cast those that depend on openssl via an up_trigger -local OLD_SPELL_VERSION="" -spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)" +spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" || return 0 + if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ]; then for each in $(show_up_depends $SPELL 1); do up_trigger $each cast_self |