From 84644d4ad824a8fea8bba4712d9949adc9af3d67 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Wed, 7 Feb 2024 10:45:08 +0100 Subject: [PATCH 1/2] security/acme-client: remove dead code, refs #3790 --- security/acme-client/pkg-descr | 3 +++ .../mvc/app/library/OPNsense/AcmeClient/LeAutomation/Base.php | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr index 2a5039e66..2a4ab7279 100644 --- a/security/acme-client/pkg-descr +++ b/security/acme-client/pkg-descr @@ -8,6 +8,9 @@ WWW: https://github.com/acmesh-official/acme.sh Plugin Changelog ================ +Fixed: +* proc_open(): Argument #2 ($descriptor_spec) must be of type array + 4.0 NOTE: This is a new major release with backwards-incompatible changes. diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomation/Base.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomation/Base.php index f85a23d14..138d64d81 100644 --- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomation/Base.php +++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomation/Base.php @@ -129,10 +129,9 @@ abstract class Base extends \OPNsense\AcmeClient\LeCommon . ' ' . '--deploy ' . implode(' ', $this->acme_args); - LeUtils::log_debug('running acme.sh command: ' . (string)$acmecmd, $this->debug); - $proc = proc_open($acmecmd, $proc_desc, $proc_pipes, null, $proc_env); // Run acme.sh command + LeUtils::log_debug('running acme.sh command: ' . (string)$acmecmd, $this->debug); $result = LeUtils::run_shell_command($acmecmd, $proc_env); // acme.sh records the last used deploy hook and would automatically From 20b7e65bc83360e48add15f91688c317f0ddd992 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Wed, 7 Feb 2024 10:47:59 +0100 Subject: [PATCH 2/2] security/acme-client: bump version --- security/acme-client/Makefile | 2 +- security/acme-client/pkg-descr | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/security/acme-client/Makefile b/security/acme-client/Makefile index 2018025bf..3bc52eb06 100644 --- a/security/acme-client/Makefile +++ b/security/acme-client/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= acme-client -PLUGIN_VERSION= 4.0 +PLUGIN_VERSION= 4.1 PLUGIN_COMMENT= ACME Client PLUGIN_MAINTAINER= opnsense@moov.de PLUGIN_DEPENDS= acme.sh py${PLUGIN_PYTHON}-dns-lexicon diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr index 2a4ab7279..45364147d 100644 --- a/security/acme-client/pkg-descr +++ b/security/acme-client/pkg-descr @@ -8,8 +8,10 @@ WWW: https://github.com/acmesh-official/acme.sh Plugin Changelog ================ +4.1 + Fixed: -* proc_open(): Argument #2 ($descriptor_spec) must be of type array +* automation does not start (#3790) 4.0