From 54e3e596285934e66615a3b29a8c2bdbc8c37d79 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <antoine@mtier.org>
Date: Wed, 29 Apr 2015 11:20:28 +0200
Subject: [PATCH] Use -M for ftp(1) on 5.7 and beyond.

---
 openup | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/openup b/openup
index d6a300d..e575acb 100755
--- a/openup
+++ b/openup
@@ -23,22 +23,31 @@
 ### DO NOT EDIT THIS FILE!!!                                         ###
 ### User defined variables: overrides are read from /etc/openup.conf ###
 ########################################################################
+
 # URL to the latest openup version
 OPENUP_URL="https://stable.mtier.org/openup"
+
 # signify(1) public key
 PKG_PUBKEY_URL="https://stable.mtier.org/mtier-$(uname -r | tr -d '.')-pkg.pub"
+
 # PKG_PATH for currently running OpenBSD release
 PKG_PATH_MAIN="http://ftp.fr.openbsd.org/pub/OpenBSD/$(uname -r)/packages/$(arch -s)"
+
 # PKG_PATH for the corresponding release stable service
 PKG_PATH_UPDATE="https://stable.mtier.org/updates/$(uname -r)/$(arch -s)"
+
 # PKG_PATH addition for the corresponding LTS release stable service
 #PKG_PATH_UPDATE_LTS="https://user%domain.tld:password@stable.mtier.org/updates-lts/$(uname -r)/$(arch -s)"
+
 # URL to the latest vuxml (vulnerabilities database)
 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 -Vo"
+
 # exclusion list: pkg names without version/flavor, separated by space
 EXCLUDE_PKG=""
+
 ########################################################################
 ### End of user defined variables                                    ###
 ########################################################################
@@ -155,6 +164,7 @@ update_pkg() {
 check_vuxml() {
 	local _BP_MATCH _OUTDATED _PKG_MATCH _b _e _p
 
+	# 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}
 
@@ -232,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 ;;