diff options
Diffstat (limited to 'app-portage/iwdevtools/files')
3 files changed, 42 insertions, 50 deletions
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/files/iwdevtools-0.10.1-ldpath-regression.patch b/app-portage/iwdevtools/files/iwdevtools-0.10.1-ldpath-regression.patch new file mode 100644 index 000000000000..5a5312639979 --- /dev/null +++ b/app-portage/iwdevtools/files/iwdevtools-0.10.1-ldpath-regression.patch @@ -0,0 +1,22 @@ +https://github.com/ionenwks/iwdevtools/commit/4e89c42455330b6660583ff1a4b54384346a123d +From: Ionen Wolkens <ionen@gentoo.org> +Date: Fri, 25 Feb 2022 04:20:17 -0500 +Subject: [PATCH] qa-vdb: fix ldpath include regression + +commit dd0bb44a3b190c756ce55c190b70f33bf350b7c5 was meant for +directories, however this is /not/ a directory. As a result +gcc's ld.so.conf wasn't included which could result in: + + * VDB: detected possibly incorrect RDEPEND (app-text/qpdf-10.6.2) + * > cross-aarch64-unknown-linux-gnu/gcc:11 +--- a/scripts/qa-vdb ++++ b/scripts/qa-vdb +@@ -674,7 +674,7 @@ _vdb-set_ldpath() { + path=${1%/*}/${path} + fi + for path in ${path}; do +- [[ -d ${path} && -x ${path} ]] || continue # ignore bad includes ++ [[ -r ${path} ]] || continue # ignore bad includes + _vdb-set_ldpath "${path}" + done + fi diff --git a/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch b/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch deleted file mode 100644 index 4cbe6712140a..000000000000 --- a/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://github.com/ionenwks/iwdevtools/commit/a679594f115e8c9fd54aa70fc0742b7d560a2204 -From: Ionen Wolkens <ionen@gentoo.org> -Date: Tue, 21 Dec 2021 00:36:40 -0500 -Subject: [PATCH] tests: relax globs for some stderr output checks - -portage may add noise to these depending on the system, e.g. - -!!! Repository 'gentoo' is missing masters attribute in '/var/db/<snip> -!!! Set 'masters = iwdevtools' in this file for future compatibility - -But these tests are only checking if our own expected error is there, -the rest is not important. - -Reported from: https://bugs.gentoo.org/829740 ---- a/tests/eoldnew/test-pick -+++ b/tests/eoldnew/test-pick -@@ -7,4 +7,4 @@ export EOLDNEW_EMERGE_CMD=echo - expect "old: dev-test/test-1.5.0*new: dev-test/test-2.0.0*" dev-test/test - expect "old: dev-test/test-1.0.0*new: dev-test/test-2.0.0*" 2 dev-test/test - expect "old: dev-test/test-1.0.0*new: dev-test/test-1.5.0*" =dev-test/test-1.5.0 --xfail 1 expect -2 "Error:*older version*" =dev-test/test-1.0.0 -+xfail 1 expect -2 "*Error: failed to find an older version*" =dev-test/test-1.0.0 ---- a/tests/eoldnew/test-skip-new -+++ b/tests/eoldnew/test-skip-new -@@ -6,4 +6,4 @@ ebuild "$(get_ebuild test 2.0.0)" merge - export EOLDNEW_EMERGE_CMD=echo - expect "*=dev-test/test-1.5.0" - dev-test/test - expect "*=dev-test/test-1.0.0" 2- dev-test/test --xfail 1 expect -2 "Error:*older version*" - =dev-test/test-1.0.0 -+xfail 1 expect -2 "*Error: failed to find an older version*" - =dev-test/test-1.0.0 ---- a/tests/qa-cmp/test-missing -+++ b/tests/qa-cmp/test-missing -@@ -1,4 +1,4 @@ - set_portroot - ebuild "$(get_ebuild test 1.5 :)" install --xfail 1 expect -2 "Error:*nothing*" -cI dev-test/test --expect -2 "''" -cI --allow-missing dev-test/test -+xfail 1 expect -2 "*Error: found nothing to compare*" -cI dev-test/test -+expect -! -2 "*Error: found nothing to compare*" -cI --allow-missing dev-test/test ---- a/tests/qa-cmp/test-system -+++ b/tests/qa-cmp/test-system -@@ -5,7 +5,7 @@ ebuild "$(get_ebuild test 1.5 :)" merge - ebuild "$(get_ebuild test 2.5 :)" install - expect -! "CMP:*" -c dev-test/test - ebuild "$(get_ebuild test 2.5 bin:file{1..2} lib.so:"${LIBD100}")" clean merge --xfail 1 expect -2 "Error:*" -c dev-test/test -+xfail 1 expect -2 "*Error: found nothing to compare*" -c dev-test/test - expect "*CMP: listing*" -c --single-all dev-test/test - ebuild "$(get_ebuild test 3.5 bin:file{3..4} lib.so:{"${LIBD200}","${LIBA300}"})" install - expect "*FILES: usr/bin/file3*SONAME: libalt.so.3*FILES:-usr/bin/file1*FILES:+usr/bin/file4*SONAME:-libdummy.so.1*SONAME:+libdummy.so.2*" -c --single-all dev-test/test |