[packages/pciutils] up to 3.10.0

[atler]

commit b347e04d4bdc44633a9bee02611ee11a610f5e5f
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu May 4 21:34:27 2023 +0200

    up to 3.10.0
    
    - `which` no longer used, replaced with shell builtin `command`

 pciutils-nowhich.patch        | 31 -------------------------------
 pciutils-pci_init-error.patch | 22 +++++-----------------
 pciutils.spec                 | 10 ++++------
 3 files changed, 9 insertions(+), 54 deletions(-)
---
diff --git a/pciutils.spec b/pciutils.spec
index 5362435..cd2eb9d 100644
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -20,19 +20,18 @@ Summary(sv.UTF-8):	PCI-bussrelaterade verktyg
 Summary(uk.UTF-8):	Утиліти роботи з PCI пристроями
 Summary(zh_CN.UTF-8):	PCI 总线相关的工具。
 Name:		pciutils
-Version:	3.9.0
+Version:	3.10.0
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	https://mj.ucw.cz/download/linux/pci/%{name}-%{version}.tar.gz
-# Source0-md5:	357496ae1652aac66cad0d2de2d831d0
+# Source0-md5:	ca53b87d2a94cdbbba6e09aca90924bd
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	1ac48f433b1995044e14c24513992211
 Patch0:		%{name}-pci_h.patch
 Patch1:		%{name}-pcimodules.patch
-Patch2:		%{name}-nowhich.patch
-Patch3:		%{name}-pci_init-error.patch
-Patch4:		hwdata.patch
+Patch2:		%{name}-pci_init-error.patch
+Patch3:		hwdata.patch
 URL:		http://mj.ucw.cz/pciutils.html
 BuildRequires:	kmod-devel
 %{?with_udev:BuildRequires:	udev-devel}
@@ -277,7 +276,6 @@ Statyczna wersja biblioteki PCI.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %{__rm} pci.ids
 
diff --git a/pciutils-nowhich.patch b/pciutils-nowhich.patch
deleted file mode 100644
index 0118f6a..0000000
--- a/pciutils-nowhich.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- pciutils-3.0.3/update-pciids.sh~	2008-11-27 17:46:09.000000000 +0100
-+++ pciutils-3.0.3/update-pciids.sh	2008-11-27 17:49:47.000000000 +0100
-@@ -19,23 +19,23 @@
- 	DECOMP="cat"
- 	SRC="$SRC.gz"
- 	GREP=zgrep
--elif which bzip2 >/dev/null 2>&1 ; then
-+elif [ -x /usr/bin/bzip2 ]; then
- 	DECOMP="bzip2 -d"
- 	SRC="$SRC.bz2"
--elif which gzip >/dev/null 2>&1 ; then
-+elif [ -x /usr/bin/gzip ]; then
- 	DECOMP="gzip -d"
- 	SRC="$SRC.gz"
- else
- 	DECOMP="cat"
- fi
- 
--if which curl >/dev/null 2>&1 ; then
-+if [ -x /usr/bin/curl ]; then
- 	DL="curl -o $DEST.new $SRC"
- 	${quiet} && DL="$DL -s -S"
--elif which wget >/dev/null 2>&1 ; then
-+elif [ -x /usr/bin/curl ]; then
- 	DL="wget --no-timestamping -O $DEST.new $SRC"
- 	${quiet} && DL="$DL -q"
--elif which lynx >/dev/null 2>&1 ; then
-+elif [ -x /usr/bin/lynx ]; then
- 	DL="eval lynx -source $SRC >$DEST.new"
- else
- 	echo >&2 "update-pciids: cannot find curl, wget or lynx"
diff --git a/pciutils-pci_init-error.patch b/pciutils-pci_init-error.patch
index 43b909f..6044d6a 100644
--- a/pciutils-pci_init-error.patch
+++ b/pciutils-pci_init-error.patch
@@ -1,26 +1,14 @@
---- pciutils-3.6.2/lib/init.c.orig	2018-03-20 21:36:30.000000000 +0100
-+++ pciutils-3.6.2/lib/init.c	2018-08-24 21:13:23.412076269 +0200
-@@ -208,8 +208,10 @@
+--- pciutils-3.10.0/lib/init.c.orig	2023-05-04 21:14:07.869516839 +0200
++++ pciutils-3.10.0/lib/init.c	2023-05-04 21:29:51.238144530 +0200
+@@ -440,8 +440,10 @@
  
-   if (a->method)
+   if (a->method != PCI_ACCESS_AUTO)
      {
 -      if (a->method >= PCI_ACCESS_MAX || !pci_methods[a->method])
 +      if (a->method >= PCI_ACCESS_MAX || !pci_methods[a->method]) {
  	a->error("This access method is not supported.");
-+	return;
++	return 0;
 +      }
        a->methods = pci_methods[a->method];
      }
    else
-@@ -230,8 +232,10 @@
- 	    }
- 	  a->debug("...No.\n");
- 	}
--      if (!a->methods)
-+      if (!a->methods) {
- 	a->error("Cannot find any working access method.");
-+	return;
-+      }
-     }
-   a->debug("Decided to use %s\n", a->methods->name);
-   a->methods->init(a);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pciutils.git/commitdiff/b347e04d4bdc44633a9bee02611ee11a610f5e5f