diff -Nru bash-5.2.21/debian/changelog bash-5.2.21/debian/changelog --- bash-5.2.21/debian/changelog 2024-03-31 09:41:03.000000000 +0100 +++ bash-5.2.21/debian/changelog 2024-04-16 21:44:44.000000000 +0100 @@ -1,3 +1,10 @@ +bash (5.2.21-2ubuntu5) noble; urgency=medium + + * Correct the bash(1) man-page to note that --rcfile does not prevent the + execution of the system-wide /etc/bash.bashrc file (LP: #1097467) + + -- Dave Jones Tue, 16 Apr 2024 21:44:44 +0100 + bash (5.2.21-2ubuntu4) noble; urgency=medium * No-change rebuild for CVE-2024-3094 diff -Nru bash-5.2.21/debian/patches/fix-rcfile-man.diff bash-5.2.21/debian/patches/fix-rcfile-man.diff --- bash-5.2.21/debian/patches/fix-rcfile-man.diff 1970-01-01 01:00:00.000000000 +0100 +++ bash-5.2.21/debian/patches/fix-rcfile-man.diff 2024-04-16 21:44:44.000000000 +0100 @@ -0,0 +1,57 @@ +Author: Dave Jones +Forwarded: yes +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=516152 +Bug-Ubuntu: https://bugs.launchpad.net/gnubash/+bug/1097467 +Description: Document that --rcfile does not exclude SYS_BASHRC from running + This patch fixes the content added by man-bashrc.diff to correctly state that + the --rcfile switch only changes the execution of the user's personal + initialization file and that the system initialization file (SYS_BASHRC which + is /etc/bashrc.bash on Ubuntu) is still executed. + . + Given that man-bashrc.diff originates from Debian, I'm proposed this separate + additional patch in Ubuntu, but in Debian I've proposed a modification to + man-bashrc.diff itself. If that is accepted, this patch should simply be + dropped in our subsequent merge. + +--- a/doc/bash.1 ++++ b/doc/bash.1 +@@ -202,14 +202,14 @@ Display a usage message on standard outp + .PD + Execute commands from + .I file +-instead of the system wide initialization file +-.I /etc/bash.bashrc +-and the standard personal initialization file ++instead of the standard personal initialization file + .I ~/.bashrc + if the shell is interactive (see + .SM + .B INVOCATION +-below). ++below). Note that the system wide initialization file ++.I /etc/bash.bashrc ++is still executed. + .TP + .B \-\-login + Equivalent to \fB\-l\fP. +@@ -359,8 +359,8 @@ This may be inhibited by using the + option. + The \fB\-\-rcfile\fP \fIfile\fP option will force + .B bash +-to read and execute commands from \fIfile\fP instead of +-\fI/etc/bash.bashrc\fP and \fI~/.bashrc\fP. ++to read and execute commands from \fIfile\fP instead of \fI~/.bashrc\fP. ++Note that \fI/etc/bash.bashrc\fP will still be read. + .PP + When + .B bash +@@ -454,7 +454,8 @@ The + .B \-\-norc + option may be used to inhibit this behavior, and the + .B \-\-rcfile +-option may be used to force another file to be read, but neither ++option may be used to force another file to be read instead of ++\fI~/.bashrc\fP, but neither + \fIrshd\fP nor \fIsshd\fP generally invoke the shell with those options + or allow them to be specified. + .PP diff -Nru bash-5.2.21/debian/patches/series bash-5.2.21/debian/patches/series --- bash-5.2.21/debian/patches/series 2024-02-22 10:31:00.000000000 +0000 +++ bash-5.2.21/debian/patches/series 2024-04-16 21:27:54.000000000 +0100 @@ -19,3 +19,4 @@ man-vx-opts.diff bash-musl.diff fix-rl_do_undo-crash.diff +fix-rcfile-man.diff