[Pkg-openssl-changes] r547 - in openssl/trunk/debian: . patches

[Kurt Roeckx]

Author: kroeckx
Date: 2012-03-17 17:25:37 +0000 (Sat, 17 Mar 2012)
New Revision: 547

Removed:
   openssl/trunk/debian/patches/disable-modexp512-x86_64.patch
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/series
   openssl/trunk/debian/rules
Log:
After cleanup of the pic patch, this actually works.


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2012-03-17 17:08:58 UTC (rev 546)
+++ openssl/trunk/debian/changelog	2012-03-17 17:25:37 UTC (rev 547)
@@ -5,8 +5,6 @@
     - Update pic.patch, openssl-pod-misspell.patch and make-targets.patch
     - Add OPENSSL_1.0.1 to version-script.patch and libssl1.0.0.symbols for
       the new functions.
-  * Disable modexp512-x86_64 and the new RSAX internal engine for now, the
-    perl script to generate modexp512-x86_64 has some problems.
   * pic.patch: upstream made OPENSSL_ia32cap_P and OPENSSL_cpuid_setup
     hidden on amd64, no need to access it PIC anymore.
   * pic.patch: Make OPENSSL_ia32cap_P hidden on i386 too (Closes: #663977)

Deleted: openssl/trunk/debian/patches/disable-modexp512-x86_64.patch
===================================================================
--- openssl/trunk/debian/patches/disable-modexp512-x86_64.patch	2012-03-17 17:08:58 UTC (rev 546)
+++ openssl/trunk/debian/patches/disable-modexp512-x86_64.patch	2012-03-17 17:25:37 UTC (rev 547)
@@ -1,27 +0,0 @@
-Index: openssl-1.0.1/Configure
-===================================================================
---- openssl-1.0.1.orig/Configure	2012-03-17 11:48:15.000000000 +0000
-+++ openssl-1.0.1/Configure	2012-03-17 11:48:38.000000000 +0000
-@@ -128,7 +128,7 @@
- 
- my $x86_elf_asm="$x86_asm:elf";
- 
--my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o:";
-+my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o:";
- my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::ghash-ia64.o::void";
- my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::ghash-sparcv9.o::void";
- my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void";
-Index: openssl-1.0.1/crypto/engine/eng_rsax.c
-===================================================================
---- openssl-1.0.1.orig/crypto/engine/eng_rsax.c	2011-10-10 20:34:17.000000000 +0000
-+++ openssl-1.0.1/crypto/engine/eng_rsax.c	2012-03-17 12:06:04.000000000 +0000
-@@ -79,7 +79,8 @@
- #undef COMPILE_RSAX
- 
- #if (defined(__x86_64) || defined(__x86_64__) || \
--     defined(_M_AMD64) || defined (_M_X64)) && !defined(OPENSSL_NO_ASM)
-+     defined(_M_AMD64) || defined (_M_X64)) && \
-+     !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_RSAX)
- #define COMPILE_RSAX
- static ENGINE *ENGINE_rsax (void);
- #endif

Modified: openssl/trunk/debian/patches/series
===================================================================
--- openssl/trunk/debian/patches/series	2012-03-17 17:08:58 UTC (rev 546)
+++ openssl/trunk/debian/patches/series	2012-03-17 17:25:37 UTC (rev 547)
@@ -29,4 +29,3 @@
 block_diginotar.patch
 block_digicert_malaysia.patch
 c_rehash-multi.patch
-disable-modexp512-x86_64.patch

Modified: openssl/trunk/debian/rules
===================================================================
--- openssl/trunk/debian/rules	2012-03-17 17:08:58 UTC (rev 546)
+++ openssl/trunk/debian/rules	2012-03-17 17:25:37 UTC (rev 547)
@@ -19,7 +19,7 @@
 DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-CONFARGS  = --prefix=/usr --openssldir=/usr/lib/ssl --libdir=lib/$(DEB_HOST_MULTIARCH) no-idea no-mdc2 no-rc5 zlib  enable-tlsext no-ssl2 no-rsax
+CONFARGS  = --prefix=/usr --openssldir=/usr/lib/ssl --libdir=lib/$(DEB_HOST_MULTIARCH) no-idea no-mdc2 no-rc5 zlib  enable-tlsext no-ssl2
 OPT_alpha = ev4 ev5
 OPT_i386  = i586 i686/cmov
 ARCHOPTS  = OPT_$(DEB_HOST_ARCH)