Re: [PR PATCH] [Updated] xbps-src: explicitly disallow pattern on build deps

[Chocimier <Chocimier@users.noreply.github.com>]

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

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

https://github.com/Chocimier/void-packages-org hostmakedepends-pattern
https://github.com/void-linux/void-packages/pull/38540

xbps-src: explicitly disallow pattern on build deps
It is not possible to use version other than currently in template.

Specifying pattern breaks build if dependency isn't in binary repo
already. That it worked when in repo was a coincidence.

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

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- 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/38540.patch is attached

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

From 420a8ca9137fa8e3a3cadb757d0d03b0b03e670a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 8 Aug 2022 20:11:02 +0200
Subject: [PATCH 1/2] xbps-src: explicitly disallow pattern on build deps

It is not possible to use version other than currently in template.

Specifying pattern breaks build if dependency isn't in binary repo
already. That it worked when in repo was a coincidence.
---
 common/xbps-src/shutils/build_dependencies.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index e4e2210d4e56..bc6934fbda1f 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -160,6 +160,8 @@ install_pkg_deps() {
             if [ -f $XBPS_SRCPKGDIR/$f/template ]; then
                 templates+=" $f"
                 continue
+            elif [ "${f/>/}" != "${f}" ] || [ "${f/</}" != "${f}" ]; then
+                msg_error "$pkgver: version pattern in host dependency '$f' is invalid, template version is used always\n"
             fi
             local _repourl=$($XBPS_QUERY_CMD -R -prepository "$f" 2>/dev/null)
             if [ "$_repourl" ]; then
@@ -210,6 +212,8 @@ install_pkg_deps() {
             if [ -f $XBPS_SRCPKGDIR/$f/template ]; then
                 templates+=" $f"
                 continue
+            elif [ "${f/>/}" != "${f}" ] || [ "${f/</}" != "${f}" ]; then
+                msg_error "$pkgver: version pattern in check dependency '$f' is invalid, template version is used always\n"
             fi
             local _repourl=$($XBPS_QUERY_CMD -R -prepository "$f" 2>/dev/null)
             if [ "$_repourl" ]; then
@@ -260,6 +264,8 @@ install_pkg_deps() {
             if [ -f $XBPS_SRCPKGDIR/$f/template ]; then
                 templates+=" $f"
                 continue
+            elif [ "${f/>/}" != "${f}" ] || [ "${f/</}" != "${f}" ]; then
+                msg_error "$pkgver: version pattern in build dependency '$f' is invalid, template version is used always\n"
             fi
             local _repourl=$($XBPS_QUERY_XCMD -R -prepository "$f" 2>/dev/null)
             if [ "$_repourl" ]; then

From 2f41f99043f085f18105dbb8c5495cf8d7283377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Aug 2022 17:58:09 +0200
Subject: [PATCH 2/2] openocd: runtime depend on exact version of jimtcl

build time version requrement is not valid an does not ensure runtime
version change
---
 srcpkgs/openocd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openocd/template b/srcpkgs/openocd/template
index d6370930edc1..7889b281c981 100644
--- a/srcpkgs/openocd/template
+++ b/srcpkgs/openocd/template
@@ -1,7 +1,7 @@
 # Template file for 'openocd'
 pkgname=openocd
 version=0.11.0+1
-revision=1
+revision=2
 # update to a commit that has a compatible jimtcl version
 _commit=830d70bfc66ada2a68c73283b9e4fa4770d408ee
 _jimtcl_version=0.81
@@ -42,9 +42,9 @@ configure_args="
  --enable-cmsis-dap-v2
  --disable-internal-libjaylink"
 hostmakedepends="automake pkg-config libtool which"
-makedepends="hidapi-devel libftdi1-devel
- jimtcl-devel>=${_jimtcl_version}_1<=${_jimtcl_version}_9999
+makedepends="hidapi-devel libftdi1-devel jimtcl-devel
  libusb-devel libjaylink-devel capstone-devel"
+depends="jimtcl-devel>=${_jimtcl_version}_1<=${_jimtcl_version}_9999"
 short_desc="Open On-Chip Debugger"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later"