diff --git a/openssl-0.9.7-beta6-ia64.patch b/openssl-0.9.7-beta6-ia64.patch deleted file mode 100644 index 2cfc6c1..0000000 --- a/openssl-0.9.7-beta6-ia64.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- crypto/bn/bn_lcl.h 2012-01-18 02:40:36.000000000 +0100 -+++ crypto/bn/bn_lcl.h.oden 2012-03-14 17:36:07.034007529 +0100 -@@ -293,6 +293,15 @@ extern "C" { - : "=l"(low),"=h"(high) \ - : "r"(a), "r"(b)); - # endif -+# elif defined(__ia64) && defined(SIXTY_FOUR_BIT_LONG) -+# if defined(__GNUC__) -+# define BN_UMULT_HIGH(a,b) ({ \ -+ register BN_ULONG ret; \ -+ asm ("xmpy.hu %0 = %1, %2" \ -+ : "=f"(ret) \ -+ : "f"(a), "f"(b)); \ -+ ret; }) -+# endif /* compiler */ - # endif /* cpu */ - #endif /* OPENSSL_NO_ASM */ - diff --git a/openssl.spec b/openssl.spec index 275ce39..53068bc 100644 --- a/openssl.spec +++ b/openssl.spec @@ -30,7 +30,6 @@ Patch2: openssl-optflags.diff Patch6: openssl-0.9.8-beta6-icpbrasil.diff Patch7: openssl-1.0.0-defaults.patch Patch8: openssl-0.9.8a-link-krb5.patch -Patch10: openssl-0.9.7-beta6-ia64.patch Patch12: openssl-0.9.6-x509.patch Patch13: openssl-0.9.7-beta5-version-add-engines.patch # http://qa.mandriva.com/show_bug.cgi?id=32621 @@ -111,7 +110,6 @@ cryptographic algorithms and protocols, including DES, RC4, RSA and SSL. %patch6 -p0 -b .icpbrasil %patch7 -p1 -b .defaults %{?_with_krb5:%patch8 -p1 -b .krb5} -%patch10 -p0 -b .ia64 %patch12 -p1 -b .x509 %patch13 -p1 -b .version-add-engines %patch15 -p1 -b .crt @@ -122,8 +120,6 @@ cryptographic algorithms and protocols, including DES, RC4, RSA and SSL. %patch303 -p1 -b .no-rpath %patch304 -p0 -b .test-use-localhost -%patch400 -p0 - perl -pi -e "s,^(OPENSSL_LIBNAME=).+$,\1%{_lib}," Makefile.org engines/Makefile # fix perl path