diff options
Diffstat (limited to 'extra')
| -rwxr-xr-x | extra/cmake/build | 2 | ||||
| -rwxr-xr-x | extra/distcc/build | 2 | ||||
| -rwxr-xr-x | extra/libressl/files/update-certdata.sh | 6 | ||||
| -rwxr-xr-x | extra/libressl/post-install | 2 | ||||
| -rw-r--r-- | extra/opendoas/files/doas.conf | 10 | ||||
| -rwxr-xr-x | extra/ubase/build | 2 |
6 files changed, 14 insertions, 10 deletions
diff --git a/extra/cmake/build b/extra/cmake/build index 401a7c14..3d56e5bc 100755 --- a/extra/cmake/build +++ b/extra/cmake/build @@ -2,7 +2,7 @@ # Use cmake to build cmake if installed. # This leads to a much faster build. -if kiss l cmake; then +if cpt-list cmake; then cmake -B build \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ diff --git a/extra/distcc/build b/extra/distcc/build index 596108ee..cbb722bf 100755 --- a/extra/distcc/build +++ b/extra/distcc/build @@ -2,7 +2,7 @@ # Running distcc as a server instead of a client # requires python to be installed. -kiss l python >/dev/null 2>&1 || pump=disable +cpt-list python >/dev/null 2>&1 || pump=disable export CFLAGS="$CFLAGS -fcommon" diff --git a/extra/libressl/files/update-certdata.sh b/extra/libressl/files/update-certdata.sh index 5283c329..611f944d 100755 --- a/extra/libressl/files/update-certdata.sh +++ b/extra/libressl/files/update-certdata.sh @@ -2,12 +2,12 @@ # # update-certdata.sh -[ -w "$KISS_ROOT/etc/ssl" ] || { - printf '%s\n' "${0##*/}: root required to update cert." >&2 +[ -w "$CPT_ROOT/etc/ssl" ] || { + printf '%s\n' "${0##*/}: root required to update CA certificates." >&2 exit 1 } -cd "$KISS_ROOT/etc/ssl" && { +cd "$CPT_ROOT/etc/ssl" && { wget https://curl.haxx.se/ca/cacert.pem mv -f cacert.pem cert.pem printf '%s\n' "${0##*/}: updated cert.pem" diff --git a/extra/libressl/post-install b/extra/libressl/post-install index 8f76be97..f39088e7 100755 --- a/extra/libressl/post-install +++ b/extra/libressl/post-install @@ -1,3 +1,3 @@ #!/bin/sh -"$KISS_ROOT/etc/ssl/update-certdata.sh" +"$CPT_ROOT/etc/ssl/update-certdata.sh" diff --git a/extra/opendoas/files/doas.conf b/extra/opendoas/files/doas.conf index 32aeff17..25ae8075 100644 --- a/extra/opendoas/files/doas.conf +++ b/extra/opendoas/files/doas.conf @@ -4,12 +4,16 @@ # KEEP THIS AT THE BOTTOM. -# This is required if you want to use kiss with 'doas' -# permit keepenv setenv { HOME } :wheel cmd kiss +# 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 # Same without asking password -# permit nopass keepenv setenv { HOME } :wheel cmd kiss +# 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 diff --git a/extra/ubase/build b/extra/ubase/build index dc26aff0..e95f1cd6 100755 --- a/extra/ubase/build +++ b/extra/ubase/build @@ -9,6 +9,6 @@ make DESTDIR="$1" PREFIX=/usr ubase-box-install unlink "$1/usr/bin/stat" # You cannot execute commands with the ubase -# implementation of su, which might break kiss +# implementation of su, which might break cpt # if the user doesn't have sudo or doas installed. unlink "$1/usr/bin/su" |