From: John Audia <therealgraysky@proton.me>
Date: Fri, 4 Jul 2025 10:16:07 +0000 (-0400)
Subject: zsh: fix shell not sourcing /etc/profile
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=82be093872a2dd06fce4eedac572fec1ae1d0985;p=feed%2Fpackages.git

zsh: fix shell not sourcing /etc/profile

Currently our zsh package does not source /etc/profile which is the
expected behavior to setup environment configs.

Build system: x86/64
Build-tested: x86/64
Run-tested: x86/64

Signed-off-by: John Audia <therealgraysky@proton.me>
---

diff --git a/utils/zsh/Makefile b/utils/zsh/Makefile
index eedf6364a6..ccd50cf468 100644
--- a/utils/zsh/Makefile
+++ b/utils/zsh/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zsh
 PKG_VERSION:=5.9
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SF/zsh
@@ -66,6 +66,8 @@ define Build/Configure
 		--enable-fndir=$(CONFIGURE_PREFIX)/share/zsh/$(PKG_VERSION)/functions \
 		--enable-site-fndir=$(CONFIGURE_PREFIX)/share/zsh/site-functions \
 		--enable-function-subdirs \
+		--enable-etcdir=/etc/zsh \
+		--enable-zprofile=/etc/zsh/zprofile \
 		--with-tcsetpgrp \
 		--with-term-lib="ncursesw", \
 		zsh_cv_shared_environ=yes \
@@ -109,12 +111,14 @@ endef
 define Package/zsh/install
 	$(INSTALL_DIR) $(1)/bin
 	$(INSTALL_DIR) $(1)/$(CONFIGURE_PREFIX)/bin
+	$(INSTALL_DIR) $(1)/etc/zsh
 	$(INSTALL_DIR) $(1)/$(CONFIGURE_PREFIX)/share/zsh/$(PKG_VERSION)
 	$(INSTALL_DIR) $(1)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh
 	$(INSTALL_DIR) $(1)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh/net
 	$(INSTALL_DIR) $(1)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh/param
 
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/$(CONFIGURE_PREFIX)/bin/zsh $(1)/$(CONFIGURE_PREFIX)/bin/
+	$(INSTALL_DATA) ./files/zprofile $(1)/etc/zsh
 	$(CP) $(PKG_INSTALL_DIR)/$(CONFIGURE_PREFIX)/share/zsh/$(PKG_VERSION)/* $(1)/$(CONFIGURE_PREFIX)/share/zsh/$(PKG_VERSION)/
 	$(CP) $(PKG_INSTALL_DIR)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh/* $(1)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh/
 	$(CP) $(PKG_INSTALL_DIR)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh/net/* $(1)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh/net/
diff --git a/utils/zsh/files/zprofile b/utils/zsh/files/zprofile
new file mode 100644
index 0000000000..6bfcdf7cb3
--- /dev/null
+++ b/utils/zsh/files/zprofile
@@ -0,0 +1 @@
+emulate sh -c 'source /etc/profile'