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

[Christoph Martin]

Author: chrism
Date: 2005-10-14 09:08:02 +0000 (Fri, 14 Oct 2005)
New Revision: 57

Modified:
   openssl/trunk/Configure
   openssl/trunk/debian/changelog
Log:
add noexecstack option to i386 subarch
include symbol versioning in Configure



Modified: openssl/trunk/Configure
===================================================================
--- openssl/trunk/Configure	2005-10-13 18:20:09 UTC (rev 56)
+++ openssl/trunk/Configure	2005-10-14 09:08:02 UTC (rev 57)
@@ -321,7 +321,7 @@
 "debian-hurd-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-ia64","gcc:-DTERMIO -O3 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 #"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC",
-"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -mcpu=i486 -Wa,--noexecstack -g -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-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -mcpu=i586 -Wa,--noexecstack -g -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-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -mcpu=i686 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -1280,6 +1280,8 @@
 	$shlib_minor=$2;
 	}
 
+$shared_ldflag .= " -Wl,--version-script=openssl.ld";
+
 open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
 unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
 open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";

Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2005-10-13 18:20:09 UTC (rev 56)
+++ openssl/trunk/debian/changelog	2005-10-14 09:08:02 UTC (rev 57)
@@ -1,9 +1,11 @@
-openssl (0.9.8-4) unstable; urgency=low
+openssl (0.9.8-4) UNRELEASED; urgency=low
 
   Christoph Martin:
   * fix asm entries for some architectures, fixing #332758 properly.
+  * add noexecstack option to i386 subarch
+  * include symbol versioning in Configure
 
- -- Kurt Roeckx <kurt at roeckx.be>  Thu, 13 Oct 2005 20:15:49 +0200
+ -- Christoph Martin <christoph.martin at uni-mainz.de>  Fri, 14 Oct 2005 10:47:02 +0200
 
 openssl (0.9.8-3) unstable; urgency=low