NOTE: This a concatenation of the patches supplied, not a true
diff file.  You'll need to extract them yourself.

--------------------------

*** stunnel-3.19.orig/common.h	Fri Aug 10 06:31:47 2001
--- stunnel-3.19.dev/common.h	Sun Aug 12 20:21:37 2001
***************
*** 147,152 ****
--- 147,157 ----
  #define USE_FORK
  #endif
  
+ /* Mac OS X's pthread implamentation is broken. Hack to fix it. */
+ #ifdef __APPLE__ 
+ #define pthread_sigmask(A, B, C) sigprocmask((A), (B), (C))
+ #endif
+ 
  /* TCP wrapper */
  #if HAVE_TCPD_H && HAVE_LIBWRAP
  #define USE_LIBWRAP


--------------------------

*** stunnel-3.19.orig/config.guess	Sat Oct 21 10:02:03 2000
--- stunnel-3.19.dev/config.guess	Sun Aug 12 16:59:36 2001
***************
*** 1,6 ****
  #! /bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
--- 1,6 ----
  #! /bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
***************
*** 52,62 ****
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      alpha:OSF1:*:*)
  	# A Vn.n version is a released version.
  	# A Tn.n version is a released field test version.
  	# A Xn.n version is an unreleased experimental baselevel.
  	# 1.2 uses "1.2" for uname -r.
! 	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
  	exit 0 ;;
      21064:Windows_NT:50:3)
  	echo alpha-dec-winnt3.5
--- 52,104 ----
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      alpha:OSF1:*:*)
+ 	if test $UNAME_RELEASE = "V4.0"; then
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ 	fi
  	# A Vn.n version is a released version.
  	# A Tn.n version is a released field test version.
  	# A Xn.n version is an unreleased experimental baselevel.
  	# 1.2 uses "1.2" for uname -r.
! 	cat <<EOF >dummy.s
! 	.globl main
! 	.ent main
! main:
! 	.frame \$30,0,\$26,0
! 	.prologue 0
! 	.long 0x47e03d80 # implver $0
! 	lda \$2,259
! 	.long 0x47e20c21 # amask $2,$1
! 	srl \$1,8,\$2
! 	sll \$2,2,\$2
! 	sll \$0,3,\$0
! 	addl \$1,\$0,\$0
! 	addl \$2,\$0,\$0
! 	ret \$31,(\$26),1
! 	.end main
! EOF
! 	${CC-cc} dummy.s -o dummy 2>/dev/null
! 	if test "$?" = 0 ; then
! 		./dummy
! 		case "$?" in
! 			7)
! 				UNAME_MACHINE="alpha"
! 				;;
! 			15)
! 				UNAME_MACHINE="alphaev5"
! 				;;
! 			14)
! 				UNAME_MACHINE="alphaev56"
! 				;;
! 			10)
! 				UNAME_MACHINE="alphapca56"
! 				;;
! 			16)
! 				UNAME_MACHINE="alphaev6"
! 				;;
! 		esac
! 	fi
! 	rm -f dummy.s dummy
! 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
  	exit 0 ;;
      21064:Windows_NT:50:3)
  	echo alpha-dec-winnt3.5
***************
*** 68,79 ****
        echo m68k-cbm-netbsd${UNAME_RELEASE}
        exit 0 ;;
      amiga:OpenBSD:*:*)
!       echo m68k-cbm-openbsd${UNAME_RELEASE}
!       exit 0 ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
  	echo arm-acorn-riscix${UNAME_RELEASE}
  	exit 0;;
!     Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
  	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
  		echo pyramid-pyramid-sysv3
--- 110,148 ----
        echo m68k-cbm-netbsd${UNAME_RELEASE}
        exit 0 ;;
      amiga:OpenBSD:*:*)
! 	echo m68k-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     *:[Aa]miga[Oo][Ss]:*:*)
! 	echo ${UNAME_MACHINE}-unknown-amigaos
! 	exit 0 ;;
!     arc64:OpenBSD:*:*)
! 	echo mips64el-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     arc:OpenBSD:*:*)
! 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     hkmips:OpenBSD:*:*)
! 	echo mips-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     pmax:OpenBSD:*:*)
! 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     sgi:OpenBSD:*:*)
! 	echo mips-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     wgrisc:OpenBSD:*:*)
! 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
  	echo arm-acorn-riscix${UNAME_RELEASE}
  	exit 0;;
!     arm32:NetBSD:*:*)
! 	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
! 	exit 0 ;;
!     SR2?01:HI-UX/MPP:*:*)
! 	echo hppa1.1-hitachi-hiuxmpp
! 	exit 0;;
!     Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
  	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
  		echo pyramid-pyramid-sysv3
***************
*** 84,89 ****
--- 153,161 ----
      NILE:*:*:dcosx)
  	echo pyramid-pyramid-svr4
  	exit 0 ;;
+     sun4H:SunOS:5.*:*)
+ 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit 0 ;;
***************
*** 108,113 ****
--- 180,197 ----
      sun3*:SunOS:*:*)
  	echo m68k-sun-sunos${UNAME_RELEASE}
  	exit 0 ;;
+     sun*:*:4.2BSD:*)
+ 	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ 	case "`/bin/arch`" in
+ 	    sun3)
+ 		echo m68k-sun-sunos${UNAME_RELEASE}
+ 		;;
+ 	    sun4)
+ 		echo sparc-sun-sunos${UNAME_RELEASE}
+ 		;;
+ 	esac
+ 	exit 0 ;;
      aushp:SunOS:*:*)
  	echo sparc-auspex-sunos${UNAME_RELEASE}
  	exit 0 ;;
***************
*** 115,137 ****
  	echo m68k-atari-netbsd${UNAME_RELEASE}
  	exit 0 ;;
      atari*:OpenBSD:*:*)
! 	echo m68k-atari-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      sun3*:NetBSD:*:*)
  	echo m68k-sun-netbsd${UNAME_RELEASE}
  	exit 0 ;;
      sun3*:OpenBSD:*:*)
! 	echo m68k-sun-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      mac68k:NetBSD:*:*)
  	echo m68k-apple-netbsd${UNAME_RELEASE}
  	exit 0 ;;
      mac68k:OpenBSD:*:*)
! 	echo m68k-apple-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      powerpc:machten:*:*)
  	echo powerpc-apple-machten${UNAME_RELEASE}
  	exit 0 ;;
      RISC*:Mach:*:*)
  	echo mips-dec-mach_bsd4.3
  	exit 0 ;;
--- 199,230 ----
  	echo m68k-atari-netbsd${UNAME_RELEASE}
  	exit 0 ;;
      atari*:OpenBSD:*:*)
! 	echo m68k-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      sun3*:NetBSD:*:*)
  	echo m68k-sun-netbsd${UNAME_RELEASE}
  	exit 0 ;;
      sun3*:OpenBSD:*:*)
! 	echo m68k-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      mac68k:NetBSD:*:*)
  	echo m68k-apple-netbsd${UNAME_RELEASE}
  	exit 0 ;;
      mac68k:OpenBSD:*:*)
! 	echo m68k-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     mvme68k:OpenBSD:*:*)
! 	echo m68k-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     mvme88k:OpenBSD:*:*)
! 	echo m88k-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      powerpc:machten:*:*)
  	echo powerpc-apple-machten${UNAME_RELEASE}
  	exit 0 ;;
+     macppc:NetBSD:*:*)
+         echo powerpc-apple-netbsd${UNAME_RELEASE}
+         exit 0 ;;
      RISC*:Mach:*:*)
  	echo mips-dec-mach_bsd4.3
  	exit 0 ;;
***************
*** 141,146 ****
--- 234,242 ----
      VAX*:ULTRIX*:*:*)
  	echo vax-dec-ultrix${UNAME_RELEASE}
  	exit 0 ;;
+     2020:CLIX:*:*)
+ 	echo clipper-intergraph-clix${UNAME_RELEASE}
+ 	exit 0 ;;
      mips:*:*:UMIPS | mips:*:*:RISCos)
  	sed 's/^	//' << EOF >dummy.c
  	int main (argc, argv) int argc; char **argv; {
***************
*** 234,240 ****
  	fi
  	exit 0 ;;
      *:AIX:*:4)
! 	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
  	else
  		IBM_ARCH=powerpc
--- 330,337 ----
  	fi
  	exit 0 ;;
      *:AIX:*:4)
! 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
! 	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
  	else
  		IBM_ARCH=powerpc
***************
*** 267,278 ****
      hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
  	echo m68k-hp-bsd4.4
  	exit 0 ;;
!     9000/[3478]??:HP-UX:*:*)
  	case "${UNAME_MACHINE}" in
  	    9000/31? )            HP_ARCH=m68000 ;;
  	    9000/[34]?? )         HP_ARCH=m68k ;;
! 	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
! 	    9000/8?? )            HP_ARCH=hppa1.0 ;;
  	esac
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
--- 364,407 ----
      hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
  	echo m68k-hp-bsd4.4
  	exit 0 ;;
!     9000/[34678]??:HP-UX:*:*)
  	case "${UNAME_MACHINE}" in
  	    9000/31? )            HP_ARCH=m68000 ;;
  	    9000/[34]?? )         HP_ARCH=m68k ;;
! 	    9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 )
!               sed 's/^              //' << EOF >dummy.c
!               #include <stdlib.h>
!               #include <unistd.h>
!               
!               int main ()
!               {
!               #if defined(_SC_KERNEL_BITS)
!                   long bits = sysconf(_SC_KERNEL_BITS);
!               #endif 
!                   long cpu  = sysconf (_SC_CPU_VERSION);
!               
!                   switch (cpu) 
!               	{
!               	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
!               	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
!               	case CPU_PA_RISC2_0: 
!               #if defined(_SC_KERNEL_BITS)
!               	    switch (bits) 
!               		{
!               		case 64: puts ("hppa2.0w"); break;
!               		case 32: puts ("hppa2.0n"); break;
!               		default: puts ("hppa2.0"); break;
!               		} break;
!               #else  /* !defined(_SC_KERNEL_BITS) */
!               	    puts ("hppa2.0"); break;
!               #endif 
!               	default: puts ("hppa1.0"); break;
!               	}
!                   exit (0);
!               }
! EOF
! 	(${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
! 	rm -f dummy.c dummy
  	esac
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
***************
*** 375,382 ****
      hp3[0-9][05]:NetBSD:*:*)
  	echo m68k-hp-netbsd${UNAME_RELEASE}
  	exit 0 ;;
!     hp3[0-9][05]:OpenBSD:*:*)
! 	echo m68k-hp-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      i?86:BSD/386:*:* | *:BSD/OS:*:*)
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
--- 504,514 ----
      hp3[0-9][05]:NetBSD:*:*)
  	echo m68k-hp-netbsd${UNAME_RELEASE}
  	exit 0 ;;
!     hp300:OpenBSD:*:*)
! 	echo m68k-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     sparc*:BSD/OS:*:*)
! 	echo sparc-unknown-bsdi${UNAME_RELEASE}
  	exit 0 ;;
      i?86:BSD/386:*:* | *:BSD/OS:*:*)
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
***************
*** 391,442 ****
  	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
  	exit 0 ;;
      i*:CYGWIN*:*)
! 	echo i386-pc-cygwin32
  	exit 0 ;;
      p*:CYGWIN*:*)
! 	echo powerpcle-unknown-cygwin32
  	exit 0 ;;
      prep*:SunOS:5.*:*)
  	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit 0 ;;
      *:GNU:*:*)
! 	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
  	exit 0 ;;
      *:Linux:*:*)
  	# The BFD linker knows what the default object file format is, so
  	# first see if it will tell us.
  	ld_help_string=`ld --help 2>&1`
! 	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then
! 	  echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0
! 	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then
! 	  echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0
! 	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then
! 	  echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0
! 	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
! 	  echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0
! 	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
! 	  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0
! 	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then
! 	  echo "powerpc-unknown-linux-gnu" ; exit 0
! 	elif test "${UNAME_MACHINE}" = "alpha" ; then
! 	  echo alpha-unknown-linux-gnu ; exit 0
! 	elif test "${UNAME_MACHINE}" = "sparc" ; then
! 	  echo sparc-unknown-linux-gnu ; exit 0
! 	else
! 	  # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us
! 	  # useful --help.  Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout.
! 	  test ! -d /usr/lib/ldscripts/. \
! 	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
  	  # Determine whether the default compiler is a.out or elf
  	  cat >dummy.c <<EOF
  main(argc, argv)
! int argc;
! char *argv[];
  {
  #ifdef __ELF__
!   printf ("%s-pc-linux-gnu\n", argv[1]);
  #else
!   printf ("%s-pc-linux-gnuaout\n", argv[1]);
  #endif
    return 0;
  }
--- 523,668 ----
  	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
  	exit 0 ;;
      i*:CYGWIN*:*)
! 	echo ${UNAME_MACHINE}-pc-cygwin
! 	exit 0 ;;
!     i*:MINGW*:*)
! 	echo ${UNAME_MACHINE}-pc-mingw32
  	exit 0 ;;
      p*:CYGWIN*:*)
! 	echo powerpcle-unknown-cygwin
  	exit 0 ;;
      prep*:SunOS:5.*:*)
  	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit 0 ;;
      *:GNU:*:*)
! 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
  	exit 0 ;;
      *:Linux:*:*)
+ 	# uname on the ARM produces all sorts of strangeness, and we need to
+ 	# filter it out.
+ 	case "$UNAME_MACHINE" in
+ 	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
+ 	esac
+ 
  	# The BFD linker knows what the default object file format is, so
  	# first see if it will tell us.
  	ld_help_string=`ld --help 2>&1`
! 	ld_supported_emulations=`echo $ld_help_string \
! 			 | sed -ne '/supported emulations:/!d
! 				    s/[ 	][ 	]*/ /g
! 				    s/.*supported emulations: *//
! 				    s/ .*//
! 				    p'`
!         case "$ld_supported_emulations" in
! 	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
! 	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
! 	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
! 	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
! 	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
! 	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
! 	esac
! 
! 	if test "${UNAME_MACHINE}" = "alpha" ; then
! 		sed 's/^	//'  <<EOF >dummy.s
! 		.globl main
! 		.ent main
! 	main:
! 		.frame \$30,0,\$26,0
! 		.prologue 0
! 		.long 0x47e03d80 # implver $0
! 		lda \$2,259
! 		.long 0x47e20c21 # amask $2,$1
! 		srl \$1,8,\$2
! 		sll \$2,2,\$2
! 		sll \$0,3,\$0
! 		addl \$1,\$0,\$0
! 		addl \$2,\$0,\$0
! 		ret \$31,(\$26),1
! 		.end main
! EOF
! 		LIBC=""
! 		${CC-cc} dummy.s -o dummy 2>/dev/null
! 		if test "$?" = 0 ; then
! 			./dummy
! 			case "$?" in
! 			7)
! 				UNAME_MACHINE="alpha"
! 				;;
! 			15)
! 				UNAME_MACHINE="alphaev5"
! 				;;
! 			14)
! 				UNAME_MACHINE="alphaev56"
! 				;;
! 			10)
! 				UNAME_MACHINE="alphapca56"
! 				;;
! 			16)
! 				UNAME_MACHINE="alphaev6"
! 				;;
! 			esac	
! 
! 			objdump --private-headers dummy | \
! 			  grep ld.so.1 > /dev/null
! 			if test "$?" = 0 ; then
! 				LIBC="libc1"
! 			fi
! 		fi	
! 		rm -f dummy.s dummy
! 		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
! 	elif test "${UNAME_MACHINE}" = "mips" ; then
! 	  cat >dummy.c <<EOF
! main(argc, argv)
!      int argc;
!      char *argv[];
! {
! #ifdef __MIPSEB__
!   printf ("%s-unknown-linux-gnu\n", argv[1]);
! #endif
! #ifdef __MIPSEL__
!   printf ("%sel-unknown-linux-gnu\n", argv[1]);
! #endif
!   return 0;
! }
! EOF
! 	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
! 	  rm -f dummy.c dummy
! 	else
! 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
! 	  # or one that does not give us useful --help.
! 	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
! 	  # If ld does not provide *any* "supported emulations:"
! 	  # that means it is gnuoldld.
! 	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
! 	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
! 
! 	  case "${UNAME_MACHINE}" in
! 	  i?86)
! 	    VENDOR=pc;
! 	    ;;
! 	  *)
! 	    VENDOR=unknown;
! 	    ;;
! 	  esac
  	  # Determine whether the default compiler is a.out or elf
  	  cat >dummy.c <<EOF
+ #include <features.h>
  main(argc, argv)
!      int argc;
!      char *argv[];
  {
  #ifdef __ELF__
! # ifdef __GLIBC__
! #  if __GLIBC__ >= 2
!     printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
! #  else
!     printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
! #  endif
! # else
!    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
! # endif
  #else
!   printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
  #endif
    return 0;
  }
***************
*** 449,454 ****
--- 675,688 ----
      i?86:DYNIX/ptx:4*:*)
  	echo i386-sequent-sysv4
  	exit 0 ;;
+     i?86:UNIX_SV:4.2MP:2.*)
+         # Unixware is an offshoot of SVR4, but it has its own version
+         # number series starting with 2...
+         # I am not positive that other SVR4 systems won't match this,
+ 	# I just have to hope.  -- rms.
+         # Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit 0 ;;
      i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
  		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
***************
*** 470,475 ****
--- 704,721 ----
  		echo ${UNAME_MACHINE}-pc-sysv32
  	fi
  	exit 0 ;;
+     i?86:UnixWare:*:*)
+ 	if /bin/uname -X 2>/dev/null >/dev/null ; then
+ 	  (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ 	    && UNAME_MACHINE=i586
+ 	fi
+ 	echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
+ 	exit 0 ;;
+     pc:*:*:*)
+         # uname -m prints for DJGPP always 'pc', but it prints nothing about
+         # the processor, so we play safe by assuming i386.
+ 	echo i386-pc-msdosdjgpp
+         exit 0 ;;
      Intel:Mach:3*:*)
  	echo i386-pc-mach3
  	exit 0 ;;
***************
*** 529,534 ****
--- 775,784 ----
  		echo ns32k-sni-sysv
  	fi
  	exit 0 ;;
+     PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                            # says <Richard.M.Bartel@ccMail.Census.GOV>
+         echo i586-unisys-sysv4
+         exit 0 ;;
      *:UNIX_System_V:4*:FTX*)
  	# From Gerald Hewes <hewes@openmarket.com>.
  	# How about differentiating between stratus architectures? -djm
***************
*** 541,557 ****
      mc68*:A/UX:*:*)
  	echo m68k-apple-aux${UNAME_RELEASE}
  	exit 0 ;;
!     R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
  	if [ -d /usr/nec ]; then
  	        echo mips-nec-sysv${UNAME_RELEASE}
  	else
  	        echo mips-unknown-sysv${UNAME_RELEASE}
  	fi
          exit 0 ;;
!     PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
!                            # says <Richard.M.Bartel@ccMail.Census.GOV>
!         echo i586-unisys-sysv4
!         exit 0 ;;
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
--- 791,824 ----
      mc68*:A/UX:*:*)
  	echo m68k-apple-aux${UNAME_RELEASE}
  	exit 0 ;;
!     news*:NEWS-OS:*:6*)
! 	echo mips-sony-newsos6
! 	exit 0 ;;
!     R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
  	if [ -d /usr/nec ]; then
  	        echo mips-nec-sysv${UNAME_RELEASE}
  	else
  	        echo mips-unknown-sysv${UNAME_RELEASE}
  	fi
          exit 0 ;;
!     Power*:Rhapsody:*:*)
!         echo powerpc-apple-rhapsody${UNAME_RELEASE}
! 	exit 0 ;;
!     *:Rhapsody:*:*)
! 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
! 	exit 0 ;;
!     *:Darwin:*:* | *:"Mac OS":*:*)
! 	echo `uname -p`-apple-darwin${UNAME_RELEASE}
! 	exit 0 ;;
!     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
! 	echo powerpc-be-beos
! 	exit 0 ;;
!     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
! 	echo powerpc-apple-beos
! 	exit 0 ;;
!     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
! 	echo i586-pc-beos
! 	exit 0 ;;
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
***************
*** 595,601 ****
  #endif
    int version;
    version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
!   printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
    exit (0);
  #endif
  
--- 862,871 ----
  #endif
    int version;
    version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
!   if (version < 4)
!     printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
!   else
!     printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
    exit (0);
  #endif
  

--------------------------

*** stunnel-3.19.orig/config.sub	Sat Oct 21 10:02:03 2000
--- stunnel-3.19.dev/config.sub	Sun Aug 12 16:59:36 2001
***************
*** 1,6 ****
  #! /bin/sh
  # Configuration validation subroutine script, version 1.1.
! #   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
  # can handle that machine.  It does not imply ALL GNU software can.
--- 1,6 ----
  #! /bin/sh
  # Configuration validation subroutine script, version 1.1.
! #   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
  # can handle that machine.  It does not imply ALL GNU software can.
***************
*** 149,167 ****
  case $basic_machine in
  	# Recognize the basic CPU types without company name.
  	# Some are omitted here because they have special meanings below.
! 	tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \
! 		| arme[lb] | pyramid \
! 		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
! 		| alpha | we32k | ns16k | clipper | i370 | sh \
! 		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
! 		| pdp11 | mips64el | mips64orion | mips64orionel \
! 		| sparc | sparclet | sparclite | sparc64)
  		basic_machine=$basic_machine-unknown
  		;;
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
  	# (2) the word "unknown" tends to confuse beginning users.
! 	i[3456]86)
  	  basic_machine=$basic_machine-pc
  	  ;;
  	# Object if more than one company name word.
--- 149,168 ----
  case $basic_machine in
  	# Recognize the basic CPU types without company name.
  	# Some are omitted here because they have special meanings below.
! 	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
! 		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
! 		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
! 		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
! 		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
! 		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
! 		| mipstx39 | mipstx39el \
! 		| sparc | sparclet | sparclite | sparc64 | v850)
  		basic_machine=$basic_machine-unknown
  		;;
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
  	# (2) the word "unknown" tends to confuse beginning users.
! 	i[34567]86)
  	  basic_machine=$basic_machine-pc
  	  ;;
  	# Object if more than one company name word.
***************
*** 170,183 ****
  		exit 1
  		;;
  	# Recognize the basic CPU types with company name.
! 	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
! 	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
! 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
! 	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
! 	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
! 	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
! 	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
! 	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
--- 171,188 ----
  		exit 1
  		;;
  	# Recognize the basic CPU types with company name.
! 	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
! 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
! 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
! 	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
! 	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
! 	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
! 	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
! 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
! 	      | sparc64-* | mips64-* | mipsel-* \
! 	      | mips64el-* | mips64orion-* | mips64orionel-*  \
! 	      | mipstx39-* | mipstx39el-* \
! 	      | f301-*)
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
***************
*** 204,212 ****
  	amiga | amiga-*)
  		basic_machine=m68k-cbm
  		;;
! 	amigados)
  		basic_machine=m68k-cbm
! 		os=-amigados
  		;;
  	amigaunix | amix)
  		basic_machine=m68k-cbm
--- 209,217 ----
  	amiga | amiga-*)
  		basic_machine=m68k-cbm
  		;;
! 	amigaos | amigados)
  		basic_machine=m68k-cbm
! 		os=-amigaos
  		;;
  	amigaunix | amix)
  		basic_machine=m68k-cbm
***************
*** 345,363 ****
  		os=-mvs
  		;;
  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
! 	i[3456]86v32)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
  		;;
! 	i[3456]86v4*)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv4
  		;;
! 	i[3456]86v)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv
  		;;
! 	i[3456]86sol2)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-solaris2
  		;;
--- 350,368 ----
  		os=-mvs
  		;;
  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
! 	i[34567]86v32)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
  		;;
! 	i[34567]86v4*)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv4
  		;;
! 	i[34567]86v)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv
  		;;
! 	i[34567]86sol2)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-solaris2
  		;;
***************
*** 389,394 ****
--- 394,407 ----
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
+ 	mipsel*-linux*)
+ 		basic_machine=mipsel-unknown
+ 		os=-linux-gnu
+ 		;;
+ 	mips*-linux*)
+ 		basic_machine=mips-unknown
+ 		os=-linux-gnu
+ 		;;
  	mips3*-*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
  		;;
***************
*** 456,480 ****
          pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
! 	pentium | p5)
! 		basic_machine=i586-intel
  		;;
! 	pentiumpro | p6)
! 		basic_machine=i686-intel
  		;;
! 	pentium-* | p5-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
! 	pentiumpro-* | p6-*)
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
! 	k5)
! 		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
! 		basic_machine=i586-amd
! 		;;
! 	nexen)
! 		# We don't have specific support for Nexgen yet, so just call it a Pentium
! 		basic_machine=i586-nexgen
  		;;
  	pn)
  		basic_machine=pn-gould
--- 469,491 ----
          pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
! 	pentium | p5 | k5 | nexen)
! 		basic_machine=i586-pc
! 		;;
! 	pentiumpro | p6 | k6 | 6x86)
! 		basic_machine=i686-pc
  		;;
! 	pentiumii | pentium2)
! 		basic_machine=i786-pc
  		;;
! 	pentium-* | p5-* | k5-* | nexen-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
! 	pentiumpro-* | p6-* | k6-* | 6x86-*)
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
! 	pentiumii-* | pentium2-*)
! 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pn)
  		basic_machine=pn-gould
***************
*** 558,563 ****
--- 569,580 ----
  		basic_machine=i386-sequent
  		os=-dynix
  		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+ 	tx39el)
+ 		basic_machine=mipstx39el-unknown
+ 		;;
  	tower | tower-32)
  		basic_machine=m68k-ncr
  		;;
***************
*** 577,583 ****
  		basic_machine=vax-dec
  		os=-vms
  		;;
!        vpp*|vx|vx-*)
                 basic_machine=f301-fujitsu
                 ;;
  	vxworks960)
--- 594,600 ----
  		basic_machine=vax-dec
  		os=-vms
  		;;
! 	vpp*|vx|vx-*)
                 basic_machine=f301-fujitsu
                 ;;
  	vxworks960)
***************
*** 607,613 ****
  # Here we handle the default manufacturer of certain CPU types.  It is in
  # some cases the only manufacturer, in others, it is the most popular.
  	mips)
! 		basic_machine=mips-mips
  		;;
  	romp)
  		basic_machine=romp-ibm
--- 624,634 ----
  # Here we handle the default manufacturer of certain CPU types.  It is in
  # some cases the only manufacturer, in others, it is the most popular.
  	mips)
! 		if [ x$os = x-linux-gnu ]; then
! 			basic_machine=mips-unknown
! 		else
! 			basic_machine=mips-mips
! 		fi
  		;;
  	romp)
  		basic_machine=romp-ibm
***************
*** 668,676 ****
  	-solaris)
  		os=-solaris2
  		;;
! 	-unixware* | svr4*)
  		os=-sysv4
  		;;
  	-gnu/linux*)
  		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
  		;;
--- 689,700 ----
  	-solaris)
  		os=-solaris2
  		;;
! 	-svr4*)
  		os=-sysv4
  		;;
+ 	-unixware*)
+ 		os=-sysv4.2uw
+ 		;;
  	-gnu/linux*)
  		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
  		;;
***************
*** 681,695 ****
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
  	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
  	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
! 	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
  	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
! 	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
! 	      | -linux-gnu* | -uxpv*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-linux*)
--- 705,720 ----
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
  	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
  	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
! 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
! 	      | -aos* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
  	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
! 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
! 	      | -mingw32* | -linux-gnu* | -uxpv* | -openstep* | -rhapsody* | -darwin* | -beos*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-linux*)
***************
*** 802,807 ****
--- 827,835 ----
  	sparc-* | *-sun)
  		os=-sunos4.1.1
  		;;
+ 	*-be)
+ 		os=-beos
+ 		;;
  	*-ibm)
  		os=-aix
  		;;
***************
*** 815,821 ****
  		os=-sysv
  		;;
  	*-cbm)
! 		os=-amigados
  		;;
  	*-dg)
  		os=-dgux
--- 843,849 ----
  		os=-sysv
  		;;
  	*-cbm)
! 		os=-amigaos
  		;;
  	*-dg)
  		os=-dgux