[arch-commits] Commit in libusb/trunk (2 files)

[David Runge]

    Date: Tuesday, February 1, 2022 @ 18:23:54
  Author: dvzrv
Revision: 435704

upgpkg: libusb 1.0.25-1: Upgrade to 1.0.25.

Simplify quoting in file.
Remove now included patch.

Modified:
  libusb/trunk/PKGBUILD
Deleted:
  libusb/trunk/libusb-1.0.24-descriptor_parsing.patch

----------------------------------------+
 PKGBUILD                               |   33 +++++++++++----------------
 libusb-1.0.24-descriptor_parsing.patch |   37 -------------------------------
 2 files changed, 14 insertions(+), 56 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-01 18:16:50 UTC (rev 435703)
+++ PKGBUILD	2022-02-01 18:23:54 UTC (rev 435704)
@@ -3,27 +3,22 @@
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=libusb
-pkgver=1.0.24
-pkgrel=2
+pkgver=1.0.25
+pkgrel=1
 pkgdesc="Library that provides generic access to USB devices"
-arch=('x86_64')
+arch=(x86_64)
 url="https://libusb.info/"
-license=('LGPL2.1')
-depends=('glibc')
-makedepends=('systemd')
-provides=('libusb-1.0.so')
-source=("https://github.com/${pkgname}/${pkgname}/releases/download/v$pkgver/${pkgname}-$pkgver.tar.bz2"
-        "${pkgname}-1.0.24-descriptor_parsing.patch"
-)
-sha512sums=('5aea36a530aaa15c6dd656d0ed3ce204522c9946d8d39ffbb290dab4a98cda388a2598da4995123d1032324056090bd429e702459626d3e8d7daeebc4e7ff3dc'
-            '588624bdcce2ff3ef98ab28b98b00eb48f16ef9e94033f29aaf8c6d6cb3e56d1299ea59f63b0d7a485955fa85182db0db5c043ceca24345c41f40311483606e2')
-b2sums=('f6188b5af1225cf8b6d1486b6efcf48e837ee4f2e3592adab3ae6aae0a74a67aa54f40f0dd547f951a194d40954f2ee33acf741d2eee0b8449ce64f2edcf1018'
-        '65efafcaa87cc75000adb0f6fae6c5fc33d72727bacde327bae5e5e68162783c8203f92ecd3de2f7e8a9869f587ea76a0b1a054369a15cd9b3cec8f7fc44036f')
+license=(LGPL2.1)
+depends=(glibc)
+makedepends=(systemd)
+provides=(libusb-1.0.so)
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/v$pkgver/${pkgname}-$pkgver.tar.bz2")
+sha512sums=('f1e6e5577d4bd1ff136927dc66c615014a06ac332ddd797b1d1ad5f7b68e2405e66068dcb210e2f0ae3e31681603ef72efbd88bf7fbe0eb41ce700fdc3f92f9d')
+b2sums=('3aecfbf9fc068fdfb8e612918bb895988f8400dc2c3ffd96a81792ab844d632f0c098947200512ddc37cfa9003956f8454c1d0362973a5d646a225f81cc2923b')
 
 prepare() {
   cd "$pkgname-$pkgver"
-  patch -Np1 -i ../"${pkgname}-1.0.24-descriptor_parsing.patch"
-  autoreconf -vfi
+  autoreconf -fiv
 }
 
 build() {
@@ -38,9 +33,9 @@
 }
 
 package () {
-  depends+=('libudev.so')
+  depends+=(libudev.so)
+
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-  install -vDm 644 {AUTHORS,ChangeLog,README} \
-    -t "${pkgdir}/usr/share/doc/${pkgname}/"
+  install -vDm 644 {AUTHORS,ChangeLog,README} -t "${pkgdir}/usr/share/doc/${pkgname}/"
 }

Deleted: libusb-1.0.24-descriptor_parsing.patch
===================================================================
--- libusb-1.0.24-descriptor_parsing.patch	2022-02-01 18:16:50 UTC (rev 435703)
+++ libusb-1.0.24-descriptor_parsing.patch	2022-02-01 18:23:54 UTC (rev 435704)
@@ -1,37 +0,0 @@
-diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
-index fb2ed53a..4d2dc8d6 100644
---- a/libusb/os/linux_usbfs.c
-+++ b/libusb/os/linux_usbfs.c
-@@ -641,7 +641,12 @@ static int seek_to_next_config(struct libusb_context *ctx,
- 	uint8_t *buffer, size_t len)
- {
- 	struct usbi_descriptor_header *header;
--	int offset = 0;
-+	int offset;
-+
-+	/* Start seeking past the config descriptor */
-+	offset = LIBUSB_DT_CONFIG_SIZE;
-+	buffer += LIBUSB_DT_CONFIG_SIZE;
-+	len -= LIBUSB_DT_CONFIG_SIZE;
- 
- 	while (len > 0) {
- 		if (len < 2) {
-@@ -718,7 +723,7 @@ static int parse_config_descriptors(struct libusb_device *dev)
- 		}
- 
- 		if (priv->sysfs_dir) {
--			 /*
-+			/*
- 			 * In sysfs wTotalLength is ignored, instead the kernel returns a
- 			 * config descriptor with verified bLength fields, with descriptors
- 			 * with an invalid bLength removed.
-@@ -727,8 +732,7 @@ static int parse_config_descriptors(struct libusb_device *dev)
- 			int offset;
- 
- 			if (num_configs > 1 && idx < num_configs - 1) {
--				offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE,
--							     remaining - LIBUSB_DT_CONFIG_SIZE);
-+				offset = seek_to_next_config(ctx, buffer, remaining);
- 				if (offset < 0)
- 					return offset;
- 				sysfs_config_len = (uint16_t)offset;