From: deraadt Date: Sat, 23 Jul 2016 17:55:45 +0000 (+0000) Subject: Back out the automatic pkg.conf installpath changes; because pkg_add has X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=5f75520d169dc776b886c8b46c7879f6cfd69af6;p=openbsd Back out the automatic pkg.conf installpath changes; because pkg_add has an immature heuristic for "what is a release and what is a snapshot". This change maybe improved the post-release experience, but it damages the pre-release experience, which may result in less effective pre-release testing, which risks creating poor releases, which may result in poor post-release experiences. Specific case: subtle breakage to fw_update. --- diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 1db18037299..359bba51a49 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.901 2016/05/27 21:13:17 deraadt Exp $ +# $OpenBSD: install.sub,v 1.902 2016/07/23 17:55:45 deraadt Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer @@ -1495,7 +1495,7 @@ install_http() { if [[ -n $_mirror ]]; then PACKAGE_PATH=$(print -r -- "$_url_base" | sed -E "/\/(snapshots|[0-9]\.[0-9])\/($ARCH)\/*$/!d - s!!/%c/packages/%a/!;q") + s!!/\1/packages/$(arch -s)/!;q") fi }