===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.6
retrieving revision 1.19
diff -u -r1.6 -r1.19
--- openbsd/update_openbsd/update_openbsd	2008/10/11 23:14:25	1.6
+++ openbsd/update_openbsd/update_openbsd	2009/03/14 02:09:23	1.19
@@ -1,18 +1,6 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.5 2008/10/11 22:12:33 andrew Exp $
+# $RedRiver: update_openbsd,v 1.18 2009/01/14 18:13:23 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
@@ -35,8 +23,44 @@
             echo -n " $_d"
         fi
     done
+
+    sendmail -d0.1 root < /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"`
@@ -45,9 +69,9 @@
 
     local _cv=`echo $CUR_VER | sed -e 's/\.//'`
     local _nv=`echo $NEW_VER | sed -e 's/\.//'`
-    local _v=""
+    local _v
 
-    if [ X"" != X"$FORCE_DIR" -a -d $FORCE_DIR ]; then
+    if [ X"No" != X"$FORCE_DIR" -a -d $FORCE_DIR ]; then
         _dir=$FORCE_DIR
         if [ -e ${_dir}/base${_nv}.tgz ]; then
             _v=$_nv
@@ -71,24 +95,42 @@
 
     fi
 
-    if [ X"" == X"${_v}" ]; then
-        if [ X"" == X"${FORCE_DIR}" ]; then
+    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`
 
-        local _file=`echo "ls base${_cv}.tgz" | ${FTP_CMD} ${FTP}/ | awk '{ print $9 }'`
+        _v=`version_in`
 
-        if [ X"base${_cv}.tgz" == X"${_file}" ]; then
+        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
-            _v=$_cv
+            _dir=${NEW_VER}
+            FTP=${MIRROR}/${_dir}/`machine`
+
+            _v=`version_in`
+        fi
+
+        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
-            _v=$_nv
+            echo Invalid version [$_v] >&2
+            return 2
         fi
 
-        if [ X"" == X"$FORCE_DIR" ]; then
+        if [ X"No" == X"$FORCE_DIR" ]; then
             _dir=$NEW_VER
         fi
 
@@ -96,21 +138,24 @@
 
     if [ X"" == X"${_v}" ]; then
         echo ERROR: Unable to determine file version! >&2
-        exit 1
+        return 1
     fi
 
     if [ X"" == X"$RELEASEDIR" ]; then
         RELEASEDIR=`pwd`/$_dir
     fi
+
     FILE_VER=$_v
-    FTP=${MIRROR}/${_dir}/`machine`
+    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 set! >&2
-        exit 1
+        return 1
     fi
 
     mkdir -p ${RELEASEDIR}
@@ -126,26 +171,79 @@
     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
+        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
 
     if [ ! -e MD5 ]; then
         echo $FTP_CMD ${FTP}/MD5
         $FTP_CMD ${FTP}/MD5
     fi
+}
 
-    ls bsd* *.tgz > index 
+check_md5() {
+    echo '### CHECKING MD5 ###'
+    cd $RELEASEDIR
+
+    if [ ! -e MD5 ]; then
+        echo MD5 File does not exist!
+        return 1
+    fi
+
+    ls bsd* *gz | sed -e 's/\(.*\)/(\1)/' > index 
     grep -f index MD5 | md5 -c
 
     if [ $? -ne 0 ]; then
         echo ERROR: MD5 does not match! >&2
-        exit 1
+        return 1
     fi
 }
 
+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
+
+    check_md5
+}
+
+
 install_kernel() {
     echo '### INSTALLING KERNEL ###'
     if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then
@@ -177,8 +275,9 @@
 
     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/*"
+        echo Extracting new firmware and ifconfig from base${_v}.tgz
+        $SUDO tar -C $DESTDIR -xzphf base${_v}.tgz \
+		./etc/firmware ./sbin/ifconfig
     fi
 
     $SUDO rm -f /obsd
@@ -261,10 +360,26 @@
     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
+        install -o root -g smmsp -m 2555 \
+            ${RELEASEDIR}/sendmail-smtp_auth \
+            /usr/local/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`
@@ -310,34 +425,52 @@
     fi
 }
 
-DESTDIR=${DESTDIR:=/}
-PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}
-INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
+if [ -e /etc/update_openbsd.conf ]; then
+    . /etc/update_openbsd.conf
+fi
 
-if [ X"" != X"$SYSMERGE" ]; then
-    if [ ! -e $SYSMERGE ]; then
-        SYSMERGE=
-    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`}
+
 set_version
+local _error=$?
 
 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 "          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
 
-get_sets
+if [ ${_error} -ne 0 ]; then
+	exit ${_error}
+fi
+
+if [ X"" != X"${FTP}" ]; then
+    get_sets || exit
+fi
+
+check_sets || exit
 
 if [ X"" != X"$SUDO" ]; then
     echo Please enter your sudo password if prompted.