usr/src/lib/openssl/Patches/18-compiler_opts.patch
author Cyril Plisko <cyril.plisko@grigale.com>
Thu, 18 Mar 2010 16:36:00 +0200
changeset 10 612517e396e0
parent 0 b34509ac961f
child 11 87960ed158f9
permissions -rw-r--r--
Import sfw build 136 Bugs Fixed ---------- 6514945 webmin still refers to xmemfs usr/sfw/lib/webmin/mount/solaris-lib.pl 6633684 [nvb78] Webmin is not integrated with apache2.2 6641988 [nvb79] Webmin interface for mysql badly configured 6780832 Add SASL support to mutt 6796795 copy text from mutt in gnome-terminal to other application is adding spaces 6799158 Update SER to link the MySQL 5.1 instead of the MySQL 4.0 6804425 Mutt doesn't have header cache support 6809910 Webmin 1.170 (Solaris 10): newaliases is not called when clicking Delete on sendmail/edit_alias.cgi 6828622 libnet Makefile invokes gcc directly, it should use $(CC) instead. 6903750 mutt fails to read MH-style mail dirs 6909860 /usr/man/man4/ipmiconsole.conf.4 refer to nonexistent man/man5 man pages in osol_129 and osol_132 6914573 webmin bundled with Solaris vulnerable to three separate XSS vulnerab ilities 6920693 trousers should use newer software 6922082 CVE-2010-0393 - CUPS lppasswd utility vulnerability 6924985 CVE-2010-0302: incomplete fix for CUPS CR#6900557(CVE-2009-3553) 6927042 memleaks in libtspi 6930830 upgrade OpenSSL to 0.9.8m (and fix CVE-2009-3555) 6932600 completion failure with zfs destroy, some problems with _dladm 6933290 After pkg image-update and reboot, tomcat service falls into maintenance 6933533 PSARC/2009/232 implementation breaks nmap 6933649 webmin contains Sun's branding, which should be removed 6934512 Envelope is not redrawn in compose mode after return from the message edit

diff -ruN openssl-0.9.8k/Configure openssl-0.9.8k/Configure
--- openssl-0.9.8k/Configure	2009-02-16 09:44:22.000000000 +0100
+++ openssl-0.9.8k/Configure	2009-06-25 16:19:22.897811727 +0200
@@ -130,6 +130,11 @@
 my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o::";
 my $ia64_asm=":bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o:::sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o::";
 
+# ASM without "rx86-elf.o rc4_skey.o". The current RC4 asm assumes RC4_INT. Solaris/OpenSolaris uses RC4_CHAR.
+# Changing to RC4_INT would break ABI compatibility.
+my $x86_elf_asm_sunw="x86cpuid-elf.o:bn86-elf.o co86-elf.o MAYBE-MO86-elf.o:dx86-elf.o yx86-elf.o:ax86-elf.o:bx86-elf.o:mx86-elf.o:sx86-elf.o s512sse2-elf.o:cx86-elf.o::rm86-elf.o:r586-elf.o";
+my $x86_64_asm_sunw="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::::";
+
 my $no_asm="::::::::::";
 
 # As for $BSDthreads. Idea is to maintain "collective" set of flags,
@@ -235,6 +240,12 @@
 #"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:${no_asm}::",
 "sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::",
 
+#### Solaris configs, used for OpenSSL as delivered by OpenSolaris
+"solaris-x86-cc-sunw","cc:-m32 -xO3 -xspace -g -Xa -DHAVE_FORK::-D_REENTRANT::-lsocket -lnsl -lc:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${x86_elf_asm_sunw}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign -M/usr/lib/ld/map.noexdata:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris64-x86_64-cc-sunw","cc:-xO3 -m64 -g -xstrconst -Xa -DL_ENDIAN -DHAVE_FORK::-D_REENTRANT::-lsocket -lnsl -lc:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR DES_PTR DES_INT DES_UNROLL:${x86_64_asm_sunw}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign -M/usr/lib/ld/map.noexdata:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv8-cc-sunw","cc:-m32 -xregs=no%appl -xO5 -g -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W -DHAVE_FORK::-D_REENTRANT::-lsocket -lnsl -lc:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o::::::::::dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris64-sparcv9-cc-sunw","cc:-m64 -xregs=no%appl -xO5 -g -xstrconst -xdepend -xspace -Xa -DB_ENDIAN -DHAVE_FORK::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::::dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs",
+
 #### IRIX 5.x configs
 # -mips2 flag is added by ./config when appropriate.
 "irix-gcc","gcc:-O3 -DTERMIOS -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${no_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",