diff options
| -rw-r--r-- | main/doas/APKBUILD | 7 | ||||
| -rw-r--r-- | main/doas/change-PATH.patch | 19 |
2 files changed, 24 insertions, 2 deletions
diff --git a/main/doas/APKBUILD b/main/doas/APKBUILD index 7f6383bca10..0db35ca88d7 100644 --- a/main/doas/APKBUILD +++ b/main/doas/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault <sir@cmpwn.com> pkgname=doas pkgver=6.8.2 -pkgrel=2 +pkgrel=3 pkgdesc="OpenBSD's temporary privilege escalation tool" url="https://github.com/Duncaen/OpenDoas" arch="all" @@ -11,7 +11,9 @@ subpackages="$pkgname-doc" install="$pkgname.post-install $pkgname.post-upgrade" source="$pkgname-$pkgver.tar.gz::https://github.com/Duncaen/OpenDoas/archive/v$pkgver.tar.gz configuration-directory.patch - manpage-example-path.patch" + manpage-example-path.patch + change-PATH.patch + " builddir="$srcdir/OpenDoas-$pkgver" options="$options suid" @@ -48,4 +50,5 @@ sha512sums=" 4a93ff477413c859ba2702e688fa4f83248fff85e61e12336838a1e9aa1a8d9963a9782e4bc5e58e8d04b86c2c8ceb6b235ae9d3b32b3e548a2514a43653137d doas-6.8.2.tar.gz 1d30ebab975aa51717a46ca4f5c7ed66cb333931587e4cf57ac25c111a62821709e71bfef829d90f6aca04498480965e8d05d0e102e7197b5197e8f8c19a5591 configuration-directory.patch 60efd196595bda2c4f036cd0080a8825a85fedcc7524c917304b342373863213b3c557b4336f1dab760f167fd8cc2a59b2e744d8a47ff8a8acebbe74b1328f4f manpage-example-path.patch +31a87aced097ea1189c2162172788cd27b82af318db3476e1c143d3c87d99e2aa6350f63b81361d0a54482ba8dd0cfd10928ff6074a4c66248a1ec815a274f68 change-PATH.patch " diff --git a/main/doas/change-PATH.patch b/main/doas/change-PATH.patch new file mode 100644 index 00000000000..c0fb7a51ba3 --- /dev/null +++ b/main/doas/change-PATH.patch @@ -0,0 +1,19 @@ +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Tue, 28 Jun 2022 22:36:16 +0200 +Subject: [PATCH] Change default PATH to the Alpine's default + +Use the same PATH as in openssh, sudo and our /etc/profile. + +--- a/doas.c ++++ b/doas.c +@@ -238,8 +238,8 @@ + int + main(int argc, char **argv) + { +- const char *safepath = "/bin:/sbin:/usr/bin:/usr/sbin:" +- "/usr/local/bin:/usr/local/sbin"; ++ const char *safepath = "/usr/local/sbin:/usr/local/bin:" ++ "/usr/sbin:/usr/bin:/sbin:/bin"; + const char *confpath = NULL; + char *shargv[] = { NULL, NULL }; + char *sh; |