===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.1
retrieving revision 1.5
diff -u -r1.1 -r1.5
--- openbsd/update_openbsd/update_openbsd	2008/08/12 19:45:47	1.1
+++ openbsd/update_openbsd/update_openbsd	2008/10/11 23:12:33	1.5
@@ -1,2 +1,359 @@
 #!/bin/sh
-# $RedRiver$
+# $RedRiver: update_openbsd,v 1.4 2008/08/12 22:44:19 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() {
+    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
+
+    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 -n " $_d"
+        fi
+    done
+}
+
+set_version() {
+    CUR_VER=`uname -r`
+    NEW_VER=`dc -e "$CUR_VER 0.1 + p"`
+    FILE_VER=""
+    FTP=""
+
+    local _cv=`echo $CUR_VER | sed -e 's/\.//'`
+    local _nv=`echo $NEW_VER | sed -e 's/\.//'`
+    local _v=""
+
+    if [ X"" != 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
+        if [ -e ${_dir}/base${_cv}.tgz ]; then
+            _v=$_cv
+        fi
+
+    elif [ -d $NEW_VER ]; then
+        _dir=$NEW_VER
+        if [ -e ${_dir}/base${_nv}.tgz ]; then
+            _v=$_nv
+        fi
+
+    fi
+
+    if [ X"" == X"${_v}" ]; then
+        if [ X"" == X"${FORCE_DIR}" ]; then
+            _dir=${NEW_VER}
+        else
+            _dir=${FORCE_DIR}
+        fi
+        FTP=${MIRROR}/${_dir}/`machine`
+
+        local _file=`echo "ls base${_cv}.tgz" | ${FTP_CMD} ${FTP}/ | awk '{ print $9 }'`
+
+        if [ X"base${_cv}.tgz" == X"${_file}" ]; then
+            NEW_VER=$CUR_VER
+            _v=$_cv
+        else
+            _v=$_nv
+        fi
+
+        if [ X"" == X"$FORCE_DIR" ]; then
+            _dir=$NEW_VER
+        fi
+
+    fi
+
+    if [ X"" == X"${_v}" ]; then
+        echo ERROR: Unable to determine file version! >&2
+        exit 1
+    fi
+
+    if [ X"" == X"$RELEASEDIR" ]; then
+        RELEASEDIR=`pwd`/$_dir
+    fi
+    FILE_VER=$_v
+    FTP=${MIRROR}/${_dir}/`machine`
+}
+
+get_sets() {
+    echo '### GETTING SETS ###'
+    if [ X"" == X"$FTP" ]; then
+        echo ERROR: No FTP site set! >&2
+        exit 1
+    fi
+
+    mkdir -p ${RELEASEDIR}
+    cd $RELEASEDIR
+
+    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
+        if [ ! -e ./${_s}${_v}.tgz ]; then
+            echo $FTP_CMD ${FTP}/${_s}${_v}.tgz
+            $FTP_CMD ${FTP}/${_s}${_v}.tgz
+        fi
+    done
+
+    echo $FTP_CMD ${FTP}/MD5
+    $FTP_CMD ${FTP}/MD5
+    ls bsd* *.tgz > index 
+    grep -f index MD5 | md5 -c
+
+    if [ $? -ne 0 ]; then
+        echo ERROR: MD5 does not match! >&2
+        exit 1
+    fi
+}
+
+install_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
+    fi
+
+    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
+    fi
+
+    if [ -e /bsd.mp -a ! -e bsd.mp ]; then
+        echo ERROR: new bsd.mp kernel does not exist! >&2
+        exit 1
+    fi
+
+    if [ ! -e bsd.rd ]; then
+        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!"
+        exit 1
+    fi
+
+    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
+        else
+            if [ -e /$_b ]; then
+                echo Copying $_b to /
+                $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_b}
+                if [ $? -ne 0 ]; then
+                    echo ERROR: Could not copy new $_b kernel! >&2
+                    exit 1
+                fi
+            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
+    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
+        exit 1
+    else
+        cd $RELEASEDIR
+    fi
+
+    local _v=$FILE_VER
+
+    for _f in *${_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
+            _path=/var/tmp/temproot
+        fi
+
+        echo Extracting $_f to $_path
+        $SUDO mkdir -p $_path
+        $SUDO tar -C $_path -xzphf ${RELEASEDIR}/${_f}
+        if [ $? -ne 0 ]; then
+            echo ERROR: Could not extract ${_f}! >&2
+            exit 1
+        fi
+    done
+
+    echo Extracted all sets.
+}
+
+update_etc() {
+    echo '### UPDATING ETC ###'
+    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
+                    exit 1
+                fi
+            fi
+
+            echo '### RUNNING MERGEMASTER ###'
+            $SUDO $MERGEMASTER -irv
+        else 
+            echo "ERROR: no source for etc!" >&2
+            exit 1
+        fi
+    else
+        if [ X"" == X"$RELEASEDIR" ]; then
+            echo "ERROR: no source for etc!" >&2
+            exit 1
+        else
+            cd $RELEASEDIR
+        fi
+
+        local _v=$FILE_VER
+        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 ###'
+            _args="-a $_args"
+            $SUDO $SYSMERGE $_args
+        fi
+    fi
+}
+
+DESTDIR=${DESTDIR:=/}
+PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}
+INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
+
+if [ X"" != X"$SYSMERGE" ]; then
+    if [ ! -e $SYSMERGE ]; then
+        SYSMERGE=
+    fi
+fi
+
+set_version
+
+echo
+echo "-= update_openbsd - helper script to update OpenBSD =-"
+echo "------------------------------------------------------"
+echo
+echo "RELEASEDIR: $RELEASEDIR"
+echo "   DESTDIR: $DESTDIR"
+echo "   CUR_VER: $CUR_VER"
+echo "   NEW_VER: $NEW_VER"
+#echo "  FILE_VER: $FILE_VER"
+echo "      SUDO: $SUDO"
+echo "  SYSMERGE: $SYSMERGE"
+echo "    MIRROR: $MIRROR"
+echo "      SETS: $INSTALLED_SETS"
+echo
+
+get_sets
+
+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
+
+install_kernel
+
+if [ $CUR_VER == $NEW_VER ]; then
+    install_sets
+    update_etc
+
+    echo '### UPDATING PACKAGES ###'
+    $SUDO pkg_add -ui -F update -F updatedepends
+
+else
+    echo Instructions for updating to the new version available from 
+    echo "  http://www.openbsd.org/faq/upgrade${_v}.html"
+fi
+
+echo New kernel installed.  Please reboot!