[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [openssl] OpenSSL source code branch OpenSSL_0_9_8-stable updated. OpenSSL_0_9_8y-38-g17540b7
From:       Dr. Stephen Henson <steve () openssl ! org>
Date:       2013-11-30 14:11:21
Message-ID: 20131130141121.41CCD1E03AB () openssl ! net
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSSL source code".

The branch, OpenSSL_0_9_8-stable has been updated
       via  17540b77e08142d5d4a5f0e134a80fa8025011ef (commit)
       via  b70e4d3e904e30796efaed77ac149e4b9e945826 (commit)
      from  d9519a4032c082ff6805ab2de70a40034aad3894 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 17540b77e08142d5d4a5f0e134a80fa8025011ef
Author: Dr. Stephen Henson <steve@openssl.org>
Date:   Wed Nov 27 15:37:39 2013 +0000

    Simplify and update openssl.spec

commit b70e4d3e904e30796efaed77ac149e4b9e945826
Author: Dr. Stephen Henson <steve@openssl.org>
Date:   Thu Nov 21 15:47:19 2013 +0000

    Fixes for no-static-engine and Windows builds.

-----------------------------------------------------------------------

Summary of changes:
 crypto/engine/eng_all.c |    6 +++---
 crypto/engine/engine.h  |    8 ++++----
 openssl.spec            |   10 +++-------
 util/libeay.num         |    2 +-
 util/pl/VC-32.pl        |    2 +-
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index f29c167..8a1b9c7 100644
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -102,14 +102,14 @@ void ENGINE_load_builtin_engines(void)
 #if !defined(OPENSSL_NO_GMP) && !defined(OPENSSL_NO_HW_GMP)
 	ENGINE_load_gmp();
 #endif
+#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
+	ENGINE_load_capi();
+#endif
 #endif
 #ifndef OPENSSL_NO_HW
 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
 	ENGINE_load_cryptodev();
 #endif
-#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
-	ENGINE_load_capi();
-#endif
 #endif
 	}
 
diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index d4bc1ef..b4e0444 100644
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -335,15 +335,15 @@ void ENGINE_load_gmp(void);
 void ENGINE_load_nuron(void);
 void ENGINE_load_sureware(void);
 void ENGINE_load_ubsec(void);
-#endif
-void ENGINE_load_cryptodev(void);
-void ENGINE_load_padlock(void);
-void ENGINE_load_builtin_engines(void);
 #ifdef OPENSSL_SYS_WIN32
 #ifndef OPENSSL_NO_CAPIENG
 void ENGINE_load_capi(void);
 #endif
 #endif
+#endif
+void ENGINE_load_cryptodev(void);
+void ENGINE_load_padlock(void);
+void ENGINE_load_builtin_engines(void);
 
 /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
  * "registry" handling. */
diff --git a/openssl.spec b/openssl.spec
index bb182ba..7d12ec3 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,18 +1,14 @@
 %define _unpackaged_files_terminate_build 0
-%define libmaj 0
-%define libmin 9
-%define librel 8
-%define librev za
+
 Release: 1
 
 %define openssldir /var/ssl
 
 Summary: Secure Sockets Layer and cryptography libraries and tools
 Name: openssl
-#Version: %{libmaj}.%{libmin}.%{librel}
-Version: %{libmaj}.%{libmin}.%{librel}%{librev}
+Version: 0.9.8za
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-Copyright: Freely distributable
+License: OpenSSL
 Group: System Environment/Libraries
 Provides: SSL
 URL: http://www.openssl.org/
diff --git a/util/libeay.num b/util/libeay.num
index 46d3b83..93a64ca 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3658,7 +3658,7 @@ ENGINE_set_ld_ssl_clnt_cert_fn          4044	EXIST:VMS:FUNCTION:ENGINE
 ENGINE_get_ssl_client_cert_function     4045	EXIST:!VMS:FUNCTION:ENGINE
 ENGINE_get_ssl_client_cert_fn           4045	EXIST:VMS:FUNCTION:ENGINE
 ENGINE_load_ssl_client_cert             4046	EXIST::FUNCTION:ENGINE
-ENGINE_load_capi                        4047	EXIST:WIN32:FUNCTION:CAPIENG,ENGINE
+ENGINE_load_capi                        4047	EXIST:WIN32:FUNCTION:CAPIENG,ENGINE,STATIC_ENGINE
 OPENSSL_isservice                       4048	EXIST::FUNCTION:
 FIPS_dsa_sig_decode                     4049	EXIST:OPENSSL_FIPS:FUNCTION:DSA
 EVP_CIPHER_CTX_clear_flags              4050	EXIST::FUNCTION:
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 5001557..2db008c 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -337,7 +337,7 @@ sub do_lib_rule
 	else
 		{
 		my $ex = "";		
-		if ($target =~ /O_SSL/)
+		if ($target !~ /O_CRYPTO/)
 			{
 			$ex .= " \$(L_CRYPTO)";
 			#$ex .= " \$(L_FIPS)" if $fipsdso;


hooks/post-receive
-- 
OpenSSL source code
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]