[gentoo-commits] repo/gentoo:master commit in: app-portage/iwdevtools/files/, app-portage/iwdevtools/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     fcdde1d0bc3279dacc5bf25aed059b8b40b1efef
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 14:02:00 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 14:21:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcdde1d0

app-portage/iwdevtools: backport diff output fix

Another short fix, leaving releases for later and going
straight to stable.

Kind of important fix, in some rare'ish cases a line may not
have been displayed leading to missed information. So new
output may be available.

Thanks-to: Joonas Niilola <juippis <AT> gentoo.org>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../files/iwdevtools-0.10.1-diff-off-by-one.patch    | 20 ++++++++++++++++++++
 ...-0.10.1-r1.ebuild => iwdevtools-0.10.1-r2.ebuild} |  1 +
 2 files changed, 21 insertions(+)

diff --git a/app-portage/iwdevtools/files/iwdevtools-0.10.1-diff-off-by-one.patch b/app-portage/iwdevtools/files/iwdevtools-0.10.1-diff-off-by-one.patch
new file mode 100644
index 000000000000..87564b0b1445
--- /dev/null
+++ b/app-portage/iwdevtools/files/iwdevtools-0.10.1-diff-off-by-one.patch
@@ -0,0 +1,20 @@
+https://github.com/ionenwks/iwdevtools/commit/74d7b913a9bea5cfbf59e451d8db4a4c6140cba8
+From: Ionen Wolkens <ionen@gentoo.org>
+Date: Wed, 16 Mar 2022 09:51:00 -0400
+Subject: [PATCH] qa-vdb: fix off-by-one in diff output
+
+This wrongly assumed f1 array was always at least as big as f2
+
+--- a/scripts/qa-vdb
++++ b/scripts/qa-vdb
+@@ -203,8 +203,8 @@ vdb-get_libdiff() {
+ 	# create combined output
+ 	local -i len=0
+ 	local o mark changes=false
+-	for ((i=0; i < ${#f1[@]}; i++)); do
+-		: "${f2[i]:=}"
++	for ((i=0; i < (${#f1[@]}>${#f2[@]}?${#f1[@]}:${#f2[@]}); i++)); do
++		: "${f1[i]:=}${f2[i]:=}"
+ 		if [[ ${f1[i]} == "${f2[i]}" ]]; then
+ 			${O[full]} || continue
+ 			mark=' '

diff --git a/app-portage/iwdevtools/iwdevtools-0.10.1-r1.ebuild b/app-portage/iwdevtools/iwdevtools-0.10.1-r2.ebuild
similarity index 97%
rename from app-portage/iwdevtools/iwdevtools-0.10.1-r1.ebuild
rename to app-portage/iwdevtools/iwdevtools-0.10.1-r2.ebuild
index bc84297f29a9..c4d90017aac1 100644
--- a/app-portage/iwdevtools/iwdevtools-0.10.1-r1.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.10.1-r2.ebuild
@@ -29,6 +29,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-ldpath-regression.patch
+	"${FILESDIR}"/${P}-diff-off-by-one.patch
 )
 
 src_configure() {