[Pkg-openssl-devel] r65 - in openssl/trunk: . debian

[Kurt Roeckx]

Author: kroeckx
Date: 2005-10-16 17:48:45 +0000 (Sun, 16 Oct 2005)
New Revision: 65

Modified:
   openssl/trunk/Configure
   openssl/trunk/debian/changelog
Log:
Also use noexecstack on amd64.  With the assembler fixes for amd64, the
following files now don't say they don't need an executable stack:
crypto/md5/md5-x86_64.s
crypto/rc4/rc4-x86_64.s
crypto/x86_64cpuid.s



Modified: openssl/trunk/Configure
===================================================================
--- openssl/trunk/Configure	2005-10-16 17:44:57 UTC (rev 64)
+++ openssl/trunk/Configure	2005-10-16 17:48:45 UTC (rev 65)
@@ -315,7 +315,7 @@
 "debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 #"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 #"debian-freebsd-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2005-10-16 17:44:57 UTC (rev 64)
+++ openssl/trunk/debian/changelog	2005-10-16 17:48:45 UTC (rev 65)
@@ -6,6 +6,10 @@
   * include symbol versioning in Configure
   * include debian-armeb arch (closes: #333579)
 
+  Kurt Roeckx:
+  * Also add noexecstack option for amd64, since it now has an 
+    executable stack with the assembler fixes for amd64.
+
  -- Christoph Martin <christoph.martin at uni-mainz.de>  Fri, 14 Oct 2005 11:22:11 +0200
 
 openssl (0.9.8-3) unstable; urgency=low