Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to stable-0.61 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 crypto/openssl/DETAILS     |    9 ++++-----
 crypto/openssl/HISTORY     |   29 +++++++++++++++++++++++++++++
 crypto/openssl/INSTALL     |   10 ++--------
 crypto/openssl/openssl.gpg |binary
 4 files changed, 35 insertions(+), 13 deletions(-)

New commits:
commit 23ac7eb7d1da05c1f0c550c788f0f8456c5e7773
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    openssl 0.9.8zd, 1.0.1k, SECURITY_PATCH++
    (cherry picked from commit e89b45edd79e13d5e6dcf594e65269c3a1a84422)

commit 5480ac69a892f6601605a45fa26d0cfbe5b450f6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    openssl:  Parallel jobs on install work, re-enable with make_normal
    (cherry picked from commit 3dcb495c36cd1888d3dd66d9f56cde4acc0b68a5)

commit c1808f70d3fcfa85f70754716c25ee257a79f773
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    openssl: Work-around for Bug #556 no longer needed
    (cherry picked from commit 544add2f2405b8bc918f07f837a414a11d0bbc01)

commit 98fa34288886ab5fa59dc522122b9e59f7995c33
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    crypto/openssl: versions 0.9.8zc and 1.0.1j, fixes CVE-2014-3513, 
CVE-2014-3567, CVE-2014-3568
    (cherry picked from commit 6008ba006698e290bed753e2a7a946e724d0364f)
    
    Conflicts:
    
        crypto/openssl/HISTORY

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

    openssl: => 1.0.1i (1.0), 0.9.8zb (0.9) [security]
    (cherry picked from commit 0fc4b9a254a36d38c07b3fbe62442ac377c3c5a2)

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

    openssl: => 1.0.1h (1.0), 0.9.8za (0.9) [security]
    (cherry picked from commit 5341e4ebfa9593756ad8b1c242af18a9dc54cba6)

commit 77bf98f3bc647edc11b6dcb07c5d42155046b7bb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    crypto/openssl: version 1.0.1g, fixes CVE-2014-0160
    (cherry picked from commit 3602ff4607c6d3c675a0adbdc50a27b4b17d33e1)

commit b9c328fdb9429f89be8da8324a6be33c95cb1f4d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    openssl 1.0.0l, SECURITY_PATCH=21
    (cherry picked from commit 2d5628d16d10368299f10c284a9968ac52ffb063)

diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index bffbc7d..db26781 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,13 +6,12 @@ fi
 
 case $OPENSSL_BRANCH in
   0.9)
-         VERSION=0.9.8y
-  SECURITY_PATCH=20
+         VERSION=0.9.8zd
+  SECURITY_PATCH=24
   ;;
   1.0)
-         VERSION=1.0.0k
-  SECURITY_PATCH=20
-      PATCHLEVEL=0
+         VERSION=1.0.1k
+  SECURITY_PATCH=26
   ;;
 esac
 
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index bbc506c..582d0db 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,32 @@
+2015-01-08 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.9.8zd, 1.0.1k, SECURITY_PATCH++
+         https://www.openssl.org/news/secadv_20150108.txt
+
+2014-12-31 Eric Sandall <sandalle AT sourcemage.org>
+       * BUILD: Work-around for Bug #556 no longer needed
+       * INSTALL: Parallel jobs on install work, re-enable with make_normal
+
+2014-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: versions 1.0.1j and 0.9.8zc, SECURITY_PATCH++, fixes
+         for CVE-2014-3513, CVE-2014-3567, CVE-2014-3568
+
+2014-08-07 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.0.1i (branch 1.0), 0.9.8zb (branch 0.9);
+         SECURITY_PATCH++ (9 CVEs)
+       * openssl.gpg: imported 0E604491 public key (Matt Caswell
+         <matt AT openssl.org>)
+
+2014-06-05 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell (branch 1.0) to 1.0.1h, (branch 0.9) to
+         0.9.8za; SECURITY_PATCH++ (7 CVEs)
+
+2014-04-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 1.0.1g, SECURITY_PATCH=22, CVE-2014-0160
+       * openssl.gpg: import key FA40E9E2
+
+2014-01-07 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.0.0l, SECURITY_PATCH=21
+
 2013-06-17 Remko van der Vossen <wich AT sourcemage.org>
        * INSTALL: workaround for bug #556
 
diff --git a/crypto/openssl/INSTALL b/crypto/openssl/INSTALL
index 0f424f6..1d9a6be 100755
--- a/crypto/openssl/INSTALL
+++ b/crypto/openssl/INSTALL
@@ -1,8 +1,2 @@
-make_single &&
-
-# workaround for bug #556
-# we don't install man pages as the pod2man calls fail
-# make MANDIR="$INSTALL_ROOT/usr/share/man" install &&
-make MANDIR="$INSTALL_ROOT/usr/share/man" install_sw &&
-
-make_normal
+make_normal  &&
+make MANDIR="$INSTALL_ROOT/usr/share/man" install
diff --git a/crypto/openssl/openssl.gpg b/crypto/openssl/openssl.gpg
index e01c054..d90e7db 100644
Binary files a/crypto/openssl/openssl.gpg and b/crypto/openssl/openssl.gpg 
differ