===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.66
retrieving revision 1.68
diff -u -r1.66 -r1.68
--- openbsd/update_openbsd/update_openbsd	2014/02/01 22:07:04	1.66
+++ openbsd/update_openbsd/update_openbsd	2014/10/18 23:42:35	1.68
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.65 2014/02/01 19:13:53 andrew Exp $
+# $AFresh1: update_openbsd,v 1.67 2014/05/11 02:40:54 andrew Exp $
 # 
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -271,7 +271,7 @@
 
     local _nv=`echo $NEW_VER | sed -e 's/\.//'`
     local _signify=`which signify 2>/dev/null`
-    local _keyfile=/etc/signify/${_nv}base.pub 
+    local _keyfile=/etc/signify/openbsd-${_nv}-base.pub 
     local _b _s
 
     (
@@ -286,7 +286,7 @@
             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 -
+        signify -V -e -p $_keyfile -x $_type -m - | grep -f index | sha256 -c -
     else
        grep -f index $_type | sum -c
     fi
@@ -462,27 +462,31 @@
         exit 1;
     fi
 
-    if [ X"" == X"$RELEASEDIR" ]; then
-        echo "ERROR: no source for etc!" >&2
-        exit 1
-    fi
-
-    cd $RELEASEDIR
-
     local _v=$FILE_VER
     local _args=""
-    if [ -e etc${_v}.tgz ]; then
-        _args="$_args -s ${RELEASEDIR}/etc${_v}.tgz"
+
+    if [ ! -e /usr/share/sysmerge/etc.tgz ]; then
+        if [ X"" == X"$RELEASEDIR" ]; then
+            echo "ERROR: no source for etc!" >&2
+            exit 1
+        fi
+
+        cd $RELEASEDIR
+
+        if [ -e etc${_v}.tgz ]; then
+            _args="$_args -s ${RELEASEDIR}/etc${_v}.tgz"
+        fi
+        if [ -e xetc${_v}.tgz ]; then
+            _args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz"
+        fi
+        if [ X"" == X"$_args" ]; then 
+            echo ERROR: No upgrade sets found! >&2
+            exit 1
+        fi
     fi
-    if [ -e xetc${_v}.tgz ]; then
-        _args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz"
-    fi
-    if [ X"" == X"$_args" ]; then 
-        echo ERROR: No upgrade sets found! >&2
-    else
-        echo '==> RUNNING SYSMERGE'
-        $SYSMERGE $_args
-    fi
+
+    echo '==> RUNNING SYSMERGE'
+    $SYSMERGE $_args
 
     cd $OLDPWD
 }