diff options
author | 2019-10-26 04:04:20 +0000 | |
---|---|---|
committer | 2019-10-26 04:04:20 +0000 | |
commit | d7c62aed5d67a42fe2b6f0f194d213f6f050bd5f (patch) | |
tree | 6143d07c410d4905d123da443d59331553d0264d /usr.sbin/syspatch/syspatch.sh | |
parent | Forgot to add '\30AUTOONF4" to ifnetflags[]. (diff) | |
download | wireguard-openbsd-d7c62aed5d67a42fe2b6f0f194d213f6f050bd5f.tar.xz wireguard-openbsd-d7c62aed5d67a42fe2b6f0f194d213f6f050bd5f.zip |
use ftp -N option; ok jca
Diffstat (limited to 'usr.sbin/syspatch/syspatch.sh')
-rw-r--r-- | usr.sbin/syspatch/syspatch.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/syspatch/syspatch.sh b/usr.sbin/syspatch/syspatch.sh index 6587dbb5344..fe82a0349ac 100644 --- a/usr.sbin/syspatch/syspatch.sh +++ b/usr.sbin/syspatch/syspatch.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: syspatch.sh,v 1.155 2019/10/25 11:14:31 ajacoutot Exp $ +# $OpenBSD: syspatch.sh,v 1.156 2019/10/26 04:04:20 deraadt Exp $ # # Copyright (c) 2016, 2017 Antoine Jacoutot <ajacoutot@openbsd.org> # @@ -130,7 +130,7 @@ fetch_and_verify() [[ -n ${_tgz} ]] [[ -t 0 ]] || echo "${_title} ${_tgz}" - unpriv -f "${_TMP}/${_tgz}" ftp -VD "${_title}" -o "${_TMP}/${_tgz}" \ + unpriv -f "${_TMP}/${_tgz}" ftp -N syspatch -VD "${_title}" -o "${_TMP}/${_tgz}" \ "${_MIRROR}/${_tgz}" (cd ${_TMP} && sha256 -qC ${_TMP}/SHA256 ${_tgz}) @@ -164,7 +164,7 @@ ls_missing() local _c _d _f _cmd _l="$(ls_installed)" _p _r _sha=${_TMP}/SHA256 # don't output anything on stdout to prevent corrupting the patch list - unpriv -f "${_sha}.sig" ftp -MVo "${_sha}.sig" "${_MIRROR}/SHA256.sig" \ + unpriv -f "${_sha}.sig" ftp -N syspatch -MVo "${_sha}.sig" "${_MIRROR}/SHA256.sig" \ >/dev/null unpriv -f "${_sha}" signify -Veq -x ${_sha}.sig -m ${_sha} -p \ /etc/signify/openbsd-${_OSrev}-syspatch.pub >/dev/null @@ -175,7 +175,7 @@ ls_missing() while read _c; do _c=${_c##syspatch${_OSrev}-} && [[ -n ${_l} ]] && echo ${_c} | grep -qw -- "${_l}" || echo ${_c} done | while read _p; do - _cmd="ftp -MVo - ${_MIRROR}/syspatch${_OSrev}-${_p}.tgz" + _cmd="ftp -N syspatch -MVo - ${_MIRROR}/syspatch${_OSrev}-${_p}.tgz" { unpriv ${_cmd} | tar tzf -; } 2>/dev/null | while read _f; do [[ -f /${_f} ]] || continue && echo ${_p} && pkill -u \ _syspatch -xf "${_cmd}" || true && break |