From a09f902c31519b264da2463e0f9884ae432f9324 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 4 May 2024 03:01:02 +0200
Subject: Merging upstream version 13.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 share/dot.bashrc      | 5 +++--
 share/profile         | 2 +-
 share/profile.md5sums | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/share/dot.bashrc b/share/dot.bashrc
index df9ee74..db632b8 100644
--- a/share/dot.bashrc
+++ b/share/dot.bashrc
@@ -1,7 +1,8 @@
 # ~/.bashrc: executed by bash(1) for non-login shells.
 
-# Note: PS1 and umask are already set in /etc/profile. You should not
-# need this unless you want different defaults for root.
+# Note: PS1 is set in /etc/profile, and the default umask is defined
+# in /etc/login.defs. You should not need this unless you want different
+# defaults for root.
 # PS1='${debian_chroot:+($debian_chroot)}\h:\w\$ '
 # umask 022
 
diff --git a/share/profile b/share/profile
index de64c87..a897491 100644
--- a/share/profile
+++ b/share/profile
@@ -25,7 +25,7 @@ if [ "${PS1-}" ]; then
 fi
 
 if [ -d /etc/profile.d ]; then
-  for i in /etc/profile.d/*.sh; do
+  for i in $(run-parts --list --regex '^[a-zA-Z0-9_][a-zA-Z0-9._-]*\.sh$' /etc/profile.d); do
     if [ -r $i ]; then
       . $i
     fi
diff --git a/share/profile.md5sums b/share/profile.md5sums
index 5d338c7..a1d0941 100644
--- a/share/profile.md5sums
+++ b/share/profile.md5sums
@@ -12,4 +12,5 @@ b94c2e3df2a779ac12080942df4d86ea 5.9 to 6.4
 6c56009f8aabda9400878ce3c7fd91af 7.7
 ff2bae0480885c074afadec201f5c668 7.8 to 9.5
 2255054e61cee1a99dbe893377820dde 9.6 to 11
-48a30a427d1794feb49f102b87ddce2b 11.1 to current
+48a30a427d1794feb49f102b87ddce2b 11.1 to 13.1
+be6a0f27688b15faede8ad38300c1acc 13.2 to current
-- 
cgit v1.2.3