- up to 1.0.0b + fix that makes test suite pass

Changed files:
    openssl-tls.patch -> 1.1
    openssl.spec -> 1.229

diff --git a/openssl-tls.patch b/openssl-tls.patch
new file mode 100644 (file)
index 0000000..d986ae5
--- /dev/null
+++ b/openssl-tls.patch
@@ -0,0 +1,16 @@
+Index: openssl/ssl/t1_lib.c
+RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v
+rcsdiff -q -kk '-r1.64.2.15' '-r1.64.2.16' -u '/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2>/dev/null
+--- t1_lib.c   2010/11/16 13:26:24     1.64.2.15
++++ t1_lib.c   2010/11/16 22:41:07     1.64.2.16
+@@ -779,8 +779,8 @@
+                               {
+                               if(s->session->tlsext_ecpointformatlist)
+                                       {
+-                                      *al = TLS1_AD_DECODE_ERROR;
+-                                      return 0;
++                                      OPENSSL_free(s->session->tlsext_ecpointformatlist);
++                                      s->session->tlsext_ecpointformatlist = NULL;
+                                       }
+                               s->session->tlsext_ecpointformatlist_length = 0;
+                               if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)

diff --git a/openssl.spec b/openssl.spec
index e32ba537f929287ff90441ac25349b8c3ac9c9e6..9cccd868b1329ce0c7f4b6fac2a26cd2a0b5f0ff 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -16,12 +16,12 @@ 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:       1.0.0a
+Version:       1.0.0b
 Release:       1
 License:       Apache-like
 Group:         Libraries
 Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: e3873edfffc783624cfbdb65e2249cbd
+# Source0-md5: 104deb3b7e6820cae6de3f49ba0ff2b0
 Source2:       %{name}.1.pl
 Source3:       %{name}-ssl-certificate.sh
 Source4:       %{name}-c_rehash.sh
@@ -33,6 +33,7 @@ Patch4:               %{name}-man-namespace.patch
 Patch5:                %{name}-asflag.patch
 Patch6:                %{name}-ca-certificates.patch
 Patch7:                %{name}-ldflags.patch
+Patch8:                %{name}-tls.patch
 URL:           http://www.openssl.org/
 BuildRequires: bc
 BuildRequires: perl-devel >= 1:5.6.1
@@ -244,6 +245,7 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
        `grep -l -r "%{_prefix}/local/bin/perl" *`
@@ -255,7 +257,7 @@ touch Makefile.*
 
 %{__perl} util/perlpath.pl %{__perl}
 
-OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}" \
+OPTFLAGS="%{rpmcflags} %{rpmcppflags} %{?with_purify:-DPURIFY}" \
 ./Configure \
 %if "%{pld_release}" == "ti"
        --openssldir=%{_var}/lib/%{name} \