Index: head/security/acme.sh/Makefile =================================================================== --- head/security/acme.sh/Makefile (revision 547483) +++ head/security/acme.sh/Makefile (revision 547484) @@ -1,65 +1,64 @@ # $FreeBSD$ PORTNAME= acme.sh -PORTVERSION= 2.8.6 -PORTREVISION= 2 +PORTVERSION= 2.8.7 CATEGORIES= security MAINTAINER= dvl@FreeBSD.org COMMENT= ACME protocol client written in shell LICENSE= GPLv3+ USE_GITHUB= yes GH_ACCOUNT= Neilpang USERS= acme GROUPS= acme OPTIONS_DEFINE= BINDTOOLS DOCS EXAMPLES IDN STANDALONE OPTIONS_SINGLE= HTTP OPTIONS_SINGLE_HTTP= CURL WGET OPTIONS_DEFAULT= CURL STANDALONE BINDTOOLS_DESC= Depend on bind-tools for nsupdate BINDTOOLS_RUN_DEPENDS= nsupdate:dns/bind-tools IDN_RUN_DEPENDS= idn2:dns/libidn2 STANDALONE_DESC= Standalone mode requires SOCAT STANDALONE_RUN_DEPENDS= socat>0:net/socat CURL_DESC= Depend on cURL for HTTP(S) queries WGET_DESC= Depend on Wget for HTTP(S) queries NO_ARCH= yes NO_BUILD= yes CURL_RUN_DEPENDS= curl:ftp/curl WGET_RUN_DEPENDS= wget:ftp/wget PORTDOCS= README.md SUB_FILES= pkg-message 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 ${INSTALL_DATA} ${FILESDIR}/account.conf.sample ${STAGEDIR}/var/db/acme/.acme.sh 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} ) ${INSTALL_DATA} ${FILESDIR}/acme.sh.conf ${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 Index: head/security/acme.sh/distinfo =================================================================== --- head/security/acme.sh/distinfo (revision 547483) +++ head/security/acme.sh/distinfo (revision 547484) @@ -1,3 +1,3 @@ -TIMESTAMP = 1588553979 -SHA256 (Neilpang-acme.sh-2.8.6_GH0.tar.gz) = fd36cb749466296ded521ceacda3fc841ec76be620900d1116e0492d171c1d9f -SIZE (Neilpang-acme.sh-2.8.6_GH0.tar.gz) = 193182 +TIMESTAMP = 1599009231 +SHA256 (Neilpang-acme.sh-2.8.7_GH0.tar.gz) = 774010429730882f6bbfcd3756ff0fa755846106664841092af828a814159861 +SIZE (Neilpang-acme.sh-2.8.7_GH0.tar.gz) = 206475 Index: head/security/acme.sh/files/patch-acme.sh =================================================================== --- head/security/acme.sh/files/patch-acme.sh (revision 547483) +++ head/security/acme.sh/files/patch-acme.sh (nonexistent) @@ -1,19 +0,0 @@ -Fix sudo issue -https://github.com/acmesh-official/acme.sh/pull/2574 - ---- acme.sh.orig 2020-08-02 05:02:04 UTC -+++ acme.sh -@@ -6415,10 +6415,10 @@ _checkSudo() { - #it's root using sudo, no matter it's using sudo or not, just fine - return 0 - fi -- if [ "$SUDO_COMMAND" = "/bin/su" ] || [ "$SUDO_COMMAND" = "/bin/bash" ]; then -+ if [ -n "$SUDO_COMMAND" ]; then - #it's a normal user doing "sudo su", or `sudo -i` or `sudo -s` -- #fine -- return 0 -+ _endswith "$SUDO_COMMAND" /bin/su || grep "^$SUDO_COMMAND\$" /etc/shells >/dev/null 2>&1 -+ return $? - fi - #otherwise - return 1 Property changes on: head/security/acme.sh/files/patch-acme.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/acme.sh/pkg-plist =================================================================== --- head/security/acme.sh/pkg-plist (revision 547483) +++ head/security/acme.sh/pkg-plist (revision 547484) @@ -1,154 +1,162 @@ sbin/acme.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/acme.sh.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/README.md %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/apache.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/cpanel_uapi.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/docker.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/dovecot.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/exim4.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/fritzbox.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/gcore_cdn.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/gitlab.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/haproxy.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/keychain.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/kong.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/mailcow.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/myapi.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/mydevil.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/mysqld.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/nginx.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/opensshd.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/openstack.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/panos.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/pureftpd.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/qiniu.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/routeros.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/ssh.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/strongswan.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/synology_dsm.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/unifi.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/vault_cli.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/vsftpd.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/README.md %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_1984hosting.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_acmedns.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_acmeproxy.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_active24.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_ad.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_ali.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_arvan.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_autodns.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_aws.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_azure.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_cf.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_clouddns.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_cloudns.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_cn.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_conoha.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_constellix.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_cx.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_cyon.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_da.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_ddnss.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_desec.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_df.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_dgon.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_dnsimple.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_do.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_doapi.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_domeneshop.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_dp.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_dpi.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_dreamhost.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_duckdns.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_durabledns.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_dyn.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_dynu.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_dynv6.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_easydns.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_euserv.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_exoscale.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_freedns.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_gandi_livedns.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_gcloud.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_gd.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_gdnsdk.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_he.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_hetzner.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_hexonet.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_hostingde.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_infoblox.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_internetbs.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_inwx.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_ispconfig.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_jd.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_joker.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_kappernet.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_kas.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_kinghost.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_knot.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_leaseweb.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_lexicon.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_linode.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_linode_v4.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_loopia.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_lua.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_maradns.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_me.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_miab.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_misaka.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_myapi.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_mydevil.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_mydnsjp.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_namecheap.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_namecom.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_namesilo.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nederhost.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_neodigit.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_netcup.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_netlify.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nic.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_njalla.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nm.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nsd.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nsone.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nsupdate.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nw.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_one.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_online.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_openprovider.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_openstack.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_opnsense.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_ovh.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_pdns.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_pleskxml.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_pointhq.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_rackspace.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_rcode0.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_regru.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_schlundtech.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_selectel.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_servercow.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_tele3.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_ultra.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_transip.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_unoeuro.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_variomedia.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_vscale.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_vultr.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_yandex.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_zilore.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_zone.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_zonomi.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/cqhttp.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/dingtalk.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/ifttt.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/mail.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/mailgun.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/pop.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/postmark.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/pushover.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/sendgrid.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/slack.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/smtp.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/teams.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/xmpp.sh @sample(acme,acme,0640) /var/db/acme/.acme.sh/account.conf.sample %%PORTEXAMPLES%%/var/db/acme/.acme.sh/deploy %%PORTEXAMPLES%%/var/db/acme/.acme.sh/dnsapi %%PORTEXAMPLES%%/var/db/acme/.acme.sh/notify @dir(acme,acme,0750) /var/db/acme/.acme.sh @dir(acme,acme,0750) /var/db/acme/certs @dir(acme,acme,0750) /var/db/acme