diff --git a/fix-bashism-issue.patch b/fix-bashism-issue.patch new file mode 100644 index 0000000000000000000000000000000000000000..fc9b93a551fe18084ed80a6e5bc2e49de8cf6b37 --- /dev/null +++ b/fix-bashism-issue.patch @@ -0,0 +1,32 @@ +From 3b79e9c866a17f0a5178b3b0bee63fab59a0003a Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Tue, 28 Nov 2023 14:24:08 +0100 +Subject: [PATCH] usb-devices: fix bashism + +> checkbashisms usb-devices +possible bashism in usb-devices line 78 ('((' should be '$(('): + maxps=$(($(printf "%4i*%s\n" $((maxps_hex & 0x7ff)) \ + $((1 + ((maxps_hex >> 11) & 0x3)))))) + +Signed-off-by: Dominique Leuenberger + +--- + usb-devices | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usb-devices b/usb-devices +index f5763da..5f60ad5 100755 +--- a/usb-devices ++++ b/usb-devices +@@ -75,7 +75,7 @@ print_endpoint() { + # Extract MaxPS size (bits 0-10) and multiplicity values (bits 11-12) + + maxps=$(($(printf "%4i*%s\n" $((maxps_hex & 0x7ff)) \ +- $((1 + ((maxps_hex >> 11) & 0x3)))))) ++ $((1 + ($((maxps_hex >> 11)) & 0x3)))))) + + read -r interval < "$eppath/interval" + +-- +2.27.0 + diff --git a/usbutils.spec b/usbutils.spec index 2605f3b9791da9ecc6013c9f7c9fd17b45f824cc..852cf8a691114a37ab4d8149f043195ce0aa1b9b 100644 --- a/usbutils.spec +++ b/usbutils.spec @@ -1,6 +1,6 @@ Name: usbutils Version: 017 -Release: 1 +Release: 2 Summary: Linux utilities for USB device License: GPLv2+ URL: http://www.linux-usb.org/ @@ -9,6 +9,7 @@ Source0: https://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}. Source1: GPL-2.0.txt Source2: GPL-3.0.txt +Patch1: fix-bashism-issue.patch BuildRequires: libusbx-devel systemd-devel gcc autoconf automake libtool Requires: hwdata @@ -46,6 +47,9 @@ rm -rf %{buildroot}/%{_libdir}/pkgconfig/usbutils.pc %{_mandir}/*/* %changelog +* Tue Jul 2 2024 yanshuai - 017-2 +- fix bashism + * Wed Jan 31 2024 zhanghongtao - 017-1 - update package to usbutils-017 - lsusb: add fallback names for 'lsusb -v' output