openssl/opensslsol.patch

   1 --- misc/openssl-0.9.8v/Configure       Mon Nov  9 15:14:26 2009
   2 +++ build/openssl-0.9.8v/Configure      Fri Mar 26 16:01:32 2010
   3 @@ -212,8 +212,8 @@
   4  "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
   5
   6  #### Solaris x86 with Sun C setups
   7 -"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
   8 -"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
   9 +"solaris-x86-cc","cc:-O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  10 +"solaris64-x86_64-cc","cc:-xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  11
  12  #### SPARC Solaris with GNU C setups
  13  "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  14 --- misc/openssl-0.9.8v/Makefile.shared Wed Sep 17 17:56:40 2008
  15 +++ build/openssl-0.9.8v/Makefile.shared        Fri Mar 26 16:04:41 2010
  16 @@ -93,7 +93,7 @@
  17      LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
  18      LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
  19      LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
  20 -    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
  21 +    LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \
  22      $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
  23
  24  LINK_SO=       \
  25 @@ -103,7 +103,7 @@
  26      SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
  27      LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
  28      LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
  29 -    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
  30 +    LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \
  31      $${SHAREDCMD} $${SHAREDFLAGS} \
  32         -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
  33         $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
  34 --- misc/openssl-0.9.8v/config  Tue Mar  9 18:08:24 2010
  35 +++ build/openssl-0.9.8v/config Fri Mar 26 16:07:55 2010
  36 @@ -399,28 +399,25 @@
  37  # this is where the translation occurs into SSLeay terms
  38  # ---------------------------------------------------------------------------
  39
  40 -GCCVER=`(gcc -dumpversion) 2>/dev/null`
  41 -if [ "$GCCVER" != "" ]; then
  42 -  # then strip off whatever prefix egcs prepends the number with...
  43 -  # Hopefully, this will work for any future prefixes as well.
  44 -  GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
  45 -  # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
  46 -  # does give us what we want though, so we use that.  We just just the
  47 -  # major and minor version numbers.
  48 -  # peak single digit before and after first dot, e.g. 2.95.1 gives 29
  49 -  GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
  50 +if [ -z "$CC" ];then
  51 +  GCCVER=`(gcc -dumpversion) 2>/dev/null`
  52 + if [ "$GCCVER" != "" ]; then
  53 +   CC=gcc
  54 +    # then strip off whatever prefix egcs prepends the number with...
  55 +    # Hopefully, this will work for any future prefixes as well.
  56 +    GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
  57 +    # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
  58 +    # does give us what we want though, so we use that.  We just just the
  59 +    # major and minor version numbers.
  60 +    # peak single digit before and after first dot, e.g. 2.95.1 gives 29
  61 +    GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
  62 + else
  63 +   CC=cc
  64 + fi
  65 +else
  66 +    CC=`echo $CC | sed 's/^[^ ]*\/\(..\).*/\1/'`
  67  fi
  68
  69 -# Only set CC if not supplied already
  70 -if [ -z "$CC" ]; then
  71 -# figure out if gcc is available and if so we use it otherwise
  72 -# we fallback to whatever cc does on the system
  73 -  if [ "$GCCVER" != "" ]; then
  74 -    CC=gcc
  75 -  else
  76 -    CC=cc
  77 -  fi
  78 -fi
  79  GCCVER=${GCCVER:-0}
  80  if [ "$SYSTEM" = "HP-UX" ];then
  81    # By default gcc is a ILP32 compiler (with long long == 64).