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

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

[Vinfall]

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

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

https://github.com/Vinfall/void-packages master
https://github.com/void-linux/void-packages/pull/49589

bash-completion: update to 2.12.0.
Two backported patches from upstream (i.e. [#688](https://github.com/scop/bash-completion/pull/688) and [#675](https://github.com/scop/bash-completion/pull/675)) are deleted since the new version includes them already.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

This PR FAILS to build on x86_64-musl with the following warnings:

```sh
=> xbps-src: updating repositories for host (x86_64-musl)...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/bootstrap/x86_64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/x86_64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/nonfree/x86_64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/debug/x86_64-musl-repodata' ...
=> xbps-src: updating software in / masterdir...
=> xbps-src: cleaning up / masterdir...
=> bash-completion-2.12.0_1: removing autodeps, please wait...
=> bash-completion-2.12.0_1: building with [gnu-configure] for x86_64-musl...
   [runtime] bash-5.2.21_1: found (https://repo-default.voidlinux.org/current/musl)
=> bash-completion-2.12.0_1: skipping check (XBPS_CHECK_PKGS is disabled) ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 03-rewrite-python-shebang ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 04-generate-runtime-deps ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 05-generate-32bit-runtime-deps ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 90-set-timestamps ...
=> bash-completion-2.12.0_1: setting mtimes to Fri Mar 29 07:05:08 UTC 2024
=> bash-completion-2.12.0_1: running pre-pkg hook: 99-pkglint-subpkgs ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 99-pkglint ...
=> ERROR: bash-completion-2.12.0_1: /etc/bash_completion.d is forbidden. Use /usr/share/bash-completion/completions.
=> ERROR: bash-completion-2.12.0_1: cannot continue with installation!
```

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

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 <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/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 <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=3eb05b1783c339ef59ed576afb0f678fa4ef49a6de8a696397df3148f8345af9
 
 # Summary of tests:
 # = 26 failed, 1106 passed, 457 skipped, 14 xfailed, 4 xpassed in 1126.01s (0:18:46) =

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

[Vinfall]

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

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

https://github.com/Vinfall/void-packages master
https://github.com/void-linux/void-packages/pull/49589

bash-completion: update to 2.12.0.
Two backported patches from upstream (i.e. [#688](https://github.com/scop/bash-completion/pull/688) and [#675](https://github.com/scop/bash-completion/pull/675)) are deleted since the new version includes them already.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

This PR FAILS to build on x86_64-musl with the following warnings:

```sh
=> xbps-src: updating repositories for host (x86_64-musl)...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/bootstrap/x86_64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/x86_64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/nonfree/x86_64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/debug/x86_64-musl-repodata' ...
=> xbps-src: updating software in / masterdir...
=> xbps-src: cleaning up / masterdir...
=> bash-completion-2.12.0_1: removing autodeps, please wait...
=> bash-completion-2.12.0_1: building with [gnu-configure] for x86_64-musl...
   [runtime] bash-5.2.21_1: found (https://repo-default.voidlinux.org/current/musl)
=> bash-completion-2.12.0_1: skipping check (XBPS_CHECK_PKGS is disabled) ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 03-rewrite-python-shebang ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 04-generate-runtime-deps ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 05-generate-32bit-runtime-deps ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 90-set-timestamps ...
=> bash-completion-2.12.0_1: setting mtimes to Fri Mar 29 07:05:08 UTC 2024
=> bash-completion-2.12.0_1: running pre-pkg hook: 99-pkglint-subpkgs ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 99-pkglint ...
=> ERROR: bash-completion-2.12.0_1: /etc/bash_completion.d is forbidden. Use /usr/share/bash-completion/completions.
=> ERROR: bash-completion-2.12.0_1: cannot continue with installation!
```

How can I solve the error `/etc/bash_completion.d is forbidden. Use /usr/share/bash-completion/completions.`? I searched a bit but could not find something useful.

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 57c4c828c2595b80ce2d7904f3d3ce9517579c75 Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniahuai0tc@riseup.net>
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 <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/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 <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=3eb05b1783c339ef59ed576afb0f678fa4ef49a6de8a696397df3148f8345af9
 
 # 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.12.0.

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/49589#issuecomment-2027962448

Comment:
Hey,

I've checked what the issue is and the pre-pkg hook 99-pkglint finds the path `/etc/bash_completion.d` in the installation path which is forbidden in Void.

There is only one file that is installed into that folder:
`/etc/bash_completion.d/000_bash_completion_compat.bash`

First of all you need to check if this file is mandatory for our distribution. If that is true, check for a way to move the file to the correct path and remove the wrong folder.

There might be a argument for configure to set the path or you need to modify the template file to make this happen.

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

[Vinfall]

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

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

https://github.com/Vinfall/void-packages master
https://github.com/void-linux/void-packages/pull/49589

bash-completion: update to 2.12.0.
Two backported patches from upstream (i.e. [#688](https://github.com/scop/bash-completion/pull/688) and [#675](https://github.com/scop/bash-completion/pull/675)) are deleted since the new version includes them already.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

This PR FAILS to build on x86_64-musl with the following warnings:

```sh
=> xbps-src: updating repositories for host (x86_64-musl)...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/bootstrap/x86_64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/x86_64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/nonfree/x86_64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/debug/x86_64-musl-repodata' ...
=> xbps-src: updating software in / masterdir...
=> xbps-src: cleaning up / masterdir...
=> bash-completion-2.12.0_1: removing autodeps, please wait...
=> bash-completion-2.12.0_1: building with [gnu-configure] for x86_64-musl...
   [runtime] bash-5.2.21_1: found (https://repo-default.voidlinux.org/current/musl)
=> bash-completion-2.12.0_1: skipping check (XBPS_CHECK_PKGS is disabled) ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 03-rewrite-python-shebang ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 04-generate-runtime-deps ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 05-generate-32bit-runtime-deps ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 90-set-timestamps ...
=> bash-completion-2.12.0_1: setting mtimes to Fri Mar 29 07:05:08 UTC 2024
=> bash-completion-2.12.0_1: running pre-pkg hook: 99-pkglint-subpkgs ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 99-pkglint ...
=> ERROR: bash-completion-2.12.0_1: /etc/bash_completion.d is forbidden. Use /usr/share/bash-completion/completions.
=> ERROR: bash-completion-2.12.0_1: cannot continue with installation!
```

How can I solve the error `/etc/bash_completion.d is forbidden. Use /usr/share/bash-completion/completions.`? I searched a bit but could not find something useful.

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From e11e1779d4e030d904f0442ffa6d270bfedd4650 Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniahuai0tc@riseup.net>
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              |  8 +-
 3 files changed, 4 insertions(+), 103 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 <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/template b/srcpkgs/bash-completion/template
index e28e00138868a9..01578ead0e0279 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.12.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/completions"
 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=3eb05b1783c339ef59ed576afb0f678fa4ef49a6de8a696397df3148f8345af9
 
 # 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.12.0.

[Vinfall]

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

New comment by Vinfall on void-packages repository

https://github.com/void-linux/void-packages/pull/49589#issuecomment-2028535925

Comment:
Thanks for the heads-up. After taking a closer look, that folder is defined in [Makefile.am](https://github.com/scop/bash-completion/blob/4f9ad009487452cb5896cd129a7c87ac4196cb21/Makefile.am#L5-L7) in bash-completion and used to override the completion provided by it in a system wide range according to https://github.com/scop/bash-completion/issues/201 and [FAQ](https://github.com/scop/bash-completion/issues/201).

This is solved by adding a additional make install argument, but I'm not sure if there is a _official_ or more appropriate way to do it. That being said, the build package works fine during my rough test on my x86_64-musl machine so it should be fine to merge.

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

[Vinfall]

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

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

bash-completion: update to 2.12.0.
https://github.com/void-linux/void-packages/pull/49589

Description:
Two backported patches from upstream (i.e. [#688](https://github.com/scop/bash-completion/pull/688) and [#675](https://github.com/scop/bash-completion/pull/675)) are deleted since the new version includes them already.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

This PR FAILS to build on x86_64-musl with the following warnings:

```sh
=> xbps-src: updating repositories for host (x86_64-musl)...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/bootstrap/x86_64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/x86_64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/nonfree/x86_64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/musl/debug/x86_64-musl-repodata' ...
=> xbps-src: updating software in / masterdir...
=> xbps-src: cleaning up / masterdir...
=> bash-completion-2.12.0_1: removing autodeps, please wait...
=> bash-completion-2.12.0_1: building with [gnu-configure] for x86_64-musl...
   [runtime] bash-5.2.21_1: found (https://repo-default.voidlinux.org/current/musl)
=> bash-completion-2.12.0_1: skipping check (XBPS_CHECK_PKGS is disabled) ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 03-rewrite-python-shebang ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 04-generate-runtime-deps ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 05-generate-32bit-runtime-deps ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 90-set-timestamps ...
=> bash-completion-2.12.0_1: setting mtimes to Fri Mar 29 07:05:08 UTC 2024
=> bash-completion-2.12.0_1: running pre-pkg hook: 99-pkglint-subpkgs ...
=> bash-completion-2.12.0_1: running pre-pkg hook: 99-pkglint ...
=> ERROR: bash-completion-2.12.0_1: /etc/bash_completion.d is forbidden. Use /usr/share/bash-completion/completions.
=> ERROR: bash-completion-2.12.0_1: cannot continue with installation!
```

How can I solve the error `/etc/bash_completion.d is forbidden. Use /usr/share/bash-completion/completions.`? I searched a bit but could not find something useful.

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Re: bash-completion: update to 2.12.0.

[Vinfall]

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

New comment by Vinfall on void-packages repository

https://github.com/void-linux/void-packages/pull/49589#issuecomment-2099631828

Comment:
Closing due to inactivity and lack of feedback.