From nobody Mon Apr 3 19:50:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pr1hY4qNXz43D7D; Mon, 3 Apr 2023 19:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pr1hY40W8z4X4x; Mon, 3 Apr 2023 19:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680551421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RalKKREZ4cNPsU5C/LkxkTq/F5GPDsLMqfNc+ZwXlaw=; b=tbNW6yBPFeesDUNPFnnbmRkqgkvHfKoSZon38dC7Kqrrhu4c4oqbm0EkE/mbUqmTekA4L6 UOxuORmiSgRxo+MitJ9sDtzKDVwO82e7IExHLJ/fAoMV9bPHJfMBY/PHIk3Un+VYKX1ceb ON8HhMVER3jIMZzxmcOWU4ZNnWriPYDGOiDIsE3Rhx0Ghfur0TH52MAlje2/iaMnKRWgl7 WXbhH6qPuvBnLD155PvOUAG9joQrILDWsueTgIApZOKJOQAmTO+QAqujTTgL8BOlyjAEow b7T4530xhcHnHTdkvhzvX8KQT6lTAUroH0+1jAnk8qSxtsx0jPbrQ6bnLyC8+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680551421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RalKKREZ4cNPsU5C/LkxkTq/F5GPDsLMqfNc+ZwXlaw=; b=Fw/B1aEQOQ9vb/8/2uXUNtHwRTzYtnmqiuxdjNcXckj/W4Si1HLT/5KTlyatJkOiEfENfX BU2EFYseIukIdwfMG7uErsC7w2bZm6gJKXmFO+50l1csc0wAgX9/jmqinVNV3QxdOZD2t+ bULqD6WlDhPaQtqXqQeIIcdi0KAvN9D5nqvDVekZ3Az+7Ni5SAWF3lpoS9ukvzT01o/3dF ZpRRNh0ClHpNPSwxkGV2RRgSW0B/I4GPh8Pygu6m+DY/9MbJ+QRjAfipP/72TmfFIAGvZx DeRE1mW31u7L6hdbdjf0kCSEOFqk95LGGjUFLOAMU9rBA087zGDL0Sok3QjrWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680551421; a=rsa-sha256; cv=none; b=KSVUfsDt9eEQpD9MddOSfv3NWFj0Isi7bdVMlDFOebnwvzKvygpR1/hfsYT2NIM8zbcs8B LnwidRsO4PSmWhYt/WwUZDr5daAO/Y9VzVwOnq5pDp3b/Yi4MleKk4RXZXa83OdxmpmadL 2s6UPoZ31kNZWdiQYOlloMAfA+6aZ87jDdiDFCVKcyyYfxWF4FSQpceYZou8N89PWaiY8v CWrwlu7U3GEFuihR1GxZTKXDSRBXzMpqyaV8uLW9aKN+nsPPSxwX/TGpfxQTJj/mTnWxEb 7jEP6WoX3VJSydY65lDwf5VO/gd2exo8TlDpCYYe0O6D5BMS3YcrmVFHG7dHvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pr1hY32xxz1B1Z; Mon, 3 Apr 2023 19:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 333JoL1d068562; Mon, 3 Apr 2023 19:50:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 333JoLY5068561; Mon, 3 Apr 2023 19:50:21 GMT (envelope-from git) Date: Mon, 3 Apr 2023 19:50:21 GMT Message-Id: <202304031950.333JoLY5068561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3cb808226c1f - main - setkey(8): add -e option to take script from the command line List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cb808226c1f62ed5c726480073eb9035a24d2cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3cb808226c1f62ed5c726480073eb9035a24d2cc commit 3cb808226c1f62ed5c726480073eb9035a24d2cc Author: Konstantin Belousov AuthorDate: 2023-04-03 01:03:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-03 19:48:48 +0000 setkey(8): add -e option to take script from the command line Reviewed by: ae Sponsored by: Nvidia networking MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39393 --- sbin/setkey/setkey.8 | 14 ++++++++++---- sbin/setkey/setkey.c | 17 ++++++++++++++++- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8 index 6df1839ca6e4..38c10546cccb 100644 --- a/sbin/setkey/setkey.8 +++ b/sbin/setkey/setkey.8 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 19, 2022 +.Dd April 3, 2023 .Dt SETKEY 8 .Os .\" @@ -45,6 +45,9 @@ .Op Fl v .Fl f Ar filename .Nm +.Op Fl v +.Fl e Ar script +.Nm .Op Fl Pgltv .Fl D .Nm @@ -65,11 +68,14 @@ The .Nm utility takes a series of operations from the standard input (if invoked with -.Fl c ) -or the file named +.Fl c ) , +from the file named .Ar filename (if invoked with -.Fl f Ar filename ) . +.Fl f Ar filename ) , +or from the command line argument following the option +(if invoked with +.Fl e Ar script ) . .Bl -tag -width indent .It Fl D Dump the SAD entries. diff --git a/sbin/setkey/setkey.c b/sbin/setkey/setkey.c index faf6373b312e..50f1c7056381 100644 --- a/sbin/setkey/setkey.c +++ b/sbin/setkey/setkey.c @@ -99,6 +99,7 @@ usage(void) printf("usage: setkey [-v] -c\n"); printf(" setkey [-v] -f filename\n"); + printf(" setkey [-v] -e \"