use full signatures to avoid downgrades.

remove double check in update that properly belongs in pkg_add
replace has_new_sig by has_different_sig, with better diagnostic messages.

1 files changed, 4 insertions, 18 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm
index 3000286bd55..e79e4f20788 100644
--- a/usr.sbin/pkg_add/OpenBSD/Update.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Update.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Update.pm,v 1.132 2010/01/09 15:10:17 espie Exp $
+# $OpenBSD: Update.pm,v 1.133 2010/01/10 16:03:49 espie Exp $
 #
 # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
 #
@@ -122,7 +122,6 @@ sub process_handle
 	eval {
 		$state->quirks->tweak_search(\@search, $h, $state);
 	};
-	my $found;
 	my $oldfound = 0;
 
 	# XXX this is nasty: maybe we added an old set to update 
@@ -164,9 +163,9 @@ sub process_handle
 			$oldfound = 1;
 			next;
 		    }
-		    if ($plist->signature->compare($p2->signature) eq 0) {
-			$found = $loc;
-			push(@l2, $loc);
+		    my $r = $plist->signature->compare($p2->signature);
+		    if (defined $r && $r > 0 && !$state->{defines}{downgrades}) {
+		    	$oldfound = 1;
 			next;
 		    }
 		    if ($plist->match_pkgpath($p2)) {
@@ -194,19 +193,6 @@ sub process_handle
 		}
 		return undef;
 	}
-	if (@$l == 1) {
-		if (defined $found && $found eq $l->[0] &&
-		    !$plist->uses_old_libs && !$state->{defines}->{installed}) {
-			$h->{update_found} = $h;
-			$set->move_kept($h);
-
-			$self->progress_message($state, 
-			    "No need to update $pkgname");
-
-			return 0;
-		}
-	}
-
 	$state->say("Update candidates: $pkgname -> ", 
 	    join(' ', map {$_->name} @$l), $state->ntogo) if $state->verbose;