cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

forgotten: scrape SIGNING_PARAMETERS

Browse Source
This commit is contained in:
espie 2017-02-13 12:52:13 +00:00
parent bdbee2d922
commit 93ec01de88
2 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
infrastructure/bin/proot
View File

@ -1,6 +1,6 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: proot,v 1.54 2016/06/26 22:10:03 espie Exp $
# $OpenBSD: proot,v 1.55 2017/02/13 12:52:13 espie Exp $
#
# Copyright (c) 2016 Marc Espie <espie@openbsd.org>
#
@ -196,10 +196,6 @@ sub do_parm
} else {
$state->{sets}{$v} = 1;
}
}, key => sub {
$state->{key} = $v;
$state->{SIGNING_PARAMETERS} =
"-s signify -s /etc/signify/$v-pkg.sec";
}, extra => sub {
$state->{known}{$v} = 1;
}, mkconf_tail => sub {
@ -328,7 +324,7 @@ sub handle_options
if ($< != 0) {
$state->fatal("Must be root");
}
for my $i (qw(PORTSDIR DISTDIR WRKOBJDIR PACKAGE_REPOSITORY PLIST_REPOSITORY LOCKDIR LOGDIR SIGNING_PARAMETERS)) {
for my $i (qw(PORTSDIR DISTDIR WRKOBJDIR PACKAGE_REPOSITORY PLIST_REPOSITORY LOCKDIR LOGDIR)) {
if (defined $state->{$i}) {
$state->{write}{$i} = 1;
}
@ -495,13 +491,6 @@ sub special_data
$state->{known}{'/etc/hosts'} = 1;
}
sub key_data
{
my $state = shift;
$state->{known}{"/etc/signify/$state->{key}-pkg.pub"} = 1;
$state->{known}{"/etc/signify/$state->{key}-pkg.sec"} = 1;
}
sub read_locates
{
my $state = shift;
@ -1079,9 +1068,6 @@ if ($state->{actions}{snapshot}) {
if ($state->{actions}{resolv}) {
$state->special_data;
}
if ($state->{key}) {
$state->key_data;
}
if (defined $state->{known}) {
$state->copy_sync;
}

17
infrastructure/man/man1/proot.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: proot.1,v 1.15 2016/08/09 13:45:01 schwarze Exp $
.\" $OpenBSD: proot.1,v 1.16 2017/02/13 12:52:13 espie Exp $
.\"
.\" Copyright (c) 2016 Marc Espie <espie@openbsd.org>
.\"
@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: August 9 2016 $
.Dd $Mdocdate: February 13 2017 $
.Dt PROOT 1
.Os
.Sh NAME
@ -185,19 +185,6 @@ change owners of every content.
.It Cm extra
extra file to copy into the
.Ar chroot .
.It Cm key
Name of a
.Xr signify 1
signing key.
Just give the stem, as in
.Cm key Ns = Ns Ar stem .
This will copy
.Pa /etc/signify/stem-pkg.{pub,sec}
and set
.Va SIGNING_PARAMETERS
in the generated
.Pa /etc/mk.conf
file accordingly.
.It Cm mkconf_lines
Add lines to the generated
.Pa /etc/mk.conf .