You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
doas: fix path in vidoas
By default (and securely), vidoas explicitly sets the PATH to only include the bare minimum standard bin directories (under /, /usr, and /usr/local). However, since macports installs in /opt/local, when vidoas gets to the stage of validating the new configuration (using `doas -C`), it fails because doas is not on the PATH. This adds a patch to update the PATH in vidoas so it can succeed when installed via macports.
This commit is contained in:
committed by
Renee Otten
parent
c96b5b3eb6
commit
2d11556daf
@@ -5,7 +5,7 @@ PortGroup codeberg 1.0
|
||||
PortGroup makefile 1.0
|
||||
|
||||
codeberg.setup thejessesmith doas 6.3p13
|
||||
revision 1
|
||||
revision 2
|
||||
checksums rmd160 7584ac777c09e07bbeb153f28be1f750963713a8 \
|
||||
sha256 2cca9003856e92ec0a50b3e559b7f3132bf8293dc8302613933f8ed06c8c7fc5 \
|
||||
size 34883
|
||||
@@ -29,6 +29,12 @@ depends_build port:bison
|
||||
|
||||
build.env "OPT=${configure.optflags}"
|
||||
|
||||
patchfiles vidoas-fix-path.diff
|
||||
|
||||
post-patch {
|
||||
reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/vidoas
|
||||
}
|
||||
|
||||
post-destroot {
|
||||
xinstall -m 0644 ${worksrcpath}/doas.conf.sample ${destroot}${prefix}/etc
|
||||
set docdir ${prefix}/share/doc/${subport}
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
--- vidoas.orig
|
||||
+++ vidoas
|
||||
@@ -15,17 +15,17 @@
|
||||
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
# PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
# Edit a temporary copy of the doas.conf file and check it for syntax
|
||||
# errors before installing it as the actual doas.conf file.
|
||||
|
||||
set -eu
|
||||
|
||||
-PATH=/bin:/usr/bin:/usr/local/bin
|
||||
+PATH=/bin:/usr/bin:/usr/local/bin:@PREFIX@/bin
|
||||
export PATH
|
||||
|
||||
PROG="${0##*/}"
|
||||
|
||||
umask 022
|
||||
|
||||
DOAS_CONF=@DOAS_CONF@
|
||||
doas_conf_mode="0600"
|
||||
Reference in New Issue
Block a user