Upgrade to 0.9.4.

1 files changed, 41 insertions, 48 deletions

diff --git a/security/openssl/files/patch-ah b/security/openssl/files/patch-ah
index 09704c48181c..4d54b18d5fc2 100644
--- a/security/openssl/files/patch-ah
+++ b/security/openssl/files/patch-ah
@@ -1,71 +1,64 @@
---- config.orig	Sun May 23 18:04:11 1999
-+++ config	Fri May 28 18:45:26 1999
-@@ -122,23 +122,12 @@
- 	echo "${MACHINE}-whatever-bsdi"; exit 0
- 	;;
- 
--    FreeBSD:3*:*:*)
--	echo "${MACHINE}-whatever-freebsd3"; exit 0
--	;;
--
--    FreeBSD:*:*:*386*)
--        case `sysctl -n hw.model` in
--	    Pentium*)
--                echo "i586-whatever-freebsd"; exit 0
--                ;;
--            *)
--                echo "i386-whatever-freebsd"; exit 0
--                ;;
--            esac;
-+    FreeBSD:[12]*:*:*)
-+	echo "${MACHINE}-whatever-freebsd"; exit 0
- 	;;
- 
-     FreeBSD:*)
--	echo "${MACHINE}-whatever-freebsd"; exit 0
-+	echo "${MACHINE}-whatever-freebsd3"; exit 0
- 	;;
- 
-     NetBSD:*:*:*386*)
-@@ -276,23 +265,6 @@
+--- config.orig	Mon Aug  9 12:16:51 1999
++++ config	Mon Aug  9 20:30:08 1999
+@@ -297,40 +297,6 @@
  esac
  done
  
 -# figure out if gcc is available and if so we use it otherwise
 -# we fallback to whatever cc does on the system
--GCCVER=`(gcc -v) 2>&1`
--if [ $? = "0" ]; then
+-GCCVER=`(gcc --version) 2>/dev/null`
+-if [ "$GCCVER" != "" ]; then
 -  CC=gcc
+-  # then strip off whatever prefix Cygnus prepends the number with...
+-  GCCVER=`echo $GCCVER | sed 's/^[a-z]*\-//'`
+-  # peak single digit before and after first dot, e.g. 2.95.1 gives 29
+-  GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
 -else
 -  CC=cc
--  if [ "$SYSTEM" = "SunOS" ]
--  then
--   case `cc -V 2>&1` in
--    *4*) CC=cc;;
--    *5*) CC=cc;;
--    *) CC=sc3;;
--   esac
+-fi
+-
+-if [ "$SYSTEM" = "SunOS" ]; then
+-  # assume output is "blah-blah C x.x"
+-  CCVER=`(cc -V 2>&1) 2>/dev/null | \
+-  	egrep -e '^cc: .* C [0-9]\.[0-9]' | \
+-	sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
+-  CCVER=${CCVER:-0}
+-  if [ $CCVER -gt 40 ]; then
+-    CC=cc	# overrides gcc!!!
+-    if [ $CCVER -eq 50 ]; then
+-      echo "WARNING! Detected WorkShop C 5.0. Do make sure you have"
+-      echo "         patch #107357-01 or later applied."
+-      sleep 5
+-    fi
+-  elif [ "$CC" = "cc" -a $CCVER -gt 0 ]; then
+-    CC=sc3
 -  fi
 -fi
 -
+-GCCVER=${GCCVER:-0}
+-CCVER=${CCVER:-0}
+-
  # read the output of the embedded GuessOS 
  read GUESSOS
  
-@@ -331,18 +303,6 @@
+@@ -423,21 +389,6 @@
    # *-dgux) OUT="dgux" ;;
    *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
  esac
 -
 -# gcc < 2.8 does not support -mcpu=ultrasparc
--if [ "$OUT" = solaris-usparc-gcc ]
+-if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
+-then
+-  echo "WARNING! Do consider upgrading to gcc-2.8 or later."
+-  sleep 5
+-  OUT=solaris-sparcv9-gcc27
+-fi
+-if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ]
 -then
-- GCCVERMAJOR="`echo $GCCVER | sed 's/.*version \([^.]*\).*/\1/`"
-- GCCVERMINOR="`echo $GCCVER | sed 's/.*version[^.]*\.\([^.]*\).*/\1/`"
-- echo "gcc version $GCCVERMAJOR.$GCCVERMINOR.x"
-- if [ $GCCVERMAJOR$GCCVERMINOR -lt 28 ]
-- then
--  OUT=solaris-usparc-oldgcc
-- fi
+-  echo "WARNING! Falling down to 'linux-sparcv8'."
+-  echo "         Upgrade to gcc-2.8 or later."
+-  sleep 5
+-  OUT=linux-sparcv8
 -fi
  
  case "$GUESSOS" in