mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 21:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/alpine-baselayout: overwrite PATH again instead of appending it

Browse Source 
Unfortunately, appending directories to $PATH has several unintended
side-effects (see #13017). Initially, we unconditionally overwrote
PATH in /etc/profile. This was changed in f440e2db3f
due to compatibility with WSL environments (see the commit message
for details). However, according to [1] this is no longer needed
hence we should just be able to overwrite $PATH again instead of
appending to it thereby solving #13017.

This commit restores the behavior prior to
f440e2db3f.

Fixes #13017

[1]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13017#note_181429
This commit is contained in:
Sören Tempel 2023-04-23 04:29:44 +02:00 committed by Natanael Copa
parent 028d34f678
commit 65502ca937
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/alpine-baselayout/APKBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-baselayout
pkgver=3.4.3
pkgrel=0
pkgrel=1
pkgdesc="Alpine base dir structure and init scripts"
url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
arch="noarch"
@ -268,7 +268,7 @@ bfe947bdd69e7d93b32c8cb4e2cabe5717cb6c1e1f49a74015ac2cfb13e96d1f12c4be23ae93a1d6
806b8f23f823a9471846d12fa6b55690b95eedb4c613b82aefaba7ffef23f83e17552befd891a487864f72ef24e395d8611738933f684a85eb4c336cb20994f8 group
fdab6f8fec2a556ab817d90a73635a927ea04dbc4e0470ed59ee6a62c87393f9534c9b746b09a776d938c25b8af9c9fb1686578e24f8307d1d074921ade1bdc7 inittab
06d12a7b9ca14fe17e412d0f24814620b67d035ae859be7906cbf4782dd69e359a6a555dafb98060b7fb7e4714aaa676c88d9017cded36e6d8398e23369bb290 passwd
116c007f0f0062c3cf68bc0d91a5bae2c4c48e9bdd77ab63e319f9d50db70747961124e9e4b639dbeec9a82556c170f67484f134f425194ff308377d5d3dd07c profile
482d6823434edc741da30201350a9dbe472a42fef0b387748040871be46f427bbb5639939ad34a717a988544579b8e768f25f02b2a47cdff7ceaa804596f557a profile
3a00083bcdf5a9e884c9d07877d52311e3d99e79cbee656e236ba06e08ba0dddb7ba76494fdc9dd1a826c48e197a790a69e6bb458e9df64832d6b5e904e9fd15 protocols-6.4
47b0f3ee73af2d259bd206a026204be0ea25531a895a0b035a904b38fe5407bc3dd2beab7f8fcb3d760587e6159702ebdb9cbc4f508942befdf7f10c10c87888 services-6.4
"

21
main/alpine-baselayout/profile
View File

@ -1,24 +1,5 @@
# Append "$1" to $PATH when not already in.
# Copied from Arch Linux, see #12803 for details.
append_path () {
case ":$PATH:" in
*:"$1":*)
;;
*)
PATH="${PATH:+$PATH:}$1"
;;
esac
}
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
append_path "/usr/local/sbin"
append_path "/usr/local/bin"
append_path "/usr/sbin"
append_path "/usr/bin"
append_path "/sbin"
append_path "/bin"
unset -f append_path
export PATH
export PAGER=less
umask 022