From nobody Mon Apr 10 05:10:29 2023 X-Original-To: dev-commits-src-branches@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 4Pvxr56RDzz44nB7; Mon, 10 Apr 2023 05:10:29 +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 4Pvxr55NC7z3lnG; Mon, 10 Apr 2023 05:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681103429; 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=3AcyRxFx833ADTpp+kekknrbBvo2iTVYOo91VlYB5hU=; b=nO4ioeRo/cATM5MQ5PLFFbNBxwn3luTqtYWYpXpjYmIKNeCUbbMprq+una/hpe4xjBFRJH VS4x+vpbTMSkaKITlg04vP680o71af2i5Z/SUx8HjaJ57o9c5yE6w8bCcFxSldqgjbV2M9 SrfYM1JliD7rJbwN3HWjvTgXVVdl+zkVlk4xkBeYmEwbPqm3KK0jzmhOROdqCbQokNVgXE PefFXN7KuawVoTHOqXW9uZVvOz/X0KDSqBQnZLKD7gbyC7UomFFFV6U3OY7XfLPsbSdbZC cNr3h4QI+WT2F0yD7ufv74IAc3Lg3rnlyRmsaG+dicNz9BKeuYMuldmMRIbzuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681103429; 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=3AcyRxFx833ADTpp+kekknrbBvo2iTVYOo91VlYB5hU=; b=p/lIODkgg47VJn1KHtlCBUuEgD2ZtLDWyROx45mt0NTA81lwYZz1Kg/UfN2JqoFWKybTSJ 1p6hvvbrkMzjpZ8O3qlC+ttQ5LYXH/Wkpz7XrDhpgRk+5OuH0Oh33ZzIkdHYLqXkkRRkcn AzMiRsnQXYW6kiQuIvDSx4HGkbrNpbfcQ2FJn+l8Aq9BVDKL7bXL9feCQDxVAtNJ/vIZXm S/ZaAtgsNJqZSE0HUWjtf2ReaCwIFDeIk/m38OCQ2EGLBrTf+4ZDMnHBncjun7MXMGRMO1 GsssyiVtJY1AEd4XQrcCt9YQ3XsprpMKtYd0n5m/a4IMhpkkOtpY8X5SFS7Drg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681103429; a=rsa-sha256; cv=none; b=jQzGoBRmkMYQuraWn4lfAgfwTfRsGEy3ZG1mvhOsNjENvbH/vubRGbr2+/CXe7VVsZH3Ii VIMuVpGqe4oP9UUxtl9ijwE/4OBoohhjalYjJUyJTVtyLb+W9804sO/O8YZzXx++jWqdUA HvwU2aYSU76JHRzs4Rdq5RXFgpZnKIXD6dsKB5+PfxGpBS3O04FMph3QvR9QFO8PzGtmTJ yZa8w7mtQ14T0amIsavzw1+esNTlEMbLH1g21Nfa4eOZXt4f6iOYmgXxDds2CD4V00OY6b VqNVcPcBM1mhEn0D/udqBg0Dbmd7Vul4H4MMlDHic4gELmJNbewse2IMoxXJEg== 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 4Pvxr54SnzzcXd; Mon, 10 Apr 2023 05:10:29 +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 33A5ATDK031192; Mon, 10 Apr 2023 05:10:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33A5ATPS031191; Mon, 10 Apr 2023 05:10:29 GMT (envelope-from git) Date: Mon, 10 Apr 2023 05:10:29 GMT Message-Id: <202304100510.33A5ATPS031191@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3cea7ca846e9 - stable/13 - setkey(8): add -e option to take script from the command line List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3cea7ca846e94c90e3cb39200f72daac48bceac9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3cea7ca846e94c90e3cb39200f72daac48bceac9 commit 3cea7ca846e94c90e3cb39200f72daac48bceac9 Author: Konstantin Belousov AuthorDate: 2023-04-03 01:03:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-10 05:10:06 +0000 setkey(8): add -e option to take script from the command line (cherry picked from commit 3cb808226c1f62ed5c726480073eb9035a24d2cc) --- 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 2bb87cc21a97..20754c1b368f 100644 --- a/sbin/setkey/setkey.8 +++ b/sbin/setkey/setkey.8 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 13, 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 2bc8ec7e5816..ff2509555ff2 100644 --- a/sbin/setkey/setkey.c +++ b/sbin/setkey/setkey.c @@ -99,6 +99,7 @@ usage() printf("usage: setkey [-v] -c\n"); printf(" setkey [-v] -f filename\n"); + printf(" setkey [-v] -e \"