[PR PATCH] bash-completion: update to 2.14.0.

[PR PATCH] bash-completion: update to 2.14.0.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 611 bytes --]

There is a new pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages bash-completion
https://github.com/void-linux/void-packages/pull/51388

bash-completion: update to 2.14.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686


A patch file from https://github.com/void-linux/void-packages/pull/51388.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bash-completion-51388.patch --]
[-- Type: text/x-diff, Size: 6754 bytes --]

From 8ddc9dd0778ec998ca19b4bb9a3fec22f50d24b4 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Mon, 22 Jul 2024 20:28:33 +0200
Subject: [PATCH] bash-completion: update to 2.14.0.

---
 .../patches/complete-xbps.patch               | 24 ------
 .../bash-completion/patches/linux-zstd.patch  | 75 -------------------
 .../bash-completion/patches/load_compat.patch | 13 ++++
 srcpkgs/bash-completion/template              |  8 +-
 4 files changed, 17 insertions(+), 103 deletions(-)
 delete mode 100644 srcpkgs/bash-completion/patches/complete-xbps.patch
 delete mode 100644 srcpkgs/bash-completion/patches/linux-zstd.patch
 create mode 100644 srcpkgs/bash-completion/patches/load_compat.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 <richardschuetz@users.noreply.github.com>
-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 <msuchanek@suse.de>
-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 <msuchanek@suse.de>
----
- 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/patches/load_compat.patch b/srcpkgs/bash-completion/patches/load_compat.patch
new file mode 100644
index 00000000000000..a4e6c89ef5bfe6
--- /dev/null
+++ b/srcpkgs/bash-completion/patches/load_compat.patch
@@ -0,0 +1,13 @@
+--- a/bash_completion.sh.in
++++ b/bash_completion.sh.in
+@@ -11,6 +11,10 @@ if [ "x${BASH_VERSION-}" != x -a "x${PS1-}" != x -a "x${BASH_COMPLETION_VERSINFO
+             # Source completion code.
+             . @datadir@/@PACKAGE@/bash_completion
+         fi
++        if shopt -q progcomp && [ -r /usr/share/bash-completion/000_bash_completion_compat.bash ]; then
++            # Source completion code.
++            . /usr/share/bash-completion/000_bash_completion_compat.bash
++        fi
+     fi
+
+ fi
diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template
index e28e00138868a9..b277b4d1180f05 100644
--- a/srcpkgs/bash-completion/template
+++ b/srcpkgs/bash-completion/template
@@ -1,9 +1,9 @@
 # Template file for 'bash-completion'
 pkgname=bash-completion
-version=2.11
-revision=5
+version=2.14.0
+revision=1
 build_style=gnu-configure
-make_install_args="profiledir=/etc/bash/bashrc.d"
+make_install_args="profiledir=/etc/bash/bashrc.d compatdir=/usr/share/bash-completion"
 depends="bash"
 checkdepends="python3-pytest python3-pexpect"
 short_desc="Programmable completion for the GNU Bash shell"
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 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=5c7494f968280832d6adb5aa19f745a56f1a79df311e59338c5efa6f7285e168
 
 # Summary of tests:
 # = 26 failed, 1106 passed, 457 skipped, 14 xfailed, 4 xpassed in 1126.01s (0:18:46) =

Re: bash-completion: update to 2.14.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51388#issuecomment-2246207462

Comment:
why are there a bunch of new symlinks to _golangci-lint?

Re: bash-completion: update to 2.14.0.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 188 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/51388#issuecomment-2246220876

Comment:
I don't know.

Should I check with upstream?

Re: bash-completion: update to 2.14.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51388#issuecomment-2246227247

Comment:
or look at the git history/contents of the files and figure it out

Re: bash-completion: update to 2.14.0.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/51388#issuecomment-2371199871

Comment:
As it seems the symlinks are all for fallback reasons.

The commits of the symlinks all give this information: "add 3rd party fallback completion loader".

Do you need more information or is this alright?

Re: [PR PATCH] [Updated] bash-completion: update to 2.14.0.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 616 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages bash-completion
https://github.com/void-linux/void-packages/pull/51388

bash-completion: update to 2.14.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686


A patch file from https://github.com/void-linux/void-packages/pull/51388.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bash-completion-51388.patch --]
[-- Type: text/x-diff, Size: 6754 bytes --]

From fb53ee0691100165eb3a657d61e5881c539addfe Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Mon, 22 Jul 2024 20:28:33 +0200
Subject: [PATCH] bash-completion: update to 2.14.0.

---
 .../patches/complete-xbps.patch               | 24 ------
 .../bash-completion/patches/linux-zstd.patch  | 75 -------------------
 .../bash-completion/patches/load_compat.patch | 13 ++++
 srcpkgs/bash-completion/template              |  8 +-
 4 files changed, 17 insertions(+), 103 deletions(-)
 delete mode 100644 srcpkgs/bash-completion/patches/complete-xbps.patch
 delete mode 100644 srcpkgs/bash-completion/patches/linux-zstd.patch
 create mode 100644 srcpkgs/bash-completion/patches/load_compat.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 <richardschuetz@users.noreply.github.com>
-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 <msuchanek@suse.de>
-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 <msuchanek@suse.de>
----
- 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/patches/load_compat.patch b/srcpkgs/bash-completion/patches/load_compat.patch
new file mode 100644
index 00000000000000..a4e6c89ef5bfe6
--- /dev/null
+++ b/srcpkgs/bash-completion/patches/load_compat.patch
@@ -0,0 +1,13 @@
+--- a/bash_completion.sh.in
++++ b/bash_completion.sh.in
+@@ -11,6 +11,10 @@ if [ "x${BASH_VERSION-}" != x -a "x${PS1-}" != x -a "x${BASH_COMPLETION_VERSINFO
+             # Source completion code.
+             . @datadir@/@PACKAGE@/bash_completion
+         fi
++        if shopt -q progcomp && [ -r /usr/share/bash-completion/000_bash_completion_compat.bash ]; then
++            # Source completion code.
++            . /usr/share/bash-completion/000_bash_completion_compat.bash
++        fi
+     fi
+
+ fi
diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template
index e28e00138868a9..b277b4d1180f05 100644
--- a/srcpkgs/bash-completion/template
+++ b/srcpkgs/bash-completion/template
@@ -1,9 +1,9 @@
 # Template file for 'bash-completion'
 pkgname=bash-completion
-version=2.11
-revision=5
+version=2.14.0
+revision=1
 build_style=gnu-configure
-make_install_args="profiledir=/etc/bash/bashrc.d"
+make_install_args="profiledir=/etc/bash/bashrc.d compatdir=/usr/share/bash-completion"
 depends="bash"
 checkdepends="python3-pytest python3-pexpect"
 short_desc="Programmable completion for the GNU Bash shell"
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 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=5c7494f968280832d6adb5aa19f745a56f1a79df311e59338c5efa6f7285e168
 
 # Summary of tests:
 # = 26 failed, 1106 passed, 457 skipped, 14 xfailed, 4 xpassed in 1126.01s (0:18:46) =

Re: [PR PATCH] [Closed]: bash-completion: update to 2.14.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 448 bytes --]

There's a closed pull request on the void-packages repository

bash-completion: update to 2.14.0.
https://github.com/void-linux/void-packages/pull/51388

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686