From 223fd1cbd4e53d03db6a0c500e8e5e0da34f71ec Mon Sep 17 00:00:00 2001
From: Robert Nagy <robert@openbsd.org>
Date: Thu, 15 Oct 2015 16:42:17 +0200
Subject: [PATCH] revert to previous

---
 openup | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/openup b/openup
index a4e6022..d455871 100755
--- a/openup
+++ b/openup
@@ -43,7 +43,7 @@ PKG_PATH_UPDATE="https://stable.mtier.org/updates/$(uname -r)/$(arch -s)"
 VUXML_URL="https://stable.mtier.org/vuxml/$(uname -r | tr -d '.').xml"
 
 # fetch command (must behave like "ftp -o"); e.g. "wget -qO"
-FETCH="ftp -MVo"
+FETCH="ftp -Vo"
 
 # exclusion list: pkg names without version/flavor, separated by space
 EXCLUDE_PKG=""
@@ -164,7 +164,8 @@ update_pkg() {
 check_vuxml() {
 	local _BP_MATCH _OUTDATED _PKG_MATCH _b _e _p
 
-	${FETCH} ${_TMPVUXML} ${VUXML_URL} || bye_bye
+	# XXX5.6 drop redirect to /dev/null when 5.6 is out of support
+	${FETCH} ${_TMPVUXML} ${VUXML_URL} >/dev/null || bye_bye
 	perl -pi -e 's,\$ARCH,'"${_ARCH}"',g' ${_TMPVUXML}
 
 	_BP_MATCH="$(grep binpatch ${_TMPVUXML} | sed -e 's,<name>,,g;s,</name>,,g;s,\$ARCH,'"${_ARCH}"',g' | sort -u)"
@@ -232,8 +233,8 @@ fi
 # regex taken from fw_update(1)
 set -A _REL -- $(sysctl -n kern.version | sed 's/^OpenBSD \([0-9]\.[0-9]\)\([^ ]*\).*/\1 \2/;q')
 _REL_INT="$(echo ${_REL[0]} | tr -d '.')"
-_OPENUP_MINREL=57
-_OPENUP_VERSION=20
+_OPENUP_MINREL=56
+_OPENUP_VERSION=19
 if [ -n "${_REL[1]}" -a "${_REL[1]}" != "-stable" ]; then _badrel=1; fi
 if [ "${_REL_INT}" -lt "${_OPENUP_MINREL}" ]; then _badrel=1; fi
 if [ -n "${_badrel}" ]; then
@@ -241,6 +242,11 @@ if [ -n "${_badrel}" ]; then
 	exit 1
 fi
 
+# XXX5.6 drop when 5.6 is out of support
+if [ "${_REL_INT}" -ge 57 ]; then
+	FETCH="ftp -MVo"
+fi
+
 while getopts 'KSc' arg; do
 	case ${arg} in
 	K)	nokrn=1 ;;