From bb872917a53052775013d108a9fd79f0968ca440 Mon Sep 17 00:00:00 2001 From: Qiang Wei Date: Fri, 2 Sep 2022 18:06:43 +0800 Subject: [PATCH] Fix manpage empty issue. Signed-off-by: Qiang Wei --- ...no-op-no-split-option-support-PR2814.patch | 37 +++++++++++++++++++ binutils.spec | 7 +++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 backport-0001-texi2pod.pl-add-no-op-no-split-option-support-PR2814.patch diff --git a/backport-0001-texi2pod.pl-add-no-op-no-split-option-support-PR2814.patch b/backport-0001-texi2pod.pl-add-no-op-no-split-option-support-PR2814.patch new file mode 100644 index 0000000..1504f39 --- /dev/null +++ b/backport-0001-texi2pod.pl-add-no-op-no-split-option-support-PR2814.patch @@ -0,0 +1,37 @@ +From 96a7037cd8573cf065aa6b12baca68696f96d9ca Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 26 Jul 2021 22:51:18 +0100 +Subject: [PATCH] texi2pod.pl: add no-op --no-split option support [PR28144] + +Change 2faf902da ("generate single html manual page by default") +added use of --no-split option to makeinfo. binutils reuses +makeinfo options for texi2pod.pl wrapper. Unsupported option +led to silent manpage truncation. + +The change adds no-op option support. + +etc/ + + * texi2pod.pl: Handle no-op --no-split option. + +Signed-off-by: Wei, Qiang +--- + etc/texi2pod.pl | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl +index 11f70d156be..dcf2b437640 100644 +--- a/etc/texi2pod.pl ++++ b/etc/texi2pod.pl +@@ -59,6 +59,8 @@ while ($_ = shift) { + $flag = shift; + } + push (@ipath, $flag); ++ } elsif (/^--no-split$/) { ++ # ignore option for makeinfo compatibility + } elsif (/^-/) { + usage(); + } else { +-- +2.33.0 + diff --git a/binutils.spec b/binutils.spec index 9a041b4..656a1fa 100644 --- a/binutils.spec +++ b/binutils.spec @@ -1,7 +1,7 @@ Summary: Binary utilities Name: binutils Version: 2.37 -Release: 10 +Release: 11 License: GPLv3+ URL: https://sourceware.org/binutils @@ -64,6 +64,7 @@ Patch40: 0028-x86-reduce-AVX512-FP-set-of-insns-decoded-through-ve.patch Patch41: 0029-x86-consistently-use-scalar_mode-for-AVX512-FP16-sca.patch Patch42: backport-CVE-2022-38126.patch +Patch43: backport-0001-texi2pod.pl-add-no-op-no-split-option-support-PR2814.patch Provides: bundled(libiberty) @@ -143,6 +144,7 @@ sed -i -e "s/^DEJATOOL = .*/DEJATOOL = binutils/" binutils/Makefile.in sed -i -e "s/^DEJATOOL = .*/DEJATOOL = gas/" gas/Makefile.in sed -i -e "s/^DEJATOOL = .*/DEJATOOL = ld/" ld/Makefile.in +touch gas/doc/as.texi touch */configure %build @@ -386,6 +388,9 @@ fi %{_infodir}/bfd*info* %changelog +* Fri Sep 02 2022 Wei, Qiang - 2.37-11 +- Fix man page empty issue + * Thu Sep 8 2022 yinyongkang - 2.37-10 - Type:CVE - ID:CVE-2022-38126 -- Gitee