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

[Kurt Roeckx]

Author: kroeckx
Date: 2013-05-20 14:59:55 +0000 (Mon, 20 May 2013)
New Revision: 603

Added:
   openssl/trunk/debian/patches/openssl_fix_for_x32.patch
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/debian-targets.patch
   openssl/trunk/debian/patches/series
Log:
Add x32 support


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2013-05-20 14:41:57 UTC (rev 602)
+++ openssl/trunk/debian/changelog	2013-05-20 14:59:55 UTC (rev 603)
@@ -7,8 +7,9 @@
   * Add Turkish translation (Closes: #660971)
   * Enable assembler for the arm targets, and remove armeb.
     Patch by Riku Voipio <riku.voipio at iki.fi> (Closes: #676533)
+  * Add support for x32 (Closes: #698406)
 
- -- Kurt Roeckx <kurt at roeckx.be>  Mon, 20 May 2013 16:41:01 +0200
+ -- Kurt Roeckx <kurt at roeckx.be>  Mon, 20 May 2013 16:56:06 +0200
 
 openssl (1.0.1e-2) unstable; urgency=high
 

Modified: openssl/trunk/debian/patches/debian-targets.patch
===================================================================
--- openssl/trunk/debian/patches/debian-targets.patch	2013-05-20 14:41:57 UTC (rev 602)
+++ openssl/trunk/debian/patches/debian-targets.patch	2013-05-20 14:59:55 UTC (rev 603)
@@ -1,7 +1,7 @@
-Index: openssl-1.0.1/Configure
+Index: openssl-1.0.1e/Configure
 ===================================================================
---- openssl-1.0.1.orig/Configure	2012-03-17 15:37:54.000000000 +0000
-+++ openssl-1.0.1/Configure	2012-03-17 16:13:49.000000000 +0000
+--- openssl-1.0.1e.orig/Configure	2013-05-20 16:54:11.000000000 +0200
++++ openssl-1.0.1e/Configure	2013-05-20 16:54:11.000000000 +0200
 @@ -105,6 +105,10 @@
  
  my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED";
@@ -13,7 +13,7 @@
  my $strict_warnings = 0;
  
  my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
-@@ -338,6 +342,48 @@
+@@ -340,6 +344,48 @@
  "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
  "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
  
@@ -57,6 +57,7 @@
 +"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -mcpu=v8 -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -mcpu=v9 -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-sparc64","gcc:-m64 -DB_ENDIAN -DTERMIO ${debian_cflags} -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-x32","gcc:-mx32 -DL_ENDIAN -DTERMIO ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32",
 +
  ####
  #### Variety of LINUX:-)

Added: openssl/trunk/debian/patches/openssl_fix_for_x32.patch
===================================================================
--- openssl/trunk/debian/patches/openssl_fix_for_x32.patch	                        (rev 0)
+++ openssl/trunk/debian/patches/openssl_fix_for_x32.patch	2013-05-20 14:59:55 UTC (rev 603)
@@ -0,0 +1,39 @@
+Index: openssl-1.0.1c/crypto/bn/asm/x86_64-gcc.c
+===================================================================
+--- openssl-1.0.1c.orig/crypto/bn/asm/x86_64-gcc.c	2010-02-28 05:38:16.000000000 -0800
++++ openssl-1.0.1c/crypto/bn/asm/x86_64-gcc.c	2013-01-17 20:16:12.000000000 -0800
+@@ -55,7 +55,7 @@
+  *    machine.
+  */
+ 
+-#ifdef _WIN64
++#if defined _WIN64 || !defined __LP64__
+ #define BN_ULONG unsigned long long
+ #else
+ #define BN_ULONG unsigned long
+@@ -192,9 +192,9 @@
+ 	asm (
+ 	"	subq	%2,%2		\n"
+ 	".p2align 4			\n"
+-	"1:	movq	(%4,%2,8),%0	\n"
+-	"	adcq	(%5,%2,8),%0	\n"
+-	"	movq	%0,(%3,%2,8)	\n"
++	"1:	movq	(%q4,%2,8),%0	\n"
++	"	adcq	(%q5,%2,8),%0	\n"
++	"	movq	%0,(%q3,%2,8)	\n"
+ 	"	leaq	1(%2),%2	\n"
+ 	"	loop	1b		\n"
+ 	"	sbbq	%0,%0		\n"
+@@ -215,9 +215,9 @@
+ 	asm (
+ 	"	subq	%2,%2		\n"
+ 	".p2align 4			\n"
+-	"1:	movq	(%4,%2,8),%0	\n"
+-	"	sbbq	(%5,%2,8),%0	\n"
+-	"	movq	%0,(%3,%2,8)	\n"
++	"1:	movq	(%q4,%2,8),%0	\n"
++	"	sbbq	(%q5,%2,8),%0	\n"
++	"	movq	%0,(%q3,%2,8)	\n"
+ 	"	leaq	1(%2),%2	\n"
+ 	"	loop	1b		\n"
+ 	"	sbbq	%0,%0		\n"

Modified: openssl/trunk/debian/patches/series
===================================================================
--- openssl/trunk/debian/patches/series	2013-05-20 14:41:57 UTC (rev 602)
+++ openssl/trunk/debian/patches/series	2013-05-20 14:59:55 UTC (rev 603)
@@ -36,3 +36,4 @@
 aesni-mac.patch
 dtls_version.patch
 get_certificate.patch
+openssl_fix_for_x32.patch