[SM-Commit] GIT changes to stable-0.43 grimoire by Arwed von Merkatz (bc2e26de5e29c73d8facebd8e7928e8682dea1fd)

Arwed von Merkatz scm at sourcemage.org
Sat Apr 17 05:08:56 EDT 2010


GIT changes to stable-0.43 grimoire by Arwed von Merkatz <v.merkatz at gmx.net>:

 VERSION                |    2 +-
 crypto/openssl/BUILD   |    2 ++
 crypto/openssl/DETAILS |    1 +
 crypto/openssl/HISTORY |    8 ++++++++
 4 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit bc2e26de5e29c73d8facebd8e7928e8682dea1fd
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    VERSION: 0.43-1

commit 4238a6e0b13f978b7119882e194adcc62871eeb6
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    openssl: actually PATCHLEVEL++ for 1.0
    (cherry picked from commit f0fbb3ab2e94f68e4f8c57d2af06da8d1836f1bb)

commit c47d8791de9aa23d1a12a4ed13224cf24f8df7d8
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    openssl: fixed lib installation on x86-64 systems
    (cherry picked from commit c5fd368ee760fe7bb2b03bd20b9b012e7f84002b)

commit e7e2d6772b5c97506c96df066e1284ba096a12a8
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    openssl: re-enable md2 support by default
    (cherry picked from commit 61b27d801cf869bbe9c0faa1710c8ef60b4bbb0c)

diff --git a/VERSION b/VERSION
index 8cb6682..940e9bb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.43-0
+0.43-1
diff --git a/crypto/openssl/BUILD b/crypto/openssl/BUILD
index 97383c4..962c5a6 100755
--- a/crypto/openssl/BUILD
+++ b/crypto/openssl/BUILD
@@ -8,6 +8,8 @@ fi                                                          &&
 OPTS="$OPENSSL_TLSEXT $OPTS"                                &&
 OPTS="--prefix=${INSTALL_ROOT}/usr                          \
       --openssldir=${INSTALL_ROOT}/etc/ssl                  \
+      --libdir=lib                                          \
+      enable-md2                                            \
       shared                                                \
       threads                                               \
       $OPTS"
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 1f23c89..ae4e484 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -10,6 +10,7 @@ case $OPENSSL_BRANCH in
   ;;
   1.0)
          VERSION=1.0.0
+      PATCHLEVEL=2
   ;;
 esac
 
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index d176a1c..23eb43f 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,11 @@
+2010-04-17 Vlad Glagolev <stealth at sourcemage.org>
+        * DETAILS: PATCHLEVEL=1 for 1.0
+        * BUILD: corrected lib path (fixes installation on x86-64 systems)
+
+2010-04-04 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL=1 for 1.0 branch
+	* BUILD: enable md2 by default (still needed somewhere, e.g. nmap)
+
 2010-03-30 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Fix GPGME -> OPENSSL for branch variable
 



More information about the SM-Commit mailing list