From nobody Sat Apr 01 13:55:38 2023 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 4PpdwB3Gksz42mss; Sat, 1 Apr 2023 13:55:38 +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 4PpdwB2bqJz3G8s; Sat, 1 Apr 2023 13:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680357338; 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=ugy7Asisurqu3dBbtKDTI+iPvjPQ1YgVIkV/QIwHu+4=; b=GRK+q3AGmi85XrmtWrO3XHY7sYyUl0KopktTA3oKHBJBnuCEraUgBG0XJC7IChWgoCz2nG XRwYeR52gEwwGU4UW8Eq9Sfl+kjLSyJJf8NaLUFXhRzmnSqaRZmxHE6jPFj7BlAILqc0EH 6QCef9JSRHuBGv8WMBmNldzb8KGNgTDmu+WdiZBl6gOw5ph1Cico9i5pJ5Rwy4/ZXVXCWn bWKabnyz9MY8KBuP984RBcqcrhU+SAwAteRKnwVNEOWpOK/KLoSkCEdXHbrShc4e77i3R6 letcWfPWd70KJFlqLTF41tGxuVj49oKynZmeKy7xUAHeTkQNz76BYhy3oKZtkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680357338; 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=ugy7Asisurqu3dBbtKDTI+iPvjPQ1YgVIkV/QIwHu+4=; b=i4aC5vxiYImUYTHQJgdzSqOqLwz/x+s0esuNb7F7KdAoadB+6wpZHMxR8MLNFIUuU3TQ6h 21hn77ISQdtpqZ4Kqevd5y01109g09hHuVpWZAJEikfYL0AFFi0+8C5PDpKKQlmdWRHbg+ i9+fdW9hhtZ8+2kpL33z1RuxsAbxwsaLS0CG6bp2Zswg4dQ3xwuguyUHo25iL+mCDGnxDI Q+V4L36FCRmrTSUtZSZIvr+CLTEWyCdKQV+E33IkDQLI6h/x1DXF/zoyTnToS8jn1DsBJL 2pO9j3/a9QZ7R/cs8Y3uxkzvefa/1ZbDzl1C2rOrtyemCU86r8KSQuHZyymrYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680357338; a=rsa-sha256; cv=none; b=gnCNbrO5prT9/LUEVA7LxUmuD6rATEjepQ7kXqkQcxEOZ+3bQzZcDXnx72f96dHqMBrtUt nIpfc15Z9my8/GSyM8JMenQ63KrLgARyq1W07HYRfKDVcEwexXtyjEn8TIfD0mHFPhYqUi TnHfLXcmVwIrWdomN/Ac/07eQQJ6gdwY2dCBNHJKfMUkNFgv6MBnA95i0Cwg0MG+SgpOEy vfUq/YmVJiZLXaRtVgcFak6t0ThsIjFPkUM0OAlJ5JE02ueCrczRcbq5EBbM1Yi9mvbZmk xKtAZVHproXqnHKQaNQ1uWAh5eDHfCV7e+ZFqI8L+WjePqXS2OC3xWGKF6u9Jw== 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 4PpdwB1Q4SzdP1; Sat, 1 Apr 2023 13:55:38 +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 331DtcGu055553; Sat, 1 Apr 2023 13:55:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 331DtcfF055552; Sat, 1 Apr 2023 13:55:38 GMT (envelope-from git) Date: Sat, 1 Apr 2023 13:55:38 GMT Message-Id: <202304011355.331DtcfF055552@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: 34da3d71612d - main - security/acme.sh: Fix up some install issues 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: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34da3d71612d361f431f3fd73dc3c2a3d3268726 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=34da3d71612d361f431f3fd73dc3c2a3d3268726 commit 34da3d71612d361f431f3fd73dc3c2a3d3268726 Author: Dan Langille AuthorDate: 2023-04-01 13:53:56 +0000 Commit: Dan Langille CommitDate: 2023-04-01 13:55:35 +0000 security/acme.sh: Fix up some install issues Don't install cronjob to /usr/local/etc/cron.d/ There is no concept of sample files in this directory. Everything is active. Instead, install to /usr/local/share/examples/acme.sh and let the user copy it over. In the cronjob itself, specify the acme user. This was previously omitted and the job would not run. Install the sample newsyslog file to /usr/local/etc/newsyslog.conf.d - this was installing to /usr/local/etc/newsyslog.d/acme.sh Add an update cluse to pkg-message mentioning the newsyslog issue. None of these changes should break existing installs. --- security/acme.sh/Makefile | 11 ++++++----- security/acme.sh/files/acme-crontab.in | 9 +++------ security/acme.sh/files/pkg-message.in | 20 +++++++++++++++++--- security/acme.sh/pkg-plist | 5 ++--- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/security/acme.sh/Makefile b/security/acme.sh/Makefile index 70ece1374805..a19716147194 100644 --- a/security/acme.sh/Makefile +++ b/security/acme.sh/Makefile @@ -1,6 +1,7 @@ PORTNAME= acme.sh -DISTVERSIONPREFIX= v PORTVERSION= 3.0.5 +DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= security MAINTAINER= dvl@FreeBSD.org @@ -39,6 +40,8 @@ PORTDOCS= README.md SUB_FILES= acme-crontab pkg-message +SUB_LIST= ACME_USER=acme + post-patch-EXAMPLES-on: ${REINPLACE_CMD} -e 's|sed -i "|sed -i bak "|' ${WRKSRC}/dnsapi/dns_nsd.sh @@ -51,16 +54,14 @@ do-install: ${MKDIR} ${STAGEDIR}/var/db/acme/.acme.sh \ ${STAGEDIR}/var/db/acme/certs \ - ${STAGEDIR}${PREFIX}/etc/cron.d \ - ${STAGEDIR}${PREFIX}/etc/newsyslog.d \ + ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d \ ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${FILESDIR}/account.conf.sample ${STAGEDIR}/var/db/acme/.acme.sh - # install the sample file; pkg-plist will install to etc/cron.d for us ${INSTALL_DATA} ${WRKDIR}/acme-crontab ${STAGEDIR}${EXAMPLESDIR}/acme.sh-cron.d - ${INSTALL_DATA} ${FILESDIR}/acme-newsyslog ${STAGEDIR}${PREFIX}/etc/newsyslog.d/acme.sh.sample + ${INSTALL_DATA} ${FILESDIR}/acme-newsyslog ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/acme.sh.conf.sample do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/security/acme.sh/files/acme-crontab.in b/security/acme.sh/files/acme-crontab.in index ce8379bd2e76..ffde51de652f 100644 --- a/security/acme.sh/files/acme-crontab.in +++ b/security/acme.sh/files/acme-crontab.in @@ -1,15 +1,12 @@ # -# By default, all entries in this file are commented and inactive. -# Please uncomment and customize as shown below. +# This file should be copied to /usr/local/etc/cron.d/acme # use /bin/sh to run commands, overriding the default set by cron -# uncomment, don't change the value #SHELL=/bin/sh # mail any output to here, no matter whose crontab this is -# uncomment, set the addres #MAILTO=me@example.org -# uncomment, set mm and hh to the time (e.g. hh:mm) of day you want the +# set mm and hh to the time (e.g. hh:mm) of day you want the # cronjob to run -#mm hh * * * %%PREFIX%%/sbin/acme.sh --cron --home /var/db/acme/.acme.sh > /dev/null +mm hh * * * %%ACME_USER%% %%PREFIX%%/sbin/acme.sh --cron --home /var/db/acme/.acme.sh > /dev/null diff --git a/security/acme.sh/files/pkg-message.in b/security/acme.sh/files/pkg-message.in index 7668c66202a1..1d272e070567 100644 --- a/security/acme.sh/files/pkg-message.in +++ b/security/acme.sh/files/pkg-message.in @@ -17,13 +17,27 @@ If you have EXAMPLES on: included are the deploy scripts. * A newsyslog.conf sample file is installed at - %%PREFIX%%/etc/newsyslog.d/acme.sh - you must modify it by + %%PREFIX%%/etc/newsyslog.conf.d/acme.sh.conf - you must modify it by at least uncommenting the line. * If you run `newsyslog -NC` it will create the required logfiles. -* Please edit %%PREFIX%%/etc/cron.d/acme.sh - directions are provided in that - file. +* Please review %%EXAMPLESDIR%%/acme.sh-cron.d - instructions are + contained in that file. +EOM +} +{ type: upgrade + message: <