===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.32
retrieving revision 1.59
diff -u -r1.32 -r1.59
--- openbsd/update_openbsd/update_openbsd	2009/12/10 19:34:39	1.32
+++ openbsd/update_openbsd/update_openbsd	2014/01/22 06:44:53	1.59
@@ -1,5 +1,20 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.31 2009/12/10 19:23:11 andrew Exp $
+# $AFresh1: update_openbsd,v 1.58 2013/12/31 18:46:59 andrew Exp $
+# 
+# Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
 
 installed_sets() {
     local misc=/usr/share/doc/README
@@ -24,12 +39,17 @@
         fi
     done
 
-    sendmail -d0.1 -bt < /dev/null | grep -q SASL
+    sendmail -d0.1 --badoption </dev/null 2>/dev/null | grep -q SASL
     if [ $? == 0 ]; then 
         echo -n ' sendmail-smtp_auth'
     fi
 }
 
+kernel_file_version() {
+    echo exit | config -e $1 | grep -A1 ^OpenBSD
+    #what $1 | sed -ne 's/[[:blank:]]\{1,\}//p'
+}
+
 version_in() {
         local _proto=${FTP%%://*}
         local _file
@@ -149,10 +169,41 @@
     if [ X"" != X"${MIRROR}" ]; then
         FTP=${MIRROR}/${_dir}/`machine`
     fi
+
+    BOOT_KERNEL=`( \
+        echo bsd; \
+        [ -e /boot.conf ] && sed -E '/^ *(set +image|boot) +/!d ; \
+            s///; s/^.*://; s/ .*$//' /boot.conf \
+    ) | tail -1`
+    BOOT_KERNEL=`follow_symlink /$BOOT_KERNEL`
+    BOOT_KERNEL="/${BOOT_KERNEL#/}"
+
+    BOOT_KERNEL_VERSION=`kernel_file_version $BOOT_KERNEL`
+
+    BOOTED_KERNEL_VERSION=`sysctl -n kern.version`
+    NEW_KERNEL_VERSION=""
+
+    # We want to default to what we had
+    INSTALL_KERNELS="${BOOT_KERNEL#/}"
+    # if the boot kernel was our specially named bsd.sp, we install from bsd
+    if [ X"$INSTALL_KERNELS" == X"bsd.sp" ]; then
+        INSTALL_KERNELS="bsd"
+    fi
+    # with a second option of an mp kernel if is is a likely candidate
+    if [ X"$INSTALL_KERNELS" != X"bsd.mp" ]; then
+        local _ncpu=$(sysctl -n hw.ncpufound)
+        [ $_ncpu -gt 1 ] && INSTALL_KERNELS="$INSTALL_KERNELS bsd.mp"
+    fi
+    # or just bsd otherwise
+    if [ X"${INSTALL_KERNELS% *}" != X"bsd" ]; then
+        INSTALL_KERNELS="$INSTALL_KERNELS bsd"
+    fi
+    BOOT_KERNELS=$INSTALL_KERNELS
+    INSTALL_KERNELS="$INSTALL_KERNELS bsd.rd"
 }
 
 get_sets() {
-    echo '### GETTING SETS ###'
+    echo '==> GETTING SETS'
     if [ X"" == X"$FTP" ]; then
         echo ERROR: No FTP site set! >&2
         return 1
@@ -163,9 +214,9 @@
 
     local _v=$FILE_VER
 
-    for _b in `echo /bsd* bsd bsd.mp bsd.rd | sort -u`; do
-        if [ -e /${_b} -a ! -e ./${_b} ]; then
-            echo $FTP_CMD ${FTP}/${_b}
+    for _b in $INSTALL_KERNELS; do
+        if [ ! -e ./${_b} ]; then
+            echo "===> $FTP_CMD ${FTP}/${_b}"
             $FTP_CMD ${FTP}/${_b}
         fi
     done
@@ -177,35 +228,36 @@
         fi
 
         if [ ! -e ./${_file} ]; then
-            echo $FTP_CMD ${FTP}/${_file}
+            echo "===> $FTP_CMD ${FTP}/${_file}"
             $FTP_CMD ${FTP}/${_file}
         fi
     done
 
     local _type
+    local _ftp
     for _type in $CHECKSUM_TYPES; do
-        if [ ! -e $_type ]; then
-            echo $FTP_CMD ${FTP}/$_type
-            $FTP_CMD ${FTP}/$_type
-        fi
+        [ -e $_type ] && break
+        _ftp=`echo "$FTP" | sed -e 's,://[^/]*/,://ftp.openbsd.org/,'`
+        echo "===> $FTP_CMD ${_ftp}/$_type"
+        $FTP_CMD ${_ftp}/$_type
     done
 }
 
 follow_symlink () {
     local _file=$1
-    local _next=$( file $_file |
-        grep 'symbolic link' | 
-        sed -e s/^.*\\\`// -e s/\\\'\$// )
-    if [ -h $_next ]; then
-        follow_symlink $_next
+    # 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/\\\'\$// )
     else
-        echo $_next
+        echo $_file
     fi
 }
 
 check_sum () {
     local _type=$1
-    echo "### CHECKING $_type SUMS ###"
+    echo "==> CHECKING $_type SUMS"
     cd $RELEASEDIR
 
     if [ ! -e $_type ]; then
@@ -213,9 +265,28 @@
         return 1
     fi
 
-    ls bsd* *gz | sed -e 's/\(.*\)/(\1)/' > index 
-    grep -f index $_type | sum -c 
+    local _nv=`echo $NEW_VER | sed -e 's/\.//'`
+    local _signify=`which signify`
+    local _keyfile=/etc/signify/${_nv}base.pub 
+    local _b _s
 
+    (
+        for _b in $INSTALL_KERNELS; do echo "($_b)"        ; done
+        for _s in $INSTALLED_SETS;  do echo "($_s$_nv.tgz)"; done
+    ) > index
+    
+
+    if [ -n "$_signify" -a "$_type" != "${_type%.sig}" ]; then
+        echo "===> Checking signature";
+        if [ ! -e $_keyfile ]; then
+            echo "key [$_keyfile] does not exist, cannot check $_type" >&2
+            return 2
+        fi
+        signify -V -e -p $_keyfile -x $_type -m - | grep -f index | sum -c -
+    else
+       grep -f index $_type | sum -c
+    fi
+
     if [ $? -ne 0 ]; then
         echo ERROR: $_type does not match! >&2
         return 1
@@ -223,24 +294,30 @@
 }
 
 check_sets() {
-    echo '### CHECKING SETS ###'
+    echo '==> CHECKING SETS'
     cd $RELEASEDIR
 
     local _missing_sets
     local _v=$FILE_VER
 
-    for _b in `echo /bsd* bsd bsd.mp bsd.rd | sort -u`; do
-	_b=${_b#/}
-        local _n=$_b
-        if [ X"bsd.sp" == X"${_n}" ]; then
-            _n=bsd
-        fi
-        if [ -e /${_b} -a ! -e ./${_n} ]; then
-            echo ${_n} does not exist
+    for _n in $INSTALL_KERNELS; do
+        local _o=$_n
+        [ X"bsd" == X"${_o}" -a -e /bsd.sp ] && _o=bsd.sp
+        if [ -e /${_o} -a ! -e ./${_n} ]; then
+            echo ${_o} does not exist
             _missing_sets=1
         fi
+
+        if [ X"${BOOT_KERNEL}" == X"/${_o}" -a -e ./${_n} ]; then
+            NEW_KERNEL_VERSION=`kernel_file_version ./${_n}`
+        fi
     done
 
+    if [ X"$NEW_KERNEL_VERSION" == X"" ]; then
+        echo Missing replacement for boot kernel $BOOT_KERNEL >&2
+        _missing_sets=1
+    fi
+
     for _s in $INSTALLED_SETS; do
         local _file=${_s}${_v}.tgz
         if [ ${_s} == sendmail-smtp_auth ]; then
@@ -253,20 +330,23 @@
     done
 
     if [ X"" == X"${_missing_sets}" ]; then
-        echo All OK
+        echo '===> All OK'
     fi
 
     local _type
     for _type in $CHECKSUM_TYPES; do
         if [ -e $_type ]; then
-            check_sum $_type
+            check_sum $_type && break
+            [ -z "$IGNORE_CHECKSUM_ERROR" ] || exit 1
         fi
     done
+
+    return 0
 }
 
 
 install_kernels() {
-    echo '### INSTALLING KERNEL ###'
+    echo '==> INSTALLING KERNEL'
     if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then
         echo ${0##*/} must be run as root or SUDO must be set! >&2
         exit 1
@@ -275,86 +355,57 @@
     if [ X"" == X"$RELEASEDIR" ]; then
         echo ERROR: no source for new kernels! >&2
         exit 1
-    else
-        cd $RELEASEDIR
     fi
 
-    if [ ! -e bsd ]; then
-        echo ERROR: new bsd kernel does not exist! >&2
-        exit 1
+    if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
+        echo "===> Backing up $BOOT_KERNEL to /obsd"
+        $SUDO ln -f $BOOT_KERNEL /obsd
+        if [ $? -ne 0 ]; then
+            echo "Error copying old kernel!" >&2
+            exit 1
+        fi
     fi
 
-    if [ -e /bsd.mp -a ! -e bsd.mp ]; then
-        echo ERROR: new bsd.mp kernel does not exist! >&2
-        exit 1
-    fi
+    cd $RELEASEDIR
 
-    if [ ! -e bsd.rd ]; then
-        echo ERROR: new bsd.rd kernel does not exist! >&2
-        exit 1
-    fi
+    for _b in $INSTALL_KERNELS; do
+        $SUDO rm -f /nbsd
+        local _bd=$_b
+        [ X"${_b}" == X"bsd" ] && _bd="bsd.sp"
 
-    local _v=$FILE_VER
+        local _is_boot=""
+        [ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel"
+        
+        echo "===> Copying $_b to /$_bd $_is_boot"
+        $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_bd}
+        if [ $? -ne 0 ]; then
+            echo ERROR: Could not copy new $_bd kernel! >&2
+            exit 1
+        fi
+    done
 
-    $SUDO rm -f /obsd
-    $SUDO ln /bsd /obsd
-    if [ $? -ne 0 ]; then
-        echo "Error copying old kernel!" >&2
-        exit 1
-    fi
+    cd $OLDPWD
 
-    local _true_bsd=`follow_symlink /bsd`
-    _true_bsd=${_true_bsd#/}
-    local _installed_new_bsd
-
-    for _b in bsd*; do
-        $SUDO rm -f /nbsd
-        if [ X"${_b}" == X"bsd" ]; then
-            echo Copying bsd to /bsd.sp
-            $SUDO cp bsd /nbsd && $SUDO mv /nbsd /bsd.sp
-            if [ $? -ne 0 ]; then
-                echo ERROR: Could not copy new SP kernel! >&2
-                exit 1
-            fi
-            if [ X"${_true_bsd}" == X"bsd.sp" ]; then
-                _installed_new_bsd=1
-            fi
-        else
-            if [ -e "/${_b}" ]; then
-                echo Copying $_b to /
-                $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_b}
+    if [ ! -h /bsd ]; then
+	    cd /
+        for _b in $BOOT_KERNELS; do
+            [ X"$_b" == X"bsd" ] && _b="bsd.sp"
+            if [ -e $_b ]; then
+                echo "===> symlinking $_b to /bsd"
+                $SUDO ln -sf $_b bsd
                 if [ $? -ne 0 ]; then
-                    echo ERROR: Could not copy new $_b kernel! >&2
+                    echo ERROR: Could not symlink new kernel! >&2
                     exit 1
                 fi
-                if [ X"${_true_bsd}" == X"${_b}" ]; then
-                    _installed_new_bsd=1
-                fi
+                break
             fi
-        fi
-    done
-
-    if [ ! -h /bsd ]; then
-        if [ -e /bsd.mp ]; then
-            echo linking /bsd.mp to /bsd
-            $SUDO ln -sf /bsd.mp /bsd
-        else
-            echo linking /bsd.sp to /bsd
-            $SUDO ln -sf /bsd.sp /bsd
-        fi
-        if [ $? -ne 0 ]; then
-            echo ERROR: Could not symlink new kernel! >&2
-            exit 1
-        fi
+        done
+	    cd $OLDPWD
     fi
-
-    if [ -z $_installed_new_bsd ]; then
-        echo WARNING: Did not replace $_true_bsd kernel >&2
-    fi
 }
 
 install_sets() {
-    echo '### INSTALLING SETS ###'
+    echo '==> INSTALLING SETS'
     if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then
         echo ${0##*/} must be run as root or SUDO must be set! >&2
         exit 1
@@ -369,15 +420,6 @@
 
     local _v=$FILE_VER
 
-    if [ $CUR_VER != $NEW_VER -a ! -e /sbin/oreboot ]; then
-        $SUDO cp /sbin/reboot /sbin/oreboot
-        if [ $? -ne 0 ]; then
-            echo "Error copying old reboot command!" >&2
-            exit 1
-        fi
-        echo "/sbin/reboot copied to /sbin/oreboot"
-    fi
-
     local _sets=`ls *${_v}.tgz | grep -v ^base `
     for _f in ${_sets} base${_v}.tgz; do
         _path=$DESTDIR
@@ -387,7 +429,7 @@
             _path=/var/tmp/temproot
         fi
 
-        echo Extracting $_f to $_path
+        echo "===> Extracting $_f to $_path"
         $SUDO mkdir -p $_path
         $SUDO tar -C $_path -xzphf ${RELEASEDIR}/${_f}
         if [ $? -ne 0 ]; then
@@ -396,8 +438,10 @@
         fi
     done
 
-    echo Extracted all sets.
+    echo '===> Extracted all sets.'
+}
 
+install_sendmail_smtp_auth() {
     if [ -e ${RELEASEDIR}/sendmail-smtp_auth.gz ]; then
         gzcat ${RELEASEDIR}/sendmail-smtp_auth.gz > \
             ${RELEASEDIR}/sendmail-smtp_auth
@@ -411,62 +455,40 @@
             ${RELEASEDIR}/sendmail-smtp_auth \
             /usr/libexec/sendmail/sendmail
 
-        echo Installed sendmail with smtp_auth
+        echo '===> Installed sendmail with smtp_auth'
     fi
 }
 
 update_etc() {
-    echo '### UPDATING ETC ###'
+    echo '==> UPDATING ETC'
     if [ ! -e $SYSMERGE ]; then
-        SYSMERGE=
+        echo "ERROR: Can't find sysmerge!" >&2
+        exit 1;
     fi
 
-    if [ X"" == X"$SYSMERGE" ]; then
-        if [ -e /var/tmp/temproot ]; then
-            MERGEMASTER=`which mergemaster`
+    if [ X"" == X"$RELEASEDIR" ]; then
+        echo "ERROR: no source for etc!" >&2
+        exit 1
+    fi
 
-            if [ $? != 0 ]; then
-                $SUDO pkg_add -i mergemaster
+    cd $RELEASEDIR
 
-                MERGEMASTER=`which mergemaster`
-                if [ $? != 0 ]; then
-                    echo ERROR: mergemaster not installed! >&2
-                    exit 1
-                fi
-            fi
-
-            echo '### RUNNING MERGEMASTER ###'
-            $SUDO $MERGEMASTER -irv
-        else 
-            echo "ERROR: no source for etc!" >&2
-            exit 1
-        fi
+    local _v=$FILE_VER
+    local _args=""
+    if [ -e etc${_v}.tgz ]; then
+        _args="$_args -s etc${_v}.tgz"
+    fi
+    if [ -e xetc${_v}.tgz ]; then
+        _args="$_args -x xetc${_v}.tgz"
+    fi
+    if [ X"" == X"$_args" ]; then 
+        echo ERROR: No upgrade sets found! >&2
     else
-        if [ X"" == X"$RELEASEDIR" ]; then
-            echo "ERROR: no source for etc!" >&2
-            exit 1
-        else
-            cd $RELEASEDIR
-        fi
-
-        local _v=$FILE_VER
-        local _args=""
-        if [ -e etc${_v}.tgz ]; then
-            _args="$_args -s etc${_v}.tgz"
-        fi
-        if [ -e xetc${_v}.tgz ]; then
-            _args="$_args -x xetc${_v}.tgz"
-        fi
-        if [ X"" == X"$_args" ]; then 
-            echo ERROR: No upgrade sets found! >&2
-        else
-            echo '### RUNNING SYSMERGE ###'
-            if sysmerge 2>&1 | grep -- -a >/dev/null; then
-                _args="-a $_args"
-            fi
-            $SUDO $SYSMERGE $_args
-        fi
+        echo '==> RUNNING SYSMERGE'
+        $SUDO $SYSMERGE $_args
     fi
+
+    cd $OLDPWD
 }
 
 
@@ -488,7 +510,7 @@
 
 INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
 
-CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256 MD5}
+CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256}
 
 set_version
 local _error=$?
@@ -497,16 +519,18 @@
 echo "-= update_openbsd - helper script to update OpenBSD =-"
 echo "------------------------------------------------------"
 echo
-echo "          SUDO: $SUDO"
-echo "      SYSMERGE: $SYSMERGE"
-echo "        MIRROR: $MIRROR"
-echo "    RELEASEDIR: $RELEASEDIR"
-echo "       DESTDIR: $DESTDIR"
-echo "INSTALLED_SETS: $INSTALLED_SETS"
+echo "           SUDO: $SUDO"
+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
-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
 
 if [ ${_error} -ne 0 ]; then
@@ -519,28 +543,67 @@
 
 check_sets || exit
 
-if [ X"" != X"$SUDO" ]; then
-    echo Please enter your sudo password if prompted.
-    echo You may be asked for it again later in the process.
-    $SUDO -v
+echo "===> Last booted:\n$BOOTED_KERNEL_VERSION"
+if [ X"$BOOT_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \
+  -a X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
+    echo "Next boot (unless replaced):\n$BOOT_KERNEL_VERSION"
 fi
+if [ -n "$NEW_KERNEL_VERSION" ]; then
+    echo "===> New $BOOT_KERNEL:\n$NEW_KERNEL_VERSION";
+else
+    echo "\n!!! WARNING: Will not replace boot kernel $BOOT_KERNEL! !!!\n" >&2
+    echo "ctrl+C to cancel, enter to continue anyway" >&2
+    local _temp
+    read _temp
+    NEW_KERNEL_VERSION=$BOOT_KERNEL_VERSION
+fi
 
+if [ -n "$SUDO" -a $CUR_VER != $NEW_VER ]; then
+    echo >&2
+    echo "!!! You are upgrading between OpenBSD versions.     !!!" >&2
+    echo "!!! You should make sure you have a 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 >&2
+    echo "ctrl+C to cancel, enter to continue" >&2
+    local _temp
+    read _temp
+fi
+
+if [ -n "$SUDO" ]; then
+    echo
+    echo You may be asked for your sudo password multiple times.
+    $SUDO -v -p "sudo Password: "
+fi
+
+if [ X"$NEW_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \
+     -a ! -e /sbin/oreboot ]; then
+    $SUDO cp /sbin/reboot /sbin/oreboot
+    if [ $? -ne 0 ]; then
+        echo "Error copying old reboot command!" >&2
+        exit 1
+    fi
+    echo "/sbin/reboot copied to /sbin/oreboot"
+fi
+
 install_kernels
 install_sets
 
-if [ $CUR_VER == $NEW_VER ]; then
+if [ X"$NEW_KERNEL_VERSION" == X"$BOOTED_KERNEL_VERSION" ]; then
+    install_sendmail_smtp_auth
+
     if [ -e /sbin/oreboot ]; then
         echo Removing /sbin/oreboot
         $SUDO rm -f /sbin/oreboot
     fi
     update_etc
 
-    echo '### UPDATING PACKAGES ###'
+    echo '==> UPDATING PACKAGES'
     $SUDO pkg_add -ui -F update -F updatedepends
 
 else
     echo Instructions for updating to the new version available from 
-    if [ X"snapshots" != X"$FORCE_DIR" ]; then
+    if [ X"snapshots" == X"$FORCE_DIR" ]; then
         echo "  http://www.openbsd.org/faq/current.html"
     else
         echo "  http://www.openbsd.org/faq/upgrade${FILE_VER}.html"
@@ -550,14 +613,4 @@
 echo New kernel installed.  Please reboot!
 if [ -e /sbin/oreboot ]; then
     echo Possibly using /sbin/oreboot
-fi
-
-local _send_dmesg=`dirname $0`/send_dmesg 
-if [ -e "$_send_dmesg" ]; then
-    if [ -e $RELEASEDIR/.send_dmesg ]; then
-        $_send_dmesg
-        rm -f $RELEASEDIR/.send_dmesg
-    elif [ X"$CUR_VER" != X"$NEW_VER" ]; then
-        touch $RELEASEDIR/.send_dmesg
-    fi
 fi