diff --git a/bash-5.1-noaq.patch b/bash-5.1-noaq.patch new file mode 100644 index 00000000..1f581d68 --- /dev/null +++ b/bash-5.1-noaq.patch @@ -0,0 +1,153 @@ +--- doc/bash.1 2022-09-06 17:47:57.750338254 +0200 ++++ doc/bash.1 2022-09-11 13:02:24.019348155 +0200 +@@ -1131,7 +1131,7 @@ + .B PARAMETERS + below). + .PP +-Words of the form \fB$\fP\(aq\fIstring\fP\(aq are treated specially. The ++Words of the form \fB$\fP'\fIstring\fP' are treated specially. The + word expands to \fIstring\fP, with backslash-escaped characters replaced + as specified by the ANSI C standard. Backslash escape sequences, if + present, are decoded as follows: +@@ -1167,10 +1167,10 @@ + .B \e\e + backslash + .TP +-.B \e\(aq ++.B \e' + single quote + .TP +-.B \e\(dq ++.B \e" + double quote + .TP + .B \e? +@@ -1200,7 +1200,7 @@ + The expanded result is single-quoted, as if the dollar sign had + not been present. + .PP +-A double-quoted string preceded by a dollar sign (\fB$\fP\(dq\fIstring\fP\(dq) ++A double-quoted string preceded by a dollar sign (\fB$"\fP\fIstring\fP\fB"\fP) + will cause the string to be translated according to the current locale. + The \fIgettext\fP infrastructure performs the message catalog lookup and + translation, using the \fBLC_MESSAGES\fP and \fBTEXTDOMAIN\fP shell +@@ -2434,7 +2434,7 @@ + Example: + .RS + .PP +-\fBMAILPATH\fP=\(aq/var/mail/bfox?"You have mail":~/shell\-mail?"$_ has mail!"\(aq ++\fBMAILPATH\fP='/var/mail/bfox?"You have mail":~/shell\-mail?"$_ has mail!"' + .PP + .B Bash + can be configured to supply +@@ -2567,24 +2567,24 @@ + .RS + .PD 0 + .TP 10 +-.B %% ++\fB%%\fP + A literal \fB%\fP. + .TP +-.B %[\fIp\fP][l]R ++\fB%\fP[\fIp\fP][\fBl\fP]\fBR\fP + The elapsed time in seconds. + .TP +-.B %[\fIp\fP][l]U ++\fB%\fP[\fIp\fP][\fBl\fP]\fBU\fP + The number of CPU seconds spent in user mode. + .TP +-.B %[\fIp\fP][l]S ++\fB%\fP[\fIp\fP][\fBl\fP]\fBS\fP + The number of CPU seconds spent in system mode. + .TP + .B %P +-The CPU percentage, computed as (%U + %S) / %R. ++The CPU percentage, computed as (\fB%U\fP + \fB%S\fP) / \fB%R\fP. + .PD + .RE + .IP +-The optional \fIp\fP is a digit specifying the \fIprecision\fP, ++The optional \fIp\fP is a digit specifying the precision, i.e. + the number of fractional digits after a decimal point. + A value of 0 causes no decimal point or fraction to be output. + At most three places after the decimal point may be specified; +@@ -2597,7 +2597,13 @@ + included. + .IP + If this variable is not set, \fBbash\fP acts as if it had the +-value \fB$\(aq\enreal\et%3lR\enuser\et%3lU\ensys\et%3lS\(aq\fP. ++value ... ++.RS 15 ++.IP \fCreal %3lR\fP ++.IP \fCuser %3lU\fP ++.IP \fCsys %3lS\fP ++.RE ++.IP + If the value is null, no timing information is displayed. + A trailing newline is added when the format string is displayed. + .PD 0 +@@ -3409,7 +3415,7 @@ + .TP + .B E + The expansion is a string that is the value of \fIparameter\fP with backslash +-escape sequences expanded as with the \fB$'...'\fP quoting mechanism. ++escape sequences expanded as with the \fB$'\fP\fIstring\fP\fB'\fP quoting mechanism. + .TP + .B P + The expansion is a string that is the result of expanding the value of +@@ -3605,7 +3611,7 @@ + .B IFS + is null, no word splitting occurs. + .PP +-Explicit null arguments (\^\f3"\^"\fP or \^\f3\(aq\^\(aq\fP\^) are retained ++Explicit null arguments (\^\f3"\^"\fP or \^\f3'\^'\fP\^) are retained + and passed to commands as empty strings. + Unquoted implicit null arguments, resulting from the expansion of + parameters that have no values, are removed. +@@ -3615,7 +3621,7 @@ + When a quoted null argument appears as part of a word whose expansion is + non-null, the null argument is removed. + That is, the word +-\f(CW\-d\(aq\^\(aq\fP becomes \f(CW\-d\fP after word splitting and ++\f(CW\-d'\^'\fP becomes \f(CW\-d\fP after word splitting and + null argument removal. + .PP + Note that if no expansion occurs, no splitting +@@ -3883,7 +3889,7 @@ + After the preceding expansions, all unquoted occurrences of the + characters + .BR \e , +-.BR \(aq , ++.BR ' , + and \^\f3"\fP\^ that did not result from one of the above + expansions are removed. + .SH REDIRECTION +@@ -5655,8 +5661,8 @@ + .B \e" + literal " + .TP +-.B \e\(aq +-literal \(aq ++.B \e' ++literal ' + .RE + .PD + .PP +@@ -5704,7 +5710,7 @@ + Unquoted text is assumed to be a function name. + In the macro body, the backslash escapes described above are expanded. + Backslash will quote any other character in the macro text, +-including " and \(aq. ++including " and '. + .PP + .B Bash + allows the current readline key bindings to be displayed or modified +@@ -10097,7 +10103,7 @@ + \fBPathname Expansion\fP are enabled. + .TP 8 + .B extquote +-If set, \fB$\fP\(aq\fIstring\fP\(aq and \fB$\fP"\fIstring\fP" quoting is ++If set, \fB$'\fP\fIstring\fP\fB'\fP and \fB$"\fP\fIstring\fP\fB"\fP quoting is + performed within \fB${\fP\fIparameter\fP\fB}\fP expansions + enclosed in double quotes. This option is enabled by default. + .TP 8 diff --git a/bash.changes b/bash.changes index c1813e07..de114dd2 100644 --- a/bash.changes +++ b/bash.changes @@ -1,7 +1,12 @@ +------------------------------------------------------------------- +Sat Sep 24 13:57:27 UTC 2022 - Christopher Yeleighton + +- add checks + ------------------------------------------------------------------- Tue Sep 20 06:59:04 UTC 2022 - Dr. Werner Fink -- Enable parallel builds by slpitting clean and all at make time +- Enable parallel builds by splitting clean and all at make time (Thanks to Christopher Yeleighton) - Do not copy more than 1 byte for \(aq becoming a "'" in quotes-man2html.patch diff --git a/bash.spec b/bash.spec index 42830585..1b2096d3 100644 --- a/bash.spec +++ b/bash.spec @@ -467,6 +467,10 @@ test ${rl1[2]} = ${rl2[2]} || exit 1 %make_build $makeopts "$profilecflags" all %make_build $makeopts -C examples/loadables/ %make_build $makeopts documentation + grep -F '$'\' doc/bash.html %{nil:test for boo#1203091} + +%check + %make_build check %install %make_install diff --git a/get_version_number.sh b/get_version_number.sh index 970174ce..38d5716c 100644 --- a/get_version_number.sh +++ b/get_version_number.sh @@ -1,5 +1,6 @@ #!/bin/bash # Note: this file is used in the spec file, do not remove it +# Print the highest version number of the patches from the archive sourcedir=$1 test -n "${sourcedir}" || sourcedir=$PWD test -e ${sourcedir}/bash.spec || exit 1 diff --git a/quotes-man2html.patch b/quotes-man2html.patch index e4f6a620..c5e77762 100644 --- a/quotes-man2html.patch +++ b/quotes-man2html.patch @@ -1,7 +1,7 @@ boo#1203091 --- - support/man2html.c | 12 ++++++++++++ + support/man2html.c | 12 ++++ 1 file changed, 12 insertions(+) --- support/man2html.c