Compare commits

...
Sign in to create a new pull request.

18 commits

Author SHA1 Message Date
Fedora Release Engineering
ccd6b05006 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 19:52:30 +00:00
Fedora Release Engineering
ef0dca6683 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 13:56:15 +00:00
Fedora Release Engineering
e3f9a81c1c Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:25:06 +00:00
Fedora Release Engineering
9802aea180 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 07:17:21 +00:00
Jonathan Dieter
62c18279ea Update License tag to SPDX
Signed-off-by: Jonathan Dieter <jonathan.dieter@cyara.com>
2023-08-04 09:57:28 +01:00
Fedora Release Engineering
0d2e13429c Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 17:16:07 +00:00
Fedora Release Engineering
73eb750198 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 05:58:01 +00:00
Fedora Release Engineering
290d7f7e8d Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 11:32:47 +00:00
Fedora Release Engineering
6df982c9b8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 03:39:47 +00:00
Fedora Release Engineering
d1ee907796 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 20:10:39 +00:00
Zbigniew Jędrzejewski-Szmek
6320af0866 Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
2021-03-02 16:12:04 +01:00
Fedora Release Engineering
ce32eaa222 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 22:47:46 +00:00
Tom Stellard
492e490800 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-09 00:29:01 +00:00
Fedora Release Engineering
4fac947ead - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 13:25:42 +00:00
Jonathan Dieter
432f5c35c2 Update to 5.7.9 to hopefully fix #1856443
Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
2020-07-17 16:58:19 +01:00
Jonathan Dieter
b06459f901 Work around build failure on GCC 10
Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
2020-02-03 20:03:09 +00:00
Fedora Release Engineering
b8be2229c3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 02:46:51 +00:00
Fedora Release Engineering
26c9548acb - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 02:39:25 +00:00
5 changed files with 73 additions and 54 deletions

2
.gitignore vendored
View file

@ -6,3 +6,5 @@
/usbip-4.15.10.tar.xz
/usbip-4.18.9.tar.xz
/usbip-4.20.12.tar.xz
/usbip-5.5.tar.xz
/usbip-5.7.9.tar.xz

View file

@ -1 +1 @@
SHA512 (usbip-4.20.12.tar.xz) = b94e4212d0bf7614e3a331dfc056ec7da38e5d6666db323bf2d20353b7293ec36ed954b41dd5792a7e2530cc5c3bb4710f8374ab58b9c40a9faee5d4c0bbbfb0
SHA512 (usbip-5.7.9.tar.xz) = 2ce175573d6387a975d7ec3132686940e903ebb63570c403b82a2e07f9fbdb365c8f1ad90bb8f1c676cc51ab1242347f9796d10ad12799957b4db0ef8e49ac46

View file

@ -1,47 +0,0 @@
diff -urb usbip-4.20.12a/libsrc/usbip_common.c usbip-4.20.12b/libsrc/usbip_common.c
--- usbip-4.20.12a/libsrc/usbip_common.c 2019-02-23 08:08:07.000000000 +0000
+++ usbip-4.20.12b/libsrc/usbip_common.c 2019-02-25 19:56:16.829743800 +0000
@@ -226,8 +226,8 @@
path = udev_device_get_syspath(sdev);
name = udev_device_get_sysname(sdev);
- strncpy(udev->path, path, SYSFS_PATH_MAX);
- strncpy(udev->busid, name, SYSFS_BUS_ID_SIZE);
+ snprintf(udev->path, SYSFS_PATH_MAX, "%s", path);
+ snprintf(udev->busid, SYSFS_BUS_ID_SIZE, "%s", name);
sscanf(name, "%u-%u", &busnum, &devnum);
udev->busnum = busnum;
diff -urb usbip-4.20.12a/libsrc/usbip_device_driver.c usbip-4.20.12b/libsrc/usbip_device_driver.c
--- usbip-4.20.12a/libsrc/usbip_device_driver.c 2019-02-23 08:08:07.000000000 +0000
+++ usbip-4.20.12b/libsrc/usbip_device_driver.c 2019-02-25 19:55:08.329692079 +0000
@@ -103,7 +103,7 @@
copy_descr_attr16(dev, &descr, idProduct);
copy_descr_attr16(dev, &descr, bcdDevice);
- strncpy(dev->path, path, SYSFS_PATH_MAX);
+ snprintf(dev->path, SYSFS_PATH_MAX, "%s", path);
dev->speed = USB_SPEED_UNKNOWN;
speed = udev_device_get_sysattr_value(sdev, "current_speed");
@@ -122,7 +122,7 @@
dev->busnum = 0;
name = udev_device_get_sysname(plat);
- strncpy(dev->busid, name, SYSFS_BUS_ID_SIZE);
+ snprintf(dev->busid, SYSFS_BUS_ID_SIZE, "%s", name);
return 0;
err:
fclose(fd);
diff -urb usbip-4.20.12a/src/usbip_network.h usbip-4.20.12b/src/usbip_network.h
--- usbip-4.20.12a/src/usbip_network.h 2019-02-23 08:08:07.000000000 +0000
+++ usbip-4.20.12b/src/usbip_network.h 2019-02-25 20:17:11.216594529 +0000
@@ -14,6 +14,8 @@
#include <stdint.h>
+#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+
extern int usbip_port;
extern char *usbip_port_string;
void usbip_setup_port_number(char *arg);

12
usbip-5.5-fix-gcc9.patch Normal file
View file

@ -0,0 +1,12 @@
diff -urb usbip-5.5/src/usbip_network.h usbip-5.5b/src/usbip_network.h
--- usbip-5.5/src/usbip_network.h 2020-01-27 00:23:03.000000000 +0000
+++ usbip-5.5b/src/usbip_network.h 2020-02-03 19:55:55.760558946 +0000
@@ -14,6 +14,8 @@
#include <stdint.h>
+#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+
extern int usbip_port;
extern char *usbip_port_string;
void usbip_setup_port_number(char *arg);

View file

@ -1,11 +1,11 @@
%global _hardened_build 1
%define _legacy_common_support 1
Name: usbip
License: GPLv2+
License: GPL-2.0-only
Summary: USB/IP user-space
Version: 4.20.12
Release: 1%{?dist}
#Source: https://www.kernel.org/pub/linux/kernel/v4.x/linux-%%{version}.tar.xz
Version: 5.7.9
Release: 13%{?dist}
#Source: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%%{version}.tar.xz
# In the interests of keeping the source rpm from being ridiculously large,
# download the Linux kernel from above and run `extract_usbip.sh <version>`
# in the SOURCE directory.
@ -17,7 +17,7 @@ Source: usbip-%{version}.tar.xz
Source1: usbip-server.service
Source2: usbip-client.service
Source99: extract_usbip.sh
Patch0: usbip-4.20-fix-gcc9.patch
Patch0: usbip-5.5-fix-gcc9.patch
Requires: kmod(usbip-core.ko)
Requires: kmod(usbip-host.ko)
Requires: kmod(vhci-hcd.ko)
@ -26,6 +26,7 @@ Requires: hwdata
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
BuildRequires: make
BuildRequires: systemd
BuildRequires: libudev-devel
BuildRequires: libtool autoconf
@ -87,6 +88,57 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir}
%{_libdir}/*.so
%changelog
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.9-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.9-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.9-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.9-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.9-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.9-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.9-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.9-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.9-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.7.9-4
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 17 2020 Jonathan Dieter <jdieter@gmail.com> - 5-7.9-1
- Update to 5.7.9 to hopefully fix #1856443
* Mon Feb 03 2020 Jonathan Dieter <jdieter@gmail.com> - 5.5-1
- Update to 5.5
- Work around build failure on GCC 10
- Remove unneeded hardened build flag (since all builds are hardened by default)
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.20.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.20.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Feb 25 2019 Jonathan Dieter <jdieter@gmail.com> - 4.20.12-1
- Update to 4.20.12
- Fix build failure on GCC 9.0