From 7223f1220ff2314bc096af8cc64a025d2ae75b75 Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Mon, 8 Jun 2026 16:33:28 +0800
Subject: [PATCH] Update to the upstream release 1.0.30

- Inlcude the major bug fixes
- Include the new API for fwupd backporting task

Resolves: RHEL-182598
Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 .gitignore   |  1 +
 libusbx.spec | 16 ++++++++++------
 sources      |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9816fe4..0e0d059 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /libusb-1.0.25-rc1.tar.bz2
 /libusb-1.0.26-rc1.tar.bz2
 /libusb-1.0.26.tar.bz2
+/libusb-1.0.30.tar.bz2
diff --git a/libusbx.spec b/libusbx.spec
index 9349701..6964d9f 100644
--- a/libusbx.spec
+++ b/libusbx.spec
@@ -1,6 +1,6 @@
 Summary:        Library for accessing USB devices
 Name:           libusbx
-%define upstream 1.0.26
+%define upstream 1.0.30
 Version:        %( echo %{upstream} | sed s/-/~/ )
 Release:        1%{?dist}
 # upstream libusbx has merged back with libusb and is now called libusb again
@@ -12,12 +12,11 @@ License:        LGPLv2+
 URL:            http://libusb.info
 BuildRequires:  systemd-devel doxygen libtool
 BuildRequires:  make
-#BuildRequires:  umockdev-devel >= 0.16.0
+# BuildRequires:  umockdev-devel >= 0.16.0
 Provides:       libusb1 = %{version}-%{release}
 Obsoletes:      libusb1 <= 1.0.9
 
 # Pull in coverity related fixes
-Patch9991:      https://github.com/libusb/libusb/pull/1067.patch
 
 %description
 This package provides a way for applications to access USB devices.
@@ -68,6 +67,8 @@ mkdir -p m4
 
 %build
 %configure --disable-static --enable-examples-build
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{make_build}
 pushd doc
 make docs
@@ -80,7 +81,7 @@ popd
 %install
 %{make_install}
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 tests/.libs/stress $RPM_BUILD_ROOT%{_bindir}/libusb-test-stress
+install -m 755 tests/stress $RPM_BUILD_ROOT%{_bindir}/libusb-test-stress
 #install -m 755 tests/.libs/umockdev $RPM_BUILD_ROOT%{_bindir}/libusb-test-umockdev
 install -m 755 examples/.libs/testlibusb \
     $RPM_BUILD_ROOT%{_bindir}/libusb-test-libusb
@@ -96,7 +97,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 %check
 LD_LIBRARY_PATH=libusb/.libs ldd $RPM_BUILD_ROOT%{_bindir}/libusb-test-stress
 LD_LIBRARY_PATH=libusb/.libs $RPM_BUILD_ROOT%{_bindir}/libusb-test-stress
-#LD_LIBRARY_PATH=libusb/.libs $RPM_BUILD_ROOT%{_bindir}/libusb-test-umockdev
 LD_LIBRARY_PATH=libusb/.libs $RPM_BUILD_ROOT%{_bindir}/libusb-test-libusb
 LD_LIBRARY_PATH=libusb/.libs $RPM_BUILD_ROOT%{_bindir}/libusb-example-listdevs
 
@@ -122,11 +122,15 @@ LD_LIBRARY_PATH=libusb/.libs $RPM_BUILD_ROOT%{_bindir}/libusb-example-listdevs
 %{_bindir}/libusb-example-listdevs
 %{_bindir}/libusb-example-xusb
 %{_bindir}/libusb-test-stress
-#%{_bindir}/libusb-test-umockdev
 %{_bindir}/libusb-test-libusb
 
 
 %changelog
+* Mon Jun 8 2026 Kate Hsuan <hpa@redhat.com> - 1.0.30-1
+- Update to upstream version 1.0.30 to include the major bug fixes
+- Include the necessary API for fwupd backporting to RHEL9.
+  Resolves: RHEL-182598
+
 * Tue Apr 12 2022 Benjamin Berg <bberg@redhat.com> - 1.0.26
 - Pull in new upstream libusb containing important regression fixes
   Resolves: #2058730
diff --git a/sources b/sources
index 3b509af..34364eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libusb-1.0.26.tar.bz2) = fcdb85c98f21639668693c2fd522814d440972d65883984c4ae53d0555bdbdb7e8c7a32199cd4b01113556a1eb5be7841b750cc73c9f6bda79bfe1af80914e71
+SHA512 (libusb-1.0.30.tar.bz2) = b14241bc499cdf353bb7fe02cea9a754b011f40ef0d0376ff8921f129f888b514d481e54c6aa380be04f655e027aaf4d6d9eba142b15758dea2e32f64af7b0c2