===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.54
retrieving revision 1.64
diff -u -r1.54 -r1.64
--- openbsd/update_openbsd/update_openbsd	2013/12/28 02:55:28	1.54
+++ openbsd/update_openbsd/update_openbsd	2014/02/01 16:31:51	1.64
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.53 2013/11/09 21:58:26 andrew Exp $
+# $AFresh1: update_openbsd,v 1.63 2014/01/23 03:17:06 andrew Exp $
 # 
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -18,7 +18,7 @@
 
 installed_sets() {
     local misc=/usr/share/doc/README
-    local man=/usr/share/man/cat1/intro.0
+    local man=/usr/share/man/man1/intro.1
     local comp=/usr/bin/cc
     local game=/usr/games/
     local xbase=/usr/X11R6/
@@ -157,7 +157,11 @@
     fi
 
     if [ X"" == X"${_v}" ]; then
-        echo ERROR: Unable to determine file version! >&2
+        if [ X"" == X"${MIRROR}" ]; then
+            echo ERROR: No sets, and no MIRROR, unable to continue. >&2
+        else
+            echo ERROR: Unable to determine FILE_VER, check your MIRROR. >&2
+        fi
         return 1
     fi
 
@@ -234,10 +238,12 @@
     done
 
     local _type
+    local _ftp
     for _type in $CHECKSUM_TYPES; do
         [ -e $_type ] && break
-        echo "===> $FTP_CMD ${FTP}/$_type"
-        $FTP_CMD ${FTP}/$_type
+        _ftp=`echo "$FTP" | sed -e 's,://[^/]*/,://ftp.openbsd.org/,'`
+        echo "===> $FTP_CMD ${_ftp}/$_type"
+        $FTP_CMD ${_ftp}/$_type
     done
 }
 
@@ -263,9 +269,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 2>/dev/null`
+    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
@@ -315,9 +340,12 @@
     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
 }
 
 
@@ -452,10 +480,10 @@
     local _v=$FILE_VER
     local _args=""
     if [ -e etc${_v}.tgz ]; then
-        _args="$_args -s etc${_v}.tgz"
+        _args="$_args -s ${RELEASEDIR}/etc${_v}.tgz"
     fi
     if [ -e xetc${_v}.tgz ]; then
-        _args="$_args -x xetc${_v}.tgz"
+        _args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz"
     fi
     if [ X"" == X"$_args" ]; then 
         echo ERROR: No upgrade sets found! >&2
@@ -486,7 +514,7 @@
 
 INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
 
-CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256 MD5}
+CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256}
 
 set_version
 local _error=$?