diff --git a/.gitignore b/.gitignore index 729c06c..9b7e3d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,10 @@ /usbip-3.17.tar.xz /usbip-3.18.tar.xz +/usbip-4.5.tar.xz +/usbip-4.9.9.tar.xz +/usbip-4.14.11.tar.xz +/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 diff --git a/sources b/sources index d23ebad..5bf4029 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e90a3347a759ab9ba0000bd358012974 usbip-3.18.tar.xz +SHA512 (usbip-5.7.9.tar.xz) = 2ce175573d6387a975d7ec3132686940e903ebb63570c403b82a2e07f9fbdb365c8f1ad90bb8f1c676cc51ab1242347f9796d10ad12799957b4db0ef8e49ac46 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 16ea3e2..99eb0bd 100644 --- a/usbip.spec +++ b/usbip.spec @@ -1,27 +1,32 @@ -%global _hardened_build 1 +%define _legacy_common_support 1 Name: usbip -License: GPLv2+ +License: GPL-2.0-only Summary: USB/IP user-space -Group: System Environment/Daemons -Version: 3.18 -Release: 4%{?dist} -#Source: https://www.kernel.org/pub/linux/kernel/v3.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 ` # 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 Source99: extract_usbip.sh +Patch0: usbip-5.5-fix-gcc9.patch 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 Requires(postun): systemd +BuildRequires: make BuildRequires: systemd BuildRequires: libudev-devel BuildRequires: libtool autoconf @@ -39,7 +44,6 @@ clients %package devel Summary: USB/IP headers and development libraries -Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -47,7 +51,7 @@ This package contains headers and static libraries for USB/IP user-space development %prep -%setup -q +%autosetup -p1 %build ./autogen.sh @@ -63,14 +67,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 @@ -86,6 +88,123 @@ 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 + +* 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 + +* 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 + +* 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 + +* 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. + +* 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 + +* 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 +- 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 + +* 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 + +* 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 + /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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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