diff options
| author |   deraadt <deraadt@openbsd.org> | 1999-10-17 06:53:40 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1999-10-17 06:53:40 +0000 |
| commit | 0046e988b21f4c912bca36d058c4874d05301b0e (patch) | |
| tree | 6795cac455c30398b6cf5fb02f175d10c681b128 | |
| parent | Fix misleading comment. (diff) | |
| download | wireguard-openbsd-0046e988b21f4c912bca36d058c4874d05301b0e.tar.xz wireguard-openbsd-0046e988b21f4c912bca36d058c4874d05301b0e.zip | |
damnit: complete disgusting dual-matching for ssl libraries which really shows
how little sh i know (and how incapable i am of reading the sh manpage after 7
guiness). thanks to various people for going through the grief of discovering
this problem first hand, after a few people in michigan had not gotten around
to testing their work (tsk tsk tsk!)
| -rw-r--r-- | distrib/miniroot/install.sub | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index a84c05f6520..2eb8e364532 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sub,v 1.140 1999/10/16 19:01:22 deraadt Exp $ +# $OpenBSD: install.sub,v 1.141 1999/10/17 06:53:40 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997,1998 Todd Miller, Theo de Raadt @@ -1111,7 +1111,8 @@ while test -n "${_get_files}" ; do echo for _f in $_get_files ; do echo "Getting ${_f} ..." - if [ "X${_f}" = "Xssl${VERSION}.tar.gz" ]; then + if [ "X${_f}" = "Xssl${VERSION}.tar.gz" -o \ + X${_f}" = "XsslUSA${VERSION}.tar.gz"]; then ( cd /mnt ; ftp ${_ftp_active} -o - -V -m ${_url_base}/${_f} | /mnt/usr/sbin/chroot /mnt /usr/sbin/pkg_add -I -) elif [ "X${_f}" = "X${_kernel}" ]; then ( cd /mnt ; ftp ${_ftp_active} -V -m ${_url_base}/${_f} ) @@ -1122,7 +1123,8 @@ while test -n "${_get_files}" ; do # Mark xfer as having failed,. _setsdone=`rmel $_f $_setsdone` _failed_files="${_failed_files} ${_f}" - elif [ "X${_f}" = "Xssl${VERSION}.tar.gz" ]; then + elif [ "X${_f}" = "Xssl${VERSION}.tar.gz" -o \ + "X${_f}" = "XsslUSA${VERSION}.tar.gz" ]; then ssl=1 fi done @@ -1268,7 +1270,8 @@ while test -n "${_get_files}" ; do echo for _f in $_get_files ; do echo "$1/${_f}:" - if [ "X${_f}" = "Xssl${VERSION}.tar.gz" ]; then + if [ "X${_f}" = "Xssl${VERSION}.tar.gz" -o \ + "X${_f}" = "XsslUSA${VERSION}.tar.gz" ]; then ( cd /mnt ; ftp -o - -V -m file:$1/${_f} | /mnt/usr/sbin/chroot /mnt /usr/sbin/pkg_add -I -) elif [ "X${_f}" = "X${_kernel}" ]; then ftp -V -m -o /mnt/$_f file:$1/$_f @@ -1279,7 +1282,8 @@ while test -n "${_get_files}" ; do # Mark xfer as having failed,. _setsdone=`rmel $_f $_setsdone` _failed_files="${_failed_files} ${_f}" - elif [ "X${_f}" = "Xssl${VERSION}.tar.gz" ]; then + elif [ "X${_f}" = "Xssl${VERSION}.tar.gz" -o \ + "X${_f}" = "XsslUSA${VERSION}.tar.gz" ]; then ssl=1 fi done |