From 5339a5d1ee8ac271b18c10f4592bc09463b201b4 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sat, 10 Dec 2022 11:36:59 +0100 Subject: [PATCH 01/10] Port to C99 Related to: --- usbsniff-c99.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ usbsniff.spec | 8 ++++++-- 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 usbsniff-c99.patch diff --git a/usbsniff-c99.patch b/usbsniff-c99.patch new file mode 100644 index 0000000..3319c26 --- /dev/null +++ b/usbsniff-c99.patch @@ -0,0 +1,42 @@ +Make available more function prototypes, to avoid implicit function +declarations. This improves compatibility with future compilers. + +Submitted upstream: + +diff --git a/usb_replay.c b/usb_replay.c +index 32e9cf14fd854f66..3ae7bf8e740ad90c 100644 +--- a/usb_replay.c ++++ b/usb_replay.c +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include "common.h" + #include "usb_replay.h" +diff --git a/usb_replay.h b/usb_replay.h +index 3dd098085336f5fa..b28c6c88985fbe42 100644 +--- a/usb_replay.h ++++ b/usb_replay.h +@@ -34,4 +34,8 @@ typedef struct urb_s { + uint16_t wLength; + } urb_t; + ++void usb_init(unsigned int vid, unsigned int pid); ++void perform_transfer(urb_t *urb); ++void print_help_and_exit(char **argv); ++ + #endif +diff --git a/usb_replay.y b/usb_replay.y +index fc7c4a23406da350..1efaf08f621d5f03 100644 +--- a/usb_replay.y ++++ b/usb_replay.y +@@ -2,6 +2,7 @@ + #include + #include + #include ++ #include "common.h" + #include "usb_replay.h" + #include "error.h" + int yylex(void); diff --git a/usbsniff.spec b/usbsniff.spec index 4a2778a..480d5e0 100644 --- a/usbsniff.spec +++ b/usbsniff.spec @@ -3,12 +3,13 @@ Name: usbsniff Version: 0 -Release: 17.20170624git%{shortcommit}%{?dist} +Release: 18.20170624git%{shortcommit}%{?dist} Summary: USB traffic capture and replay tools License: GPLv3+ URL: https://github.com/vdudouyt/usbsniff Source0: https://github.com/vdudouyt/usbsniff/archive/%{commit}/usbsniff-%{shortcommit}.tar.gz +Patch0: usbsniff-c99.patch BuildRequires: make BuildRequires: gcc @@ -24,7 +25,7 @@ the device. Useful for debugging USB devices or reverse-engineering protocols. %prep -%setup -q -n usbsniff-%{commit} +%autosetup -p1 -n usbsniff-%{commit} %build @@ -44,6 +45,9 @@ make install DESTDIR=%{buildroot} %changelog +* Sat Dec 10 2022 Florian Weimer - 0-18.20170624gitb4ba3c8 +- Port to C99 + * Sat Jul 23 2022 Fedora Release Engineering - 0-17.20170624gitb4ba3c8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 31d1043e5b8f585b96ca0ba17beef7f7dee0e2bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:58:51 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbsniff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbsniff.spec b/usbsniff.spec index 480d5e0..83cbc19 100644 --- a/usbsniff.spec +++ b/usbsniff.spec @@ -3,7 +3,7 @@ Name: usbsniff Version: 0 -Release: 18.20170624git%{shortcommit}%{?dist} +Release: 19.20170624git%{shortcommit}%{?dist} Summary: USB traffic capture and replay tools License: GPLv3+ @@ -45,6 +45,9 @@ make install DESTDIR=%{buildroot} %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0-19.20170624gitb4ba3c8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Dec 10 2022 Florian Weimer - 0-18.20170624gitb4ba3c8 - Port to C99 From 2c64b87ce5b78ce3a428a70dc56ed0411d714f29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:17:06 +0000 Subject: [PATCH 03/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbsniff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbsniff.spec b/usbsniff.spec index 83cbc19..75024e4 100644 --- a/usbsniff.spec +++ b/usbsniff.spec @@ -3,7 +3,7 @@ Name: usbsniff Version: 0 -Release: 19.20170624git%{shortcommit}%{?dist} +Release: 20.20170624git%{shortcommit}%{?dist} Summary: USB traffic capture and replay tools License: GPLv3+ @@ -45,6 +45,9 @@ make install DESTDIR=%{buildroot} %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0-20.20170624gitb4ba3c8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0-19.20170624gitb4ba3c8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e4f3dbf86947d1829f03db0c45e5e960740d097f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:18:39 +0000 Subject: [PATCH 04/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- usbsniff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbsniff.spec b/usbsniff.spec index 75024e4..52fa494 100644 --- a/usbsniff.spec +++ b/usbsniff.spec @@ -3,7 +3,7 @@ Name: usbsniff Version: 0 -Release: 20.20170624git%{shortcommit}%{?dist} +Release: 21.20170624git%{shortcommit}%{?dist} Summary: USB traffic capture and replay tools License: GPLv3+ @@ -45,6 +45,9 @@ make install DESTDIR=%{buildroot} %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0-21.20170624gitb4ba3c8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0-20.20170624gitb4ba3c8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 2aff183e92b741e1623e396a4e27e966b909ffd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:25:55 +0000 Subject: [PATCH 05/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- usbsniff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbsniff.spec b/usbsniff.spec index 52fa494..162d5ae 100644 --- a/usbsniff.spec +++ b/usbsniff.spec @@ -3,7 +3,7 @@ Name: usbsniff Version: 0 -Release: 21.20170624git%{shortcommit}%{?dist} +Release: 22.20170624git%{shortcommit}%{?dist} Summary: USB traffic capture and replay tools License: GPLv3+ @@ -45,6 +45,9 @@ make install DESTDIR=%{buildroot} %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0-22.20170624gitb4ba3c8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0-21.20170624gitb4ba3c8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a664003ca5eff1b1dc8104c8761e3a48c9ce4501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 13:29:50 +0200 Subject: [PATCH 06/10] convert GPLv3+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- usbsniff.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/usbsniff.spec b/usbsniff.spec index 162d5ae..4e2d18f 100644 --- a/usbsniff.spec +++ b/usbsniff.spec @@ -3,10 +3,11 @@ Name: usbsniff Version: 0 -Release: 22.20170624git%{shortcommit}%{?dist} +Release: 23.20170624git%{shortcommit}%{?dist} Summary: USB traffic capture and replay tools -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later URL: https://github.com/vdudouyt/usbsniff Source0: https://github.com/vdudouyt/usbsniff/archive/%{commit}/usbsniff-%{shortcommit}.tar.gz Patch0: usbsniff-c99.patch @@ -45,6 +46,9 @@ make install DESTDIR=%{buildroot} %changelog +* Thu Jul 25 2024 Miroslav Suchý - 0-23.20170624gitb4ba3c8 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 0-22.20170624gitb4ba3c8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d070733b5761fa8e5447f92273a6163cb1c49279 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:57:12 +0000 Subject: [PATCH 07/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- usbsniff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbsniff.spec b/usbsniff.spec index 4e2d18f..d1ae439 100644 --- a/usbsniff.spec +++ b/usbsniff.spec @@ -3,7 +3,7 @@ Name: usbsniff Version: 0 -Release: 23.20170624git%{shortcommit}%{?dist} +Release: 24.20170624git%{shortcommit}%{?dist} Summary: USB traffic capture and replay tools # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -46,6 +46,9 @@ make install DESTDIR=%{buildroot} %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0-24.20170624gitb4ba3c8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 25 2024 Miroslav Suchý - 0-23.20170624gitb4ba3c8 - convert license to SPDX From 5679d0ed059279b1539cbfbe31515bff40277fbe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:52:58 +0000 Subject: [PATCH 08/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- usbsniff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbsniff.spec b/usbsniff.spec index d1ae439..7f1fef5 100644 --- a/usbsniff.spec +++ b/usbsniff.spec @@ -3,7 +3,7 @@ Name: usbsniff Version: 0 -Release: 24.20170624git%{shortcommit}%{?dist} +Release: 25.20170624git%{shortcommit}%{?dist} Summary: USB traffic capture and replay tools # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -46,6 +46,9 @@ make install DESTDIR=%{buildroot} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0-25.20170624gitb4ba3c8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 0-24.20170624gitb4ba3c8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3a5a502ab5067700a8185ffb58501d51a34ed3ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:42:08 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- usbsniff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbsniff.spec b/usbsniff.spec index 7f1fef5..59ce7aa 100644 --- a/usbsniff.spec +++ b/usbsniff.spec @@ -3,7 +3,7 @@ Name: usbsniff Version: 0 -Release: 25.20170624git%{shortcommit}%{?dist} +Release: 26.20170624git%{shortcommit}%{?dist} Summary: USB traffic capture and replay tools # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -46,6 +46,9 @@ make install DESTDIR=%{buildroot} %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0-26.20170624gitb4ba3c8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 0-25.20170624gitb4ba3c8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From c02f16946761c7f1e44b4016e3097f7766f20fe2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:16:45 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- usbsniff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbsniff.spec b/usbsniff.spec index 59ce7aa..f3ef8b0 100644 --- a/usbsniff.spec +++ b/usbsniff.spec @@ -3,7 +3,7 @@ Name: usbsniff Version: 0 -Release: 26.20170624git%{shortcommit}%{?dist} +Release: 27.20170624git%{shortcommit}%{?dist} Summary: USB traffic capture and replay tools # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -46,6 +46,9 @@ make install DESTDIR=%{buildroot} %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0-27.20170624gitb4ba3c8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 0-26.20170624gitb4ba3c8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild