Attachment 216961 Details for Bug 248434 – security/acme.sh: Backport fix for running under sudo

[patch] security/acme.sh: Backport fix for running under sudo

patch-security_acme.sh-2.8.6_1.txt (text/plain), 5.70 KB, created by John W. O'Brien on 2020-08-02 16:08:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John W. O'Brien

Created: 2020-08-02 16:08:38 UTC

Size: 5.70 KB

patch

obsolete

>Index: security/acme.sh/Makefile
>===================================================================
>--- security/acme.sh/Makefile	(revision 543917)
>+++ security/acme.sh/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	acme.sh
> PORTVERSION=	2.8.6
>+PORTREVISION=	1
> CATEGORIES=	security
> 
> MAINTAINER=	dvl@FreeBSD.org
>Index: security/acme.sh/files/patch-acme.sh
>===================================================================
>--- security/acme.sh/files/patch-acme.sh	(nonexistent)
>+++ security/acme.sh/files/patch-acme.sh	(working copy)
>@@ -0,0 +1,19 @@
>+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: security/acme.sh/files/patch-acme.sh
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/acme.sh/pkg-plist
>===================================================================
>--- security/acme.sh/pkg-plist	(revision 543917)
>+++ security/acme.sh/pkg-plist	(working copy)
>@@ -18,32 +18,39 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/mysqld.sh
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/nginx.sh
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/opensshd.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
>@@ -56,6 +63,7 @@
> %%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
>@@ -72,6 +80,8 @@
> %%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_kas.sh
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_kinghost.sh
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_knot.sh
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_leaseweb.sh
>@@ -94,6 +104,7 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_neodigit.sh
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_netcup.sh
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nic.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
>@@ -101,6 +112,7 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_one.sh
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_online.sh
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_openprovider.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
>@@ -121,6 +133,7 @@
> %%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

Flags:

john: maintainer-approval? (dvl)

Actions: View | Diff

Attachments on bug 248434: 216961