deleted file mode 100644

@@ -1,78 +0,0 @@

-diff -Naur bash-4.4.18.orig/config.h.in bash-4.4.18/config.h.in

-+++ bash-4.4.18/config.h.in	2020-02-06 14:12:36.615748334 +0530

-@@ -797,6 +797,14 @@

- #undef HAVE_SETREGID

- #undef HAVE_DECL_SETREGID

- 

-+/* Define if you have the setregid function.  */

-+#undef HAVE_SETRESGID

-+#undef HAVE_DECL_SETRESGID

-+

-+/* Define if you have the setresuid function.  */

-+#undef HAVE_SETRESUID

-+#undef HAVE_DECL_SETRESUID

-+

- /* Define if you have the setvbuf function.  */

- #undef HAVE_SETVBUF

- 

-diff -Naur bash-4.4.18.orig/configure bash-4.4.18/configure

-+++ bash-4.4.18/configure	2020-02-06 14:13:40.215751387 +0530

-@@ -10241,6 +10241,17 @@

- #define HAVE_DECL_STRSIGNAL $ac_have_decl

- _ACEOF

- 

-+for ac_func in setresuid setresgid

-+do :

-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

-+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :

-+  cat >>confdefs.h <<_ACEOF

-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

-+_ACEOF

-+

-+fi

-+done

- 

- ac_fn_c_check_decl "$LINENO" "strtold" "ac_cv_have_decl_strtold" "$ac_includes_default"

- if test "x$ac_cv_have_decl_strtold" = xyes; then :

-diff -Naur bash-4.4.18.orig/configure.ac bash-4.4.18/configure.ac

-+++ bash-4.4.18/configure.ac	2020-02-06 14:14:55.927755022 +0530

-@@ -799,6 +799,8 @@

- AC_CHECK_DECLS([printf])

- AC_CHECK_DECLS([sbrk])

- AC_CHECK_DECLS([setregid])

-+dnl AC_CHECK_DECLS[(setresuid])

-+dnl AC_CHECK_DECLS[(setresgid])

- AC_CHECK_DECLS([strcpy])

- AC_CHECK_DECLS([strsignal])

- 

-diff -Naur bash-4.4.18.orig/shell.c bash-4.4.18/shell.c

-+++ bash-4.4.18/shell.c	2020-02-06 14:17:12.947761601 +0530

-@@ -1276,7 +1276,11 @@

- {

-   int e;

- 

-+#if HAVE_SETRESUID

-+  if (setresuid (current_user.uid, current_user.uid, current_user.uid) < 0)

-+#else

-   if (setuid (current_user.uid) < 0)

-+#endif

-     {

-       e = errno;

-       sys_error (_("cannot set uid to %d: effective uid %d"), current_user.uid, current_user.euid);

-@@ -1285,7 +1289,11 @@

- 	exit (e);

- #endif

-     }

-+#if HAVE_SETRESGID

-+  if (setresgid (current_user.gid, current_user.gid, current_user.gid) < 0)

-+#else

-   if (setgid (current_user.gid) < 0)

-+#endif

-     sys_error (_("cannot set gid to %d: effective gid %d"), current_user.gid, current_user.egid);

- 

-   current_user.euid = current_user.uid;

deleted file mode 100755

@@ -1,21 +0,0 @@

-diff -dupr a/config-top.h b/config-top.h

-+++ b/config-top.h	2017-01-13 19:48:28.940934708 -0800

-@@ -87,7 +87,7 @@

- #define DEFAULT_BASHRC "~/.bashrc"

- 

- /* System-wide .bashrc file for interactive shells. */

--/* #define SYS_BASHRC "/etc/bash.bashrc" */

-+#define SYS_BASHRC "/etc/bash.bashrc"

- 

- /* System-wide .bash_logout for login shells. */

- /* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */

-@@ -100,7 +100,7 @@

-    sshd and source the .bashrc if so (like the rshd behavior).  This checks

-    for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment,

-    which can be fooled under certain not-uncommon circumstances. */

--/* #define SSH_SOURCE_BASHRC */

-+#define SSH_SOURCE_BASHRC

- 

- /* Define if you want the case-capitalizing operators (~[~]) and the

-    `capcase' variable attribute (declare -c). */

@@ -1,30 +1,30 @@

 Summary:        Bourne-Again SHell

 Name:           bash

-Version:        5.0

-Release:        3%{?dist}

+Version:        5.1.16

+Release:        1%{?dist}

 License:        GPLv3

 URL:            http://www.gnu.org/software/bash

 Group:          System Environment/Base

 Vendor:         VMware, Inc.

 Distribution:   Photon

-Source0:        http://ftp.gnu.org/gnu/bash/%{name}-%{version}.tar.gz

-%define sha512  %{name}=bb4519f06e278f271d08722b531e49d2e842cc3e0b02a6b3eee422e2efcb5b6226111af43f5e5eae56beb85ac8bfebcd6a4aacbabb8f609e529aa4d571890864

-Source1:        bash_completion

+Source0: https://ftp.gnu.org/gnu/bash/%{name}-%{version}.tar.gz

+%define sha512 %{name}=a32a343b6dde9a18eb6217602655f72c4098b0d90f04cf4e686fb21b81fc4ef26ade30f7226929fbb7c207cde34617dbad2c44f6103161d1141122bb31dc6c80

-Patch0:         bash-4.4.patch

-Patch1:         CVE-2019-18276.patch

+Source1: bash_completion

-Provides:       /bin/sh

-Provides:       /bin/bash

+Patch0: enable-SYS_BASHRC-SSH_SOURCE_BASHRC.patch

+

+Provides: /bin/sh

+Provides: /bin/bash

 BuildRequires:  readline

-Requires:       readline

-Requires(post):    /bin/grep

-Requires(post):    /usr/bin/cp

-Requires(postun):  /bin/grep

-Requires(postun):  /usr/bin/mv

+Requires:           readline

+Requires(post):     /bin/grep

+Requires(post):     /usr/bin/cp

+Requires(postun):   /bin/grep

+Requires(postun):   /usr/bin/mv

 %description

 The package contains the Bourne-Again SHell

@@ -151,14 +151,13 @@ cat > %{buildroot}%{_sysconfdir}/profile.d/bash_completion.sh << "EOF"

 # check for interactive bash and only bash

 if [ -n "$BASH_VERSION" -a -n "$PS1" ]; then

-# enable bash completion in interactive shells

-if ! shopt -oq posix; then

-  if [ -f %{_datadir}/bash-completion/bash_completion ]; then

-    . %{_datadir}/bash-completion/bash_completion

+  # enable bash completion in interactive shells

+  if ! shopt -oq posix; then

+    if [ -f %{_datadir}/bash-completion/bash_completion ]; then

+      . %{_datadir}/bash-completion/bash_completion

+    fi

   fi

 fi

-

-fi

 EOF

 cat > %{buildroot}%{_sysconfdir}/bash.bashrc << "EOF"

@@ -191,7 +190,7 @@ fi

 NORMAL="\[\e[0m\]"

 RED="\[\e[1;31m\]"

 GREEN="\[\e[1;32m\]"

-if [[ $EUID == 0 ]]; then

+if [[ $EUID = 0 ]]; then

   PS1="$RED\u [ $NORMAL\w$RED ]# $NORMAL"

 else

   PS1="$GREEN\u [ $NORMAL\w$GREEN ]\$ $NORMAL"

@@ -200,8 +199,9 @@ fi

 unset RED GREEN NORMAL

 if test -n "$SSH_CONNECTION" -a -z "$PROFILEREAD"; then

-     . %{_sysconfdir}/profile > /dev/null 2>&1

+  . %{_sysconfdir}/profile > /dev/null 2>&1

 fi

+

 # End /etc/bash.bashrc

 EOF

@@ -273,25 +273,25 @@ make NON_ROOT_USERNAME=nobody %{?_smp_mflags} check

 %post

 if [ $1 -eq 1 ]; then

-if [ ! -f "/root/.bash_logout" ]; then

-  cp %{_sysconfdir}/skel/.bash_logout /root/.bash_logout

-fi

+  if [ ! -f "/root/.bash_logout" ]; then

+    cp %{_sysconfdir}/skel/.bash_logout /root/.bash_logout

+  fi

-if [ ! -f %{_sysconfdir}/shells ]; then

-  echo "/bin/sh" >> %{_sysconfdir}/shells

-  echo "/bin/bash" >> %{_sysconfdir}/shells

-  echo "%{_bindir}/sh" >> %{_sysconfdir}/shells

-  echo "%{_bindir}/bash" >> %{_sysconfdir}/shells

-else

-  grep -q '^/bin/sh$' %{_sysconfdir}/shells || \

-      echo "/bin/sh" >> %{_sysconfdir}/shells

-  grep -q '^/bin/bash$' %{_sysconfdir}/shells || \

-      echo "/bin/bash" >> %{_sysconfdir}/shells

-  grep -q '^%{_bindir}/sh$' %{_sysconfdir}/shells || \

-      echo "%{_bindir}/sh" >> %{_sysconfdir}/shells

-  grep -q '^%{_bindir}/bash$' %{_sysconfdir}/shells || \

-      echo "%{_bindir}/bash" >> %{_sysconfdir}/shells

-fi

+  if [ ! -f %{_sysconfdir}/shells ]; then

+    echo "/bin/sh" >> %{_sysconfdir}/shells

+    echo "/bin/bash" >> %{_sysconfdir}/shells

+    echo "%{_bindir}/sh" >> %{_sysconfdir}/shells

+    echo "%{_bindir}/bash" >> %{_sysconfdir}/shells

+  else

+    grep -q '^/bin/sh$' %{_sysconfdir}/shells || \

+        echo "/bin/sh" >> %{_sysconfdir}/shells

+    grep -q '^/bin/bash$' %{_sysconfdir}/shells || \

+        echo "/bin/bash" >> %{_sysconfdir}/shells

+    grep -q '^%{_bindir}/sh$' %{_sysconfdir}/shells || \

+        echo "%{_bindir}/sh" >> %{_sysconfdir}/shells

+    grep -q '^%{_bindir}/bash$' %{_sysconfdir}/shells || \

+        echo "%{_bindir}/bash" >> %{_sysconfdir}/shells

+  fi

 fi

 %postun

@@ -301,23 +301,23 @@ if [ $1 -eq 0 ]; then

   fi

   if [ ! -x /bin/sh ]; then

     grep -v '^/bin/sh$'  %{_sysconfdir}/shells | \

-    grep -v '^/bin/sh$' > %{_sysconfdir}/shells.rpm && \

-    mv %{_sysconfdir}/shells.rpm %{_sysconfdir}/shells

+        grep -v '^/bin/sh$' > %{_sysconfdir}/shells.rpm && \

+        mv %{_sysconfdir}/shells.rpm %{_sysconfdir}/shells

   fi

   if [ ! -x /bin/bash ]; then

     grep -v '^/bin/bash$'  %{_sysconfdir}/shells | \

-    grep -v '^/bin/bash$' > %{_sysconfdir}/shells.rpm && \

-    mv %{_sysconfdir}/shells.rpm %{_sysconfdir}/shells

+        grep -v '^/bin/bash$' > %{_sysconfdir}/shells.rpm && \

+        mv %{_sysconfdir}/shells.rpm %{_sysconfdir}/shells

   fi

   if [ ! -x %{_bindir}/sh ]; then

     grep -v '^%{_bindir}/sh$'  %{_sysconfdir}/shells | \

-    grep -v '^%{_bindir}/sh$' > %{_sysconfdir}/shells.rpm && \

-    mv %{_sysconfdir}/shells.rpm %{_sysconfdir}/shells

+        grep -v '^%{_bindir}/sh$' > %{_sysconfdir}/shells.rpm && \

+        mv %{_sysconfdir}/shells.rpm %{_sysconfdir}/shells

   fi

   if [ ! -x %{_bindir}/bash ]; then

     grep -v '^%{_bindir}/bash$'  %{_sysconfdir}/shells | \

-    grep -v '^%{_bindir}/bash$' > %{_sysconfdir}/shells.rpm && \

-    mv %{_sysconfdir}/shells.rpm %{_sysconfdir}/shells

+        grep -v '^%{_bindir}/bash$' > %{_sysconfdir}/shells.rpm && \

+        mv %{_sysconfdir}/shells.rpm %{_sysconfdir}/shells

   fi

 fi

@@ -342,6 +342,8 @@ fi

 %{_mandir}/*/*

 %changelog

+* Wed Aug 24 2022 Shreenidhi Shedi <sshedi@vmware.com> 5.1.16-1

+- Upgrade to v5.1.16

 * Wed Feb 23 2022 Shreenidhi Shedi <sshedi@vmware.com> 5.0-3

 - Fix binary path

 * Fri Feb 19 2021 Satya Naga Vasamsetty <svasamsetty@vmware.com> 5.0-2

@@ -1753,7 +1753,7 @@ _root_command()

     local root_command=$1

     _command

 }

-complete -F _root_command fakeroot gksu gksudo kdesudo really

+complete -F _root_command fakeroot gksu gksudo kdesudo really sudo

 # Return true if the completion should be treated as running as root

 _complete_as_root()

new file mode 100644

@@ -0,0 +1,35 @@

+From 036216b03d55db0396a9e1bb246503ad58398088 Mon Sep 17 00:00:00 2001

+From: Shreenidhi Shedi <sshedi@vmware.com>

+Date: Wed, 24 Aug 2022 15:39:59 +0530

+Subject: [PATCH] config-top.h: enable SYS_BASHRC & SSH_SOURCE_BASHRC

+

+Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com>

+---

+ config-top.h | 4 ++--

+ 1 file changed, 2 insertions(+), 2 deletions(-)

+

+diff --git a/config-top.h b/config-top.h

+index 735f75e..5934fe5 100644

+--- a/config-top.h

+@@ -91,7 +91,7 @@

+ #define DEFAULT_BASHRC "~/.bashrc"

+ 

+ /* System-wide .bashrc file for interactive shells. */

+-/* #define SYS_BASHRC "/etc/bash.bashrc" */

++#define SYS_BASHRC "/etc/bash.bashrc"

+ 

+ /* System-wide .bash_logout for login shells. */

+ /* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */

+@@ -104,7 +104,7 @@

+    sshd and source the .bashrc if so (like the rshd behavior).  This checks

+    for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment,

+    which can be fooled under certain not-uncommon circumstances. */

+-/* #define SSH_SOURCE_BASHRC */

++#define SSH_SOURCE_BASHRC

+ 

+ /* Define if you want the case-toggling operators (~[~]) and the

+    `capcase' variable attribute (declare -c). */

+-- 

+2.25.1

+