diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2018-07-02 09:47:58 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-07-02 09:48:21 +0200 |
commit | e544d4c60f846622daf1fffde0fede19dee03a7e (patch) | |
tree | a2d5b67312d6bed28e842c46ddb11950f47276a2 /app-shells/zsh/files | |
parent | www-client/otter: Old. (diff) | |
download | gentoo-e544d4c60f846622daf1fffde0fede19dee03a7e.tar.gz gentoo-e544d4c60f846622daf1fffde0fede19dee03a7e.tar.bz2 gentoo-e544d4c60f846622daf1fffde0fede19dee03a7e.zip |
app-shells/zsh: Security cleanup.
Bug: https://bugs.gentoo.org/651860
Package-Manager: Portage-2.3.41, Repoman-2.3.9
Diffstat (limited to 'app-shells/zsh/files')
-rw-r--r-- | app-shells/zsh/files/zprofile-1 | 42 | ||||
-rw-r--r-- | app-shells/zsh/files/zprofile-2 | 41 |
2 files changed, 0 insertions, 83 deletions
diff --git a/app-shells/zsh/files/zprofile-1 b/app-shells/zsh/files/zprofile-1 deleted file mode 100644 index e78ec265bf51..000000000000 --- a/app-shells/zsh/files/zprofile-1 +++ /dev/null @@ -1,42 +0,0 @@ -# @GENTOO_PORTAGE_EPREFIX@/etc/zsh/zprofile - -# Load environment settings from profile.env, which is created by -# env-update from the files in /etc/env.d -if [ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env ] ; then - . "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env -fi - -# You should override these in your ~/.zprofile (or equivalent) for per-user -# settings. For system defaults, you can add a new file in /etc/profile.d/. -export EDITOR=${EDITOR:-/bin/nano} -export PAGER=${PAGER:-/usr/bin/less} - -# 077 would be more secure, but 022 is generally quite realistic -umask 022 - -# Set up PATH depending on whether we're root or a normal user. -# There's no real reason to exclude sbin paths from the normal user, -# but it can make tab-completion easier when they aren't in the -# user's PATH to pollute the executable namespace. -# -# It is intentional in the following line to use || instead of -o. -# This way the evaluation can be short-circuited and calling whoami is -# avoided. -if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then - @ZSH_NOPREFIX@PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}" - @ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}:/usr/sbin:/usr/bin:/sbin:/bin" -else - @ZSH_NOPREFIX@PATH="/usr/local/bin:/usr/bin:/bin:${PATH}" - @ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}:/usr/bin:/bin" -fi -export PATH -unset ROOTPATH - -shopts=$- -setopt nullglob -for sh in "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.d/*.sh ; do - [ -r "$sh" ] && . "$sh" -done -unsetopt nullglob -set -$shopts -unset sh shopts diff --git a/app-shells/zsh/files/zprofile-2 b/app-shells/zsh/files/zprofile-2 deleted file mode 100644 index 9c4313c4494d..000000000000 --- a/app-shells/zsh/files/zprofile-2 +++ /dev/null @@ -1,41 +0,0 @@ -# @GENTOO_PORTAGE_EPREFIX@/etc/zsh/zprofile - -# Load environment settings from profile.env, which is created by -# env-update from the files in /etc/env.d -if [ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env ] ; then - . "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env -fi - -# You should override these in your ~/.zprofile (or equivalent) for per-user -# settings. For system defaults, you can add a new file in /etc/profile.d/. -export EDITOR=${EDITOR:-/bin/nano} -export PAGER=${PAGER:-/usr/bin/less} - -# 077 would be more secure, but 022 is generally quite realistic -umask 022 - -# Set up PATH depending on whether we're root or a normal user. -# There's no real reason to exclude sbin paths from the normal user, -# but it can make tab-completion easier when they aren't in the -# user's PATH to pollute the executable namespace. -# -# It is intentional in the following line to use || instead of -o. -# This way the evaluation can be short-circuited and calling whoami is -# avoided. -if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then - @ZSH_NOPREFIX@PATH="${ROOTPATH}" - @ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}:/usr/sbin:/usr/bin:/sbin:/bin" -@ZSH_PREFIX@else - @ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}:/usr/bin:/bin" -fi -export PATH -unset ROOTPATH - -shopts=$- -setopt nullglob -for sh in "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.d/*.sh ; do - [ -r "$sh" ] && . "$sh" -done -unsetopt nullglob -set -$shopts -unset sh shopts |