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,79 +1,80 @@ PORTNAME= acme.sh -DISTVERSIONPREFIX= v PORTVERSION= 3.0.5 +DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= security MAINTAINER= dvl@FreeBSD.org COMMENT= ACME protocol client written in shell WWW= https://github.com/Neilpang/acme.sh/ LICENSE= GPLv3+ USE_GITHUB= yes GH_ACCOUNT= acmesh-official USERS= acme GROUPS= acme OPTIONS_DEFINE= BINDTOOLS DOCS EXAMPLES IDN STANDALONE OPTIONS_DEFAULT= CURL STANDALONE OPTIONS_SINGLE= HTTP OPTIONS_SINGLE_HTTP= CURL WGET BINDTOOLS_DESC= Depend on bind-tools for nsupdate CURL_DESC= Depend on cURL for HTTP(S) queries STANDALONE_DESC= Standalone mode requires SOCAT WGET_DESC= Depend on Wget for HTTP(S) queries NO_ARCH= yes NO_BUILD= yes BINDTOOLS_RUN_DEPENDS= nsupdate:dns/bind-tools CURL_RUN_DEPENDS= curl:ftp/curl IDN_RUN_DEPENDS= idn2:dns/libidn2 STANDALONE_RUN_DEPENDS= socat>0:net/socat WGET_RUN_DEPENDS= wget:ftp/wget 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 post-patch-IDN-on: ${REINPLACE_CMD} -e 's|^ *idn | idn2 |'\ -e 's|_exists idn|_exists idn2|' ${WRKSRC}/acme.sh do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin/${PORTNAME} ${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} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/deploy ${STAGEDIR}${EXAMPLESDIR}/dnsapi ( cd ${WRKSRC} && ${COPYTREE_BIN} deploy ${STAGEDIR}${EXAMPLESDIR} ) ( cd ${WRKSRC} && ${COPYTREE_BIN} dnsapi ${STAGEDIR}${EXAMPLESDIR} ) ( cd ${WRKSRC} && ${COPYTREE_BIN} notify ${STAGEDIR}${EXAMPLESDIR} ) ${RLN} ${STAGEDIR}/${EXAMPLESDIR}/deploy ${STAGEDIR}/var/db/acme/.acme.sh ${RLN} ${STAGEDIR}/${EXAMPLESDIR}/dnsapi ${STAGEDIR}/var/db/acme/.acme.sh ${RLN} ${STAGEDIR}/${EXAMPLESDIR}/notify ${STAGEDIR}/var/db/acme/.acme.sh .include 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 @@ -1,29 +1,43 @@ [ { type: install message: <