* [PATCH] usbutils: Update to 014
@ 2022-11-28 16:58 Peter Müller
0 siblings, 0 replies; 3+ messages in thread
From: Peter Müller @ 2022-11-28 16:58 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4483 bytes --]
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
usbutils/patches/usbutils-003-hwdata.patch | 79 ---------------------
usbutils/patches/usbutils-make-hwdata.patch | 21 ------
usbutils/usbutils.nm | 11 ++-
3 files changed, 4 insertions(+), 107 deletions(-)
delete mode 100644 usbutils/patches/usbutils-003-hwdata.patch
delete mode 100644 usbutils/patches/usbutils-make-hwdata.patch
diff --git a/usbutils/patches/usbutils-003-hwdata.patch b/usbutils/patches/usbutils-003-hwdata.patch
deleted file mode 100644
index 4a08c48fa..000000000
--- a/usbutils/patches/usbutils-003-hwdata.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- usbutils-003/Makefile.am 2011-03-22 00:23:33.000000000 +0100
-+++ usbutils-003_/Makefile.am 2011-06-16 15:41:20.927882420 +0200
-@@ -4,15 +4,9 @@
- AM_LDFLAGS = \
- -Wl,--as-needed
-
--data_DATA = \
-- usb.ids
--
- bin_PROGRAMS = \
- lsusb
-
--sbin_SCRIPTS = \
-- update-usbids.sh
--
- bin_SCRIPTS = \
- usb-devices \
- lsusb.py
-@@ -27,37 +21,22 @@
-
- lsusb_CPPFLAGS = \
- $(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
-- -DDATADIR=\"$(datadir)\"
-+ -DDATADIR=\"$(datadir)/hwdata\"
-
- lsusb_LDADD = \
- $(LIBUSB_LIBS)
-
--if HAVE_ZLIB
--data_DATA += usb.ids.gz
--lsusb_CPPFLAGS += -DHAVE_LIBZ
--lsusb_LDADD += -lz
--endif
--
- man_MANS = \
- lsusb.8 \
- usb-devices.1
-
- EXTRA_DIST = \
-- usb.ids \
-- update-usbids.sh.in \
- lsusb.8.in \
- usb-devices.1.in \
- usb-devices \
- lsusb.py \
- usbutils.pc.in
-
--usb.ids.gz: $(srcdir)/usb.ids
-- gzip -c -9 $< > $@
--
--update-usbids.sh: $(srcdir)/update-usbids.sh.in
-- sed 's|@usbids@|$(datadir)/usb.ids|g' $< >$@
-- chmod 755 $@
--
- lsusb.8: $(srcdir)/lsusb.8.in
- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
-
-@@ -71,10 +50,8 @@
- sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
-
- DISTCLEANFILES = \
-- usb.ids.gz \
- lsusb.8 \
- usb-devices.1 \
-- update-usbids.sh \
- usbutils.pc
-
- distclean-local:
---- usbutils-003/lsusb.py 2010-12-16 01:07:09.000000000 +0100
-+++ usbutils-003_/lsusb.py 2011-08-11 09:57:57.079327430 +0200
-@@ -16,7 +16,7 @@
- warnsort = False
-
- prefix = "/sys/bus/usb/devices/"
--usbids = "/usr/share/usb.ids"
-+usbids = "/usr/share/hwdata/usb.ids"
-
- esc = chr(27)
- norm = esc + "[0;0m"
diff --git a/usbutils/patches/usbutils-make-hwdata.patch b/usbutils/patches/usbutils-make-hwdata.patch
deleted file mode 100644
index 862c7fcb3..000000000
--- a/usbutils/patches/usbutils-make-hwdata.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up usbutils-004/Makefile.am.orig usbutils-004/Makefile.am
---- usbutils-004/Makefile.am.orig 2011-09-20 09:42:04.282566870 +0200
-+++ usbutils-004/Makefile.am 2011-09-20 09:42:41.399102845 +0200
-@@ -38,7 +38,7 @@ EXTRA_DIST = \
- usbutils.pc.in
-
- lsusb.8: $(srcdir)/lsusb.8.in
-- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
-+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/hwdata/usb.ids|g' $< >$@
-
- usb-devices.1: $(srcdir)/usb-devices.1.in
- sed 's|VERSION|$(VERSION)|g' $< >$@
-@@ -47,7 +47,7 @@ pkgconfigdir = $(datarootdir)/pkgconfig
- pkgconfig_DATA = usbutils.pc
-
- usbutils.pc: $(srcdir)/usbutils.pc.in
-- sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
-+ sed 's|@usbids@|$(datadir)/hwdata/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
-
- DISTCLEANFILES = \
- lsusb.8 \
diff --git a/usbutils/usbutils.nm b/usbutils/usbutils.nm
index a54a78c0d..a0038fef5 100644
--- a/usbutils/usbutils.nm
+++ b/usbutils/usbutils.nm
@@ -5,11 +5,11 @@
name = usbutils
epoch = 1
-version = 005
+version = 014
release = 4
groups = System/Tools
-url = http://www.linux-usb.org/
+url = https://www.linux-usb.org/
license = GPLv2
summary = Tool to provide and enhance USB support in Linux.
@@ -17,21 +17,18 @@ description
A set of tools to configure list USB Devices.
end
-source_dl = http://www.kernel.org/pub/linux/utils/usb/usbutils/
+source_dl = https://www.kernel.org/pub/linux/utils/usb/usbutils/
build
requires
autoconf
automake
hwdata
+ libudev-devel
libusb-devel
zlib-devel
end
- prepare_cmds
- ./autogen.sh
- end
-
install_cmds
# Removing lsusb.py.
rm -rfv %{BUILDROOT}/usr/bin/lsusb.py
--
2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] usbutils: Update to 014
2022-07-09 14:03 Peter Müller
@ 2022-07-09 14:33 ` Adolf Belka
0 siblings, 0 replies; 3+ messages in thread
From: Adolf Belka @ 2022-07-09 14:33 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3962 bytes --]
Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>
On 09/07/2022 16:03, Peter Müller wrote:
> Full changelog as retrieved from NEWS file:
>
> usbutils 014
> ============
>
> Adrian Kalazi (1):
> Add Tx+Rx lanes to tree mode
>
> Aurelien Jarno (1):
> lsusb(8): mention the udev's hardware database
>
> Benson Leung (1):
> lsusb: Fix typo in string output for iAdditionalInfoURL
>
> Bui Quang Minh (1):
> lsusb-t: Add lower bound checks in read_sysfs_file_string
>
> Grant Grundler (2):
> lsusb: remove unused RETRIES constant
> lsusb: don't complain on EAGAIN
>
> Greg Kroah-Hartman (10):
> sysfs: add copyright notice taken from name.*
> LICENSES: add symlink to handle "or-later" issue for GPL-2.0
> LICENSES: put spdx headers on the license files
> rename "GPL-2.0+" to "GPL-2.0-or-later"
> LICENSE: rename GPL-3.0.txt -> GPL-3.0-only.txt
> usbhid-dump.8.in: add copyright information
> .gitignore: add copyright and SPDX info
> usbhid-dump: add copyright and SPDX info
> SPDX header cleanups from GPL-2.0 -> GPL-2.0-only
> usbutils.spdx: update with output of latest reuse tool
>
> Jonathan Neuschäfer (2):
> lsusb: Fix spelling of bEndpointAddress in UVC
> lsusb: Decode endpoint addresses in UVC
>
> Lukas Zaoral (3):
> lsusb.c: fix leak in dump_printer_device
> usb-devices: do not use `local` in a POSIX shell script
> desc-defs.c: fix possible out-of-bound read
>
> Matthias Braun (1):
> Fix typos in lsusb.8.in
>
> Ruslan Kabatsayev (5):
> Fix locating endpoint when it's a directory rather than a symlink
> Fix formatting of interface descriptors to match /sys/kernel/debug/usb/devices
> Fix formatting of endpoint direction to match /sys/kernel/debug/usb/devices
> Fix formatting of endpoint type to match /sys/kernel/debug/usb/devices
> Fix formatting of max endpoint packet size to match /sys/kernel/debug/usb/devices
>
> Thomas Hebb (1):
> lsusb: Fix buffer size copy/paste error
>
> Tormod Volden (1):
> Makefile.am: Remove unused DATADIR
>
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
> lfs/usbutils | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lfs/usbutils b/lfs/usbutils
> index 0ad637d30..e2d2e92a6 100644
> --- a/lfs/usbutils
> +++ b/lfs/usbutils
> @@ -1,7 +1,7 @@
> ###############################################################################
> # #
> # IPFire.org - A linux based firewall #
> -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
> +# Copyright (C) 2007-2022 IPFire Team <info(a)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,10 @@
>
> include Config
>
> -VER = 013
> +VER = 014
>
> THISAPP = usbutils-$(VER)
> -DL_FILE = $(THISAPP).tar.xz
> +DL_FILE = $(THISAPP).tar.gz
> DL_FROM = $(URL_IPFIRE)
> DIR_APP = $(DIR_SRC)/$(THISAPP)
> TARGET = $(DIR_INFO)/$(THISAPP)
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>
> -$(DL_FILE)_BLAKE2 = d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873
> +$(DL_FILE)_BLAKE2 = 8defadf7aa05dedb5af52a08ee8b5c152529c35e32514360326c9bc45860c8a1d10b5688cc40ddc2218824b7a776ed8590182cee2c54504d4fbd94512ce80259
>
> install : $(TARGET)
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] usbutils: Update to 014
@ 2022-07-09 14:03 Peter Müller
2022-07-09 14:33 ` Adolf Belka
0 siblings, 1 reply; 3+ messages in thread
From: Peter Müller @ 2022-07-09 14:03 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3645 bytes --]
Full changelog as retrieved from NEWS file:
usbutils 014
============
Adrian Kalazi (1):
Add Tx+Rx lanes to tree mode
Aurelien Jarno (1):
lsusb(8): mention the udev's hardware database
Benson Leung (1):
lsusb: Fix typo in string output for iAdditionalInfoURL
Bui Quang Minh (1):
lsusb-t: Add lower bound checks in read_sysfs_file_string
Grant Grundler (2):
lsusb: remove unused RETRIES constant
lsusb: don't complain on EAGAIN
Greg Kroah-Hartman (10):
sysfs: add copyright notice taken from name.*
LICENSES: add symlink to handle "or-later" issue for GPL-2.0
LICENSES: put spdx headers on the license files
rename "GPL-2.0+" to "GPL-2.0-or-later"
LICENSE: rename GPL-3.0.txt -> GPL-3.0-only.txt
usbhid-dump.8.in: add copyright information
.gitignore: add copyright and SPDX info
usbhid-dump: add copyright and SPDX info
SPDX header cleanups from GPL-2.0 -> GPL-2.0-only
usbutils.spdx: update with output of latest reuse tool
Jonathan Neuschäfer (2):
lsusb: Fix spelling of bEndpointAddress in UVC
lsusb: Decode endpoint addresses in UVC
Lukas Zaoral (3):
lsusb.c: fix leak in dump_printer_device
usb-devices: do not use `local` in a POSIX shell script
desc-defs.c: fix possible out-of-bound read
Matthias Braun (1):
Fix typos in lsusb.8.in
Ruslan Kabatsayev (5):
Fix locating endpoint when it's a directory rather than a symlink
Fix formatting of interface descriptors to match /sys/kernel/debug/usb/devices
Fix formatting of endpoint direction to match /sys/kernel/debug/usb/devices
Fix formatting of endpoint type to match /sys/kernel/debug/usb/devices
Fix formatting of max endpoint packet size to match /sys/kernel/debug/usb/devices
Thomas Hebb (1):
lsusb: Fix buffer size copy/paste error
Tormod Volden (1):
Makefile.am: Remove unused DATADIR
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
lfs/usbutils | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lfs/usbutils b/lfs/usbutils
index 0ad637d30..e2d2e92a6 100644
--- a/lfs/usbutils
+++ b/lfs/usbutils
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2022 IPFire Team <info(a)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,10 @@
include Config
-VER = 013
+VER = 014
THISAPP = usbutils-$(VER)
-DL_FILE = $(THISAPP).tar.xz
+DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873
+$(DL_FILE)_BLAKE2 = 8defadf7aa05dedb5af52a08ee8b5c152529c35e32514360326c9bc45860c8a1d10b5688cc40ddc2218824b7a776ed8590182cee2c54504d4fbd94512ce80259
install : $(TARGET)
--
2.35.3
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-28 16:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-28 16:58 [PATCH] usbutils: Update to 014 Peter Müller
-- strict thread matches above, loose matches on Subject: below --
2022-07-09 14:03 Peter Müller
2022-07-09 14:33 ` Adolf Belka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox