diff --git a/openup b/openup index ff7d955..c47884c 100755 --- a/openup +++ b/openup @@ -268,6 +268,17 @@ do_i_need_to_reboot() { fi } +patch_syspatch() { + pr_err + pr_err "Patching syspatch(8) to use syspatches signed by MTier." + pr_err + cp /usr/sbin/syspatch /usr/sbin/syspatch.pre-mtier + sed -i \ + "s,openbsd-\${_OSrev}-syspatch.pub,mtier-\${_OSrev}-pkg.pub,g; \ + s,\${_MIRROR}/syspatch,https://stable.mtier.org/syspatch,g" \ + /usr/sbin/syspatch +} + trap "bye_bye" 1 2 3 13 15 if [ -f /etc/openup.conf ]; then @@ -283,7 +294,7 @@ fi 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=60 -_OPENUP_VERSION=31 +_OPENUP_VERSION=32 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 @@ -338,6 +349,17 @@ fi check_openupd +if [ -z "${nosyspatch}" -a -e /usr/sbin/syspatch ]; then + _sum=$(sha256 -q /usr/sbin/syspatch) + case "${_sum}" + in + # 6.1 syspatch + b8b9c4bec128884498b5c3e77a350f42079f7987ef862a1ec452f489403dfbe6) + patch_syspatch + ;; + esac +fi + if [ "${checkrun}" ]; then if [ "${_REL_INT}" -ge 61 -a -z "${nosyspatch}" ]; then check_syspatches