From da29a2e6df16e1f086323766313628e716975d512a83fa97211d38cb7132712c Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 16 Nov 2009 09:08:26 +0000 Subject: [PATCH] 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 --- func-parm-err.patch | 12 ++++++------ non-exec-stack.diff | 8 +++++--- openssl.changes | 5 +++++ openssl.spec | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/func-parm-err.patch b/func-parm-err.patch index 9d4efa5..3ce9d25 100644 --- a/func-parm-err.patch +++ b/func-parm-err.patch @@ -1,10 +1,10 @@ -Index: openssl-0.9.8h/crypto/x509/x509_att.c -================================================================================ ---- openssl-0.9.8h/crypto/x509/x509_att.c -+++ openssl-0.9.8h/crypto/x509/x509_att.c -@@ -305,7 +305,7 @@ +Index: openssl-0.9.8k/crypto/x509/x509_att.c +=================================================================== +--- openssl-0.9.8k.orig/crypto/x509/x509_att.c ++++ openssl-0.9.8k/crypto/x509/x509_att.c +@@ -312,7 +312,7 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIB 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, stmp)) diff --git a/non-exec-stack.diff b/non-exec-stack.diff index b64308d..9dd9f97 100644 --- a/non-exec-stack.diff +++ b/non-exec-stack.diff @@ -1,10 +1,12 @@ ---- crypto/perlasm/x86unix.pl +Index: crypto/perlasm/x86unix.pl +=================================================================== +--- crypto/perlasm/x86unix.pl.orig +++ crypto/perlasm/x86unix.pl -@@ -586,6 +586,7 @@ +@@ -557,6 +557,7 @@ sub main'file_end push(@out,$const); $const=""; } + push(@out, ".section .note.GNU-stack,\"\",\@progbits"); } - sub main'data_word + sub main'data_byte diff --git a/openssl.changes b/openssl.changes index 3de1779..cb314e1 100644 --- a/openssl.changes +++ b/openssl.changes @@ -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 diff --git a/openssl.spec b/openssl.spec index 8fc6ca9..edbe13c 100644 --- a/openssl.spec +++ b/openssl.spec @@ -32,7 +32,7 @@ Obsoletes: openssl-64bit %endif # Version: 0.9.8k -Release: 2 +Release: 3 Summary: Secure Sockets and Transport Layer Security Url: http://www.openssl.org/ Source: http://www.%{name}.org/source/%{name}-%{version}.tar.bz2