diff --git a/openssl-gcc42_b.patch b/openssl-gcc42_b.patch new file mode 100644 index 0000000..c70193c --- /dev/null +++ b/openssl-gcc42_b.patch @@ -0,0 +1,12 @@ +--- crypto/ocsp/ocsp.h.orig 2007-09-02 17:56:39.000000000 +0200 ++++ crypto/ocsp/ocsp.h 2007-09-02 18:04:50.000000000 +0200 +@@ -469,7 +469,7 @@ + ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d, + void *data, STACK_OF(ASN1_OBJECT) *sk); + #define ASN1_STRING_encode_of(type,s,i2d,data,sk) \ +-((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))openssl_fcast(ASN1_STRING_encode))(s,i2d,data,sk) ++ ASN1_STRING_encode(s, CHECKED_I2D_OF(type, i2d), data, sk) + + X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim); + + diff --git a/openssl.changes b/openssl.changes index ec7953c..26f62ec 100644 --- a/openssl.changes +++ b/openssl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 5 11:39:26 CEST 2007 - mkoenig@suse.de + +- fix another gcc 4.2 build problem [#307669] + ------------------------------------------------------------------- Fri Aug 3 14:17:27 CEST 2007 - coolo@suse.de diff --git a/openssl.spec b/openssl.spec index b079cdc..a1f975b 100644 --- a/openssl.spec +++ b/openssl.spec @@ -19,7 +19,7 @@ Group: Productivity/Networking/Security Provides: ssl Autoreqprov: on Version: 0.9.8e -Release: 32 +Release: 41 Summary: Secure Sockets and Transport Layer Security URL: http://www.openssl.org/ Source: http://www.%{name}.org/source/%{name}-%{version}.tar.bz2 @@ -40,6 +40,7 @@ Patch20: openssl-0.9.8a.ca-app-segfault.bug128655.dif Patch21: bswap.diff Patch22: openssl-0.9.8-key_length.patch Patch23: openssl-gcc42.patch +Patch24: openssl-gcc42_b.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libopenssl0_9_8 @@ -200,6 +201,7 @@ Authors: %patch21 %patch22 -p1 %patch23 +%patch24 cp -p %{S:10} . cp -p %{S:20} certs/ cp -p %{S:21} certs/ @@ -415,6 +417,8 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi %{ssletcdir}/certs %changelog +* Wed Sep 05 2007 - mkoenig@suse.de +- fix another gcc 4.2 build problem [#307669] * Fri Aug 03 2007 - coolo@suse.de - provide the version obsoleted (#293401) * Wed Aug 01 2007 - werner@suse.de