From 6f651414769a5d6f68bb8bfd9fa7fcd1d52e81fb Mon Sep 17 00:00:00 2001 From: rpe Date: Tue, 11 Apr 2017 19:23:10 +0000 Subject: [PATCH] Ensure that the version part of $_url_base is correctly removed by using $VNAME (x.y) instead of $VERSION (xy). This fixes the problem that the version part ended up in installurl which is wrong anyway and also confuses pkg_add. Thanks to florian@ and trondd at kagu-tsuchi dot com for reporting this. OK tb@ --- distrib/miniroot/install.sub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 4171e0723a0..1708c6a5c7c 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.995 2017/04/07 22:53:25 rpe Exp $ +# $OpenBSD: install.sub,v 1.996 2017/04/11 19:23:10 rpe Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer @@ -1707,7 +1707,7 @@ install_http() { else # Remove the architecture and snaphots or version part. INSTALL_URL=${_url_base%/$ARCH} - INSTALL_URL=${INSTALL_URL%@(/$VERSION|/snapshots)} + INSTALL_URL=${INSTALL_URL%@(/$VNAME|/snapshots)} fi } -- 2.20.1