- Update from version 017 to 018 - Update of rootfile - meson is now the only build method - Changelog 018 Add a manpage for lsusb.py Add lsusb.py.1 to DISTCLEANFILES Add a manpage for usbreset usb-devices: fix bashism autogen.sh: use valid email for 2024 copyright README: list libudev as a requirement meson: bump to libusb-1.0.22, reinstate libusb_set_option() meson: set project details meson: always include config.h first, use -include meson: add compiler warnings to the build meson: add all* CFLAGS from travis-autogen.sh meson: temporary disable extra noisy warning man: remove version from the manual pages lsusb.py: remove inline lsusb-VERSION.py note lsusb.py: remove @DATADIR@ instance README: add Contributing section lsusb.py: mention both usb.ids paths Rename .in files to their final state Update .gitignore files meson: convert Wswitch-enum to Wswitch and enable meson: enable commented out warnings meson: add a bunch more warnings to the mix travis: remove travis-ci files ci: add build ci (Alpline) based on kmod's ci: add Arch permutation ci: add Debian permutation ci: add Fedora permutation ci: add Ubuntu permutation ci: add codeql (static analysis) based on main.yml ci: add SPDX copyright/licence identifiers README: fix link, add DCO and SPDX details lsusb: make internal API const-aware lsusb: const annotate most data, re-enable -Wdiscarded-qualifiers ci: run monthly checks by dependabot meson: fold usbhid-dump/meson.build in .gitmodules: remove no longer needed file ci: add/update the final SPDX identifiers man: move manual pages in designated sub-folder ci: add reuse lint stage lsusb: drop the audioterminal hash table lsusb: drop the videoterminal hash table lsusb: drop the genericstrtable hash tables meson: re-enable some warnings editorconfig: add initial config file .clang-format: import from Linux kernel as of v6.11.-rc6 .clang-format: update for_each pattern and list ci: add clang-format action clang-format: bump column limit to 120 ci: directly use archlinux:multilib-devel ci: drop the mkdir && cd dance ci: add clang permutation, for 64bit only lsusb: reformat and add trailing commas for multi-line arrays usb-spec: move the opening curly brackets to end of line ci: add codespell action, fix all typos Include "negotiated speed" in device dump lsusb: remove autotools checks for iconv lsusb: remove byteswap.h check lsusb: always include config.h usbutils: remove usbutils.pc usbutils: convert build system to use meson usbutils.spdx: update file based on recent file movements lsusb: fix memory leak in libusb lsusb: billboard alternate mode is in little endian format README: update based on build tool changes lsusb: add support to show superspeed++ usbhid-dump: clean up meson.build a bit justfile: add one meson: disable -Wswitch-enum usbutils.spdx: update the SPDX file README.md: update the SPDX wording a bit README.md: add the linux-usb mailing list to the README. LICENSE: add LGPL-2.1 license text usbutils.spdx: update the data update usbutils.spdx file editorconfig: make the line length 120 clang-format: add proper copyright information clang-format: fix SPDX license lsusb-t: get rid of custom list.h logic LICENSES: add CC0 and MIT licenses lsusb-t: fix memory leak justfile: add some more targets usbutils.spdx: update based on file additions usbutils.spdx: update due to new file and checksums usbreset: replace some unbounded strcpy() calls sysfs.c: fix an theoretical issue with snprintf() usbutils.spdx: update checksums usbmisc: fix possible stack-buffer-overflow Running lsusb with -D argument and path, which len is more than PATH_MAX + 1, cause stack-buffer-overflow because of copy to the buf a string without null-terminator Force setting 0 byte to the end of the buf fixes this error Fix #190 update ccid descriptor dumping to V1.1 spec V1.1 is actually V1.10.. remove one space usb-devices: Fix usb-devices with busybox Do not warn about missing LPM bit when not required lsusb: add VideoControl Endpoint Descriptor ci: bump github/codeql-action in the all-actions group ci: bump the all-actions group with 2 updates
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/usbutils | 2 +- lfs/usbutils | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/config/rootfiles/common/usbutils b/config/rootfiles/common/usbutils index 9a30134ce..df25e397d 100644 --- a/config/rootfiles/common/usbutils +++ b/config/rootfiles/common/usbutils @@ -2,7 +2,7 @@ usr/bin/lsusb usr/bin/lsusb.py usr/bin/usb-devices usr/bin/usbhid-dump -#usr/lib/pkgconfig/usbutils.pc +#usr/share/man/man1/lsusb.py.1 #usr/share/man/man1/usb-devices.1 #usr/share/man/man8/lsusb.8 #usr/share/man/man8/usbhid-dump.8 diff --git a/lfs/usbutils b/lfs/usbutils index 780b6297a..25653e847 100644 --- a/lfs/usbutils +++ b/lfs/usbutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,10 +24,12 @@
include Config
-VER = 017 +VER = 018 + +# https://www.kernel.org/pub/linux/utils/usb/usbutils/
THISAPP = usbutils-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1dc37f50bd214cd1612819c5814e5a6fe01609b21830e40f03c163a1e100f8d041e93defc0981da8a8a2a8c8a07283a09d3e37101e9ae1d61fd2842809ebcc0e +$(DL_FILE)_BLAKE2 = 030f45afd5867ee38c8284a0741d1de63653a98746bfef42281390c5bdefbbb99c318d708e88ea2e28810d519d735da3103fe438befa889fc9b5ae9e21200992
install : $(TARGET)
@@ -71,11 +73,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./autogen.sh - cd $(DIR_APP) && ./configure --prefix=/usr \ - --datadir=/usr/share/hwdata \ - --disable-zlib - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && meson setup \ + --prefix=/usr \ + --datadir=/usr/share/hwdata \ + builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) + cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) @$(POSTBUILD)