Work around build failure on GCC 10

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
f38
Jonathan Dieter 5 years ago
parent b8be2229c3
commit b06459f901

1
.gitignore vendored

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

@ -1 +1 @@
SHA512 (usbip-4.20.12.tar.xz) = b94e4212d0bf7614e3a331dfc056ec7da38e5d6666db323bf2d20353b7293ec36ed954b41dd5792a7e2530cc5c3bb4710f8374ab58b9c40a9faee5d4c0bbbfb0 SHA512 (usbip-5.5.tar.xz) = a0286a18a148617cbb46fd119e73062b9dd35a62b144727fe9309462a40cf4038176eea422d8f0c13d32c9712c878586802ba7276e5a15101757fb1886603c5c

@ -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);

@ -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);

@ -1,11 +1,11 @@
%global _hardened_build 1 %define _legacy_common_support 1
Name: usbip Name: usbip
License: GPLv2+ License: GPLv2+
Summary: USB/IP user-space Summary: USB/IP user-space
Version: 4.20.12 Version: 5.5
Release: 3%{?dist} Release: 1%{?dist}
#Source: https://www.kernel.org/pub/linux/kernel/v4.x/linux-%%{version}.tar.xz #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, # In the interests of keeping the source rpm from being ridiculously large,
# download the Linux kernel from above and run `extract_usbip.sh <version>` # download the Linux kernel from above and run `extract_usbip.sh <version>`
# in the SOURCE directory. # in the SOURCE directory.
@ -17,7 +17,7 @@ Source: usbip-%{version}.tar.xz
Source1: usbip-server.service Source1: usbip-server.service
Source2: usbip-client.service Source2: usbip-client.service
Source99: extract_usbip.sh 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-core.ko)
Requires: kmod(usbip-host.ko) Requires: kmod(usbip-host.ko)
Requires: kmod(vhci-hcd.ko) Requires: kmod(vhci-hcd.ko)
@ -87,6 +87,11 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir}
%{_libdir}/*.so %{_libdir}/*.so
%changelog %changelog
* 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 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.20.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Loading…
Cancel
Save