From 63c796906b1711d0235d9313030d98edfef7aff3 Mon Sep 17 00:00:00 2001 From: Vinfall <91039000+Vinfall@users.noreply.github.com> Date: Fri, 29 Mar 2024 19:38:40 +0800 Subject: [PATCH] bash-completion: update to 2.12.0. Two backported patches from upstream (i.e. https://github.com/scop/bash-completion/pull/688 and https://github.com/scop/bash-completion/pull/675) are deleted since the new version includes them already. --- .../patches/complete-xbps.patch | 24 ------ .../bash-completion/patches/linux-zstd.patch | 75 ------------------- srcpkgs/bash-completion/template | 6 +- 3 files changed, 3 insertions(+), 102 deletions(-) delete mode 100644 srcpkgs/bash-completion/patches/complete-xbps.patch delete mode 100644 srcpkgs/bash-completion/patches/linux-zstd.patch diff --git a/srcpkgs/bash-completion/patches/complete-xbps.patch b/srcpkgs/bash-completion/patches/complete-xbps.patch deleted file mode 100644 index 3e34ef1d78dacb..00000000000000 --- a/srcpkgs/bash-completion/patches/complete-xbps.patch +++ /dev/null @@ -1,24 +0,0 @@ -Complete tar with .xbps files. - -Backported from upstream https://github.com/scop/bash-completion/pull/688 - ---- a/completions/tar -+++ b/completions/tar 2022-01-23 11:42:19.699734913 -0300 -@@ -422,7 +422,7 @@ - - __tar_detect_ext() - { -- local tars='@(@(tar|gem|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst))' -+ local tars='@(@(tar|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst)|gem|xbps)' - ext="$tars" - - case "$tar_mode_arg" in -@@ -430,7 +430,7 @@ - # Should never happen? - ;; - ?(-)*[cr]*f) -- ext='@(tar|gem|spkg)' -+ ext='@(tar|gem|spkg|xbps)' - case ${words[1]} in - *a*) ext="$tars" ;; - *z*) ext='t?(ar.)gz' ;; diff --git a/srcpkgs/bash-completion/patches/linux-zstd.patch b/srcpkgs/bash-completion/patches/linux-zstd.patch deleted file mode 100644 index f230a1c08169b7..00000000000000 --- a/srcpkgs/bash-completion/patches/linux-zstd.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 4298bc2760d00c83025680f11a3490403b91ba98 Mon Sep 17 00:00:00 2001 -From: Richard Schütz -Date: Tue, 28 Dec 2021 20:07:11 +0100 -Subject: [PATCH] feat(_modules): support zstd compressed modules - ---- - bash_completion | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bash_completion b/bash_completion -index 3d50b2ae..16523708 100644 ---- a/bash_completion -+++ b/bash_completion -@@ -1417,7 +1417,8 @@ _modules() - local modpath - modpath=/lib/modules/$1 - COMPREPLY=($(compgen -W "$(command ls -RL $modpath 2>/dev/null | -- command sed -ne 's/^\(.*\)\.k\{0,1\}o\(\.[gx]z\)\{0,1\}$/\1/p')" -- "$cur")) -+ command sed -ne 's/^\(.*\)\.k\{0,1\}o\(\.[gx]z\)\{0,1\}$/\1/p' \ -+ -e 's/^\(.*\)\.ko\.zst$/\1/p')" -- "$cur")) - } - - # This function completes on installed modules -From b6a9ed50909224fa6b7887b604e86e4efce8289b Mon Sep 17 00:00:00 2001 -From: Michal Suchánek -Date: Fri, 1 Oct 2021 21:40:44 +0200 -Subject: [PATCH] feat(insmod,modinfo,modprobe): support zstd compressed - modules (#614) - -Signed-off-by: Michal Suchanek ---- - completions/insmod | 2 +- - completions/modinfo | 2 +- - completions/modprobe | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/completions/insmod b/completions/insmod -index a59e7535..2f756a99 100644 ---- a/completions/insmod -+++ b/completions/insmod -@@ -7,7 +7,7 @@ _insmod() - - # do filename completion for first argument - if ((cword == 1)); then -- _filedir '@(?(k)o?(.[gx]z))' -+ _filedir '@(?(k)o?(.[gx]z|.zst))' - else # do module parameter completion - COMPREPLY=($(compgen -W "$(PATH="$PATH:/sbin" modinfo \ - -p ${words[1]} 2>/dev/null | cut -d: -f1)" -- "$cur")) -diff --git a/completions/modinfo b/completions/modinfo -index b2809144..4d4d835c 100644 ---- a/completions/modinfo -+++ b/completions/modinfo -@@ -43,7 +43,7 @@ _modinfo() - - # do filename completion if we're giving a path to a module - if [[ $cur == @(*/|[.~])* ]]; then -- _filedir '@(?(k)o?(.[gx]z))' -+ _filedir '@(?(k)o?(.[gx]z|.zst))' - else - _modules $version - fi -diff --git a/completions/modprobe b/completions/modprobe -index 958cd938..799ea197 100644 ---- a/completions/modprobe -+++ b/completions/modprobe -@@ -80,7 +80,7 @@ _modprobe() - insert) - # do filename completion if we're giving a path to a module - if [[ $cur == @(*/|[.~])* ]]; then -- _filedir '@(?(k)o?(.[gx]z))' -+ _filedir '@(?(k)o?(.[gx]z|.zst))' - elif [[ -n $module ]]; then - # do module parameter completion - if [[ $cur == *=* ]]; then diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template index e28e00138868a9..a888ecc8df7818 100644 --- a/srcpkgs/bash-completion/template +++ b/srcpkgs/bash-completion/template @@ -1,7 +1,7 @@ # Template file for 'bash-completion' pkgname=bash-completion -version=2.11 -revision=5 +version=2.12.0 +revision=1 build_style=gnu-configure make_install_args="profiledir=/etc/bash/bashrc.d" depends="bash" @@ -11,7 +11,7 @@ maintainer="skmpz " license="GPL-2.0-or-later" homepage="https://github.com/scop/bash-completion" distfiles="https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz" -checksum=73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac +checksum=3eb05b1783c339ef59ed576afb0f678fa4ef49a6de8a696397df3148f8345af9 # Summary of tests: # = 26 failed, 1106 passed, 457 skipped, 14 xfailed, 4 xpassed in 1126.01s (0:18:46) =