commit: 991fe55334a777ca7ed6e7ed3c7ceb04af1783e0 Author: Eray Aslan <eras <AT> gentoo <DOT> org> AuthorDate: Thu Dec 18 20:11:47 2025 +0000 Commit: Eray Aslan <eras <AT> gentoo <DOT> org> CommitDate: Thu Dec 18 20:17:20 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=991fe553
net-mail/mailutils: Fix test failure Tests were defining variables A, B and C and then testing wordsplitting on them which conflicted with the predefined read-only A variable in Gentoo ebuilds. Instead define and test _A, _B and _C for wordsplitting tests. Closes: https://bugs.gentoo.org/967610 Signed-off-by: Eray Aslan <eras <AT> gentoo.org> .../files/mailutils-fix-test-failure.patch | 172 +++++++++++++++++++++ net-mail/mailutils/mailutils-3.21.ebuild | 1 + 2 files changed, 173 insertions(+) diff --git a/net-mail/mailutils/files/mailutils-fix-test-failure.patch b/net-mail/mailutils/files/mailutils-fix-test-failure.patch new file mode 100644 index 000000000000..767c3b7b188f --- /dev/null +++ b/net-mail/mailutils/files/mailutils-fix-test-failure.patch @@ -0,0 +1,172 @@ +--- a/libmailutils/wordsplit/wordsplit.at 2025-12-18 20:44:10.041576656 +0100 ++++ b/libmailutils/wordsplit/wordsplit.at 2025-12-18 20:45:50.538476607 +0100 +@@ -1207,10 +1207,10 @@ + + AT_BANNER([Substring removal]) + TESTWSP([strip shortest prefix],[wsp-strip wsp-spref], +-[-DA=talis:ac:tanta -DB=talis:ac -DC=talis], +-[${A#*:} +-${B#*:} +-${C#*:}], ++[-D_A=talis:ac:tanta -D_B=talis:ac -D_C=talis], ++[${_A#*:} ++${_B#*:} ++${_C#*:}], + [NF: 1 + 0: ac:tanta + TOTAL: 1 +@@ -1223,10 +1223,10 @@ + ]) + + TESTWSP([strip longest prefix],[wsp-strip wsp-lpref], +-[-DA=talis:ac:tanta -DB=talis:ac -DC=talis], +-[${A##*:} +-${B##*:} +-${C##*:}], ++[-D_A=talis:ac:tanta -D_B=talis:ac -D_C=talis], ++[${_A##*:} ++${_B##*:} ++${_C##*:}], + [NF: 1 + 0: tanta + TOTAL: 1 +@@ -1239,10 +1239,10 @@ + ]) + + TESTWSP([strip shortest suffix],[wsp-strip wsp-ssuf], +-[-DA=talis:ac:tanta -DB=talis:ac -DC=talis], +-[${A%:*} +-${B%:*} +-${C%:*}], ++[-D_A=talis:ac:tanta -D_B=talis:ac -D_C=talis], ++[${_A%:*} ++${_B%:*} ++${_C%:*}], + [NF: 1 + 0: talis:ac + TOTAL: 1 +@@ -1255,10 +1255,10 @@ + ]) + + TESTWSP([strip longest suffix],[wsp-strip wsp-lsuf], +-[-DA=talis:ac:tanta -DB=talis:ac -DC=talis], +-[${A%%:*} +-${B%%:*} +-${C%%:*}], ++[-D_A=talis:ac:tanta -D_B=talis:ac -D_C=talis], ++[${_A%%:*} ++${_B%%:*} ++${_C%%:*}], + [NF: 1 + 0: talis + TOTAL: 1 +--- a/libmailutils/tests/testsuite 2025-12-18 20:44:22.052684969 +0100 ++++ b/libmailutils/tests/testsuite 2025-12-18 20:48:14.911648132 +0100 +@@ -17432,18 +17432,18 @@ + + { set +x + printf "%s\n" "$at_srcdir/wordsplit.at:1209: +- wsp -DA=talis:ac:tanta -DB=talis:ac -DC=talis <<'EOT' +-\${A#*:} +-\${B#*:} +-\${C#*:} ++ wsp -D_A=talis:ac:tanta -D_B=talis:ac -D_C=talis <<'EOT' ++\${_A#*:} ++\${_B#*:} ++\${_C#*:} + EOT + " + at_fn_check_prepare_notrace 'a ${...} parameter expansion' "wordsplit.at:1209" + ( $at_check_trace; +- wsp -DA=talis:ac:tanta -DB=talis:ac -DC=talis <<'EOT' +-${A#*:} +-${B#*:} +-${C#*:} ++ wsp -D_A=talis:ac:tanta -D_B=talis:ac -D_C=talis <<'EOT' ++${_A#*:} ++${_B#*:} ++${_C#*:} + EOT + + ) >>"$at_stdout" 2>>"$at_stderr" 5>&- +@@ -17481,18 +17481,18 @@ + + { set +x + printf "%s\n" "$at_srcdir/wordsplit.at:1225: +- wsp -DA=talis:ac:tanta -DB=talis:ac -DC=talis <<'EOT' +-\${A##*:} +-\${B##*:} +-\${C##*:} ++ wsp -D_A=talis:ac:tanta -D_B=talis:ac -D_C=talis <<'EOT' ++\${_A##*:} ++\${_B##*:} ++\${_C##*:} + EOT + " + at_fn_check_prepare_notrace 'a ${...} parameter expansion' "wordsplit.at:1225" + ( $at_check_trace; +- wsp -DA=talis:ac:tanta -DB=talis:ac -DC=talis <<'EOT' +-${A##*:} +-${B##*:} +-${C##*:} ++ wsp -D_A=talis:ac:tanta -D_B=talis:ac -D_C=talis <<'EOT' ++${_A##*:} ++${_B##*:} ++${_C##*:} + EOT + + ) >>"$at_stdout" 2>>"$at_stderr" 5>&- +@@ -17530,18 +17530,18 @@ + + { set +x + printf "%s\n" "$at_srcdir/wordsplit.at:1241: +- wsp -DA=talis:ac:tanta -DB=talis:ac -DC=talis <<'EOT' +-\${A%:*} +-\${B%:*} +-\${C%:*} ++ wsp -D_A=talis:ac:tanta -D_B=talis:ac -D_C=talis <<'EOT' ++\${_A%:*} ++\${_B%:*} ++\${_C%:*} + EOT + " + at_fn_check_prepare_notrace 'a ${...} parameter expansion' "wordsplit.at:1241" + ( $at_check_trace; +- wsp -DA=talis:ac:tanta -DB=talis:ac -DC=talis <<'EOT' +-${A%:*} +-${B%:*} +-${C%:*} ++ wsp -D_A=talis:ac:tanta -D_B=talis:ac -D_C=talis <<'EOT' ++${_A%:*} ++${_B%:*} ++${_C%:*} + EOT + + ) >>"$at_stdout" 2>>"$at_stderr" 5>&- +@@ -17579,18 +17579,18 @@ + + { set +x + printf "%s\n" "$at_srcdir/wordsplit.at:1257: +- wsp -DA=talis:ac:tanta -DB=talis:ac -DC=talis <<'EOT' +-\${A%%:*} +-\${B%%:*} +-\${C%%:*} ++ wsp -D_A=talis:ac:tanta -D_B=talis:ac -D_C=talis <<'EOT' ++\${_A%%:*} ++\${_B%%:*} ++\${_C%%:*} + EOT + " + at_fn_check_prepare_notrace 'a ${...} parameter expansion' "wordsplit.at:1257" + ( $at_check_trace; +- wsp -DA=talis:ac:tanta -DB=talis:ac -DC=talis <<'EOT' +-${A%%:*} +-${B%%:*} +-${C%%:*} ++ wsp -D_A=talis:ac:tanta -D_B=talis:ac -D_C=talis <<'EOT' ++${_A%%:*} ++${_B%%:*} ++${_C%%:*} + EOT + + ) >>"$at_stdout" 2>>"$at_stderr" 5>&- diff --git a/net-mail/mailutils/mailutils-3.21.ebuild b/net-mail/mailutils/mailutils-3.21.ebuild index 26c61e463aec..518c890a6735 100644 --- a/net-mail/mailutils/mailutils-3.21.ebuild +++ b/net-mail/mailutils/mailutils-3.21.ebuild @@ -63,6 +63,7 @@ REQUIRED_USE=" DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO ) PATCHES=( "${FILESDIR}"/${PN}-3.5-add-include.patch + "${FILESDIR}"/${PN}-fix-test-failure.patch ) pkg_setup() {
