Accepting request 24437 from Base:System

Copy from Base:System/openssl based on submit request 24437 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/24437
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=28
This commit is contained in:
OBS User autobuild 2009-11-16 09:08:26 +00:00 committed by Git OBS Bridge
parent 61dcd4d00d
commit da29a2e6df
4 changed files with 17 additions and 10 deletions

View File

@ -1,10 +1,10 @@
Index: openssl-0.9.8h/crypto/x509/x509_att.c Index: openssl-0.9.8k/crypto/x509/x509_att.c
================================================================================ ===================================================================
--- openssl-0.9.8h/crypto/x509/x509_att.c --- openssl-0.9.8k.orig/crypto/x509/x509_att.c
+++ openssl-0.9.8h/crypto/x509/x509_att.c +++ openssl-0.9.8k/crypto/x509/x509_att.c
@@ -305,7 +305,7 @@ @@ -312,7 +312,7 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIB
if(!(ttmp = ASN1_TYPE_new())) goto err; if(!(ttmp = ASN1_TYPE_new())) goto err;
if (len == -1) if ((len == -1) && !(attrtype & MBSTRING_FLAG))
{ {
- if (!ASN1_TYPE_set1(ttmp, attrtype, data)) - if (!ASN1_TYPE_set1(ttmp, attrtype, data))
+ if (!ASN1_TYPE_set1(ttmp, attrtype, stmp)) + if (!ASN1_TYPE_set1(ttmp, attrtype, stmp))

View File

@ -1,10 +1,12 @@
--- crypto/perlasm/x86unix.pl Index: crypto/perlasm/x86unix.pl
===================================================================
--- crypto/perlasm/x86unix.pl.orig
+++ crypto/perlasm/x86unix.pl +++ crypto/perlasm/x86unix.pl
@@ -586,6 +586,7 @@ @@ -557,6 +557,7 @@ sub main'file_end
push(@out,$const); push(@out,$const);
$const=""; $const="";
} }
+ push(@out, ".section .note.GNU-stack,\"\",\@progbits"); + push(@out, ".section .note.GNU-stack,\"\",\@progbits");
} }
sub main'data_word sub main'data_byte

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 3 19:09:35 UTC 2009 - coolo@novell.com
- updated patches to apply with fuzz=0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 1 10:21:16 CEST 2009 - gjhe@novell.com Tue Sep 1 10:21:16 CEST 2009 - gjhe@novell.com

View File

@ -32,7 +32,7 @@ Obsoletes: openssl-64bit
%endif %endif
# #
Version: 0.9.8k Version: 0.9.8k
Release: 2 Release: 3
Summary: Secure Sockets and Transport Layer Security Summary: Secure Sockets and Transport Layer Security
Url: http://www.openssl.org/ Url: http://www.openssl.org/
Source: http://www.%{name}.org/source/%{name}-%{version}.tar.bz2 Source: http://www.%{name}.org/source/%{name}-%{version}.tar.bz2