pciutils: update to 3.8.0

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>

7 files changed, 11 insertions, 73 deletions

diff --git a/utils/pciutils/patches/100-remove-no-timestamping.patch b/utils/pciutils/patches/100-remove-no-timestamping.patch
deleted file mode 100644
index 93bc85faf..000000000
--- a/utils/pciutils/patches/100-remove-no-timestamping.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/update-pciids.sh
-+++ b/update-pciids.sh
-@@ -33,7 +33,7 @@ if which curl >/dev/null 2>&1 ; then
- 	DL="curl -o $DEST.new $SRC"
-     ${quiet} && DL="$DL -s -S"
- elif which wget >/dev/null 2>&1 ; then
--	DL="wget --no-timestamping -O $DEST.new $SRC"
-+	DL="wget -O $DEST.new $SRC"
- 	${quiet} && DL="$DL -q"
- elif which lynx >/dev/null 2>&1 ; then
- 	DL="eval lynx -source $SRC >$DEST.new"
diff --git a/utils/pciutils/patches/101-no-strip.patch b/utils/pciutils/patches/101-no-strip.patch
index 2f1e02289..827a4531c 100644
--- a/utils/pciutils/patches/101-no-strip.patch
+++ b/utils/pciutils/patches/101-no-strip.patch
@@ -1,11 +1,13 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -119,7 +119,7 @@ distclean: clean
+@@ -131,8 +131,8 @@ distclean: clean
  install: all
  # -c is ignored on Linux, but required on FreeBSD
- 	$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)/$(MANDIR)/man5
--	$(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR)
-+	$(INSTALL) -c -m 755 lspci setpci $(DESTDIR)$(SBINDIR)
+ 	$(DIRINSTALL) -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)/$(MANDIR)/man5
+-	$(INSTALL) -c -m 755 $(STRIP) lspci$(EXEEXT) $(DESTDIR)$(LSPCIDIR)
+-	$(INSTALL) -c -m 755 $(STRIP) setpci$(EXEEXT) $(DESTDIR)$(SBINDIR)
++	$(INSTALL) -c -m 755 lspci$(EXEEXT) $(DESTDIR)$(LSPCIDIR)
++	$(INSTALL) -c -m 755 setpci$(EXEEXT) $(DESTDIR)$(SBINDIR)
  	$(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
  	$(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
  	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
diff --git a/utils/pciutils/patches/102-compressed-ids.patch b/utils/pciutils/patches/102-compressed-ids.patch
deleted file mode 100644
index 2ea8605d9..000000000
--- a/utils/pciutils/patches/102-compressed-ids.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/update-pciids.sh
-+++ b/update-pciids.sh
-@@ -6,9 +6,8 @@ set -e
- SRC="https://pci-ids.ucw.cz/v2.2/pci.ids"
- DEST=pci.ids
- PCI_COMPRESSED_IDS=
--GREP=grep
- 
--# if pci.ids is read-only (because the filesystem is read-only),
-+# if pci.ids.gz is read-only (because the filesystem is read-only),
- # then just skip this whole process.
- if ! touch ${DEST} >/dev/null 2>&1 ; then
- 	${quiet} || echo "${DEST} is read-only, exiting." 1>&2
-@@ -18,7 +17,7 @@ fi
- if [ "$PCI_COMPRESSED_IDS" = 1 ] ; then
- 	DECOMP="cat"
- 	SRC="$SRC.gz"
--	GREP=zgrep
-+	DEST="$DEST.gz"
- elif which bzip2 >/dev/null 2>&1 ; then
- 	DECOMP="bzip2 -d"
- 	SRC="$SRC.bz2"
-@@ -53,7 +52,7 @@ if ! $DECOMP <$DEST.new >$DEST.neww ; th
- 	exit 1
- fi
- 
--if ! $GREP >/dev/null "^C " $DEST.neww ; then
-+if ! zcat $DEST.neww | grep >/dev/null "^C " ; then
- 	echo >&2 "update-pciids: missing class info, probably truncated file"
- 	exit 1
- fi
diff --git a/utils/pciutils/patches/103-relative-path-ids.patch b/utils/pciutils/patches/103-relative-path-ids.patch
deleted file mode 100644
index c6d690681..000000000
--- a/utils/pciutils/patches/103-relative-path-ids.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -88,7 +88,7 @@ lspci: LDLIBS+=$(LIBKMOD_LIBS)
- ls-kernel.o: CFLAGS+=$(LIBKMOD_CFLAGS)
- 
- update-pciids: update-pciids.sh
--	sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/$(PCI_IDS)@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@"
-+	sed <$< >$@ "s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@"
- 	chmod +x $@
- 
- # The example of use of libpci
diff --git a/utils/pciutils/patches/104-resolv.patch b/utils/pciutils/patches/104-resolv.patch
index 0acfb81cb..485e1b9f5 100644
--- a/utils/pciutils/patches/104-resolv.patch
+++ b/utils/pciutils/patches/104-resolv.patch
@@ -1,11 +1,11 @@
 --- a/lib/configure
 +++ b/lib/configure
-@@ -52,7 +52,7 @@ echo >>$c "#define PCI_OS_`echo $sys | t
+@@ -60,7 +60,7 @@ echo >>$c "#define PCI_OS_`echo $sys | t
  echo >$m 'WITH_LIBS='
  
  echo_n "Looking for access methods..."
 -LIBRESOLV=-lresolv
 +LIBRESOLV=
  LIBEXT=so
- 
- case $sys in
+ EXEEXT=
+ SYSINCLUDE=/usr/include
diff --git a/utils/pciutils/patches/105-fix-host.patch b/utils/pciutils/patches/105-fix-host.patch
deleted file mode 100644
index 14f7ded61..000000000
--- a/utils/pciutils/patches/105-fix-host.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/configure
-+++ b/lib/configure
-@@ -39,7 +39,7 @@ if [ -z "$HOST" ] ; then
- fi
- [ -n "$RELEASE" ] && rel="${RELEASE}"
- # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless.
--host=`echo $HOST | sed -e 's/^\([^-]*\)-\([^-]*\)-\([^-]*\)-\([^-]*\)$/\1-\3/' -e 's/^\([^-]*\)-\([^-]*\)-\([^-]*\)$/\1-\2/' -e 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | tr '[A-Z]' '[a-z]'`
-+host=`echo $HOST | sed -e 's/^\([^-]*\)-\([^-]*\)-\([^-]*\)-\([^-]*\)$/\1-\3/' -e 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | tr '[A-Z]' '[a-z]'`
- cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- echo " $host $rel $cpu $sys"
diff --git a/utils/pciutils/patches/106-hwdata.patch b/utils/pciutils/patches/106-hwdata.patch
index ee63bc5bc..e18ef78cd 100644
--- a/utils/pciutils/patches/106-hwdata.patch
+++ b/utils/pciutils/patches/106-hwdata.patch
@@ -1,7 +1,7 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -35,7 +35,7 @@ ABI_VERSION=.3
- PREFIX=/usr/local
+@@ -36,7 +36,7 @@ PREFIX=/usr/local
+ BINDIR=$(PREFIX)/bin
  SBINDIR=$(PREFIX)/sbin
  SHAREDIR=$(PREFIX)/share
 -IDSDIR=$(SHAREDIR)