[packages/openssl/OPENSSL_0_9_8] up to 0.9.8zh

[glen]

commit e2c5dbe53339cf114d563d731d1545c058d3e6d6
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Dec 3 17:59:22 2015 +0200

    up to 0.9.8zh
    
    openssl-globalCA.diff merged into openssl-ca-certificates.patch

 openssl-ca-certificates.patch | 20 ++++++++++----------
 openssl-globalCA.diff         | 12 ------------
 openssl.spec                  |  6 ++----
 3 files changed, 12 insertions(+), 26 deletions(-)
---
diff --git a/openssl.spec b/openssl.spec
index a284eb8..7eea5d5 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -14,18 +14,17 @@ Summary(pt_BR.UTF-8):	Uma biblioteca C que fornece vários algoritmos e protocol
 Summary(ru.UTF-8):	Библиотеки и утилиты для соединений через Secure Sockets Layer
 Summary(uk.UTF-8):	Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:		openssl
-Version:	0.9.8zd
+Version:	0.9.8zh
 Release:	1
 License:	Apache-like
 Group:		Libraries
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5:	e9b9ee12f2911e1a378e2458d9bfff77
+# Source0-md5:	c00f014c64dfac1ec40dc7459d9673e6
 Source2:	%{name}.1.pl
 Source3:	%{name}-ssl-certificate.sh
 Source4:	%{name}-c_rehash.sh
 Patch0:		%{name}-alpha-ccc.patch
 Patch1:		%{name}-optflags.patch
-Patch2:		%{name}-globalCA.diff
 Patch3:		%{name}-include.patch
 Patch4:		%{name}-man-namespace.patch
 Patch5:		%{name}-asflag.patch
@@ -196,7 +195,6 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
diff --git a/openssl-ca-certificates.patch b/openssl-ca-certificates.patch
index 1922211..40facfe 100644
--- a/openssl-ca-certificates.patch
+++ b/openssl-ca-certificates.patch
@@ -1,11 +1,11 @@
---- openssl-0.9.8i/crypto/cryptlib.h~	2008-11-13 11:22:38.000000000 +0200
-+++ openssl-0.9.8i/crypto/cryptlib.h	2008-11-13 11:26:00.343937555 +0200
+--- openssl-0.9.8zh/crypto/cryptlib.h~	2015-12-03 16:55:31.000000000 +0200
++++ openssl-0.9.8zh/crypto/cryptlib.h	2015-12-03 18:00:16.202974639 +0200
 @@ -82,7 +82,7 @@
- #ifndef OPENSSL_SYS_VMS
- #define X509_CERT_AREA		OPENSSLDIR
- #define X509_CERT_DIR		OPENSSLDIR "/certs"
--#define X509_CERT_FILE		OPENSSLDIR "/ca-certificates.crt"
-+#define X509_CERT_FILE		"/etc/certs/ca-certificates.crt"
- #define X509_PRIVATE_DIR	OPENSSLDIR "/private"
- #else
- #define X509_CERT_AREA		"SSLROOT:[000000]"
+ # ifndef OPENSSL_SYS_VMS
+ #  define X509_CERT_AREA          OPENSSLDIR
+ #  define X509_CERT_DIR           OPENSSLDIR "/certs"
+-#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
++#  define X509_CERT_FILE          "/etc/certs/ca-certificates.crt"
+ #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
+ # else
+ #  define X509_CERT_AREA          "SSLROOT:[000000]"
diff --git a/openssl-globalCA.diff b/openssl-globalCA.diff
deleted file mode 100644
index 169f444..0000000
--- a/openssl-globalCA.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur openssl-0.9.6b/crypto/cryptlib.h openssl-0.9.6b-new/crypto/cryptlib.h
---- openssl-0.9.6b/crypto/cryptlib.h	Tue May  2 14:35:04 2000
-+++ openssl-0.9.6b-new/crypto/cryptlib.h	Sat Mar 16 12:27:30 2002
-@@ -77,7 +77,7 @@
- #ifndef VMS
- #define X509_CERT_AREA		OPENSSLDIR
- #define X509_CERT_DIR		OPENSSLDIR "/certs"
--#define X509_CERT_FILE		OPENSSLDIR "/cert.pem"
-+#define X509_CERT_FILE		OPENSSLDIR "/ca-certificates.crt"
- #define X509_PRIVATE_DIR	OPENSSLDIR "/private"
- #else
- #define X509_CERT_AREA		"SSLROOT:[000000]"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssl.git/commitdiff/e2c5dbe53339cf114d563d731d1545c058d3e6d6