===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.68
retrieving revision 1.92
diff -u -r1.68 -r1.92
--- openbsd/update_openbsd/update_openbsd	2014/10/18 23:42:35	1.68
+++ openbsd/update_openbsd/update_openbsd	2017/11/28 03:29:59	1.92
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.67 2014/05/11 02:40:54 andrew Exp $
+# $AFresh1: update_openbsd,v 1.91 2017/11/28 03:28:26 andrew Exp $
 # 
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -27,10 +27,12 @@
     local xserv=/usr/X11R6/bin/X
     local xshare=/usr/X11R6/bin/startx
 
+    local _nv=`echo $NEW_VER | sed -e 's/\.//'`
     local _c _d _e
     echo -n base
-    echo -n ' etc'
+    [ $_nv -lt 57 ] && echo -n ' etc'
     for _d in misc man comp game xbase xetc xfont xserv xshare; do
+        [ $_d = xetc -a $_nv -ge 57 ] && continue
         eval _e=\$${_d}
         _c=`ls $_e 2> /dev/null | wc -l`
         #echo $_c $_d $_e
@@ -58,7 +60,7 @@
             local _list=`echo "ls base*.tgz" | ${FTP_CMD} ${FTP}/`
             _file=`echo ${_list} | awk '/base[0-9][0-9].tgz/ { print $9 }'`
 
-        elif [ X"http" == X"${_proto}" ]; then
+        elif [ X"http" == X"${_proto}" -o X"https" == X"${_proto}" ]; then
             local _list=`${FTP_CMD} -V -o - ${FTP}/`
             _file=`echo ${_list} | awk '/[^x]base[0-9][0-9]*\.tgz/ { 
                     sub("^.*base","base");
@@ -116,10 +118,13 @@
     fi
 
     if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then
-        if [ X"No" == X"${FORCE_DIR}" ]; then
-            _dir=${NEW_VER}
-        else
+        if [ X"No" != X"${FORCE_DIR}" ]; then
             _dir=${FORCE_DIR}
+        elif sysctl kern.version | grep -q -- '-current '; then
+            _dir=snapshots
+            FORCE_DIR=snapshots
+        else
+            _dir=${NEW_VER}
         fi
         FTP=${MIRROR}/${_dir}/`machine`
 
@@ -222,10 +227,14 @@
         if [ ! -e ./${_b} ]; then
             echo "===> $FTP_CMD ${FTP}/${_b}"
             $FTP_CMD ${FTP}/${_b}
+        else
+            echo "===> Have ${_b}"
         fi
+        kernel_file_version "${_b}"
     done
 
     for _s in $INSTALLED_SETS; do
+        [ "$_v" -ge "57" -a "$_s" != "${_s%etc}" ] && continue
         local _file=${_s}${_v}.tgz
         if [ ${_s} == sendmail-smtp_auth ]; then
             _file=${_s}.gz
@@ -251,9 +260,7 @@
     local _file=$1
     # This could go circular, but I dunno how to fix that.
     if [ -h $_file ]; then
-        follow_symlink $( file $_file |
-            grep 'symbolic link' | 
-            sed -e s/^.*\\\`// -e s/\\\'\$// )
+        follow_symlink $( readlink -f $_file )
     else
         echo $_file
     fi
@@ -288,7 +295,7 @@
         fi
         signify -V -e -p $_keyfile -x $_type -m - | grep -f index | sha256 -c -
     else
-       grep -f index $_type | sum -c
+       grep -f index $_type | sha256 -c
     fi
 
     if [ $? -ne 0 ]; then
@@ -323,6 +330,7 @@
     fi
 
     for _s in $INSTALLED_SETS; do
+        [ "$_v" -ge "57" -a "$_s" != "${_s%etc}" ] && continue
         local _file=${_s}${_v}.tgz
         if [ ${_s} == sendmail-smtp_auth ]; then
             _file=${_s}.gz
@@ -334,11 +342,12 @@
     done
 
     if [ X"" == X"${_missing_sets}" ]; then
-        echo '===> All OK'
+        echo 'All OK'
     fi
 
     local _type
     for _type in $CHECKSUM_TYPES; do
+	[ -n "$NO_SIGNIFY" -a "$_type" != "${_type%.sig}" ] && continue
         if [ -e $_type ]; then
             check_sum $_type && break
             [ -z "$IGNORE_CHECKSUM_ERROR" ] && exit 1
@@ -376,7 +385,7 @@
         local _is_boot=""
         [ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel"
         
-        echo "===> Copying $_b to /$_bd $_is_boot"
+        echo "Copying $_b to /$_bd $_is_boot"
         cp ${_b} /nbsd && mv /nbsd /${_bd}
         if [ $? -ne 0 ]; then
             echo ERROR: Could not copy new $_bd kernel! >&2
@@ -425,7 +434,7 @@
             _path=/var/tmp/temproot
         fi
 
-        echo "===> Extracting $_f to $_path"
+        echo "Extracting $_f to $_path"
         mkdir -p $_path
         tar -C $_path -xzphf ${RELEASEDIR}/${_f}
         if [ $? -ne 0 ]; then
@@ -465,7 +474,7 @@
     local _v=$FILE_VER
     local _args=""
 
-    if [ ! -e /usr/share/sysmerge/etc.tgz ]; then
+    if [ ! -e /var/sysmerge/etc.tgz ]; then
         if [ X"" == X"$RELEASEDIR" ]; then
             echo "ERROR: no source for etc!" >&2
             exit 1
@@ -505,38 +514,52 @@
     . ${HOME}/.update_openbsdrc
 fi
 
-#MIRROR=${MIRROR:=ftp://ftp.openbsd.org/pub/OpenBSD}
+MIRROR=${MIRROR:=http://fastly.cdn.openbsd.org/pub/OpenBSD}
 FTP_CMD=${FTP_CMD:=ftp -V}
-PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}
 
 DESTDIR=${DESTDIR:=/}
 SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge}
 FORCE_DIR=${FORCE_DIR:=No}
 
+export PKG_PATH TRUSTED_PKG_PATH
+
+set_version
+
+PKG_PATH=${PKG_PATH:=${MIRROR}/${FORCE_DIR:=$NEW_VER}/packages/`machine`/}
+TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine`/all/}
+
 INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
 
 CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256}
 
-set_version
 local _error=$?
 
 echo
 echo "-= update_openbsd - helper script to update OpenBSD =-"
 echo "------------------------------------------------------"
 echo
-echo "       SYSMERGE: $SYSMERGE"
-echo "         MIRROR: $MIRROR"
-echo "     RELEASEDIR: $RELEASEDIR"
-echo "        DESTDIR: $DESTDIR"
-echo "    BOOT_KERNEL: $BOOT_KERNEL"
-echo "INSTALL_KERNELS: $INSTALL_KERNELS"
-echo " INSTALLED_SETS: $INSTALLED_SETS"
+echo "        SYSMERGE: $SYSMERGE"
+echo "          MIRROR: $FTP"
+echo "        PKG_PATH: $PKG_PATH"
+echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH"
+echo "      RELEASEDIR: $RELEASEDIR"
+echo "         DESTDIR: $DESTDIR"
+echo "     BOOT_KERNEL: $BOOT_KERNEL"
+echo " INSTALL_KERNELS: $INSTALL_KERNELS"
+echo "  INSTALLED_SETS: $INSTALLED_SETS"
 echo
-echo "        CUR_VER: $CUR_VER"
-echo "        NEW_VER: $NEW_VER"
-#echo "       FILE_VER: $FILE_VER"
+echo "         CUR_VER: $CUR_VER"
+echo "         NEW_VER: $NEW_VER"
+#echo "        FILE_VER: $FILE_VER"
 echo
 
+for k in $INSTALL_KERNELS; do
+    if [ -e "/$k" ]; then
+        echo "Existing $k"
+        kernel_file_version "/$k"
+    fi
+done
+
 if [ ${_error} -ne 0 ]; then
 	exit ${_error}
 fi
@@ -569,7 +592,7 @@
     echo "!!!  at the end of the proces but it is safer to  !!!" >&2 
     echo "!!!  have a separate root shell open.             !!!" >&2
     echo "!!!  It is needed in order to run /sbin/oreboot.  !!!" >&2
-    echo "!!!  sudo MAY NOT WORK after sets are extracted.  !!!" >&2
+    echo "!!!  doas MAY NOT WORK after sets are extracted.  !!!" >&2
     echo >&2
     echo "enter to continue, ctrl+C to cancel" >&2
     local _temp
@@ -593,14 +616,27 @@
 
     if [ -e /sbin/oreboot ]; then
         echo Removing /sbin/oreboot
-        $rm -f /sbin/oreboot
+        rm -f /sbin/oreboot
     fi
     update_etc
 
-    echo '==> UPDATING PACKAGES'
-    pkg_add -ui -F update -F updatedepends
+    OPENUP=$( which openup 2>/dev/null )
+    if [ -n "$OPENUP" ]; then
+        echo "==> UPDATING WITH $OPENUP"
+        $OPENUP
+    else
+        echo '==> UPDATING PACKAGES'
+        pkg_add -u
+    fi
 
+    echo '==> UPDATING FIRMWARE'
+    fw_update
+
 else
+    [ -e /etc/rc.sysmerge ] && grep -q $SYSMERGE /etc/rc.sysmerge ||
+        echo "$SYSMERGE -b" >>/etc/rc.sysmerge &&
+        echo "==> RUNNING $SYSMERGE -b ON REBOOT"
+
     echo Instructions for updating to the new version available from 
     if [ X"snapshots" == X"$FORCE_DIR" ]; then
         echo "  http://www.openbsd.org/faq/current.html"