packages: openssl/openssl.spec, openssl/openssl-tls.patch (NEW) - up to 1.0...

arekm arekm at pld-linux.org
Wed Nov 17 19:14:59 CET 2010


Author: arekm                        Date: Wed Nov 17 18:14:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.0.0b + fix that makes test suite pass

---- Files affected:
packages/openssl:
   openssl.spec (1.228 -> 1.229) , openssl-tls.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/openssl/openssl.spec
diff -u packages/openssl/openssl.spec:1.228 packages/openssl/openssl.spec:1.229
--- packages/openssl/openssl.spec:1.228	Wed Jun 23 15:26:08 2010
+++ packages/openssl/openssl.spec	Wed Nov 17 19:14:54 2010
@@ -17,12 +17,12 @@
 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
@@ -34,6 +34,7 @@
 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
@@ -245,6 +246,7 @@
 %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" *`
@@ -256,7 +258,7 @@
 
 %{__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} \
@@ -515,6 +517,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.229  2010/11/17 18:14:54  arekm
+- up to 1.0.0b + fix that makes test suite pass
+
 Revision 1.228  2010/06/23 13:26:08  tommat
 - initial arm support
 

================================================================
Index: packages/openssl/openssl-tls.patch
diff -u /dev/null packages/openssl/openssl-tls.patch:1.1
--- /dev/null	Wed Nov 17 19:14:59 2010
+++ packages/openssl/openssl-tls.patch	Wed Nov 17 19:14:54 2010
@@ -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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl.spec?r1=1.228&r2=1.229&f=u



More information about the pld-cvs-commit mailing list