From 96907342ff0c32aa2527e61d8e165ecc8b26aba9 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sun, 16 Nov 2025 11:19:11 +0200 Subject: [PATCH] Switch to new download format and update source.sh script --- pkg.info | 17 +++++++++++++++-- source.sh | 25 ++++++++++++------------- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/pkg.info b/pkg.info index bf06573..71616a2 100644 --- a/pkg.info +++ b/pkg.info @@ -1,9 +1,22 @@ name: sudo description: Utility that grants users the ability to run commands as root version: 1.9.17p2 +revision: 2 url: https://www.sudo.ws/sudo/ license: ISC architecture: any -depends: ["glibc","openldap","openssl","pam","zlib"] -keep: ["etc/sudoers","etc/sudoers.d/"] type: source +keep: + - etc/sudoers + - etc/sudoers.d/ +depends: + - glibc + - openldap + - openssl + - pam + - zlib +downloads: + - url: https://www.sudo.ws/dist/sudo-${BPM_PKG_VERSION}.tar.gz + extract_to: ${BPM_SOURCE} + extract_strip_components: 1 + checksum: 4a38a1ab3adb1199257edc2a7c4a2bd714665eb605b04368843b06dada2cfcfb diff --git a/source.sh b/source.sh index 995c684..5ea934d 100644 --- a/source.sh +++ b/source.sh @@ -2,16 +2,6 @@ # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT -DOWNLOAD="https://www.sudo.ws/dist/sudo-${BPM_PKG_VERSION}.tar.gz" -FILENAME="${DOWNLOAD##*/}" - -# The prepare function is executed in the root of the temp directory -# This function is used for downloading files and putting them into the correct location -prepare() { - wget "$DOWNLOAD" - tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE" -} - # The build function is executed in the source directory # This function is used to compile the source code build() { @@ -33,7 +23,16 @@ check() { # This function is used to move the compiled files into the output directory package() { make DESTDIR="$BPM_OUTPUT" install - install -Dm644 ../sudo-pam "$BPM_OUTPUT"/etc/pam.d/sudo - install -Dm644 ../allow-wheel "$BPM_OUTPUT"/etc/sudoers.d/00-allow-wheel - install -Dm644 LICENSE.md "$BPM_OUTPUT"/usr/share/licenses/sudo/LICENSE.md + + # Remove /run directory + rm -rf "$BPM_OUTPUT"/run + + # Install configuration file + install -Dm644 "$BPM_WORKDIR"/allow-wheel "$BPM_OUTPUT"/etc/sudoers.d/00-allow-wheel + + # Install pam module + install -Dm644 "$BPM_WORKDIR"/sudo-pam "$BPM_OUTPUT"/etc/pam.d/sudo + + # Install package license + install -Dm644 "$BPM_SOURCE"/LICENSE.md "$BPM_OUTPUT"/usr/share/licenses/sudo/LICENSE.md }