From 07d7cd96c74232b2bb72ea3d64668c9fe80fb8a0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:41:45 +0000 Subject: [PATCH 01/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 16ea3e2..d370377 100644 --- a/usbip.spec +++ b/usbip.spec @@ -5,7 +5,7 @@ License: GPLv2+ Summary: USB/IP user-space Group: System Environment/Daemons Version: 3.18 -Release: 4%{?dist} +Release: 5%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v3.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 ` @@ -86,6 +86,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 3.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Feb 5 2015 - Jonathan Dieter - 3.18-4 - Fix datadir (#1189855) - Fix client service type From 5fd50d5a30f66934bed9198065effafedd63a701 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:27:15 +0000 Subject: [PATCH 02/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index d370377..1d4dc7c 100644 --- a/usbip.spec +++ b/usbip.spec @@ -5,7 +5,7 @@ License: GPLv2+ Summary: USB/IP user-space Group: System Environment/Daemons Version: 3.18 -Release: 5%{?dist} +Release: 6%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v3.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 ` @@ -86,6 +86,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 3.18-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 3.18-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 453fa89427b336ed18bb962adf73489b18cbd60f Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Mon, 25 Apr 2016 09:31:59 +0300 Subject: [PATCH 03/41] Update to 4.5 and add dependency on kernel-modules-extra Signed-off-by: Jonathan Dieter --- .gitignore | 1 + sources | 2 +- usbip.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 729c06c..fe18935 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /usbip-3.17.tar.xz /usbip-3.18.tar.xz +/usbip-4.5.tar.xz diff --git a/sources b/sources index d23ebad..1c7c5aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e90a3347a759ab9ba0000bd358012974 usbip-3.18.tar.xz +1c95422ded0d8a2d82c6d5ea60a627b2 usbip-4.5.tar.xz diff --git a/usbip.spec b/usbip.spec index 1d4dc7c..8da69ee 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,8 +4,8 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Group: System Environment/Daemons -Version: 3.18 -Release: 6%{?dist} +Version: 4.5 +Release: 1%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v3.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 ` @@ -18,6 +18,7 @@ Source99: extract_usbip.sh Requires: kmod(usbip-core.ko) Requires: kmod(usbip-host.ko) Requires: kmod(vhci-hcd.ko) +Requires: kernel-modules-extra Requires: hwdata Requires(post): systemd Requires(preun): systemd @@ -86,6 +87,10 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Mon Apr 25 2016 Jonathan Dieter - 4.5-1 +- Update to 4.5 with very minor fixes +- Add dependency to kernel-modules-extra (fixes #1329313) + * Fri Feb 05 2016 Fedora Release Engineering - 3.18-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From e420de8c3a70235535e0feea78cfc517959f700c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:49:58 +0000 Subject: [PATCH 04/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 8da69ee..18b9ac0 100644 --- a/usbip.spec +++ b/usbip.spec @@ -5,7 +5,7 @@ License: GPLv2+ Summary: USB/IP user-space Group: System Environment/Daemons Version: 4.5 -Release: 1%{?dist} +Release: 2%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v3.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 ` @@ -87,6 +87,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Apr 25 2016 Jonathan Dieter - 4.5-1 - Update to 4.5 with very minor fixes - Add dependency to kernel-modules-extra (fixes #1329313) From 449163476d03c7f227089d846a57ec42209508cd Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Sun, 12 Feb 2017 19:07:39 +0200 Subject: [PATCH 05/41] Update to 4.9.9 which will hopefully build in Rawhide Signed-off-by: Jonathan Dieter --- .gitignore | 1 + sources | 2 +- usbip.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fe18935..713eaa2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /usbip-3.17.tar.xz /usbip-3.18.tar.xz /usbip-4.5.tar.xz +/usbip-4.9.9.tar.xz diff --git a/sources b/sources index 1c7c5aa..6286735 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c95422ded0d8a2d82c6d5ea60a627b2 usbip-4.5.tar.xz +SHA512 (usbip-4.9.9.tar.xz) = 0cf4b2384a42ad3c0242d73e11e0830943b31f6c95a5f7a75f730084a291f994fcc7370c9ed70580218ecadda221c6d636c68f4b41d224847e1f1c82adcafb84 diff --git a/usbip.spec b/usbip.spec index 18b9ac0..d5a0ba1 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,8 +4,8 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Group: System Environment/Daemons -Version: 4.5 -Release: 2%{?dist} +Version: 4.9.9 +Release: 1%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v3.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 ` @@ -87,6 +87,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Sun Feb 12 2017 Jonathan Dieter - 4.9.9-1 +- Update to 4.9.9 with build fixes + * Sat Feb 11 2017 Fedora Release Engineering - 4.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 25ca1a3f125abe64c5967890babbef5ec3e2079b Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Mon, 27 Feb 2017 09:18:30 +0200 Subject: [PATCH 06/41] Fix build failures with GCC 7 Signed-off-by: Jonathan Dieter --- 0001-usbip-Fix-format-overflow.patch | 106 ++++++++++++++++++ ...bip-Fix-implicit-fallthrough-warning.patch | 33 ++++++ usbip.spec | 12 +- 3 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 0001-usbip-Fix-format-overflow.patch create mode 100644 0002-usbip-Fix-implicit-fallthrough-warning.patch diff --git a/0001-usbip-Fix-format-overflow.patch b/0001-usbip-Fix-format-overflow.patch new file mode 100644 index 0000000..67ce071 --- /dev/null +++ b/0001-usbip-Fix-format-overflow.patch @@ -0,0 +1,106 @@ +From ad4d8dccc457e3b45b47fd5c5fdebfcf0171aa5e Mon Sep 17 00:00:00 2001 +From: Jonathan Dieter +Date: Wed, 22 Feb 2017 20:03:06 +0200 +Subject: [PATCH] usbip: Fix-format-overflow + +The usbip userspace tools call sprintf()/snprintf() and don't check for +the return value which can lead the paths to overflow, truncating the +final file in the path. + +More urgently, GCC 7 now warns that these aren't checked with +-Wformat-overflow, and with -Werror enabled in configure.ac, that makes +these tools unbuildable. + +This patch fixes these problems by replacing sprintf() with snprintf() in +one place and adding checks for the return value of snprintf(). + +Reviewed-by: Peter Senna Tschudin +Signed-off-by: Jonathan Dieter +--- + tools/usb/usbip/libsrc/usbip_common.c | 8 +++++++- + tools/usb/usbip/libsrc/usbip_host_common.c | 28 +++++++++++++++++++++++----- + 2 files changed, 30 insertions(+), 6 deletions(-) + +diff --git a/tools/usb/usbip/libsrc/usbip_common.c b/tools/usb/usbip/libsrc/usbip_common.c +index ac73710..66017d7 100644 +--- a/tools/usb/usbip/libsrc/usbip_common.c ++++ b/tools/usb/usbip/libsrc/usbip_common.c +@@ -215,9 +215,15 @@ int read_usb_interface(struct usbip_usb_device *udev, int i, + struct usbip_usb_interface *uinf) + { + char busid[SYSFS_BUS_ID_SIZE]; ++ int size; + struct udev_device *sif; + +- sprintf(busid, "%s:%d.%d", udev->busid, udev->bConfigurationValue, i); ++ size = snprintf(busid, sizeof(busid), "%s:%d.%d", ++ udev->busid, udev->bConfigurationValue, i); ++ if (size < 0 || (unsigned int)size >= sizeof(busid)) { ++ err("busid length %i >= %lu or < 0", size, sizeof(busid)); ++ return -1; ++ } + + sif = udev_device_new_from_subsystem_sysname(udev_context, "usb", busid); + if (!sif) { +diff --git a/tools/usb/usbip/libsrc/usbip_host_common.c b/tools/usb/usbip/libsrc/usbip_host_common.c +index 9d41522..6fb91d9 100644 +--- a/tools/usb/usbip/libsrc/usbip_host_common.c ++++ b/tools/usb/usbip/libsrc/usbip_host_common.c +@@ -40,13 +40,20 @@ struct udev *udev_context; + static int32_t read_attr_usbip_status(struct usbip_usb_device *udev) + { + char status_attr_path[SYSFS_PATH_MAX]; ++ int size; + int fd; + int length; + char status; + int value = 0; + +- snprintf(status_attr_path, SYSFS_PATH_MAX, "%s/usbip_status", +- udev->path); ++ size = snprintf(status_attr_path, sizeof(status_attr_path), ++ "%s/usbip_status", udev->path); ++ if (size < 0 || (unsigned int)size >= sizeof(status_attr_path)) { ++ err("usbip_status path length %i >= %lu or < 0", size, ++ sizeof(status_attr_path)); ++ return -1; ++ } ++ + + fd = open(status_attr_path, O_RDONLY); + if (fd < 0) { +@@ -218,6 +225,7 @@ int usbip_export_device(struct usbip_exported_device *edev, int sockfd) + { + char attr_name[] = "usbip_sockfd"; + char sockfd_attr_path[SYSFS_PATH_MAX]; ++ int size; + char sockfd_buff[30]; + int ret; + +@@ -237,10 +245,20 @@ int usbip_export_device(struct usbip_exported_device *edev, int sockfd) + } + + /* only the first interface is true */ +- snprintf(sockfd_attr_path, sizeof(sockfd_attr_path), "%s/%s", +- edev->udev.path, attr_name); ++ size = snprintf(sockfd_attr_path, sizeof(sockfd_attr_path), "%s/%s", ++ edev->udev.path, attr_name); ++ if (size < 0 || (unsigned int)size >= sizeof(sockfd_attr_path)) { ++ err("exported device path length %i >= %lu or < 0", size, ++ sizeof(sockfd_attr_path)); ++ return -1; ++ } + +- snprintf(sockfd_buff, sizeof(sockfd_buff), "%d\n", sockfd); ++ size = snprintf(sockfd_buff, sizeof(sockfd_buff), "%d\n", sockfd); ++ if (size < 0 || (unsigned int)size >= sizeof(sockfd_buff)) { ++ err("socket length %i >= %lu or < 0", size, ++ sizeof(sockfd_buff)); ++ return -1; ++ } + + ret = write_sysfs_attribute(sockfd_attr_path, sockfd_buff, + strlen(sockfd_buff)); +-- +2.9.3 + diff --git a/0002-usbip-Fix-implicit-fallthrough-warning.patch b/0002-usbip-Fix-implicit-fallthrough-warning.patch new file mode 100644 index 0000000..5adceba --- /dev/null +++ b/0002-usbip-Fix-implicit-fallthrough-warning.patch @@ -0,0 +1,33 @@ +From 1d33ad30f2bad7d2c3f431b676e57f092596840c Mon Sep 17 00:00:00 2001 +From: Jonathan Dieter +Date: Tue, 21 Feb 2017 19:41:35 +0200 +Subject: [PATCH v2 2/2] usbip: Fix implicit fallthrough warning + +GCC 7 now warns when switch statements fall through implicitly, and with +-Werror enabled in configure.ac, that makes these tools unbuildable. + +We fix this by notifying the compiler that this particular case statement +is meant to fall through. + +Reviewed-by: Peter Senna Tschudin +Signed-off-by: Jonathan Dieter +--- + tools/usb/usbip/src/usbip.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tools/usb/usbip/src/usbip.c b/tools/usb/usbip/src/usbip.c +index d7599d9..73d8eee 100644 +--- a/tools/usb/usbip/src/usbip.c ++++ b/tools/usb/usbip/src/usbip.c +@@ -176,6 +176,8 @@ int main(int argc, char *argv[]) + break; + case '?': + printf("usbip: invalid option\n"); ++ /* Terminate after printing error */ ++ /* FALLTHRU */ + default: + usbip_usage(); + goto out; +-- +2.9.3 + diff --git a/usbip.spec b/usbip.spec index d5a0ba1..f71dc26 100644 --- a/usbip.spec +++ b/usbip.spec @@ -5,7 +5,7 @@ License: GPLv2+ Summary: USB/IP user-space Group: System Environment/Daemons Version: 4.9.9 -Release: 1%{?dist} +Release: 2%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v3.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 ` @@ -15,6 +15,11 @@ Source: usbip-%{version}.tar.xz Source1: usbip-server.service Source2: usbip-client.service Source99: extract_usbip.sh +# The following patches have been submitted to the LKML (see the thread +# starting at https://www.spinics.net/lists/kernel/msg2448891.html) and are +# still in the process of being reviewed. +Patch1: 0001-usbip-Fix-format-overflow.patch +Patch2: 0002-usbip-Fix-implicit-fallthrough-warning.patch Requires: kmod(usbip-core.ko) Requires: kmod(usbip-host.ko) Requires: kmod(vhci-hcd.ko) @@ -49,6 +54,8 @@ development %prep %setup -q +%patch1 -p4 +%patch2 -p4 %build ./autogen.sh @@ -87,6 +94,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Mon Feb 20 2017 Jonathan Dieter - 4.9.9-2 +- Add patches to fix continuing build failures with GCC 7 + * Sun Feb 12 2017 Jonathan Dieter - 4.9.9-1 - Update to 4.9.9 with build fixes From 91282110ddebf152301ff4ffcd992da7c0264947 Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Mon, 27 Feb 2017 10:16:03 +0200 Subject: [PATCH 07/41] Fix 32-bit build failures Signed-off-by: Jonathan Dieter --- 0001-usbip-Fix-format-overflow.patch | 26 ++++++++++--------- ...bip-Fix-implicit-fallthrough-warning.patch | 6 ++--- usbip.spec | 5 +++- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/0001-usbip-Fix-format-overflow.patch b/0001-usbip-Fix-format-overflow.patch index 67ce071..bbf4940 100644 --- a/0001-usbip-Fix-format-overflow.patch +++ b/0001-usbip-Fix-format-overflow.patch @@ -1,7 +1,7 @@ -From ad4d8dccc457e3b45b47fd5c5fdebfcf0171aa5e Mon Sep 17 00:00:00 2001 +From cd2517f4b56e7147d013c7030e09d2c2e3562f2a Mon Sep 17 00:00:00 2001 From: Jonathan Dieter -Date: Wed, 22 Feb 2017 20:03:06 +0200 -Subject: [PATCH] usbip: Fix-format-overflow +Date: Mon, 27 Feb 2017 10:04:29 +0200 +Subject: [PATCH v4 1/2] usbip: Fix-format-overflow The usbip userspace tools call sprintf()/snprintf() and don't check for the return value which can lead the paths to overflow, truncating the @@ -17,15 +17,16 @@ one place and adding checks for the return value of snprintf(). Reviewed-by: Peter Senna Tschudin Signed-off-by: Jonathan Dieter --- - tools/usb/usbip/libsrc/usbip_common.c | 8 +++++++- + + tools/usb/usbip/libsrc/usbip_common.c | 9 ++++++++- tools/usb/usbip/libsrc/usbip_host_common.c | 28 +++++++++++++++++++++++----- - 2 files changed, 30 insertions(+), 6 deletions(-) + 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/tools/usb/usbip/libsrc/usbip_common.c b/tools/usb/usbip/libsrc/usbip_common.c -index ac73710..66017d7 100644 +index ac73710..1517a23 100644 --- a/tools/usb/usbip/libsrc/usbip_common.c +++ b/tools/usb/usbip/libsrc/usbip_common.c -@@ -215,9 +215,15 @@ int read_usb_interface(struct usbip_usb_device *udev, int i, +@@ -215,9 +215,16 @@ int read_usb_interface(struct usbip_usb_device *udev, int i, struct usbip_usb_interface *uinf) { char busid[SYSFS_BUS_ID_SIZE]; @@ -36,14 +37,15 @@ index ac73710..66017d7 100644 + size = snprintf(busid, sizeof(busid), "%s:%d.%d", + udev->busid, udev->bConfigurationValue, i); + if (size < 0 || (unsigned int)size >= sizeof(busid)) { -+ err("busid length %i >= %lu or < 0", size, sizeof(busid)); ++ err("busid length %i >= %lu or < 0", size, ++ (long unsigned)sizeof(busid)); + return -1; + } sif = udev_device_new_from_subsystem_sysname(udev_context, "usb", busid); if (!sif) { diff --git a/tools/usb/usbip/libsrc/usbip_host_common.c b/tools/usb/usbip/libsrc/usbip_host_common.c -index 9d41522..6fb91d9 100644 +index 9d41522..6ff7b60 100644 --- a/tools/usb/usbip/libsrc/usbip_host_common.c +++ b/tools/usb/usbip/libsrc/usbip_host_common.c @@ -40,13 +40,20 @@ struct udev *udev_context; @@ -62,7 +64,7 @@ index 9d41522..6fb91d9 100644 + "%s/usbip_status", udev->path); + if (size < 0 || (unsigned int)size >= sizeof(status_attr_path)) { + err("usbip_status path length %i >= %lu or < 0", size, -+ sizeof(status_attr_path)); ++ (long unsigned)sizeof(status_attr_path)); + return -1; + } + @@ -87,7 +89,7 @@ index 9d41522..6fb91d9 100644 + edev->udev.path, attr_name); + if (size < 0 || (unsigned int)size >= sizeof(sockfd_attr_path)) { + err("exported device path length %i >= %lu or < 0", size, -+ sizeof(sockfd_attr_path)); ++ (long unsigned)sizeof(sockfd_attr_path)); + return -1; + } @@ -95,7 +97,7 @@ index 9d41522..6fb91d9 100644 + size = snprintf(sockfd_buff, sizeof(sockfd_buff), "%d\n", sockfd); + if (size < 0 || (unsigned int)size >= sizeof(sockfd_buff)) { + err("socket length %i >= %lu or < 0", size, -+ sizeof(sockfd_buff)); ++ (long unsigned)sizeof(sockfd_buff)); + return -1; + } diff --git a/0002-usbip-Fix-implicit-fallthrough-warning.patch b/0002-usbip-Fix-implicit-fallthrough-warning.patch index 5adceba..3e3b477 100644 --- a/0002-usbip-Fix-implicit-fallthrough-warning.patch +++ b/0002-usbip-Fix-implicit-fallthrough-warning.patch @@ -1,7 +1,7 @@ -From 1d33ad30f2bad7d2c3f431b676e57f092596840c Mon Sep 17 00:00:00 2001 +From b1cabcfde670c82aff0ef07c21095d63c29cbf3e Mon Sep 17 00:00:00 2001 From: Jonathan Dieter -Date: Tue, 21 Feb 2017 19:41:35 +0200 -Subject: [PATCH v2 2/2] usbip: Fix implicit fallthrough warning +Date: Mon, 27 Feb 2017 10:13:01 +0200 +Subject: [PATCH v4 2/2] usbip: Fix implicit fallthrough warning GCC 7 now warns when switch statements fall through implicitly, and with -Werror enabled in configure.ac, that makes these tools unbuildable. diff --git a/usbip.spec b/usbip.spec index f71dc26..e01a415 100644 --- a/usbip.spec +++ b/usbip.spec @@ -5,7 +5,7 @@ License: GPLv2+ Summary: USB/IP user-space Group: System Environment/Daemons Version: 4.9.9 -Release: 2%{?dist} +Release: 3%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v3.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 ` @@ -94,6 +94,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Mon Feb 27 2017 Jonathan Dieter - 4.9.9-3 +- Fix 32-bit build failures + * Mon Feb 20 2017 Jonathan Dieter - 4.9.9-2 - Add patches to fix continuing build failures with GCC 7 From eda42e2a0eadd8c0469b9b9c02c7ee9a87bd6132 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:05:09 +0000 Subject: [PATCH 08/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index e01a415..ad163db 100644 --- a/usbip.spec +++ b/usbip.spec @@ -5,7 +5,7 @@ License: GPLv2+ Summary: USB/IP user-space Group: System Environment/Daemons Version: 4.9.9 -Release: 3%{?dist} +Release: 4%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v3.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 ` @@ -94,6 +94,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 4.9.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Feb 27 2017 Jonathan Dieter - 4.9.9-3 - Fix 32-bit build failures From 575e6a2a082750f274336b8960c817a918abd914 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:53:25 +0000 Subject: [PATCH 09/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index ad163db..33fb60b 100644 --- a/usbip.spec +++ b/usbip.spec @@ -5,7 +5,7 @@ License: GPLv2+ Summary: USB/IP user-space Group: System Environment/Daemons Version: 4.9.9 -Release: 4%{?dist} +Release: 5%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v3.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 ` @@ -94,6 +94,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 4.9.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 4.9.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From d4bd7054981b2c862c82434db7a5b8ed14fb78df Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Sat, 26 Aug 2017 22:04:19 -0700 Subject: [PATCH 10/41] Exclude s390x because it doesn't have USB Signed-off-by: Jonathan Dieter --- usbip.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 33fb60b..ebc7690 100644 --- a/usbip.spec +++ b/usbip.spec @@ -5,12 +5,15 @@ License: GPLv2+ Summary: USB/IP user-space Group: System Environment/Daemons Version: 4.9.9 -Release: 5%{?dist} +Release: 6%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v3.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 ` # in the SOURCE directory. URL: https://www.kernel.org +# The kernel modules require working USB and there's no USB for s390x +# See bug #1483403 +ExcludeArch: s390x Source: usbip-%{version}.tar.xz Source1: usbip-server.service Source2: usbip-client.service @@ -94,6 +97,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Sat Aug 26 2017 Jonathan Dieter - 4.9.9-6 +- Exclude s390x because it doesn't support USB + * Thu Aug 03 2017 Fedora Release Engineering - 4.9.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From fd77ca35a9f50b4a918ce3d5427a38f6550659bf Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Sat, 13 Jan 2018 19:15:00 +0200 Subject: [PATCH 11/41] Update to 4.14.11 (Fixes bug #1533864) Signed-off-by: Jonathan Dieter --- .gitignore | 1 + 0001-usbip-Fix-format-overflow.patch | 108 ------------------ ...bip-Fix-implicit-fallthrough-warning.patch | 33 ------ sources | 2 +- usbip.spec | 16 +-- 5 files changed, 11 insertions(+), 149 deletions(-) delete mode 100644 0001-usbip-Fix-format-overflow.patch delete mode 100644 0002-usbip-Fix-implicit-fallthrough-warning.patch diff --git a/.gitignore b/.gitignore index 713eaa2..9c5da17 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /usbip-3.18.tar.xz /usbip-4.5.tar.xz /usbip-4.9.9.tar.xz +/usbip-4.14.11.tar.xz diff --git a/0001-usbip-Fix-format-overflow.patch b/0001-usbip-Fix-format-overflow.patch deleted file mode 100644 index bbf4940..0000000 --- a/0001-usbip-Fix-format-overflow.patch +++ /dev/null @@ -1,108 +0,0 @@ -From cd2517f4b56e7147d013c7030e09d2c2e3562f2a Mon Sep 17 00:00:00 2001 -From: Jonathan Dieter -Date: Mon, 27 Feb 2017 10:04:29 +0200 -Subject: [PATCH v4 1/2] usbip: Fix-format-overflow - -The usbip userspace tools call sprintf()/snprintf() and don't check for -the return value which can lead the paths to overflow, truncating the -final file in the path. - -More urgently, GCC 7 now warns that these aren't checked with --Wformat-overflow, and with -Werror enabled in configure.ac, that makes -these tools unbuildable. - -This patch fixes these problems by replacing sprintf() with snprintf() in -one place and adding checks for the return value of snprintf(). - -Reviewed-by: Peter Senna Tschudin -Signed-off-by: Jonathan Dieter ---- - - tools/usb/usbip/libsrc/usbip_common.c | 9 ++++++++- - tools/usb/usbip/libsrc/usbip_host_common.c | 28 +++++++++++++++++++++++----- - 2 files changed, 31 insertions(+), 6 deletions(-) - -diff --git a/tools/usb/usbip/libsrc/usbip_common.c b/tools/usb/usbip/libsrc/usbip_common.c -index ac73710..1517a23 100644 ---- a/tools/usb/usbip/libsrc/usbip_common.c -+++ b/tools/usb/usbip/libsrc/usbip_common.c -@@ -215,9 +215,16 @@ int read_usb_interface(struct usbip_usb_device *udev, int i, - struct usbip_usb_interface *uinf) - { - char busid[SYSFS_BUS_ID_SIZE]; -+ int size; - struct udev_device *sif; - -- sprintf(busid, "%s:%d.%d", udev->busid, udev->bConfigurationValue, i); -+ size = snprintf(busid, sizeof(busid), "%s:%d.%d", -+ udev->busid, udev->bConfigurationValue, i); -+ if (size < 0 || (unsigned int)size >= sizeof(busid)) { -+ err("busid length %i >= %lu or < 0", size, -+ (long unsigned)sizeof(busid)); -+ return -1; -+ } - - sif = udev_device_new_from_subsystem_sysname(udev_context, "usb", busid); - if (!sif) { -diff --git a/tools/usb/usbip/libsrc/usbip_host_common.c b/tools/usb/usbip/libsrc/usbip_host_common.c -index 9d41522..6ff7b60 100644 ---- a/tools/usb/usbip/libsrc/usbip_host_common.c -+++ b/tools/usb/usbip/libsrc/usbip_host_common.c -@@ -40,13 +40,20 @@ struct udev *udev_context; - static int32_t read_attr_usbip_status(struct usbip_usb_device *udev) - { - char status_attr_path[SYSFS_PATH_MAX]; -+ int size; - int fd; - int length; - char status; - int value = 0; - -- snprintf(status_attr_path, SYSFS_PATH_MAX, "%s/usbip_status", -- udev->path); -+ size = snprintf(status_attr_path, sizeof(status_attr_path), -+ "%s/usbip_status", udev->path); -+ if (size < 0 || (unsigned int)size >= sizeof(status_attr_path)) { -+ err("usbip_status path length %i >= %lu or < 0", size, -+ (long unsigned)sizeof(status_attr_path)); -+ return -1; -+ } -+ - - fd = open(status_attr_path, O_RDONLY); - if (fd < 0) { -@@ -218,6 +225,7 @@ int usbip_export_device(struct usbip_exported_device *edev, int sockfd) - { - char attr_name[] = "usbip_sockfd"; - char sockfd_attr_path[SYSFS_PATH_MAX]; -+ int size; - char sockfd_buff[30]; - int ret; - -@@ -237,10 +245,20 @@ int usbip_export_device(struct usbip_exported_device *edev, int sockfd) - } - - /* only the first interface is true */ -- snprintf(sockfd_attr_path, sizeof(sockfd_attr_path), "%s/%s", -- edev->udev.path, attr_name); -+ size = snprintf(sockfd_attr_path, sizeof(sockfd_attr_path), "%s/%s", -+ edev->udev.path, attr_name); -+ if (size < 0 || (unsigned int)size >= sizeof(sockfd_attr_path)) { -+ err("exported device path length %i >= %lu or < 0", size, -+ (long unsigned)sizeof(sockfd_attr_path)); -+ return -1; -+ } - -- snprintf(sockfd_buff, sizeof(sockfd_buff), "%d\n", sockfd); -+ size = snprintf(sockfd_buff, sizeof(sockfd_buff), "%d\n", sockfd); -+ if (size < 0 || (unsigned int)size >= sizeof(sockfd_buff)) { -+ err("socket length %i >= %lu or < 0", size, -+ (long unsigned)sizeof(sockfd_buff)); -+ return -1; -+ } - - ret = write_sysfs_attribute(sockfd_attr_path, sockfd_buff, - strlen(sockfd_buff)); --- -2.9.3 - diff --git a/0002-usbip-Fix-implicit-fallthrough-warning.patch b/0002-usbip-Fix-implicit-fallthrough-warning.patch deleted file mode 100644 index 3e3b477..0000000 --- a/0002-usbip-Fix-implicit-fallthrough-warning.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b1cabcfde670c82aff0ef07c21095d63c29cbf3e Mon Sep 17 00:00:00 2001 -From: Jonathan Dieter -Date: Mon, 27 Feb 2017 10:13:01 +0200 -Subject: [PATCH v4 2/2] usbip: Fix implicit fallthrough warning - -GCC 7 now warns when switch statements fall through implicitly, and with --Werror enabled in configure.ac, that makes these tools unbuildable. - -We fix this by notifying the compiler that this particular case statement -is meant to fall through. - -Reviewed-by: Peter Senna Tschudin -Signed-off-by: Jonathan Dieter ---- - tools/usb/usbip/src/usbip.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tools/usb/usbip/src/usbip.c b/tools/usb/usbip/src/usbip.c -index d7599d9..73d8eee 100644 ---- a/tools/usb/usbip/src/usbip.c -+++ b/tools/usb/usbip/src/usbip.c -@@ -176,6 +176,8 @@ int main(int argc, char *argv[]) - break; - case '?': - printf("usbip: invalid option\n"); -+ /* Terminate after printing error */ -+ /* FALLTHRU */ - default: - usbip_usage(); - goto out; --- -2.9.3 - diff --git a/sources b/sources index 6286735..e43bdb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usbip-4.9.9.tar.xz) = 0cf4b2384a42ad3c0242d73e11e0830943b31f6c95a5f7a75f730084a291f994fcc7370c9ed70580218ecadda221c6d636c68f4b41d224847e1f1c82adcafb84 +SHA512 (usbip-4.14.11.tar.xz) = 9572ee6a9e0eef4accca33f6596dd11645c6ba072c070be9dccf21b03a51813f9c75b1294e817f99b6085da92edaf2a295be4219c8dce16bbc8b5c35ca786720 diff --git a/usbip.spec b/usbip.spec index ebc7690..7f0f251 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,9 +4,9 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Group: System Environment/Daemons -Version: 4.9.9 -Release: 6%{?dist} -#Source: https://www.kernel.org/pub/linux/kernel/v3.x/linux-%%{version}.tar.xz +Version: 4.14.11 +Release: 1%{?dist} +#Source: https://www.kernel.org/pub/linux/kernel/v4.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 ` # in the SOURCE directory. @@ -21,8 +21,6 @@ Source99: extract_usbip.sh # The following patches have been submitted to the LKML (see the thread # starting at https://www.spinics.net/lists/kernel/msg2448891.html) and are # still in the process of being reviewed. -Patch1: 0001-usbip-Fix-format-overflow.patch -Patch2: 0002-usbip-Fix-implicit-fallthrough-warning.patch Requires: kmod(usbip-core.ko) Requires: kmod(usbip-host.ko) Requires: kmod(vhci-hcd.ko) @@ -57,8 +55,6 @@ development %prep %setup -q -%patch1 -p4 -%patch2 -p4 %build ./autogen.sh @@ -97,6 +93,12 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Sat Jan 13 2018 Jonathan Dieter - 4.14.11-1 +- Update usbip to 4.14.11 + +* Fri Jan 12 2018 Zamir SUN - 4.14.0-1 +- Update usbip to 4.14.0 (Fixes bug #1533864) + * Sat Aug 26 2017 Jonathan Dieter - 4.9.9-6 - Exclude s390x because it doesn't support USB From 4494ae38a45bb209bae3f2311469f17dc4c553f2 Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Sat, 13 Jan 2018 19:25:27 +0200 Subject: [PATCH 12/41] Remove unnecessary comments about upstreamed patches Signed-off-by: Jonathan Dieter --- usbip.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/usbip.spec b/usbip.spec index 7f0f251..ece694e 100644 --- a/usbip.spec +++ b/usbip.spec @@ -18,9 +18,6 @@ Source: usbip-%{version}.tar.xz Source1: usbip-server.service Source2: usbip-client.service Source99: extract_usbip.sh -# The following patches have been submitted to the LKML (see the thread -# starting at https://www.spinics.net/lists/kernel/msg2448891.html) and are -# still in the process of being reviewed. Requires: kmod(usbip-core.ko) Requires: kmod(usbip-host.ko) Requires: kmod(vhci-hcd.ko) From e25ceeac8cfb67ef9f855fd39c213615f67e6e7a Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Thu, 8 Feb 2018 18:30:37 +0200 Subject: [PATCH 13/41] Remove obsolete Group tag Signed-off-by: Jonathan Dieter --- usbip.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usbip.spec b/usbip.spec index ece694e..80ac37a 100644 --- a/usbip.spec +++ b/usbip.spec @@ -3,9 +3,8 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space -Group: System Environment/Daemons Version: 4.14.11 -Release: 1%{?dist} +Release: 2%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v4.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 ` @@ -90,6 +89,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Thu Feb 08 2018 Jonathan Dieter - 4.14.11-2 +- Remove obsolete Group tag + * Sat Jan 13 2018 Jonathan Dieter - 4.14.11-1 - Update usbip to 4.14.11 From a07e93fe415f04cef213ab1461bf7f48545ac984 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:10:44 +0000 Subject: [PATCH 14/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 80ac37a..9de696e 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 4.14.11 -Release: 2%{?dist} +Release: 3%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v4.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 ` @@ -89,6 +89,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 4.14.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Feb 08 2018 Jonathan Dieter - 4.14.11-2 - Remove obsolete Group tag From 58d8cc84fc0b6569a09a3a28ed9b17a925553946 Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Thu, 15 Mar 2018 13:00:40 +0200 Subject: [PATCH 15/41] Attempt another build after supposed failure the last time Signed-off-by: Jonathan Dieter --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 9de696e..b8c2244 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 4.14.11 -Release: 3%{?dist} +Release: 4%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v4.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 ` @@ -89,6 +89,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Thu Mar 15 2018 Jonathan Dieter - 4.14.11-4 +- Attempt another build after supposed failure the last time + * Fri Feb 09 2018 Fedora Release Engineering - 4.14.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 3aa126742c5de1a18fa329099215b41e0fd414a0 Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Thu, 15 Mar 2018 20:09:21 +0200 Subject: [PATCH 16/41] Update 4.15.10 to fix build failures Signed-off-by: Jonathan Dieter --- .gitignore | 1 + sources | 2 +- usbip.spec | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9c5da17..7ab0a40 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /usbip-4.5.tar.xz /usbip-4.9.9.tar.xz /usbip-4.14.11.tar.xz +/usbip-4.15.10.tar.xz diff --git a/sources b/sources index e43bdb0..16cce4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usbip-4.14.11.tar.xz) = 9572ee6a9e0eef4accca33f6596dd11645c6ba072c070be9dccf21b03a51813f9c75b1294e817f99b6085da92edaf2a295be4219c8dce16bbc8b5c35ca786720 +SHA512 (usbip-4.15.10.tar.xz) = dd072441a2b0d32963505f1407e8867cb8ac032cddd9989a15375060573af0a4a8fcdd8350a935a5c429094ac0146871ce46f214c3f1b41cf1ecdfcfd1773a5a diff --git a/usbip.spec b/usbip.spec index b8c2244..9d85052 100644 --- a/usbip.spec +++ b/usbip.spec @@ -3,8 +3,8 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space -Version: 4.14.11 -Release: 4%{?dist} +Version: 4.15.10 +Release: 1%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v4.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 ` @@ -89,8 +89,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog -* Thu Mar 15 2018 Jonathan Dieter - 4.14.11-4 +* Thu Mar 15 2018 Jonathan Dieter - 4.15.10-1 - Attempt another build after supposed failure the last time +- Update to 4.15.10 to fix GCC 8 build failure * Fri Feb 09 2018 Fedora Release Engineering - 4.14.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 477b820b172834ab4b7e01e3fb1b945f9f14d16d Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Thu, 28 Jun 2018 16:49:04 +0300 Subject: [PATCH 17/41] Remove unneeded ldconfig scriptlets Signed-off-by: Jonathan Dieter --- usbip.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usbip.spec b/usbip.spec index 9d85052..598e358 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 4.15.10 -Release: 1%{?dist} +Release: 2%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v4.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 ` @@ -66,14 +66,12 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %post %systemd_post usbip-client.service usbip-server.service -/sbin/ldconfig %preun %systemd_preun usbip-client.service usbip-server.service %postun %systemd_postun_with_restart usbip-client.service usbip-server.service -/sbin/ldconfig %files %license COPYING @@ -89,6 +87,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Thu Jun 28 2018 Jonathan Dieter - 4.15.10-2 +- Remove unneeded ldconfig scriptlets + * Thu Mar 15 2018 Jonathan Dieter - 4.15.10-1 - Attempt another build after supposed failure the last time - Update to 4.15.10 to fix GCC 8 build failure From be42f74bef55b96a6bb062dc4915aa7c5c23538a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:20:00 +0000 Subject: [PATCH 18/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 598e358..5352140 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 4.15.10 -Release: 2%{?dist} +Release: 3%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v4.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 ` @@ -87,6 +87,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 4.15.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jun 28 2018 Jonathan Dieter - 4.15.10-2 - Remove unneeded ldconfig scriptlets From a8eb4ac8b06204f17bb059440ea0b44e2d9b286f Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Thu, 20 Sep 2018 21:28:08 +0100 Subject: [PATCH 19/41] Update to 4.18.9 and add patch to fix #1631148 Signed-off-by: Jonathan Dieter --- .gitignore | 1 + sources | 2 +- usbip-4.18.9-compare-actual-name.patch | 12 ++++++++++++ usbip.spec | 12 +++++++++--- 4 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 usbip-4.18.9-compare-actual-name.patch diff --git a/.gitignore b/.gitignore index 7ab0a40..5dc95b4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /usbip-4.9.9.tar.xz /usbip-4.14.11.tar.xz /usbip-4.15.10.tar.xz +/usbip-4.18.9.tar.xz diff --git a/sources b/sources index 16cce4f..50e67c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usbip-4.15.10.tar.xz) = dd072441a2b0d32963505f1407e8867cb8ac032cddd9989a15375060573af0a4a8fcdd8350a935a5c429094ac0146871ce46f214c3f1b41cf1ecdfcfd1773a5a +SHA512 (usbip-4.18.9.tar.xz) = 722556e8dfd25822dfd1325c3b2053819751c997fb77515667f7ff3ec410d6229a42395ad745533aefa22a2df0cbc361fe608fe9dd082cedaeddba76f6fbc4d4 diff --git a/usbip-4.18.9-compare-actual-name.patch b/usbip-4.18.9-compare-actual-name.patch new file mode 100644 index 0000000..50649bb --- /dev/null +++ b/usbip-4.18.9-compare-actual-name.patch @@ -0,0 +1,12 @@ +diff -urb usbip-4.18.9a/libsrc/vhci_driver.c usbip-4.18.9b/libsrc/vhci_driver.c +--- usbip-4.18.9a/libsrc/vhci_driver.c 2018-09-19 20:41:37.000000000 +0000 ++++ usbip-4.18.9b/libsrc/vhci_driver.c 2018-09-20 10:11:10.843791788 +0000 +@@ -150,7 +150,7 @@ + + static int vhci_hcd_filter(const struct dirent *dirent) + { +- return strcmp(dirent->d_name, "vhci_hcd") >= 0; ++ return !strncmp(dirent->d_name, "vhci_hcd", 9); + } + + static int get_ncontrollers(void) diff --git a/usbip.spec b/usbip.spec index 5352140..c348228 100644 --- a/usbip.spec +++ b/usbip.spec @@ -3,8 +3,8 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space -Version: 4.15.10 -Release: 3%{?dist} +Version: 4.18.9 +Release: 1%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v4.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 ` @@ -17,6 +17,7 @@ Source: usbip-%{version}.tar.xz Source1: usbip-server.service Source2: usbip-client.service Source99: extract_usbip.sh +Patch0: usbip-4.18.9-compare-actual-name.patch Requires: kmod(usbip-core.ko) Requires: kmod(usbip-host.ko) Requires: kmod(vhci-hcd.ko) @@ -50,7 +51,7 @@ This package contains headers and static libraries for USB/IP user-space development %prep -%setup -q +%autosetup -p1 %build ./autogen.sh @@ -87,6 +88,11 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Thu Sep 20 2018 Jonathan Dieter - 4.18.9-1 +- Update to 4.18.9 +- Add patch to fix problem importing device when another device is in + /sys/devices/platform after vhci (#1631148) + * Sat Jul 14 2018 Fedora Release Engineering - 4.15.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 6f756ae6e603a6bfeab5482578ad58513d931a2f Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Thu, 20 Sep 2018 21:47:58 +0100 Subject: [PATCH 20/41] Fix missing period in patch Signed-off-by: Jonathan Dieter --- usbip-4.18.9-compare-actual-name.patch | 2 +- usbip.spec | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/usbip-4.18.9-compare-actual-name.patch b/usbip-4.18.9-compare-actual-name.patch index 50649bb..767fae3 100644 --- a/usbip-4.18.9-compare-actual-name.patch +++ b/usbip-4.18.9-compare-actual-name.patch @@ -6,7 +6,7 @@ diff -urb usbip-4.18.9a/libsrc/vhci_driver.c usbip-4.18.9b/libsrc/vhci_driver.c static int vhci_hcd_filter(const struct dirent *dirent) { - return strcmp(dirent->d_name, "vhci_hcd") >= 0; -+ return !strncmp(dirent->d_name, "vhci_hcd", 9); ++ return !strncmp(dirent->d_name, "vhci_hcd.", 9); } static int get_ncontrollers(void) diff --git a/usbip.spec b/usbip.spec index c348228..24a3670 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 4.18.9 -Release: 1%{?dist} +Release: 2%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v4.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 ` @@ -92,6 +92,7 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} - Update to 4.18.9 - Add patch to fix problem importing device when another device is in /sys/devices/platform after vhci (#1631148) +- Fix missing period in patch * Sat Jul 14 2018 Fedora Release Engineering - 4.15.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 7fc1a30e215b08f6c29f661a77b2a8174d209ef3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 21/41] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- usbip.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 24a3670..61aee95 100644 --- a/usbip.spec +++ b/usbip.spec @@ -43,7 +43,6 @@ clients %package devel Summary: USB/IP headers and development libraries -Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel From ef3440540ed6a12b300075e45169f4eb16caba7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:57:20 +0000 Subject: [PATCH 22/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 61aee95..52c4fb1 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 4.18.9 -Release: 2%{?dist} +Release: 3%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v4.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 ` @@ -87,6 +87,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 4.18.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Sep 20 2018 Jonathan Dieter - 4.18.9-1 - Update to 4.18.9 - Add patch to fix problem importing device when another device is in From 8da8d0d0b9d5ca95da3a7e14b8592e439f87f00c Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Mon, 25 Feb 2019 20:19:37 +0000 Subject: [PATCH 23/41] Fix build for GCC 9 Signed-off-by: Jonathan Dieter --- .gitignore | 1 + sources | 2 +- usbip-4.18.9-compare-actual-name.patch | 12 ------- usbip-4.20-fix-gcc9.patch | 47 ++++++++++++++++++++++++++ usbip.spec | 10 ++++-- 5 files changed, 56 insertions(+), 16 deletions(-) delete mode 100644 usbip-4.18.9-compare-actual-name.patch create mode 100644 usbip-4.20-fix-gcc9.patch diff --git a/.gitignore b/.gitignore index 5dc95b4..6fb7306 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /usbip-4.14.11.tar.xz /usbip-4.15.10.tar.xz /usbip-4.18.9.tar.xz +/usbip-4.20.12.tar.xz diff --git a/sources b/sources index 50e67c2..5ab810f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usbip-4.18.9.tar.xz) = 722556e8dfd25822dfd1325c3b2053819751c997fb77515667f7ff3ec410d6229a42395ad745533aefa22a2df0cbc361fe608fe9dd082cedaeddba76f6fbc4d4 +SHA512 (usbip-4.20.12.tar.xz) = b94e4212d0bf7614e3a331dfc056ec7da38e5d6666db323bf2d20353b7293ec36ed954b41dd5792a7e2530cc5c3bb4710f8374ab58b9c40a9faee5d4c0bbbfb0 diff --git a/usbip-4.18.9-compare-actual-name.patch b/usbip-4.18.9-compare-actual-name.patch deleted file mode 100644 index 767fae3..0000000 --- a/usbip-4.18.9-compare-actual-name.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urb usbip-4.18.9a/libsrc/vhci_driver.c usbip-4.18.9b/libsrc/vhci_driver.c ---- usbip-4.18.9a/libsrc/vhci_driver.c 2018-09-19 20:41:37.000000000 +0000 -+++ usbip-4.18.9b/libsrc/vhci_driver.c 2018-09-20 10:11:10.843791788 +0000 -@@ -150,7 +150,7 @@ - - static int vhci_hcd_filter(const struct dirent *dirent) - { -- return strcmp(dirent->d_name, "vhci_hcd") >= 0; -+ return !strncmp(dirent->d_name, "vhci_hcd.", 9); - } - - static int get_ncontrollers(void) diff --git a/usbip-4.20-fix-gcc9.patch b/usbip-4.20-fix-gcc9.patch new file mode 100644 index 0000000..f7f98bb --- /dev/null +++ b/usbip-4.20-fix-gcc9.patch @@ -0,0 +1,47 @@ +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 + ++#pragma GCC diagnostic ignored "-Waddress-of-packed-member" ++ + extern int usbip_port; + extern char *usbip_port_string; + void usbip_setup_port_number(char *arg); diff --git a/usbip.spec b/usbip.spec index 52c4fb1..32b51f3 100644 --- a/usbip.spec +++ b/usbip.spec @@ -3,8 +3,8 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space -Version: 4.18.9 -Release: 3%{?dist} +Version: 4.20.12 +Release: 1%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v4.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 ` @@ -17,7 +17,7 @@ Source: usbip-%{version}.tar.xz Source1: usbip-server.service Source2: usbip-client.service Source99: extract_usbip.sh -Patch0: usbip-4.18.9-compare-actual-name.patch +Patch0: usbip-4.20-fix-gcc9.patch Requires: kmod(usbip-core.ko) Requires: kmod(usbip-host.ko) Requires: kmod(vhci-hcd.ko) @@ -87,6 +87,10 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Mon Feb 25 2019 Jonathan Dieter - 4.20.12-1 +- Update to 4.20.12 +- Fix build failure on GCC 9.0 + * Sun Feb 03 2019 Fedora Release Engineering - 4.18.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 26c9548acb9b000b86db6f858b08805c31d8c4c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:39:25 +0000 Subject: [PATCH 24/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 32b51f3..672b915 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 4.20.12 -Release: 1%{?dist} +Release: 2%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v4.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 ` @@ -87,6 +87,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 4.20.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Feb 25 2019 Jonathan Dieter - 4.20.12-1 - Update to 4.20.12 - Fix build failure on GCC 9.0 From b8be2229c34ec4224913618d7ad781e73af0ede0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:46:51 +0000 Subject: [PATCH 25/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 672b915..95d9c77 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 4.20.12 -Release: 2%{?dist} +Release: 3%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v4.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 ` @@ -87,6 +87,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 4.20.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 4.20.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b06459f901945e10580082b295fbb3d8f030094b Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Mon, 3 Feb 2020 20:03:09 +0000 Subject: [PATCH 26/41] Work around build failure on GCC 10 Signed-off-by: Jonathan Dieter --- .gitignore | 1 + sources | 2 +- usbip-4.20-fix-gcc9.patch | 47 --------------------------------------- usbip-5.5-fix-gcc9.patch | 12 ++++++++++ usbip.spec | 15 ++++++++----- 5 files changed, 24 insertions(+), 53 deletions(-) delete mode 100644 usbip-4.20-fix-gcc9.patch create mode 100644 usbip-5.5-fix-gcc9.patch diff --git a/.gitignore b/.gitignore index 6fb7306..15e42fa 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /usbip-4.15.10.tar.xz /usbip-4.18.9.tar.xz /usbip-4.20.12.tar.xz +/usbip-5.5.tar.xz diff --git a/sources b/sources index 5ab810f..72cc97c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usbip-4.20.12.tar.xz) = b94e4212d0bf7614e3a331dfc056ec7da38e5d6666db323bf2d20353b7293ec36ed954b41dd5792a7e2530cc5c3bb4710f8374ab58b9c40a9faee5d4c0bbbfb0 +SHA512 (usbip-5.5.tar.xz) = a0286a18a148617cbb46fd119e73062b9dd35a62b144727fe9309462a40cf4038176eea422d8f0c13d32c9712c878586802ba7276e5a15101757fb1886603c5c diff --git a/usbip-4.20-fix-gcc9.patch b/usbip-4.20-fix-gcc9.patch deleted file mode 100644 index f7f98bb..0000000 --- a/usbip-4.20-fix-gcc9.patch +++ /dev/null @@ -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 - -+#pragma GCC diagnostic ignored "-Waddress-of-packed-member" -+ - extern int usbip_port; - extern char *usbip_port_string; - void usbip_setup_port_number(char *arg); diff --git a/usbip-5.5-fix-gcc9.patch b/usbip-5.5-fix-gcc9.patch new file mode 100644 index 0000000..21212aa --- /dev/null +++ b/usbip-5.5-fix-gcc9.patch @@ -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 + ++#pragma GCC diagnostic ignored "-Waddress-of-packed-member" ++ + extern int usbip_port; + extern char *usbip_port_string; + void usbip_setup_port_number(char *arg); diff --git a/usbip.spec b/usbip.spec index 95d9c77..471a56b 100644 --- a/usbip.spec +++ b/usbip.spec @@ -1,11 +1,11 @@ -%global _hardened_build 1 +%define _legacy_common_support 1 Name: usbip License: GPLv2+ Summary: USB/IP user-space -Version: 4.20.12 -Release: 3%{?dist} -#Source: https://www.kernel.org/pub/linux/kernel/v4.x/linux-%%{version}.tar.xz +Version: 5.5 +Release: 1%{?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 ` # 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) @@ -87,6 +87,11 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Mon Feb 03 2020 Jonathan Dieter - 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 - 4.20.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 432f5c35c2dca949a13516980c7cf26584990bb9 Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Fri, 17 Jul 2020 16:58:19 +0100 Subject: [PATCH 27/41] Update to 5.7.9 to hopefully fix #1856443 Signed-off-by: Jonathan Dieter --- .gitignore | 1 + sources | 2 +- usbip.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 15e42fa..9b7e3d5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /usbip-4.18.9.tar.xz /usbip-4.20.12.tar.xz /usbip-5.5.tar.xz +/usbip-5.7.9.tar.xz diff --git a/sources b/sources index 72cc97c..5bf4029 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usbip-5.5.tar.xz) = a0286a18a148617cbb46fd119e73062b9dd35a62b144727fe9309462a40cf4038176eea422d8f0c13d32c9712c878586802ba7276e5a15101757fb1886603c5c +SHA512 (usbip-5.7.9.tar.xz) = 2ce175573d6387a975d7ec3132686940e903ebb63570c403b82a2e07f9fbdb365c8f1ad90bb8f1c676cc51ab1242347f9796d10ad12799957b4db0ef8e49ac46 diff --git a/usbip.spec b/usbip.spec index 471a56b..9dc0412 100644 --- a/usbip.spec +++ b/usbip.spec @@ -3,7 +3,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space -Version: 5.5 +Version: 5.7.9 Release: 1%{?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, @@ -87,6 +87,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Fri Jul 17 2020 Jonathan Dieter - 5-7.9-1 +- Update to 5.7.9 to hopefully fix #1856443 + * Mon Feb 03 2020 Jonathan Dieter - 5.5-1 - Update to 5.5 - Work around build failure on GCC 10 From 4fac947eada5189eeadde4e765ddb05751babb0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:25:42 +0000 Subject: [PATCH 28/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 9dc0412..77ee3a1 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 5.7.9 -Release: 1%{?dist} +Release: 2%{?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 ` @@ -87,6 +87,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 5.7.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jonathan Dieter - 5-7.9-1 - Update to 5.7.9 to hopefully fix #1856443 From 492e490800fb78c8517783ccfb84646d5a0c1856 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:29:01 +0000 Subject: [PATCH 29/41] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- usbip.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/usbip.spec b/usbip.spec index 77ee3a1..284c2cb 100644 --- a/usbip.spec +++ b/usbip.spec @@ -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 From ce32eaa2224da62f04e91b017a4f5b032233444f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:47:46 +0000 Subject: [PATCH 30/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 284c2cb..4e3477d 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 5.7.9 -Release: 2%{?dist} +Release: 3%{?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 ` @@ -88,6 +88,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 5.7.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 5.7.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 6320af08669a47b55cc96e32bad4a80648759438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:04 +0100 Subject: [PATCH 31/41] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- usbip.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 4e3477d..8c2db14 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 5.7.9 -Release: 3%{?dist} +Release: 4%{?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 ` @@ -88,6 +88,10 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 5.7.9-4 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Jan 27 2021 Fedora Release Engineering - 5.7.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d1ee907796be0a542c4f6e9bfc7d1aa9da389b43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:10:39 +0000 Subject: [PATCH 32/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 8c2db14..a6acce4 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 5.7.9 -Release: 4%{?dist} +Release: 5%{?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 ` @@ -88,6 +88,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 5.7.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 5.7.9-4 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 6df982c9b8e98a511f0e1f69c0fb7fd3f2586e79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:39:47 +0000 Subject: [PATCH 33/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index a6acce4..9135407 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 5.7.9 -Release: 5%{?dist} +Release: 6%{?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 ` @@ -88,6 +88,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 5.7.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 5.7.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 290d7f7e8d2a9c2bf8383232fbdc61584ba69be9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:32:47 +0000 Subject: [PATCH 34/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 9135407..d754298 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 5.7.9 -Release: 6%{?dist} +Release: 7%{?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 ` @@ -88,6 +88,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 5.7.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 5.7.9-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 73eb75019855bf11bfca729bc5ad8743ae52057c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:58:01 +0000 Subject: [PATCH 35/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index d754298..b90e71f 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 5.7.9 -Release: 7%{?dist} +Release: 8%{?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 ` @@ -88,6 +88,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 5.7.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 5.7.9-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0d2e13429c8ec7661f5f76a0561550ce79e3228b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:16:07 +0000 Subject: [PATCH 36/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index b90e71f..f347e1e 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Version: 5.7.9 -Release: 8%{?dist} +Release: 9%{?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 ` @@ -88,6 +88,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 5.7.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 5.7.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 62c18279eacbdb4a4e1a566889a1632087b5d03c Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Fri, 4 Aug 2023 09:57:28 +0100 Subject: [PATCH 37/41] Update License tag to SPDX Signed-off-by: Jonathan Dieter --- usbip.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index f347e1e..78c0bc2 100644 --- a/usbip.spec +++ b/usbip.spec @@ -1,7 +1,7 @@ %define _legacy_common_support 1 Name: usbip -License: GPLv2+ +License: GPL-2.0-only Summary: USB/IP user-space Version: 5.7.9 Release: 9%{?dist} From 9802aea1809e568ed0b9c64ba82b1b5f72245ae5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:17:21 +0000 Subject: [PATCH 38/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 78c0bc2..7864727 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPL-2.0-only Summary: USB/IP user-space Version: 5.7.9 -Release: 9%{?dist} +Release: 10%{?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 ` @@ -88,6 +88,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 5.7.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 5.7.9-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e3f9a81c1cf49decda3789ec8eb2b9f0c541dd5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:25:06 +0000 Subject: [PATCH 39/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 7864727..7df3a16 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPL-2.0-only Summary: USB/IP user-space Version: 5.7.9 -Release: 10%{?dist} +Release: 11%{?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 ` @@ -88,6 +88,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 5.7.9-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 5.7.9-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ef0dca66836dd7aca6dec05cb681fd919b901c4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:56:15 +0000 Subject: [PATCH 40/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index 7df3a16..a212f1b 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPL-2.0-only Summary: USB/IP user-space Version: 5.7.9 -Release: 11%{?dist} +Release: 12%{?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 ` @@ -88,6 +88,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 5.7.9-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 5.7.9-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ccd6b0500606b66a76fddbbaf8dc265e675952f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:52:30 +0000 Subject: [PATCH 41/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- usbip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbip.spec b/usbip.spec index a212f1b..99eb0bd 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPL-2.0-only Summary: USB/IP user-space Version: 5.7.9 -Release: 12%{?dist} +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 ` @@ -88,6 +88,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 5.7.9-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 5.7.9-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild