diff --git a/debian/changelog b/debian/changelog index a7b619a0..413a6d81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +bash (5.1-6ubuntu2) kinetic; 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, 23 Aug 2022 22:21:42 +0100 + bash (5.1-6ubuntu1) jammy; urgency=medium * Merge with Debian; remaining changes: diff --git a/debian/patches/fix-rcfile-man.diff b/debian/patches/fix-rcfile-man.diff new file mode 100644 index 00000000..98d275f2 --- /dev/null +++ b/debian/patches/fix-rcfile-man.diff @@ -0,0 +1,21 @@ +--- 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. diff --git a/debian/patches/series b/debian/patches/series index 5c9b77c0..4875f874 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -34,3 +34,4 @@ use-system-texi2html.diff bzero.diff man-macro-warnings.diff man-vx-opts.diff +fix-rcfile-man.diff