From nobody Mon Aug 19 00:19:55 2024 X-Original-To: dev-commits-ports-all@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 4WnCsS2fVtz5Tc8p; Mon, 19 Aug 2024 00:19:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WnCsS1dFRz4bmb; Mon, 19 Aug 2024 00:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724026796; 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=d4RzLhoLvAfBMCqt5RTCdwPSl6GITjsFwLTiuj5wBNM=; b=L8IQtEOmwvirer7wZTho1EcEYpLatYNR6w0Vqe/1D8MKE6XspJod37vo/kQjqqM3em/u+K qdkk1k5EmZi0m/gnLH1X2uSL7Vfgv4ZVH3+FcjccEEBXUeGMxoDtkYrkdZYQLDQGNgEh9a gPPf8lwcrFe7nvsuA1J/oCxvUdqGO8D8ecomvIysF8r1tQl4koq8UtCRL8TzHjd6fKtUtO 2nz1KjblaR2LtwoFYqdT2QlFzq9jtzZIU6SOAiZxMz4Otu/Q2NDoZlv6gjRrIdIFj0ctL7 jJ+dLGwUJzuI7KiEefghfkWV3dlOAFUgQm4FZ6NvT515VeQKlaCqycFlVDqy0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724026796; a=rsa-sha256; cv=none; b=lDgke6gqxPD6u+3e6OqQJNE1KSSA2QJj3SilrPb4mFBOC2qA2xDc4APrwrus6EMuShQJOG faBC/8txZ4FrFHdw+ZeUvwX2g0FNE024PXecbJPIKErfnaDZ9BUcTP7w3dodfRl6DCCf+Q P9CZwimFxHAjTKEBVzKA0MBwZyp1AKafFHaBLzqHdH/quJWrgClZ571wbuck5lIwCRVkNa QWZqzbiwfj65KfdShueRKjcYTrOqWzMPQM36JYpI882KDU5t01JOuCXLLXE0D5WtGdXX1R LEO+25ttOQ3BFyg7pg87bgHmnNItv6K3EPr2vWh8A7d6Yg0MN8ywLAWwqYyNYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724026796; 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=d4RzLhoLvAfBMCqt5RTCdwPSl6GITjsFwLTiuj5wBNM=; b=tHehNICxYhQZv2ARxr8VILYNhBpDkynu0qCNaTQW0297NEADNYkZu7EpZ80cOK0M4eguGm QXLnJK5wK6fOZ7CarlRR/LWSXvHJgEyzMciDh5I6aTbs8iEEPW1Z/W2ECkb5qyzSUG1Fq2 OfcQPSGi1Fx+PymwnDsFPwGLPPdL3QccYQWLVrqBUAmluykHJIkAzICoiJuHFWHVnu7NML yYmCMSXteMCFRSaxVeI/JwvhV9KmZuUP4AaZMZI4xX1EhjnzCdhb1taCXYhdgiBT0lMxS4 tyGJlsJZJraM8Wn1Ipi8pilZ8SbEUUWDXq6PW4MhF9WsFP3JuKKVq2l2/RYbKA== 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 4WnCsS0fDvzvZ0; Mon, 19 Aug 2024 00:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47J0Jt5i039295; Mon, 19 Aug 2024 00:19:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47J0JtcJ039292; Mon, 19 Aug 2024 00:19:55 GMT (envelope-from git) Date: Mon, 19 Aug 2024 00:19:55 GMT Message-Id: <202408190019.47J0JtcJ039292@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: a38bf998b911 - main - security/acme.sh: fix 'pkg -r' installation List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a38bf998b911e2bbcd611e703bd011f49d572d87 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=a38bf998b911e2bbcd611e703bd011f49d572d87 commit a38bf998b911e2bbcd611e703bd011f49d572d87 Author: Siva Mahadevan AuthorDate: 2024-08-18 23:09:50 +0000 Commit: Dan Langille CommitDate: 2024-08-19 00:18:39 +0000 security/acme.sh: fix 'pkg -r' installation PR: 280916 --- security/acme.sh/Makefile | 2 +- security/acme.sh/pkg-post-install | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/security/acme.sh/Makefile b/security/acme.sh/Makefile index 7b383a071e92..06698e11933c 100644 --- a/security/acme.sh/Makefile +++ b/security/acme.sh/Makefile @@ -1,6 +1,6 @@ PORTNAME= acme.sh PORTVERSION= 3.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MAINTAINER= dvl@FreeBSD.org diff --git a/security/acme.sh/pkg-post-install b/security/acme.sh/pkg-post-install index 7f1b8ddddc63..fecfc70882d8 100644 --- a/security/acme.sh/pkg-post-install +++ b/security/acme.sh/pkg-post-install @@ -1,7 +1,8 @@ #!/bin/sh # create the log file, if it does not exist -if [ ! -f /var/log/acme.sh.log ] +if [ ! -f "${PKG_ROOTDIR}/var/log/acme.sh.log" ] then - /usr/bin/install -C -m 640 -o acme -g acme /dev/null /var/log/acme.sh.log + chroot "${PKG_ROOTDIR}" \ + /usr/bin/install -C -m 640 -o acme -g acme /dev/null /var/log/acme.sh.log fi