* [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/files/
@ 2023-06-11 15:32 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2023-06-11 15:32 UTC (permalink / raw
To: gentoo-commits
commit: c17aa1fdefb5d26ea9f2f318c090298cbba11ab6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 15:31:49 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 15:31:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17aa1fd
app-shells/zsh: add upstream commit link for egrep fix
Noticed while checking the clang15 patch.
Bug: https://bugs.gentoo.org/869332
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-shells/zsh/files/zsh-5.9-do-not-use-egrep-in-tests.patch | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app-shells/zsh/files/zsh-5.9-do-not-use-egrep-in-tests.patch b/app-shells/zsh/files/zsh-5.9-do-not-use-egrep-in-tests.patch
index 7cf605674e96..070767058c3b 100644
--- a/app-shells/zsh/files/zsh-5.9-do-not-use-egrep-in-tests.patch
+++ b/app-shells/zsh/files/zsh-5.9-do-not-use-egrep-in-tests.patch
@@ -1,3 +1,5 @@
+https://github.com/zsh-users/zsh/commit/4fc5dc0292acd77f17281f451774ba2ca4203026
+
commit 4fc5dc0292acd77f17281f451774ba2ca4203026
Author: Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
Date: 2022-09-15 18:56:20 +0900
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/files/
@ 2024-11-22 23:22 Conrad Kostecki
0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2024-11-22 23:22 UTC (permalink / raw
To: gentoo-commits
commit: a593b5ad5b624cbe1889431c403b690f68bede0a
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Nov 20 16:47:19 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 23:21:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a593b5ad
app-shells/zsh: remove unused file
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
app-shells/zsh/files/zprofile-4 | 42 -----------------------------------------
1 file changed, 42 deletions(-)
diff --git a/app-shells/zsh/files/zprofile-4 b/app-shells/zsh/files/zprofile-4
deleted file mode 100644
index 9155aae3fc58..000000000000
--- a/app-shells/zsh/files/zprofile-4
+++ /dev/null
@@ -1,42 +0,0 @@
-# /etc/zsh/zprofile
-
-# Load environment settings from profile.env, which is created by
-# env-update from the files in /etc/env.d
-if [[ -e /etc/profile.env ]] ; then
- . /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
- # Check to make sure ROOTPATH is sane before we use it.
- # https://bugs.gentoo.org/656400
- if [[ -n ${ROOTPATH} ]] && [[ :${ROOTPATH}: == *:/usr/sbin:* ]] ; then
- PATH="${ROOTPATH}"
- fi
-fi
-export PATH
-unset ROOTPATH
-
-shopts=$-
-setopt nullglob
-for sh in /etc/profile.d/*.sh ; do
- [[ -r "${sh}" ]] && . "${sh}"
-done
-unsetopt nullglob
-set -$shopts
-unset sh shopts
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/files/
@ 2024-02-08 17:34 Mike Gilbert
0 siblings, 0 replies; 9+ messages in thread
From: Mike Gilbert @ 2024-02-08 17:34 UTC (permalink / raw
To: gentoo-commits
commit: eed1e79c68e5f930666e23b79834cbb05b209e65
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 8 17:32:06 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Feb 8 17:32:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed1e79c
app-shells/zsh: unset ROOTPATH
This matches the behavior of /etc/profile from baselayout.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
app-shells/zsh/files/zprofile-5 | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app-shells/zsh/files/zprofile-5 b/app-shells/zsh/files/zprofile-5
index 7bc5e03b5e34..a89fddea48af 100644
--- a/app-shells/zsh/files/zprofile-5
+++ b/app-shells/zsh/files/zprofile-5
@@ -14,6 +14,8 @@ export PAGER=${PAGER:-/usr/bin/less}
# 077 would be more secure, but 022 is generally quite realistic
umask 022
+unset ROOTPATH
+
shopts=$-
setopt nullglob
for sh in /etc/profile.d/*.sh ; do
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/files/
@ 2023-06-11 15:32 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2023-06-11 15:32 UTC (permalink / raw
To: gentoo-commits
commit: 8f44fcf1ab5e29ebe240bb9f9adb9fe1f70dbce4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 15:30:37 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 15:30:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f44fcf1
app-shells/zsh: add commit link for clang15 patch
Bug: https://bugs.gentoo.org/869539
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-shells/zsh/files/zsh-5.9-clang-15-configure.patch | 1 +
1 file changed, 1 insertion(+)
diff --git a/app-shells/zsh/files/zsh-5.9-clang-15-configure.patch b/app-shells/zsh/files/zsh-5.9-clang-15-configure.patch
index a840401becc3..eb74a6ab65c9 100644
--- a/app-shells/zsh/files/zsh-5.9-clang-15-configure.patch
+++ b/app-shells/zsh/files/zsh-5.9-clang-15-configure.patch
@@ -1,4 +1,5 @@
https://bugs.gentoo.org/869539
+https://github.com/zsh-users/zsh/commit/ab4d62eb975a4c4c51dd35822665050e2ddc6918
https://www.zsh.org/mla/workers/2022/msg00964.html
--- a/configure.ac
+++ b/configure.ac
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/files/
@ 2022-09-16 1:50 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-09-16 1:50 UTC (permalink / raw
To: gentoo-commits
commit: de7ee49e504cf5eef6084f0216593020bebf2c93
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 01:50:18 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 01:50:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de7ee49e
app-shells/zsh: add link to upstream patch submission
Bug: https://bugs.gentoo.org/869539
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-shells/zsh/files/zsh-5.9-clang-15-configure.patch | 1 +
1 file changed, 1 insertion(+)
diff --git a/app-shells/zsh/files/zsh-5.9-clang-15-configure.patch b/app-shells/zsh/files/zsh-5.9-clang-15-configure.patch
index 8a77e365c700..a840401becc3 100644
--- a/app-shells/zsh/files/zsh-5.9-clang-15-configure.patch
+++ b/app-shells/zsh/files/zsh-5.9-clang-15-configure.patch
@@ -1,4 +1,5 @@
https://bugs.gentoo.org/869539
+https://www.zsh.org/mla/workers/2022/msg00964.html
--- a/configure.ac
+++ b/configure.ac
@@ -583,11 +583,11 @@ if test x$zsh_cv_c_have_union_init = xye
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/files/
@ 2022-05-15 12:45 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2022-05-15 12:45 UTC (permalink / raw
To: gentoo-commits
commit: 7e647e02c4f09ffb0df70a5d3771d0f834e15849
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 09:22:39 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun May 15 12:40:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e647e02
app-shells/zsh: restore color change on su
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/25461
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-shells/zsh/files/prompt_gentoo_setup-1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-shells/zsh/files/prompt_gentoo_setup-1 b/app-shells/zsh/files/prompt_gentoo_setup-1
index 046e2d87f53a..8b9ac4439919 100644
--- a/app-shells/zsh/files/prompt_gentoo_setup-1
+++ b/app-shells/zsh/files/prompt_gentoo_setup-1
@@ -14,7 +14,7 @@ prompt_gentoo_setup () {
local prompt_gentoo_user=${2:-'green'}
local prompt_gentoo_root=${3:-'red'}
- if [ "$USER" = 'root' ]
+ if [ "$EUID" = '0' ]
then
local base_prompt="%B%F{$prompt_gentoo_root}%m%k "
else
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/files/
@ 2021-03-21 16:34 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2021-03-21 16:34 UTC (permalink / raw
To: gentoo-commits
commit: be45bf5a5b1177231b1e1068ef02cff51c6257a1
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 20 09:18:24 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 21 16:11:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be45bf5a
app-shells/zsh: Minor improvements in zprofile
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-shells/zsh/files/zprofile-4 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-shells/zsh/files/zprofile-4 b/app-shells/zsh/files/zprofile-4
index 2e33b11f491..b92c245784d 100644
--- a/app-shells/zsh/files/zprofile-4
+++ b/app-shells/zsh/files/zprofile-4
@@ -2,7 +2,7 @@
# Load environment settings from profile.env, which is created by
# env-update from the files in /etc/env.d
-if [ -e /etc/profile.env ] ; then
+if [[ -e /etc/profile.env ]] ; then
. /etc/profile.env
fi
@@ -22,7 +22,7 @@ umask 022
# 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
+if [[ "$EUID" = "0" ]] || [[ "$USER" = "root" ]] ; then
# Check to make sure ROOTPATH is sane before we use it.
# https://bugs.gentoo.org/656400
if [[ :${ROOTPATH}: == *:/usr/sbin:* ]]; then
@@ -35,7 +35,7 @@ unset ROOTPATH
shopts=$-
setopt nullglob
for sh in /etc/profile.d/*.sh ; do
- [ -r "$sh" ] && . "$sh"
+ [[ -r "${sh}" ]] && . "${sh}"
done
unsetopt nullglob
set -$shopts
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/files/
@ 2019-11-08 2:44 Aaron Bauman
0 siblings, 0 replies; 9+ messages in thread
From: Aaron Bauman @ 2019-11-08 2:44 UTC (permalink / raw
To: gentoo-commits
commit: a22eeff0b12d49cbd9cc3a9b56ba4bf3c7692707
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Oct 20 07:39:48 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 02:43:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a22eeff0
app-shells/zsh: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13355
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../zsh/files/zsh-5.7-fix_infinite_recursion.patch | 35 ----------------------
1 file changed, 35 deletions(-)
diff --git a/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch b/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch
deleted file mode 100644
index 042b948b23d..00000000000
--- a/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b70919e0d9dadc93893e9d18bc3ef13b88756ecf Mon Sep 17 00:00:00 2001
-From: dana <dana@dana.is>
-Date: Sun, 27 Jan 2019 00:26:31 -0600
-Subject: [PATCH] 44020: VCS_INFO_detect_p4: Fix infinite recursion
-
----
- ChangeLog | 5 +++++
- Functions/VCS_Info/Backends/VCS_INFO_detect_p4 | 1 -
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 81668ccc9..be243c1b8 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,8 @@
-+2018-01-27 dana <dana@dana.is>
-+
-+ * 44020: Functions/VCS_Info/Backends/VCS_INFO_detect_p4: Fix
-+ infinite recursion
-+
- 2018-01-24 dana <dana@dana.is>
-
- * unposted: Config/version.mk: Post-release version bump
-diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
-index d171c68ee..5ec21da9f 100644
---- a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
-+++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
-@@ -44,7 +44,6 @@ VCS_INFO_p4_get_server() {
- }
-
-
--(( ${+functions[VCS_INFO_detect_p4]} )) ||
- VCS_INFO_detect_p4() {
- local serverport p4where
-
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/files/
@ 2019-02-14 8:38 Fabian Groffen
0 siblings, 0 replies; 9+ messages in thread
From: Fabian Groffen @ 2019-02-14 8:38 UTC (permalink / raw
To: gentoo-commits
commit: 57668f2a996a42dae2455fd56acfd8ae75dc1fae
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 08:37:30 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 08:37:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57668f2a
app-shells/zsh: fix zprofile for Prefix
Closes: https://bugs.gentoo.org/677880
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-shells/zsh/files/zprofile-4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-shells/zsh/files/zprofile-4 b/app-shells/zsh/files/zprofile-4
index 6402ca718d3..2e33b11f491 100644
--- a/app-shells/zsh/files/zprofile-4
+++ b/app-shells/zsh/files/zprofile-4
@@ -25,7 +25,7 @@ umask 022
if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
# Check to make sure ROOTPATH is sane before we use it.
# https://bugs.gentoo.org/656400
- if [[ :${ROOTPATH}: == *:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:* ]]; then
+ if [[ :${ROOTPATH}: == *:/usr/sbin:* ]]; then
PATH="${ROOTPATH}"
fi
fi
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-11-22 23:22 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-11 15:32 [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-11-22 23:22 Conrad Kostecki
2024-02-08 17:34 Mike Gilbert
2023-06-11 15:32 Sam James
2022-09-16 1:50 Sam James
2022-05-15 12:45 Lars Wendler
2021-03-21 16:34 Lars Wendler
2019-11-08 2:44 Aaron Bauman
2019-02-14 8:38 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox