From f50d2679b1715155118ad9506aa0f38e3da7ef36 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Tue, 11 Aug 2020 15:30:40 +0300 Subject: opendoas: apply cpt changes --- extra/opendoas/build | 2 +- extra/opendoas/checksums | 2 +- extra/opendoas/files/doas.conf | 20 ++++++++------------ 3 files changed, 10 insertions(+), 14 deletions(-) (limited to 'extra/opendoas') diff --git a/extra/opendoas/build b/extra/opendoas/build index 5a317865..933dd2db 100755 --- a/extra/opendoas/build +++ b/extra/opendoas/build @@ -11,4 +11,4 @@ cat _ > bsd.prog.mk; rm -f _ make make DESTDIR="$1" install -install -D doas.conf "$1/etc/doas.conf" +install -Dm640 doas.conf "$1/etc/doas.conf" diff --git a/extra/opendoas/checksums b/extra/opendoas/checksums index 0c295ccc..09b65ebe 100644 --- a/extra/opendoas/checksums +++ b/extra/opendoas/checksums @@ -1,2 +1,2 @@ baf5a2c73116781519cf03b5b9147eee8db69e8b052eaa81caf093107226b4fe v6.6.1.tar.gz -6a0d938e6df092d755bcb0843c688bd2c9c245ede8727a589fa7556a6d31e5b9 doas.conf +00d817a45f17e74d3e2b85b47780b23ef4a964258fbd6c3fbbb03f974848fcd0 doas.conf diff --git a/extra/opendoas/files/doas.conf b/extra/opendoas/files/doas.conf index 25ae8075..ee3871c9 100644 --- a/extra/opendoas/files/doas.conf +++ b/extra/opendoas/files/doas.conf @@ -2,18 +2,14 @@ # See doas.conf(5) for details. -# KEEP THIS AT THE BOTTOM. - # This is required if you want to use cpt with 'doas' -# permit keepenv setenv { HOME } :wheel cmd /usr/bin/cpt-alternatives -# permit keepenv setenv { HOME } :wheel cmd /usr/bin/cpt-install -# permit keepenv setenv { HOME } :wheel cmd /usr/bin/cpt-remove -# permit :wheel cmd git args fetch -# permit :wheel cmd git args merge +# permit :wheel cmd env +# +# Same without asking password +# permit nopass :wheel cmd env +# In order to accept all commands +# permit :wheel +# # Same without asking password -# permit nopass keepenv setenv { HOME } :wheel cmd /usr/bin/cpt-alternatives -# permit nopass keepenv setenv { HOME } :wheel cmd /usr/bin/cpt-install -# permit nopass keepenv setenv { HOME } :wheel cmd /usr/bin/cpt-remove -# permit nopass :wheel cmd git args fetch -# permit nopass :wheel cmd git args merge +# permit nopass :wheel -- cgit v1.2.3