default signer less picky, just select by function, e.g., *pkg or *fw.
authorespie <espie@openbsd.org>
Fri, 17 Jan 2014 10:55:01 +0000 (10:55 +0000)
committerespie <espie@openbsd.org>
Fri, 17 Jan 2014 10:55:01 +0000 (10:55 +0000)
usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm

index adc558a..90539c6 100644 (file)
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: AddCreateDelete.pm,v 1.21 2014/01/14 10:05:58 espie Exp $
+# $OpenBSD: AddCreateDelete.pm,v 1.22 2014/01/17 10:55:01 espie Exp $
 #
 # Copyright (c) 2007-2014 Marc Espie <espie@openbsd.org>
 #
@@ -112,16 +112,10 @@ OpenBSD::Auto::cache(signer_list,
                if ($self->defines('SIGNER')) {
                        return [split /,/, $self->{subst}->value('SIGNER')];
                } else {
-                       require OpenBSD::Paths;
-
-                       my $cmd = OpenBSD::Paths->uname." -r";
-                       my $value = `$cmd`;
-                       $value =~ s/\.//;
-                       chomp $value;
                        if ($self->defines('FW_UPDATE')) {
-                               return [$value."fw", qr{^\d+fw$}];
+                               return [qr{^.*fw$}];
                        } else {
-                               return [$value."pkg", qr{^\d+pkg$}];
+                               return [qr{^.*pkg$}];
                        }
                }
        });