From fd977276c43eb71a0f90c26768e5446e494e92f0 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Mon, 11 May 2026 20:10:13 +0300 Subject: [PATCH 01/11] avahi: move version checks to override Move existing version checks into override and add explicit package checks. Signed-off-by: George Sapkin --- libs/avahi/test-version.sh | 43 +++++++++++++++++++++ libs/avahi/test.sh | 79 +++++++++++++++----------------------- 2 files changed, 74 insertions(+), 48 deletions(-) create mode 100755 libs/avahi/test-version.sh diff --git a/libs/avahi/test-version.sh b/libs/avahi/test-version.sh new file mode 100755 index 00000000000000..661e3f055148ee --- /dev/null +++ b/libs/avahi/test-version.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +# shellckeck shell=busybox + +_version_check() { + local bin="$1" pkg="$2" ver="$3" + # apk versions use _ where upstream uses - (e.g. 0.9_rc4 vs 0.9-rc4) + local upstream_ver + upstream_ver=$(echo "$ver" | tr '_' '-') + "$bin" -V 2>&1 | grep -F "$upstream_ver" || { + echo "FAIL: $bin -V did not print expected version '$upstream_ver'" + exit 1 + } +} + +case "$PKG_NAME" in +avahi-autoipd) + _version_check avahi-autoipd avahi-autoipd "$PKG_VERSION" + ;; + +avahi-dbus-daemon|\ +avahi-nodbus-daemon) + _version_check avahi-daemon avahi-daemon "$PKG_VERSION" + ;; + +avahi-dnsconfd) + _version_check avahi-dnsconfd avahi-dnsconfd "$PKG_VERSION" + ;; + +avahi-daemon-service-http|\ +avahi-daemon-service-ssh|\ +avahi-utils|\ +libavahi-client|\ +libavahi-dbus-support|\ +libavahi-nodbus-support) + exit 0 + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac diff --git a/libs/avahi/test.sh b/libs/avahi/test.sh index 4175934ace611a..a57c0f87e22eff 100644 --- a/libs/avahi/test.sh +++ b/libs/avahi/test.sh @@ -1,16 +1,5 @@ #!/bin/sh -_version_check() { - local bin="$1" pkg="$2" ver="$3" - # apk versions use _ where upstream uses - (e.g. 0.9_rc4 vs 0.9-rc4) - local upstream_ver - upstream_ver=$(echo "$ver" | tr '_' '-') - "$bin" -V 2>&1 | grep -F "$upstream_ver" || { - echo "FAIL: $bin -V did not print expected version '$upstream_ver'" - exit 1 - } -} - _lib_check() { local f="$1" [ -e "$f" ] || { echo "FAIL: $f not found"; exit 1; } @@ -20,10 +9,6 @@ _lib_check() { # Works for both dbus and nodbus variants; dbus variant skips the start # test when avahi-utils (which needs dbus) is not installed. _daemon_start_test() { - local ver="$1" - - _version_check avahi-daemon avahi-daemon "$ver" - # Config file from package [ -f /etc/avahi/avahi-daemon.conf ] || { echo "FAIL: /etc/avahi/avahi-daemon.conf not installed" @@ -41,36 +26,36 @@ _daemon_start_test() { # Try to start avahi-daemon with a minimal config and no privilege drop mkdir -p /var/run/avahi-daemon /tmp/avahi-test - cat > /tmp/avahi-test/avahi-daemon.conf << 'EOF' -[server] -host-name=avahi-test -use-ipv4=yes -use-ipv6=no -check-response-ttl=no -use-iff-running=no -enable-dbus=no - -[wide-area] -enable-wide-area=no - -[publish] -publish-addresses=yes -publish-hinfo=no -publish-workstation=no -publish-domain=yes -disable-publishing=no - -[reflector] -enable-reflector=no - -[rlimits] -rlimit-core=0 -rlimit-data=4194304 -rlimit-fsize=0 -rlimit-nofile=30 -rlimit-stack=4194304 -rlimit-nproc=3 -EOF + cat > /tmp/avahi-test/avahi-daemon.conf <<-'EOF' + [server] + host-name=avahi-test + use-ipv4=yes + use-ipv6=no + check-response-ttl=no + use-iff-running=no + enable-dbus=no + + [wide-area] + enable-wide-area=no + + [publish] + publish-addresses=yes + publish-hinfo=no + publish-workstation=no + publish-domain=yes + disable-publishing=no + + [reflector] + enable-reflector=no + + [rlimits] + rlimit-core=0 + rlimit-data=4194304 + rlimit-fsize=0 + rlimit-nofile=30 + rlimit-stack=4194304 + rlimit-nproc=3 + EOF avahi-daemon --no-drop-root --no-chroot \ --file=/tmp/avahi-test/avahi-daemon.conf \ @@ -150,11 +135,10 @@ libavahi-client) ;; avahi-dbus-daemon|avahi-nodbus-daemon) - _daemon_start_test "$2" + _daemon_start_test ;; avahi-autoipd) - _version_check avahi-autoipd avahi-autoipd "$2" [ -x /usr/sbin/avahi-autoipd ] || { echo "FAIL: avahi-autoipd not executable"; exit 1; } [ -x /etc/avahi/avahi-autoipd.action ] || { echo "FAIL: avahi-autoipd.action script not installed" @@ -175,7 +159,6 @@ avahi-daemon-service-ssh) ;; avahi-dnsconfd) - _version_check avahi-dnsconfd avahi-dnsconfd "$2" [ -x /usr/sbin/avahi-dnsconfd ] || { echo "FAIL: avahi-dnsconfd not executable"; exit 1; } [ -x /etc/avahi/avahi-dnsconfd.action ] || { echo "FAIL: avahi-dnsconfd.action not installed" From 11cb87b7914c4821684f652efc857d0f9c71ec46 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Mon, 11 May 2026 16:55:31 +0200 Subject: [PATCH 02/11] krb5: add version check override Skip version checks as none of the executables seem to report their versions. Signed-off-by: George Sapkin --- net/krb5/test-version.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 net/krb5/test-version.sh diff --git a/net/krb5/test-version.sh b/net/krb5/test-version.sh new file mode 100755 index 00000000000000..a5b9278c1dd49f --- /dev/null +++ b/net/krb5/test-version.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +# shellckeck shell=busybox + +case "$PKG_NAME" in +krb5-libs|\ +krb5-server|\ +krb5-server-extras|\ +krb5-client) + exit 0 + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac From cb2711a35fb4fdee82c9850002aa74c89402c95a Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Sat, 16 May 2026 18:32:28 +0300 Subject: [PATCH 03/11] libcap-ng: fix version check override Fixes: 12b01bad ("libcap-ng-bin: add test-version.sh to skip version check") Signed-off-by: George Sapkin --- libs/libcap-ng/test-version.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libs/libcap-ng/test-version.sh b/libs/libcap-ng/test-version.sh index c63b25c8aa4f4f..58eff107865c2e 100755 --- a/libs/libcap-ng/test-version.sh +++ b/libs/libcap-ng/test-version.sh @@ -1,5 +1,14 @@ #!/bin/sh + +# shellckeck shell=busybox + case "$1" in -captest|filecap|netcap|pscap) exit 0 ;; -*) echo "Untested package: $1" >&2; exit 1 ;; +libcap-ng|\ +libcap-ng-bin) + exit 0 + ;; +*) + echo "Untested package: $1" >&2 + exit 1 + ;; esac From 6787381922afc8d6fc013b54b1627906cd43f183 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Mon, 11 May 2026 16:50:26 +0200 Subject: [PATCH 04/11] libftdi1: add version check override Add explicit ftdi_eeprom version and a matching version check override. Signed-off-by: George Sapkin --- libs/libftdi1/Makefile | 7 ++++--- libs/libftdi1/test-version.sh | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100755 libs/libftdi1/test-version.sh diff --git a/libs/libftdi1/Makefile b/libs/libftdi1/Makefile index 09688603b14990..33713c665de925 100644 --- a/libs/libftdi1/Makefile +++ b/libs/libftdi1/Makefile @@ -1,4 +1,3 @@ -# # Copyright (C) 2014-2017 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -9,7 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libftdi1 PKG_VERSION:=1.5 -PKG_RELEASE:=2 +PKG_FTDI_EEPROM_VERSION:=0.17 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.intra2net.com/en/developer/libftdi/download/ @@ -35,7 +35,7 @@ endef define Package/libftdi1/description libFTDI - FTDI USB driver with bitbang mode - libFTDI is an open source library to talk to FTDI chips: FT232BM, FT245BM, FT2232C, FT2232H, FT4232H, FT2232D and FT245R, including the popular bitbang mode. + libFTDI is an open source library to talk to FTDI chips: FT232BM, FT245BM, FT2232C, FT2232H, FT4232H, FT2232D and FT245R, including the popular bitbang mode. The library is linked with your program in userspace, no kernel driver required. endef @@ -45,6 +45,7 @@ define Package/ftdi_eeprom DEPENDS:=+confuse +libftdi1 TITLE:=Tool for reading/erasing/flashing FTDI USB chip eeproms URL:=https://www.intra2net.com/en/developer/libftdi/ + VERSION:=$(PKG_FTDI_EEPROM_VERSION)-r$(PKG_RELEASE) endef define Package/ftdi_eeprom/description diff --git a/libs/libftdi1/test-version.sh b/libs/libftdi1/test-version.sh new file mode 100755 index 00000000000000..9f102a0246ae1a --- /dev/null +++ b/libs/libftdi1/test-version.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +# shellckeck shell=busybox + +case "$PKG_NAME" in +ftdi_eeprom) + ftdi_eeprom --version 2>&1 | grep -F "$PKG_VERSION" + ;; + +libftdi1) + exit 0 + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac From 98871c78a281792c5c0e0a64d7bfa7967a8e8ea0 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Mon, 11 May 2026 18:50:35 +0300 Subject: [PATCH 05/11] libucontext: add version check override Skip version checks as none of the executables seem to report their versions. Signed-off-by: George Sapkin --- libs/libucontext/test-version.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 libs/libucontext/test-version.sh diff --git a/libs/libucontext/test-version.sh b/libs/libucontext/test-version.sh new file mode 100755 index 00000000000000..34a7d119ce557c --- /dev/null +++ b/libs/libucontext/test-version.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# shellckeck shell=busybox + +case "$PKG_NAME" in +libucontext|\ +libucontext-tests) + exit 0 + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac From d4d4f77a7b3b51c838ea304e33fb69fc58eb4c51 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Sat, 16 May 2026 18:29:09 +0300 Subject: [PATCH 06/11] python3: add more packages to version check overrides Add source packages and library to version check overrides. Fixes: b5d3a38e ("python3: move version checks to override") Signed-off-by: George Sapkin --- lang/python/python3/test-version.sh | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/lang/python/python3/test-version.sh b/lang/python/python3/test-version.sh index c18da419318fad..88c2efcc537c0d 100755 --- a/lang/python/python3/test-version.sh +++ b/lang/python/python3/test-version.sh @@ -9,27 +9,47 @@ python3-light) python3 --version | grep -Fx "Python $PKG_VERSION" ;; +libpython3-3.14|\ python3-asyncio|\ +python3-asyncio-src|\ python3-base-src|\ python3-codecs|\ +python3-codecs-src|\ python3-ctypes|\ +python3-ctypes-src|\ python3-dbm|\ +python3-dbm-src|\ python3-decimal|\ +python3-decimal-src|\ python3-dev|\ +python3-dev-src|\ python3-light-src|\ python3-logging|\ +python3-logging-src|\ python3-lzma|\ +python3-lzma-src|\ python3-multiprocessing|\ +python3-multiprocessing-src|\ python3-ncurses|\ +python3-ncurses-src|\ python3-openssl|\ +python3-openssl-src|\ python3-pydoc|\ +python3-pydoc-src|\ python3-readline|\ +python3-readline-src|\ python3-sqlite3|\ +python3-sqlite3-src|\ python3-unittest|\ +python3-unittest-src|\ python3-urllib|\ +python3-urllib-src|\ python3-uuid|\ +python3-uuid-src|\ python3-venv|\ -python3-xml) +python3-venv-src|\ +python3-xml|\ +python3-xml-src) exit 0 ;; From f85f1272c2c8678ca385d424e66e74128b0e81d6 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Thu, 14 May 2026 15:07:17 +0300 Subject: [PATCH 07/11] python-pyserial: fix host build Fixes: ac212e0c ("python-pyserial: add hostbuild") Signed-off-by: George Sapkin --- lang/python/python-pyserial/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lang/python/python-pyserial/Makefile b/lang/python/python-pyserial/Makefile index 6f82bcc840d694..f0e7e88aceb447 100644 --- a/lang/python/python-pyserial/Makefile +++ b/lang/python/python-pyserial/Makefile @@ -18,7 +18,8 @@ PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE.txt PKG_MAINTAINER:=Micke Prag -HOST_BUILD_DEPENDS:=python3/host python-build/host python-installer/host python-wheel/host +HOST_BUILD_DEPENDS:=python-setuptools/host +PKG_BUILD_DEPENDS:=python-setuptools/host include ../pypi.mk include $(INCLUDE_DIR)/package.mk From 542f5026aba8ebf380d2ab1c325de0c1bd313700 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Mon, 11 May 2026 22:49:42 +0300 Subject: [PATCH 08/11] python-pyserial: add version check override Skip version checks as none of the executables seem to report their versions. Signed-off-by: George Sapkin --- lang/python/python-pyserial/test-version.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 lang/python/python-pyserial/test-version.sh diff --git a/lang/python/python-pyserial/test-version.sh b/lang/python/python-pyserial/test-version.sh new file mode 100755 index 00000000000000..54624c5c106fd5 --- /dev/null +++ b/lang/python/python-pyserial/test-version.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# shellckeck shell=busybox + +case "$PKG_NAME" in +python3-pyserial|\ +python3-pyserial-src) + exit 0 + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac From 970ab8161126b81e024800bf4becf30578f97d1b Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Mon, 11 May 2026 22:57:13 +0300 Subject: [PATCH 09/11] python-tabulate: add version check override Skip version checks as none of the executables seem to report their versions. Signed-off-by: George Sapkin --- lang/python/python-tabulate/test-version.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 lang/python/python-tabulate/test-version.sh diff --git a/lang/python/python-tabulate/test-version.sh b/lang/python/python-tabulate/test-version.sh new file mode 100755 index 00000000000000..77f701d732b820 --- /dev/null +++ b/lang/python/python-tabulate/test-version.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# shellckeck shell=busybox + +case "$PKG_NAME" in +python3-tabulate|\ +python3-tabulate-src) + exit 0 + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac From da65c40c0f08315c300911c5621c6e9abf6e59d8 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Wed, 13 May 2026 21:31:36 +0300 Subject: [PATCH 10/11] unbound: add version check override Add version check override script. Signed-off-by: George Sapkin --- net/unbound/test-version.sh | 29 +++++++++++++++++++++++++++++ net/unbound/test.sh | 1 - 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100755 net/unbound/test-version.sh diff --git a/net/unbound/test-version.sh b/net/unbound/test-version.sh new file mode 100755 index 00000000000000..23d7c46c8694b2 --- /dev/null +++ b/net/unbound/test-version.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +# shellckeck shell=busybox + +case "$PKG_NAME" in +libunbound) + exit 0 + ;; + +unbound-anchor|\ +unbound-checkconf|\ +unbound-control|\ +unbound-host) + $PKG_NAME -h 2>&1 | grep -F "$PKG_VERSION" + ;; + +unbound-control-setup) + exit 0 + ;; + +unbound-daemon) + unbound -V 2>&1 | grep -F "$PKG_VERSION" + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac diff --git a/net/unbound/test.sh b/net/unbound/test.sh index 7753456e4010a5..b3a3db3e72d77e 100644 --- a/net/unbound/test.sh +++ b/net/unbound/test.sh @@ -2,7 +2,6 @@ case "$1" in unbound-daemon) - unbound -V 2>&1 | grep -F "$2" [ -f /etc/unbound/unbound.conf ] || { echo "FAIL: /etc/unbound/unbound.conf not installed"; exit 1; } ;; From 518668e318dfb1c43c5d5984535e429a3542e54a Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Mon, 11 May 2026 18:42:20 +0300 Subject: [PATCH 11/11] vim: move version checks to override Move existing version checks into override and add explicit package checks. Signed-off-by: George Sapkin --- utils/vim/test-version.sh | 25 +++++++++++++++++++++++++ utils/vim/test.sh | 10 ---------- 2 files changed, 25 insertions(+), 10 deletions(-) create mode 100755 utils/vim/test-version.sh delete mode 100644 utils/vim/test.sh diff --git a/utils/vim/test-version.sh b/utils/vim/test-version.sh new file mode 100755 index 00000000000000..cd60f01d2394e5 --- /dev/null +++ b/utils/vim/test-version.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +# shellckeck shell=busybox + +case "$PKG_NAME" in +vim|\ +vim-full|\ +vim-fuller) + vim --version | grep -F "$PKG_VERSION" + ;; + +vim-help|\ +vim-runtime) + exit 0 + ;; + +xxd) + xxd --version 2>&1 | grep -F "${PKG_VERSION//./-}" + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac diff --git a/utils/vim/test.sh b/utils/vim/test.sh deleted file mode 100644 index 0ef5041041f53a..00000000000000 --- a/utils/vim/test.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -case "$1" in - vim|vim-full|vim-fuller) - vim --version | grep -F "$2" - ;; - xxd) - xxd --version 2>&1 | grep -F "${2//./-}" - ;; -esac