From nobody Thu Jun 02 21:31:11 2022 X-Original-To: dev-commits-ports-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 25D001B67835; Thu, 2 Jun 2022 21:31:12 +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 4LDfMh0bNgz4kjx; Thu, 2 Jun 2022 21:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654205472; 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=I7CO258FiQesV7uUbuPtJcsHL2A6z9nkgpQpccwBFys=; b=a3Um3HZT3XF/1w9aPAXgsRdEgYlqBMocjPvq/5vSXw+5V9NvlJmSnV9Dys8ptUh4+ssgHv BccW+pU17UNYQaPx/1VvKM8ghXFqms8BTi7uq+X3t5bmUPGGiQe1/mvz/9A81k+dunTO07 snFPYC8zYgFYGfk0H7AYvqRrXu7rwBuvth3+nD6ISipgpurk4BnQ+GqFGbhYXBe/9rosK1 W2kz8gE8/yNh0QEfDqSFQl6JL3Aq6FH/JZ+JMQjTZu8NJTFnAl4ALFlmwQZJAQ5BRIx+UU C1BYRmHjZ9dCoi72Nsw6upOCF1XTVNyazJkkx+2grg5OQDt9ZzvU7yLRwKWQew== 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 E9ABB1C69D; Thu, 2 Jun 2022 21:31:11 +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 252LVBiW052676; Thu, 2 Jun 2022 21:31:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 252LVBlU052674; Thu, 2 Jun 2022 21:31:11 GMT (envelope-from git) Date: Thu, 2 Jun 2022 21:31:11 GMT Message-Id: <202206022131.252LVBlU052674@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 0a0dd568d8ab - main - security/easy-rsa: fix confusion of vars file List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a0dd568d8ab0a5598b7d0ccc6d560102418f512 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654205472; 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=I7CO258FiQesV7uUbuPtJcsHL2A6z9nkgpQpccwBFys=; b=d8OF4UOZw64U+DjvK9neGAOmiINUV8r2CkKGT1v9ZGCXfhU5Zfyik2tm7dtl0olAKGOkDK n8BmVUd6PRYkLu8zHQ7nVhJ3GJmgTxa2znGFRcyfM4G0YrOPiWQ6prLRHnE4D+Bu8HZJXI Ldtwv9wdKPS480fy18hmrdh11EXIwspCqLeVu8X5XrA1+KTg2a6OPkEviGA/Sy/8gtE9EO 2lebfSiK3PRJqszhLIRdCZytydb4wBP/QP0RM5KE91kdTkp/WCV2vuXlXEq9cDci9kb5Eg lcr8KTFBFPr/N8s59i4dq38blmNUnyJR77JpcQz1t6hoE5hIqekHV2WKvHaRSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654205472; a=rsa-sha256; cv=none; b=i9alFmts9zRfrXL+JYVuu8bcls+bxgSC8QPT6nI8JtcR6dZbB16bTGVGCA/1K29nj/kr+u C/lbwZwKHPDeQyaXA4BzR9nJmSIKvE477TuPlLyqsr/uB018hB/agSe7vHd+6y0W0fFch7 ZLp622lIX/HcO14D2OOuQ1gGBFEEOudTz4Pz79vBp6RqvzVreXqAjHgAl8rouuA282bXt0 SdcMT3g+MwOpS0uTUWzX/PjprM7Z3DR6h3Vco9rBzvxWYbTOo+bADw4sMqCpfNHGmWRicy Ayt6rtPBjBZO95cVdgnFSaIw1TOq0tu3JsN/wb8lRk+OYOh1YP2wZ1jUNCeRKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a0dd568d8ab0a5598b7d0ccc6d560102418f512 commit 0a0dd568d8ab0a5598b7d0ccc6d560102418f512 Author: Matthias Andree AuthorDate: 2022-06-02 21:26:24 +0000 Commit: Matthias Andree CommitDate: 2022-06-02 21:29:43 +0000 security/easy-rsa: fix confusion of vars file ...and no longer package it as @sample. It is per-PKI, and easyrsa init-pki will copy vars.example from the distribution, and create a PKI-local copy named vars. Should fix grembo@'s bug report [1] add a new pkg-message file to explain this. while here, add a convenience hardlink easy-rsa to the easyrsa wrapper, to have an executable matching the package name. PR: 264415 Reported by: grembo@ (Michael Gmelin) --- security/easy-rsa/Makefile | 2 ++ security/easy-rsa/pkg-message | 15 +++++++++++++++ security/easy-rsa/pkg-plist | 3 ++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/security/easy-rsa/Makefile b/security/easy-rsa/Makefile index b1a0304f579e..7cbe849e9b68 100644 --- a/security/easy-rsa/Makefile +++ b/security/easy-rsa/Makefile @@ -1,5 +1,6 @@ PORTNAME= easy-rsa DISTVERSION= 3.1.0 +PORTREVISION= 1 CATEGORIES= security net-mgmt MASTER_SITES= https://github.com/OpenVPN/easy-rsa/releases/download/v${DISTVERSION}/ DISTNAME= EasyRSA-${DISTVERSION} @@ -33,6 +34,7 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DATADIR}/x509-types/ ${INSTALL_SCRIPT} ${WRKDIR}/easyrsa ${STAGEDIR}${PREFIX}/bin/ + ${LN} -fh ${STAGEDIR}${PREFIX}/bin/easyrsa ${STAGEDIR}${PREFIX}/bin/easy-rsa ${INSTALL_SCRIPT} ${WRKSRC}/easyrsa ${STAGEDIR}${DATADIR}/easyrsa.real ${INSTALL_DATA} ${WRKSRC}/vars.example ${STAGEDIR}${DATADIR}/ ${INSTALL_DATA} ${WRKSRC}/openssl-easyrsa.cnf ${STAGEDIR}${DATADIR}/openssl-easyrsa.cnf.example diff --git a/security/easy-rsa/pkg-message b/security/easy-rsa/pkg-message new file mode 100644 index 000000000000..64008e57eb92 --- /dev/null +++ b/security/easy-rsa/pkg-message @@ -0,0 +1,15 @@ +NOTE: easy-rsa will require you to initialize a pki ONLY UPON FIRST USE. +The packaging itself no longer does this because that would confuse easy-rsa, +and easy-rsa expects the vars not to be per-installation, but per-PKI. + +ONLY for the very first run for a new PKI, do something such as: + + easyrsa --pki-dir=~/my_new_pki init-pki # DANGEROUS - DESTROYS ~/my_new_pki + which will copy vars.example both into ~/my_new_pki + and create another copy named ~/my/new_pki/vars for you to edit for this PKI. + + Then, edit ~/my/new_pki/vars to set the defaults. + +After upgrades, use other commands, explained by running: easyrsa help. +to explain options such as --pki-dir (see above), run: easyrsa help options + diff --git a/security/easy-rsa/pkg-plist b/security/easy-rsa/pkg-plist index a98f2b0dcdf6..af2c06e18188 100644 --- a/security/easy-rsa/pkg-plist +++ b/security/easy-rsa/pkg-plist @@ -1,4 +1,5 @@ bin/easyrsa +bin/easy-rsa %%DATADIR%%/easyrsa.real @sample %%DATADIR%%/openssl-easyrsa.cnf.example %%DATADIR%%/openssl-easyrsa.cnf -@sample %%DATADIR%%/vars.example %%DATADIR%%/vars +%%DATADIR%%/vars.example