commit: 6e05585ff9a7bb9c700acd7f462e662d2af5629d
parent bd303ada4a8c78ace79c41a9478e577272e7108d
Author: fosslinux <fosslinux@aussies.space>
Date: Sun, 4 Feb 2024 03:52:25 +0000
Merge pull request #426 from fosslinux/opendoas
Opendoas (ie, sudo)
Diffstat:
9 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/parts.rst b/parts.rst
@@ -1244,3 +1244,11 @@ shadow provides a variety of command line utilites to work with users and
groups, avoiding the need for manual modification of ``/etc/passwd`` and
``/etc/group``. This allows unprivileged users to be created by, or for,
post-bootstrap build systems.
+
+opendoas 6.8.2
+==============
+
+opendoas is a port of 'doas' from OpenBSD to Linux. It has all functions of sudo
+that could be conceivably needed in live-bootstrap, and is much simpler to
+build. This allows build systems that expect sudo after live-bootstrap to use
+it.
diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs
@@ -85,6 +85,7 @@ d58d85c4be26d90f111f273929a4998d05294fe5aa37c4842d5aecaa593e6079 musl-1.1.24_2.
81f79a0faf58e105c5f12d9f538d3ea7578a3b361e633ab8f47324ec23ec9de6 musl-1.2.4_0.tar.bz2
6dc5e763b747b66f72692c6820d7f46b7f4cf2e2fe05229a1d01c03919c1c936 musl-1.2.4_1.tar.bz2
820203286127e7c22cee9f1b3cff664431f10d14c3f22f00b3e771fd849fd449 musl-1.2.4_2.tar.bz2
+a18c4b2e5de2bfe5bb3ee9d360484fcfebad3df042f1859d4aa333dd60f55e56 opendoas-6.8.2_0.tar.bz2
c490016e49bbf77e7f63071f7aa60e8290a0c67f017846def1c3f65bd10d5712 openssl-1.1.1l_0.tar.bz2
71864d042cdc564b65eab21360902c714e9b43f80a19689c5600589529b267e7 patch-2.7.6_0.tar.bz2
5ae7fe43d62d1064c123d9813017015e5e8d5107d0e70f0199576141416ff81d perl-5.000_0.tar.bz2
@@ -108,14 +109,14 @@ da7c8ec579dd225c0d8bee63d95aeeb27ac2d5a60d4eefe298508cbf86bf506c python-3.4.10_
0be505f63205b4bc1b1421896c610468ad1a2194bbc4c9abf58f61685c2023d1 python-3.8.16_0.tar.bz2
34c51d3df85585a8aee7691b3500a5c3c7442b06a6f57231b76970bdd6e99bf9 sed-4.0.9_0.tar.bz2
e8daec00b2c2de7b18efbec057dc9290eed06668806c6f5a48914d4a5cd95eb4 sed-4.8_0.tar.bz2
-cec5c99e27350c180c8e0bf3c20984c4302cbfb02fa19e46860331302001021d shadow-4.14.3_0.tar.bz2
+96bd9f051aa665f6836efe3642127df6987b529ed53f1c539293fc049f0f4c28 shadow-4.14.3_0.tar.bz2
912d8f344104f1322255d6210c7c7e1371413ab530b2c6796e6aa565c74bf647 tar-1.34_0.tar.bz2
1667937d5d646f2bb7ec7ab54a23ddd65a0ae3ca7d5e597f3fbcd5163031d2ef tcc-0.9.27_0.tar.bz2
b20cea098c8ff635a0ce9f99430d7c9a75d081194941ab54dc92dbc8af3776a4 tcc-0.9.27_1.tar.bz2
8e8cc802fccdb907cd74501dccce1ee85ffb0150b33b4719f86d6720f5b09a7a tcc-0.9.27_2.tar.bz2
d4fe9460ca561fc2f546f9730f19f541b17dac0bcc42eb190abba856588c3593 tcc-0.9.27_3.tar.bz2
50ebaa1d8fcc4a03a43d431eb71e2f435cc8712ae47d400564df3716037d553a texinfo-6.7_0.tar.bz2
-229d9189adac10ad2a2c76fc147a4c317fc5b34026cef1c47edc9159aee480da util-linux-2.19.1_0.tar.bz2
+858f3c9b3e824d6cdff8009de171fb1ac6932adc227efd854aebf29aba0bbf7c util-linux-2.19.1_0.tar.bz2
ecdb7ffeb9256f6a9760be70969fe5dea9cde6a538cc88595281fe44340e98a1 which-2.21_0.tar.bz2
3fade2079cc91f2c5624ff7247220059caee82e7de493332103d7a78155400b2 xz-5.4.1_0.tar.bz2
ca8ec9876a7334f5f87e1159e0efe343b8b497ffb0dea8b548223035ecd67f9e zlib-1.2.13_0.tar.bz2
diff --git a/steps/helpers.sh b/steps/helpers.sh
@@ -417,7 +417,7 @@ src_pkg() {
# So this does not need a command -v grep.
if tar --help | grep ' \-\-sort' >/dev/null 2>&1; then
tar -C "${DESTDIR}" --sort=name --hard-dereference \
- --numeric-owner --owner=0 --group=0 --mode=go=rX,u+rw,a-s -cf "${dest_tar}" .
+ --numeric-owner --owner=0 --group=0 --mode=go=rX,u+rw -cf "${dest_tar}" .
else
local olddir
olddir=$PWD
@@ -432,7 +432,7 @@ src_pkg() {
get_files . > ${filelist}
fi
tar --no-recursion ${null} --files-from "${filelist}" \
- --numeric-owner --owner=0 --group=0 --mode=go=rX,u+rw,a-s -cf "${dest_tar}"
+ --numeric-owner --owner=0 --group=0 --mode=go=rX,u+rw -cf "${dest_tar}"
rm -f "$filelist"
cd "$olddir"
fi
diff --git a/steps/manifest b/steps/manifest
@@ -197,6 +197,7 @@ build: gcc-13.1.0
build: libmd-1.1.0
build: libbsd-0.11.8
build: shadow-4.14.3
+build: opendoas-6.8.2
improve: cleanup_filesystem
improve: null_time ( FORCE_TIMESTAMPS == True )
improve: update_checksums ( UPDATE_CHECKSUMS == True )
diff --git a/steps/opendoas-6.8.2/files/doas.conf b/steps/opendoas-6.8.2/files/doas.conf
@@ -0,0 +1 @@
+permit nopass :wheel
diff --git a/steps/opendoas-6.8.2/files/doas.conf.license b/steps/opendoas-6.8.2/files/doas.conf.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 fosslinux <fosslinux@aussies.space>
+
+SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/steps/opendoas-6.8.2/pass1.sh b/steps/opendoas-6.8.2/pass1.sh
@@ -0,0 +1,20 @@
+# SPDX-FileCopyrightText: 2024 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_configure() {
+ ./configure --prefix="${PREFIX}" \
+ --without-pam
+}
+
+src_compile() {
+ make -f GNUmakefile "${MAKEJOBS}" PREFIX="${PREFIX}"
+}
+
+src_install() {
+ make -f GNUmakefile install PREFIX="${PREFIX}" DESTDIR="${DESTDIR}"
+
+ ln -s doas "${DESTDIR}${PREFIX}/bin/sudo"
+
+ install -D -m 400 ../../files/doas.conf "${DESTDIR}/etc/doas.conf"
+}
diff --git a/steps/opendoas-6.8.2/sources b/steps/opendoas-6.8.2/sources
@@ -0,0 +1 @@
+https://github.com/Duncaen/OpenDoas/releases/download/v6.8.2/opendoas-6.8.2.tar.xz 4e98828056d6266bd8f2c93e6ecf12a63a71dbfd70a5ea99ccd4ab6d0745adf0
diff --git a/steps/util-linux-2.19.1/pass1.sh b/steps/util-linux-2.19.1/pass1.sh
@@ -6,7 +6,7 @@ src_prepare() {
default
# We don't have gettext (autopoint) yet.
- AUTOPOINT=true AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
+ AUTOPOINT=true AUTOMAKE=automake-1.10 AUTOCONF=autoconf-2.64 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
}
src_configure() {
