packages (AC-branch): openssl/openssl-globalCA.diff, openssl/openssl.spec -...

[glen]

Author: glen                         Date: Sat Nov  5 23:11:45 2011 GMT
Module: packages                      Tag: AC-branch
---- Log message:
- switch ca-bundle to ca-certificates one; rel 5

---- Files affected:
packages/openssl:
   openssl-globalCA.diff (1.1 -> 1.1.4.1) , openssl.spec (1.146.2.3.2.13 -> 1.146.2.3.2.14) 

---- Diffs:

================================================================
Index: packages/openssl/openssl-globalCA.diff
diff -u packages/openssl/openssl-globalCA.diff:1.1 packages/openssl/openssl-globalCA.diff:1.1.4.1
--- packages/openssl/openssl-globalCA.diff:1.1	Sun Mar 17 10:33:06 2002
+++ packages/openssl/openssl-globalCA.diff	Sun Nov  6 00:11:40 2011
@@ -1,12 +1,11 @@
-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
+--- openssl-0.9.7m/crypto/cryptlib.h~	2005-04-13 11:49:51.000000000 +0300
++++ openssl-0.9.7m/crypto/cryptlib.h	2011-11-06 01:07:47.482927980 +0200
 @@ -77,7 +77,7 @@
- #ifndef VMS
+ #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		"/usr/share/ssl/ca-bundle.crt"
++#define X509_CERT_FILE		"/etc/certs/ca-certificates.crt"
  #define X509_PRIVATE_DIR	OPENSSLDIR "/private"
  #else
  #define X509_CERT_AREA		"SSLROOT:[000000]"

================================================================
Index: packages/openssl/openssl.spec
diff -u packages/openssl/openssl.spec:1.146.2.3.2.13 packages/openssl/openssl.spec:1.146.2.3.2.14
--- packages/openssl/openssl.spec:1.146.2.3.2.13	Tue Sep 14 14:24:28 2010
+++ packages/openssl/openssl.spec	Sun Nov  6 00:11:40 2011
@@ -15,12 +15,11 @@
 Summary(uk.UTF-8):	Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:		openssl
 Version:	0.9.7m
-Release:	4
+Release:	5
 License:	Apache-like
 Group:		Libraries
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 # Source0-md5:	74a4d1b87e1e6e1ec95dbe58cb4c5b9a
-Source1:	%{name}-ca-bundle.crt
 Source2:	%{name}.1.pl
 Source3:	%{name}-ssl-certificate.sh
 Source4:	%{name}-c_rehash.sh
@@ -45,6 +44,7 @@
 Obsoletes:	SSLeay-devel
 Obsoletes:	SSLeay-perl
 Obsoletes:	libopenssl0
+Requires:	ca-certificates
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -330,7 +330,6 @@
 fi
 sed -i -e 's,^libdir=.*,libdir=%{_libdir},' $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/ssl/ca-bundle.crt
 install libcrypto.a libssl.a $RPM_BUILD_ROOT%{_libdir}
 install lib*.so.*.* $RPM_BUILD_ROOT%{_libdir}
 ln -sf libcrypto.so.*.* $RPM_BUILD_ROOT%{_libdir}/libcrypto.so
@@ -452,6 +451,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.146.2.3.2.14  2011/11/05 23:11:40  glen
+- switch ca-bundle to ca-certificates one; rel 5
+
 Revision 1.146.2.3.2.13  2010/09/14 12:24:28  glen
 - disable unfinishde pathc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-globalCA.diff?r1=1.1&r2=1.1.4.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl.spec?r1=1.146.2.3.2.13&r2=1.146.2.3.2.14&f=u