===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.4
retrieving revision 1.38
diff -u -r1.4 -r1.38
--- openbsd/update_openbsd/update_openbsd	2008/08/12 23:44:19	1.4
+++ openbsd/update_openbsd/update_openbsd	2012/04/19 05:03:47	1.38
@@ -1,233 +1,391 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.3 2008/08/12 22:42:09 andrew Exp $
+# $AFresh1: update_openbsd,v 1.37 2010/06/17 22:39:09 andrew Exp $
 
-SYSMERGE=/usr/sbin/sysmerge
-MIRROR=ftp://ftp.openbsd.org/pub/OpenBSD
-FTP_CMD='ftp -V'
-
-if [ -e /etc/update_openbsd.conf ]; then
-    . /etc/update_openbsd.conf
-fi
-
-if [ -e ${HOME}/.update_openbsdrc ]; then
-    . ${HOME}/.update_openbsdrc
-fi
-
 installed_sets() {
-    misc=/usr/share/doc/README
-    man=/usr/share/man/cat1/intro.0
-    comp=/usr/bin/cc
-    game=/usr/games/
-    xbase=/usr/X11R6/
-    xetc=/etc/X11/xinit/xinitrc
-    xfont=/usr/X11R6/lib/X11/fonts
-    xserv=/usr/X11R6/bin/X
-    xshare=/usr/X11R6/bin/startx
+    local misc=/usr/share/doc/README
+    local man=/usr/share/man/cat1/intro.0
+    local comp=/usr/bin/cc
+    local game=/usr/games/
+    local xbase=/usr/X11R6/
+    local xetc=/etc/X11/xinit/xinitrc
+    local xfont=/usr/X11R6/lib/X11/fonts
+    local xserv=/usr/X11R6/bin/X
+    local xshare=/usr/X11R6/bin/startx
 
-    echo base
-    echo etc
+    local _c _d _e
+    echo -n base
+    echo -n ' etc'
     for _d in misc man comp game xbase xetc xfont xserv xshare; do
         eval _e=\$${_d}
         _c=`ls $_e 2> /dev/null | wc -l`
         #echo $_c $_d $_e
         if [ $_c -ne 0 ]; then
-            echo $_d
+            echo -n " $_d"
         fi
     done
+
+    sendmail -d0.1 --badoption </dev/null 2>/dev/null | grep -q SASL
+    if [ $? == 0 ]; then 
+        echo -n ' sendmail-smtp_auth'
+    fi
 }
 
+version_in() {
+        local _proto=${FTP%%://*}
+        local _file
+
+        if [ X"ftp" == X"${_proto}" ]; then
+            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
+            local _list=`${FTP_CMD} -V -o - ${FTP}/`
+            _file=`echo ${_list} | awk '/[^x]base[0-9][0-9]*\.tgz/ { 
+                    sub("^.*base","base");
+                    sub("\.tgz.*",".tgz"); 
+                    print $0;
+                }'`
+
+        elif [ X"scp" == X"${_proto}" ]; then
+            echo SCP is not yet supported >&2
+            return 2
+
+        else 
+            echo Unsupported FTP ${FTP} >&2
+            return 2
+
+        fi
+
+        local _v=${_file##*base}
+        _v=${_v%.tgz*}
+        echo $_v
+}
+
 set_version() {
     CUR_VER=`uname -r`
     NEW_VER=`dc -e "$CUR_VER 0.1 + p"`
+    FILE_VER=""
+    FTP=""
 
-    if [ -d $NEW_VER ]; then
-        DIR=$NEW_VER
-    fi
+    local _cv=`echo $CUR_VER | sed -e 's/\.//'`
+    local _nv=`echo $NEW_VER | sed -e 's/\.//'`
+    local _v
 
-    if [ -d $CUR_VER ]; then
+    if [ X"No" != X"$FORCE_DIR" -a -d $FORCE_DIR ]; then
+        _dir=$FORCE_DIR
+        if [ -e ${_dir}/base${_nv}.tgz ]; then
+            _v=$_nv
+        elif [ -e ${_dir}/base${_cv}.tgz ]; then
+            NEW_VER=$CUR_VER
+            _v=$_cv
+        fi
+
+    elif [ -d $CUR_VER ]; then
+        _dir=$CUR_VER
         NEW_VER=$CUR_VER
-        DIR=$NEW_VER
-    fi
+        if [ -e ${_dir}/base${_cv}.tgz ]; then
+            _v=$_cv
+        fi
 
-    if [ X"" != X"$FORCE_DIR" ]; then
-        if [ -d $FORCE_DIR ]; then
-            DIR=$FORCE_DIR
-
-            _cv=`echo $CUR_VER | sed -e 's/\.//'`
-            if [ -e $DIR/base${_cv}.tgz ]; then
-                NEW_VER=$CUR_VER
-            fi
+    elif [ -d $NEW_VER ]; then
+        _dir=$NEW_VER
+        if [ -e ${_dir}/base${_nv}.tgz ]; then
+            _v=$_nv
         fi
+
     fi
 
-    if [ X"" == X"$DIR" ]; then
-        FTP=${MIRROR}/${NEW_VER}/`machine`
+    if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then
+        if [ X"No" == X"${FORCE_DIR}" ]; then
+            _dir=${NEW_VER}
+        else
+            _dir=${FORCE_DIR}
+        fi
+        FTP=${MIRROR}/${_dir}/`machine`
 
-        #echo "ls\nquit\n" | ftp $MIRROR | grep "$NEW_VER"
-        $FTP_CMD ${FTP}/MD5 > /dev/null
+        _v=`version_in`
 
-        if [ -e MD5 ]; then
-            rm -f MD5
-        else
+        if [ X"" == X"${_v}" ]; then
+            if [ X"No" != X"$FORCE_DIR" ]; then
+                echo No sets in forced [${FTP}] >&2
+                return 2
+            fi
+
             NEW_VER=$CUR_VER
+            _dir=${NEW_VER}
+            FTP=${MIRROR}/${_dir}/`machine`
+
+            _v=`version_in`
         fi
 
-        if [ X"$FORCE_DIR" == X"" ]; then
-            DIR=$NEW_VER
+        if [ X"" == X"${_v}" ]; then
+            echo No sets in [${FTP}] >&2
+            return 2 
+        elif [ X"${_cv}" == X"${_v}" ]; then
+            NEW_VER=$CUR_VER
+        elif [ X"${_nv}" == X"${_v}" ]; then
+            NEW_VER=$NEW_VER
         else
-            DIR=$FORCE_DIR
+            echo Invalid version [$_v] >&2
+            return 2
         fi
 
-        FTP=${MIRROR}/${DIR}/`machine`
+        if [ X"No" == X"$FORCE_DIR" ]; then
+            _dir=$NEW_VER
+        fi
+
     fi
 
-    if [ X"" != X"$RELEASEDIR" ]; then
-        DIR=$RELEASEDIR
+    if [ X"" == X"${_v}" ]; then
+        echo ERROR: Unable to determine file version! >&2
+        return 1
     fi
 
-    if [ -d $DIR ]; then
-       cd $DIR
-       RELEASEDIR=`pwd`
+    if [ X"" == X"$RELEASEDIR" ]; then
+        RELEASEDIR=`pwd`/$_dir
     fi
 
-    _v=`echo $NEW_VER | sed -e 's/\.//'`
+    FILE_VER=$_v
+    if [ X"" != X"${MIRROR}" ]; then
+        FTP=${MIRROR}/${_dir}/`machine`
+    fi
 }
 
 get_sets() {
+    echo '### GETTING SETS ###'
     if [ X"" == X"$FTP" ]; then
-        echo Error, no FTP site is set! >&2
-        exit 1
+        echo ERROR: No FTP site set! >&2
+        return 1
     fi
 
-    if [ X"" == X"$RELEASEDIR" ]; then
-        RELEASEDIR=$DIR
-    fi
-
-    mkdir -p $RELEASEDIR
+    mkdir -p ${RELEASEDIR}
     cd $RELEASEDIR
-    RELEASEDIR=`pwd`
 
-    for _b in /bsd* bsd bsd.mp bsd.rd; do
+    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}
             $FTP_CMD ${FTP}/${_b}
         fi
     done
 
-    for _s in `installed_sets`; do
-        echo $FTP_CMD ${FTP}/${_s}${_v}.tgz
-        $FTP_CMD ${FTP}/${_s}${_v}.tgz
+    for _s in $INSTALLED_SETS; do
+        local _file=${_s}${_v}.tgz
+        if [ ${_s} == sendmail-smtp_auth ]; then
+            _file=${_s}.gz
+        fi
+
+        if [ ! -e ./${_file} ]; then
+            echo $FTP_CMD ${FTP}/${_file}
+            $FTP_CMD ${FTP}/${_file}
+        fi
     done
 
-    echo $FTP_CMD ${FTP}/MD5
-    $FTP_CMD ${FTP}/MD5
-    ls bsd* *.tgz > index 
-    grep -f index MD5 | md5 -c
+    local _type
+    for _type in $CHECKSUM_TYPES; do
+        if [ ! -e $_type ]; then
+            echo $FTP_CMD ${FTP}/$_type
+            $FTP_CMD ${FTP}/$_type
+        fi
+    done
+}
 
+follow_symlink () {
+    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/\\\'\$// )
+    else
+        echo $_file
+    fi
+}
+
+check_sum () {
+    local _type=$1
+    echo "### CHECKING $_type SUMS ###"
+    cd $RELEASEDIR
+
+    if [ ! -e $_type ]; then
+        echo $_type File does not exist!
+        return 1
+    fi
+
+    ls bsd* *gz | sed -e 's/\(.*\)/(\1)/' > index 
+    grep -f index $_type | sum -c 
+
     if [ $? -ne 0 ]; then
-        echo !!! WARNING: MD5 does not match !!! >&2
-        exit 1
+        echo ERROR: $_type does not match! >&2
+        return 1
     fi
 }
 
-install_kernel() {
+check_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
+            _missing_sets=1
+        fi
+    done
+
+    for _s in $INSTALLED_SETS; do
+        local _file=${_s}${_v}.tgz
+        if [ ${_s} == sendmail-smtp_auth ]; then
+            _file=${_s}.gz
+        fi
+        if [ ! -e ./${_file} ]; then
+            echo ${_file} does not exist
+            _missing_sets=1
+        fi
+    done
+
+    if [ X"" == X"${_missing_sets}" ]; then
+        echo All OK
+    fi
+
+    local _type
+    for _type in $CHECKSUM_TYPES; do
+        if [ -e $_type ]; then
+            check_sum $_type
+        fi
+    done
+}
+
+
+install_kernels() {
+    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
     fi
 
     if [ X"" == X"$RELEASEDIR" ]; then
-        echo "ERROR: no source for new kernels!" >&2
+        echo ERROR: no source for new kernels! >&2
         exit 1
     else
         cd $RELEASEDIR
     fi
 
     if [ ! -e bsd ]; then
-        echo "new bsd kernel does not exist!" >&2
+        echo ERROR: new bsd kernel does not exist! >&2
         exit 1
     fi
 
     if [ -e /bsd.mp -a ! -e bsd.mp ]; then
-        echo "new bsd.mp kernel does not exist!" >&2
+        echo ERROR: new bsd.mp kernel does not exist! >&2
         exit 1
     fi
 
     if [ ! -e bsd.rd ]; then
-        echo "new bsd.rd kernel does not exist!" >&2
+        echo ERROR: new bsd.rd kernel does not exist! >&2
         exit 1
     fi
 
+    local _v=$FILE_VER
 
-    if [ -e base${_v}.tgz ]; then
-        echo Extracting new firmware from base${_v}.tgz
-        $SUDO tar -C $DESTDIR -xzphf base${_v}.tgz "*etc/firmware/*"
-    fi
-
     $SUDO rm -f /obsd
     $SUDO ln /bsd /obsd
     if [ $? -ne 0 ]; then
-        echo "Error copying old kernel!"
+        echo "Error copying old kernel!" >&2
         exit 1
     fi
 
+    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
+        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: Couldn't copy new SP kernel!" >&2
+                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
+            if [ -e "/${_b}" ]; then
                 echo Copying $_b to /
                 $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_b}
                 if [ $? -ne 0 ]; then
-                    echo "ERROR: Couldn't copy new $_b kernel!" >&2
+                    echo ERROR: Could not copy new $_b kernel! >&2
                     exit 1
                 fi
+                if [ X"${_true_bsd}" == X"${_b}" ]; then
+                    _installed_new_bsd=1
+                fi
             fi
         fi
     done
 
     if [ ! -h /bsd ]; then
+	cd /
         if [ -e /bsd.mp ]; then
             echo linking /bsd.mp to /bsd
-            $SUDO ln -sf /bsd.mp /bsd
+            $SUDO ln -sf /bsd.mp bsd
         else
             echo linking /bsd.sp to /bsd
-            $SUDO ln -sf /bsd.sp /bsd
+            $SUDO ln -sf /bsd.sp bsd
         fi
         if [ $? -ne 0 ]; then
-            echo "ERROR: Couldn't symlink new kernel!" >&2
+            echo ERROR: Could not symlink new kernel! >&2
             exit 1
         fi
+	cd $OLDPWD
     fi
+
+    if [ -z $_installed_new_bsd ]; then
+        echo WARNING: Did not replace $_true_bsd kernel >&2
+    fi
 }
 
 install_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
     fi
 
     if [ X"" == X"$RELEASEDIR" ]; then
-        echo "ERROR: no source for sets!" >&2
+        echo ERROR: no source for sets! >&2
         exit 1
     else
         cd $RELEASEDIR
     fi
 
-    for _f in *${_v}.tgz; do
+    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
         if [ X"etc${_v}.tgz"  == X"$_f" \
             -o X"xetc${_v}.tgz" == X"$_f" ]; then
-            if [ X"" != X"$SYSMERGE" ]; then
-                continue
-            fi
+            [ X"" != X"$SYSMERGE" ] && continue
             _path=/var/tmp/temproot
         fi
 
@@ -235,21 +393,43 @@
         $SUDO mkdir -p $_path
         $SUDO tar -C $_path -xzphf ${RELEASEDIR}/${_f}
         if [ $? -ne 0 ]; then
-            echo "Error extracting ${_f}!" >&2
+            echo ERROR: Could not extract ${_f}! >&2
             exit 1
         fi
     done
 
     echo Extracted all sets.
+
+    if [ -e ${RELEASEDIR}/sendmail-smtp_auth.gz ]; then
+        gzcat ${RELEASEDIR}/sendmail-smtp_auth.gz > \
+            ${RELEASEDIR}/sendmail-smtp_auth
+    fi
+    if [ -e ${RELEASEDIR}/sendmail-smtp_auth ]; then
+        if ! pkg_info -qe 'cyrus-sasl-*'; then
+            $SUDO pkg_add -i cyrus-sasl
+        fi
+
+        $SUDO install -o root -g smmsp -m 2555 \
+            ${RELEASEDIR}/sendmail-smtp_auth \
+            /usr/libexec/sendmail/sendmail
+
+        echo Installed sendmail with smtp_auth
+    fi
 }
 
 update_etc() {
+    echo '### UPDATING ETC ###'
+    if [ ! -e $SYSMERGE ]; then
+        SYSMERGE=
+    fi
+
     if [ X"" == X"$SYSMERGE" ]; then
         if [ -e /var/tmp/temproot ]; then
             MERGEMASTER=`which mergemaster`
 
             if [ $? != 0 ]; then
                 $SUDO pkg_add -i mergemaster
+
                 MERGEMASTER=`which mergemaster`
                 if [ $? != 0 ]; then
                     echo ERROR: mergemaster not installed! >&2
@@ -271,67 +451,90 @@
             cd $RELEASEDIR
         fi
 
-        _cv=`echo $CUR_VER | sed -e 's/\.//'`
-        if [ -e etc${_cv}.tgz ]; then
-            _args="$_args -s etc${_cv}.tgz"
+        local _v=$FILE_VER
+        local _args=""
+        if [ -e etc${_v}.tgz ]; then
+            _args="$_args -s etc${_v}.tgz"
         fi
-        if [ -e xetc${_cv}.tgz ]; then
-            _args="$_args -x xetc${_cv}.tgz"
+        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 ###'
-            _args="-a $_args"
+            if sysmerge 2>&1 | grep -- -a >/dev/null; then
+                _args="-a $_args"
+            fi
             $SUDO $SYSMERGE $_args
         fi
     fi
 }
 
-DESTDIR=${DESTDIR:=/}
-PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}
 
-if [ X"" != X"$SYSMERGE" ]; then
-    if [ ! -e $SYSMERGE ]; then
-        SYSMERGE=
-    fi
+if [ -e /etc/update_openbsd.conf ]; then
+    . /etc/update_openbsd.conf
 fi
 
+if [ -e ${HOME}/.update_openbsdrc ]; then
+    . ${HOME}/.update_openbsdrc
+fi
+
+#MIRROR=${MIRROR:=ftp://ftp.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}
+
+INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
+
+CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256 MD5}
+
 set_version
+local _error=$?
 
 echo
 echo "-= update_openbsd - helper script to update OpenBSD =-"
 echo "------------------------------------------------------"
 echo
-echo "       DIR: $DIR"
-echo "RELEASEDIR: $RELEASEDIR"
-echo "   DESTDIR: $DESTDIR"
-echo "   CUR_VER: $CUR_VER"
-echo "   NEW_VER: $NEW_VER"
-echo "      SUDO: $SUDO"
-echo "  SYSMERGE: $SYSMERGE"
-echo "    MIRROR: $MIRROR"
+echo "          SUDO: $SUDO"
+echo "      SYSMERGE: $SYSMERGE"
+echo "        MIRROR: $MIRROR"
+echo "    RELEASEDIR: $RELEASEDIR"
+echo "       DESTDIR: $DESTDIR"
+echo "INSTALLED_SETS: $INSTALLED_SETS"
 echo
+echo "       CUR_VER: $CUR_VER"
+echo "       NEW_VER: $NEW_VER"
+#echo "      FILE_VER: $FILE_VER"
+echo
 
-if [ X"" == X"$RELEASEDIR" ]; then
-    echo '### GETTING SETS ###'
+if [ ${_error} -ne 0 ]; then
+	exit ${_error}
+fi
+
+if [ X"" != X"${FTP}" ]; then
     get_sets
 fi
 
+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
 fi
 
-echo '### INSTALLING KERNEL ###'
-install_kernel
+install_kernels
+install_sets
 
-if [ $CUR_VER == $NEW_VER -o X"" != X"$FORCE_DIR" ]; then
-    echo '### INSTALLING SETS ###'
-    install_sets
-
-    echo '### UPDATING ETC ###'
+if [ $CUR_VER == $NEW_VER ]; then
+    if [ -e /sbin/oreboot ]; then
+        echo Removing /sbin/oreboot
+        $SUDO rm -f /sbin/oreboot
+    fi
     update_etc
 
     echo '### UPDATING PACKAGES ###'
@@ -339,7 +542,24 @@
 
 else
     echo Instructions for updating to the new version available from 
-    echo "  http://www.openbsd.org/faq/upgrade${_v}.html"
+    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"
+    fi
 fi
 
 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