On Wed, Apr 18, 2018 at 09:22:24AM +0100, Stuart Henderson wrote:
> On 2018/04/17 13:34, joshua.meger...@iwco.com wrote:
> > >Synopsis: OpenBSD 6.3 http install fails if http proxy is used
> > >Category: installer
> > >Environment:
> > System : OpenBSD 6.3
> > Details : OpenBSD 6.3 (GENERIC.MP) #107: Sat Mar 24 14:21:59
> > MDT 2018
> >
> > dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> >
> > Architecture: OpenBSD.amd64
> > Machine : amd64
> > >Description:
> > When using an HTTP proxy to install, the installation is unable to
> > retrieve files after selecting sets. This is because the retrieval
> > URL is being set from the output of FTP when it fetches SHA256.sig,
> > but doesn't account for ftp echoing '(via <proxy>)' after the URL.
> > Line 1376 of the file 'install.sub' attempts to strip the trailing
> > '/SHA256.sig' from the URL in the output, but since there's extra
> > characters afterwards the pattern doesn't match and the base URL
> > for fetching further files fails.
> > >How-To-Repeat:
> > Set an http proxy during install, either manually or via
> > autoinstall.
> > >Fix:
> > Change line 1376 of install.sub from:
> > _rurl_base=${_rurl_base%/SHA256.sig}
> > to:
> > _rurl_base=${_rurl_base%/SHA256.sig*}
> > ______________________________________________ CONFIDENTIALITY NOTICE: This
> > e-mail, and any files/attachments transmitted, may include confidential
> > and/or proprietary information from IWCO Direct, intended solely for the
> > use of the individual or entity to whom they are addressed. If you are not
> > the intended recipient, you are hereby notified that disclosure, printing,
> > copying, distribution, or the taking of any action in reliance on the
> > contents of this electronic information is strictly prohibited. If you have
> > received this e-mail message in error, please immediately notify the sender
> > by reply message and then delete the electronic message and any
> > files/attachments. ______________________________________________
> >
>
> Untested but the diff for this looks like :
>
>
> Index: install.sub
> ===================================================================
> RCS file: /cvs/src/distrib/miniroot/install.sub,v
> retrieving revision 1.1066
> diff -u -p -r1.1066 install.sub
> --- install.sub 15 Mar 2018 17:43:54 -0000 1.1066
> +++ install.sub 18 Apr 2018 08:21:45 -0000
> @@ -1802,7 +1802,7 @@ install_http() {
> # In case of URL redirection, use the final location to retrieve the
> # rest of the files from. Redirection does not change INSTALL_MIRROR.
> _rurl_base=$(sed -n 's/^Requesting //p' $_ftp_stdout | sed '$!d')
> - _rurl_base=${_rurl_base%/SHA256.sig}
> + _rurl_base=${_rurl_base%/SHA256.sig*}
>
> # Verify SHA256.sig, write SHA256 and extract the list of files.
> if unpriv -f $_sha \
>
tested and OK rpe
