From 774bed211d7e451dbe4da71933c87a9b6899864b58563e64c8b0a2db8a546a3d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 2 Jan 2022 15:43:05 +0000 Subject: [PATCH 1/5] Accepting request 941729 from home:dirkmueller:Factory - update to 2.1: - build warnings fixed - increased max number of interfaces allowed, fixing problem with some USB sound devices. - autogen.sh added - LICENSES directory added and license moved to it - SPDX license headers added - policykit support added OBS-URL: https://build.opensuse.org/request/show/941729 OBS-URL: https://build.opensuse.org/package/show/Base:System/usbview?expand=0&rev=8 --- usbview-2.0.tar.gz | 3 --- usbview.changes | 12 ++++++++++++ usbview.spec | 38 +++++++++++++++++++------------------- v2.1.tar.gz | 3 +++ 4 files changed, 34 insertions(+), 22 deletions(-) delete mode 100644 usbview-2.0.tar.gz create mode 100644 v2.1.tar.gz diff --git a/usbview-2.0.tar.gz b/usbview-2.0.tar.gz deleted file mode 100644 index cdf4c4e..0000000 --- a/usbview-2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42511e4d43ddc5805bab0dea8aeeea54cc00462d229e04066ed5fb7c065d1b6b -size 366337 diff --git a/usbview.changes b/usbview.changes index 43355a2..f859d2a 100644 --- a/usbview.changes +++ b/usbview.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Dec 20 23:22:34 UTC 2021 - Dirk Müller + +- update to 2.1: + - build warnings fixed + - increased max number of interfaces allowed, fixing problem with some + USB sound devices. + - autogen.sh added + - LICENSES directory added and license moved to it + - SPDX license headers added + - policykit support added + ------------------------------------------------------------------- Sat Jun 29 09:00:30 UTC 2013 - meissner@suse.com diff --git a/usbview.spec b/usbview.spec index f70fb18..4a78e0b 100644 --- a/usbview.spec +++ b/usbview.spec @@ -1,7 +1,7 @@ # # spec file for package usbview # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,22 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: usbview -Version: 2.0 +Version: 2.1 Release: 0 Summary: USB Topology and Device Viewer -License: GPL-2.0+ +License: GPL-2.0-only Group: Hardware/Other -Url: http://www.kroah.com/linux-usb/ -Source: http://www.kroah.com/linux-usb/%{name}-%{version}.tar.gz -Source1: %name.desktop +URL: https://github.com/gregkh/usbview +Source: https://github.com/gregkh/usbview/archive/refs/tags/v%{version}.tar.gz +Source1: %{name}.desktop +BuildRequires: ImageMagick +BuildRequires: automake BuildRequires: gtk3-devel +BuildRequires: polkit BuildRequires: update-desktop-files -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: polkit %description USBView is a GTK program that displays the topography of the devices @@ -35,27 +38,24 @@ that are plugged into the USB on a Linux machine. It also displays information on each of the devices. This can be useful to determine if a device is working properly. - - -Authors: --------- - Greg Kroah-Hartman - %prep %setup -q %build +sh autogen.sh %configure %install -%makeinstall -%suse_update_desktop_file -i %name System Monitor +%make_install +%suse_update_desktop_file -i %{name} System Monitor %files -%defattr(-,root,root) -%doc ChangeLog COPYING* README TODO +%license LICENSES/GPL-2.0-only.txt +%doc ChangeLog README TODO %{_bindir}/usbview %{_datadir}/applications/*.desktop -%doc %{_mandir}/man?/*.* +%{_datadir}/icons/hicolor/*/apps/usbview.* +%{_datadir}/polkit-1/actions/org.freedesktop.pkexec.usbview.policy +%{_mandir}/man?/*.* %changelog diff --git a/v2.1.tar.gz b/v2.1.tar.gz new file mode 100644 index 0000000..fa41015 --- /dev/null +++ b/v2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:781cdba9c22ebbe5e1f9c1033ce9d837aac93b06af68724710ed19b26122cbcc +size 283199 From 7f5db6dcbae5cc88254057ec0b052e2732daa4937c11bbcdc5d8c51426f2ae73 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 21 Jan 2022 14:35:34 +0000 Subject: [PATCH 2/5] Accepting request 947958 from home:msmeissn:branches:Base:System - update to 2.2: - security issue fixed with polkit (CVE-2022-23220 bsc#1194300). - copyright year fixups and updates - tooltip added to explain red devices have no attached drivers OBS-URL: https://build.opensuse.org/request/show/947958 OBS-URL: https://build.opensuse.org/package/show/Base:System/usbview?expand=0&rev=9 --- usbview.changes | 8 ++++++++ usbview.spec | 4 ++-- v2.1.tar.gz | 3 --- v2.2.tar.gz | 3 +++ 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 v2.1.tar.gz create mode 100644 v2.2.tar.gz diff --git a/usbview.changes b/usbview.changes index f859d2a..becdf39 100644 --- a/usbview.changes +++ b/usbview.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 21 14:20:01 UTC 2022 - Marcus Meissner + +- update to 2.2: + - security issue fixed with polkit (CVE-2022-23220 bsc#1194300). + - copyright year fixups and updates + - tooltip added to explain red devices have no attached drivers + ------------------------------------------------------------------- Mon Dec 20 23:22:34 UTC 2021 - Dirk Müller diff --git a/usbview.spec b/usbview.spec index 4a78e0b..d9c33b0 100644 --- a/usbview.spec +++ b/usbview.spec @@ -1,7 +1,7 @@ # # spec file for package usbview # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: usbview -Version: 2.1 +Version: 2.2 Release: 0 Summary: USB Topology and Device Viewer License: GPL-2.0-only diff --git a/v2.1.tar.gz b/v2.1.tar.gz deleted file mode 100644 index fa41015..0000000 --- a/v2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:781cdba9c22ebbe5e1f9c1033ce9d837aac93b06af68724710ed19b26122cbcc -size 283199 diff --git a/v2.2.tar.gz b/v2.2.tar.gz new file mode 100644 index 0000000..1bbd4ef --- /dev/null +++ b/v2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ce48fd8cd64d16f6beb8459185f4e4bc92a973c6606f2d95b7372089ed364bd +size 283827 From 8ee3f2bfd5c50cc6741a4165d9b6d87b3e77d4c8348dec33b4d0b832e4e89ce5 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 23 Jan 2022 13:53:42 +0000 Subject: [PATCH 3/5] Accepting request 948146 from home:dirkmueller:Factory - update to 3.0: - remove need for debugfs/usbdevfs/usbfs file entirely, rely only on sysfs now. This removes the need to run the program as root, which should have never happened. - added SPDX identifiers and .spdx file to make packaging easier for others. OBS-URL: https://build.opensuse.org/request/show/948146 OBS-URL: https://build.opensuse.org/package/show/Base:System/usbview?expand=0&rev=10 --- usbview.changes | 10 ++++++++++ usbview.spec | 4 ++-- v2.2.tar.gz | 3 --- v3.0.tar.gz | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 v2.2.tar.gz create mode 100644 v3.0.tar.gz diff --git a/usbview.changes b/usbview.changes index becdf39..d8c5628 100644 --- a/usbview.changes +++ b/usbview.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Jan 22 19:49:27 UTC 2022 - Dirk Müller + +- update to 3.0: + - remove need for debugfs/usbdevfs/usbfs file entirely, rely only on + sysfs now. This removes the need to run the program as root, which + should have never happened. + - added SPDX identifiers and .spdx file to make packaging easier for + others. + ------------------------------------------------------------------- Fri Jan 21 14:20:01 UTC 2022 - Marcus Meissner diff --git a/usbview.spec b/usbview.spec index d9c33b0..4fa04d5 100644 --- a/usbview.spec +++ b/usbview.spec @@ -17,7 +17,7 @@ Name: usbview -Version: 2.2 +Version: 3.0 Release: 0 Summary: USB Topology and Device Viewer License: GPL-2.0-only @@ -51,7 +51,7 @@ sh autogen.sh %files %license LICENSES/GPL-2.0-only.txt -%doc ChangeLog README TODO +%doc ChangeLog README %{_bindir}/usbview %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/usbview.* diff --git a/v2.2.tar.gz b/v2.2.tar.gz deleted file mode 100644 index 1bbd4ef..0000000 --- a/v2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ce48fd8cd64d16f6beb8459185f4e4bc92a973c6606f2d95b7372089ed364bd -size 283827 diff --git a/v3.0.tar.gz b/v3.0.tar.gz new file mode 100644 index 0000000..b3d3a01 --- /dev/null +++ b/v3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77b163b84b41b040e6713388e89619ae3d146001515771c6bbf44e8a0807deb9 +size 287791 From b20a2f3a7304a442b0cf6bdb2586e4f4b1de3ee89971131804f7c7e42ab0f8ea Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 24 Jan 2022 10:49:15 +0000 Subject: [PATCH 4/5] - explicitly remove unneeded polkit pkexec file (bsc#1194300). OBS-URL: https://build.opensuse.org/package/show/Base:System/usbview?expand=0&rev=11 --- usbview.changes | 5 +++++ usbview.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/usbview.changes b/usbview.changes index d8c5628..1ac7dfa 100644 --- a/usbview.changes +++ b/usbview.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 24 10:48:34 UTC 2022 - Marcus Meissner + +- explicitly remove unneeded polkit pkexec file (bsc#1194300). + ------------------------------------------------------------------- Sat Jan 22 19:49:27 UTC 2022 - Dirk Müller diff --git a/usbview.spec b/usbview.spec index 4fa04d5..88196d1 100644 --- a/usbview.spec +++ b/usbview.spec @@ -47,6 +47,9 @@ sh autogen.sh %install %make_install +# not needed anymore +rm %buildroot/%{_datadir}/polkit-1/actions/org.freedesktop.pkexec.usbview.policy + %suse_update_desktop_file -i %{name} System Monitor %files @@ -55,7 +58,6 @@ sh autogen.sh %{_bindir}/usbview %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/usbview.* -%{_datadir}/polkit-1/actions/org.freedesktop.pkexec.usbview.policy %{_mandir}/man?/*.* %changelog From 91be32a5f017bac0d6b3717a7b227b1f1aee4bc2a996ccc7e2a82b68771ba281 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 24 Jan 2022 11:40:14 +0000 Subject: [PATCH 5/5] Accepting request 948383 from home:dimstar:Factory - Drop polkit (Build)Requires: without a polkit pkexec file, we also do not have to rely on polkit. - Pass --disable-polkit to configure instead of letting make install copy a file which we later delete again. OBS-URL: https://build.opensuse.org/request/show/948383 OBS-URL: https://build.opensuse.org/package/show/Base:System/usbview?expand=0&rev=12 --- usbview.changes | 8 ++++++++ usbview.spec | 7 +------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/usbview.changes b/usbview.changes index 1ac7dfa..62c7496 100644 --- a/usbview.changes +++ b/usbview.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jan 24 11:30:54 UTC 2022 - Dominique Leuenberger + +- Drop polkit (Build)Requires: without a polkit pkexec file, we + also do not have to rely on polkit. +- Pass --disable-polkit to configure instead of letting make + install copy a file which we later delete again. + ------------------------------------------------------------------- Mon Jan 24 10:48:34 UTC 2022 - Marcus Meissner diff --git a/usbview.spec b/usbview.spec index 88196d1..74a210a 100644 --- a/usbview.spec +++ b/usbview.spec @@ -28,9 +28,7 @@ Source1: %{name}.desktop BuildRequires: ImageMagick BuildRequires: automake BuildRequires: gtk3-devel -BuildRequires: polkit BuildRequires: update-desktop-files -Requires: polkit %description USBView is a GTK program that displays the topography of the devices @@ -43,13 +41,10 @@ a device is working properly. %build sh autogen.sh -%configure +%configure --disable-polkit %install %make_install -# not needed anymore -rm %buildroot/%{_datadir}/polkit-1/actions/org.freedesktop.pkexec.usbview.policy - %suse_update_desktop_file -i %{name} System Monitor %files