From 6267629a8003d7b40e812261a63be6480ec76df0 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 10 Jan 2024 05:33:43 +0300 Subject: [PATCH] import usbip-5.7.9-8.el9 --- .gitignore | 1 + .usbip.metadata | 1 + SOURCES/extract_usbip.sh | 19 +++ SOURCES/usbip-5.5-fix-gcc9.patch | 12 ++ SOURCES/usbip-client.service | 10 ++ SOURCES/usbip-server.service | 9 ++ SPECS/usbip.spec | 218 +++++++++++++++++++++++++++++++ 7 files changed, 270 insertions(+) create mode 100644 .gitignore create mode 100644 .usbip.metadata create mode 100755 SOURCES/extract_usbip.sh create mode 100644 SOURCES/usbip-5.5-fix-gcc9.patch create mode 100644 SOURCES/usbip-client.service create mode 100644 SOURCES/usbip-server.service create mode 100644 SPECS/usbip.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a6bd15f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/usbip-5.7.9.tar.xz diff --git a/.usbip.metadata b/.usbip.metadata new file mode 100644 index 0000000..b74b0f0 --- /dev/null +++ b/.usbip.metadata @@ -0,0 +1 @@ +50f2fc7752c5bbda792fa21e891f7bc50fd0606a SOURCES/usbip-5.7.9.tar.xz diff --git a/SOURCES/extract_usbip.sh b/SOURCES/extract_usbip.sh new file mode 100755 index 0000000..ec4dd1e --- /dev/null +++ b/SOURCES/extract_usbip.sh @@ -0,0 +1,19 @@ +#!/bin/sh +if [ "q$1" == "q" ]; then + echo "Usage: $0 " + exit 1 +fi +echo "Extracting linux source" +tar -xf "linux-$1".tar.xz +if [ "$?" -ne "0" ]; then + echo "Error extracting kernel source" + exit 1 +fi +if [ -d "usbip-$1" ]; then + rm -rf "usbip-$1" +fi +mv "linux-${1}"/tools/usb/usbip "usbip-$1" +echo "Creating usbip archive" +tar -cJvf "usbip-$1".tar.xz "usbip-$1" +rm -rf "linux-$1" +rm -rf "usbip-$1" diff --git a/SOURCES/usbip-5.5-fix-gcc9.patch b/SOURCES/usbip-5.5-fix-gcc9.patch new file mode 100644 index 0000000..21212aa --- /dev/null +++ b/SOURCES/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/SOURCES/usbip-client.service b/SOURCES/usbip-client.service new file mode 100644 index 0000000..b10b74b --- /dev/null +++ b/SOURCES/usbip-client.service @@ -0,0 +1,10 @@ +[Unit] +Description=USB/IP client modules + +[Service] +Type=oneshot +RemainAfterExit=true +ExecStart=/sbin/modprobe -qab vhci-hcd + +[Install] +WantedBy=multi-user.target diff --git a/SOURCES/usbip-server.service b/SOURCES/usbip-server.service new file mode 100644 index 0000000..52bf9ed --- /dev/null +++ b/SOURCES/usbip-server.service @@ -0,0 +1,9 @@ +[Unit] +Description=USB/IP server daemon + +[Service] +ExecStartPre=/sbin/modprobe -qab usbip_host +ExecStart=/usr/sbin/usbipd + +[Install] +WantedBy=multi-user.target diff --git a/SPECS/usbip.spec b/SPECS/usbip.spec new file mode 100644 index 0000000..047f8ca --- /dev/null +++ b/SPECS/usbip.spec @@ -0,0 +1,218 @@ +%define _legacy_common_support 1 + +Name: usbip +License: GPLv2+ +Summary: USB/IP user-space +Version: 5.7.9 +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 ` +# 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 + +# Use the same directory of the main package for subpackage licence and docs +%global _docdir_fmt %{name} + +%description +USB/IP allows you to share USB devices over a network. With USB/IP, you can +plug a USB device into one computer and use it on a different computer on the +network. + +This package contains the user-space tools for USB/IP, both for servers and +clients + +%package devel +Summary: USB/IP headers and development libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package contains headers and static libraries for USB/IP user-space +development + +%prep +%autosetup -p1 + +%build +./autogen.sh +%configure --disable-static --with-usbids-dir=%{_datadir}/hwdata +make %{?_smp_mflags} + +%install +%make_install +rm -f %{buildroot}%{_libdir}/libusbip*.la +mkdir -p %{buildroot}%{_unitdir} +install -pm 644 %{SOURCE1} %{buildroot}%{_unitdir} +install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} + +%post +%systemd_post usbip-client.service usbip-server.service + +%preun +%systemd_preun usbip-client.service usbip-server.service + +%postun +%systemd_postun_with_restart usbip-client.service usbip-server.service + +%files +%license COPYING +%doc README AUTHORS +%{_sbindir}/* +%{_libdir}/*.so.* +%{_mandir}/man8/* +%{_unitdir}/* + +%files devel +%license COPYING +%{_includedir}/* +%{_libdir}/*.so + +%changelog +* Wed Jan 10 2024 MSVSphere Packaging Team - 5.7.9-8 +- Rebuilt for MSVSphere 9.3 + +* 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 + +* Thu Jan 15 2015 - Jonathan Dieter - 3.18-3 +- Improve description + +* Wed Jan 14 2015 - Jonathan Dieter - 3.18-2 +- Remove clean section +- Remove defattr in files list +- Use license macro for COPYING +- Use combined doc directory +- Combine systemd macros into one +- Remove /etc/default config file +- Stop rmmoding when services stop +- Remove unneeded After=syslog.target in services +- Update to 3.18 +- Replace /usr/share with datadir macro in configure +- Switch to make_install macro +- When manually using install, preserve timestamps + +* Tue Dec 16 2014 - Jonathan Dieter - 3.17-1 +- Initial release