Update pciutils to 3.6.3.

2020-01-22  Martin Mares <mj@ucw.cz>

	* Released as 3.6.3.

	* `lspci -t' (tree mode) can be combined with `-s' to show a sub-tree.
	  We also fixed potential buffer overflows in the tree dumper.

	* Cleaned messy code for dumping of I/O, memory, and ROM regions.
	  This helped fixing a bug, which caused some 64-bit regions to be
	  reported as virtual. All flags are now printed after the address
	  (previously, "[virtual]" and "[enhanced]" were before it for no good
	  reason).

	* Added pci_find_cap_nr() to the library, which handles capabilities
	  which occur multiple times in a single device.

	* Minor improvements in printing of PCIe capabilities.

	* We now decode the Multicast and Secondary PCI Express extended
	  capabilities.

	* The list of capability names available to setpci was updated.

	* Minor bugs were fixed in FreeBSD and Solaris ports.

	* We now prefer HTTPS URLs in all documentation

	* The pci.ids file has a man page.

	* As usually, updated pci.ids to the current snapshot of the database.

5 files changed, 24 insertions, 29 deletions

diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile
index f9a3ceeede3..e3a02ef3f04 100644
--- a/sysutils/pciutils/Makefile
+++ b/sysutils/pciutils/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2019/01/25 04:54:35 msaitoh Exp $
+# $NetBSD: Makefile,v 1.43 2020/01/23 04:26:40 msaitoh Exp $
 
-DISTNAME=	pciutils-3.6.2
-PKGREVISION=	1
+DISTNAME=	pciutils-3.6.3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/
 MASTER_SITES+=	https://www.kernel.org/pub/software/utils/pciutils/
diff --git a/sysutils/pciutils/PLIST b/sysutils/pciutils/PLIST
index 40a9a8d760f..3db0fae17c8 100644
--- a/sysutils/pciutils/PLIST
+++ b/sysutils/pciutils/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2014/11/27 11:45:56 msaitoh Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/01/23 04:26:40 msaitoh Exp $
 include/pciutils/config.h
 include/pciutils/header.h
 include/pciutils/pci.h
 include/pciutils/types.h
 lib/lib${PCIUTILS_LIBNAME}.a
 lib/pkgconfig/libpci.pc
+man/man5/pci.ids.5
 man/man7/pcilib.7
 man/man8/lspci.8
 man/man8/setpci.8
diff --git a/sysutils/pciutils/distinfo b/sysutils/pciutils/distinfo
index 13a69db01aa..9ee4796d0e4 100644
--- a/sysutils/pciutils/distinfo
+++ b/sysutils/pciutils/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.32 2019/01/25 04:54:35 msaitoh Exp $
+$NetBSD: distinfo,v 1.33 2020/01/23 04:26:40 msaitoh Exp $
 
-SHA1 (pciutils-3.6.2.tar.gz) = eb525f1e4a0158357c49df5414d22d6437d7ef8b
-RMD160 (pciutils-3.6.2.tar.gz) = bbfcc77755736b2911e8dd84edb2f47c25f31064
-SHA512 (pciutils-3.6.2.tar.gz) = ab2bab26dd11f941286593135b751b811fa6199d4b5fb8a18e74f72709ea598ab0c0efa31ad6ca70949966dcf80cdfb16d53e5d339b773c69e0a12f132bb8577
-Size (pciutils-3.6.2.tar.gz) = 473699 bytes
-SHA1 (patch-aa) = 33b77a042920cfaaacc75987e626ab251decc3df
-SHA1 (patch-ab) = 4e994bfbb01956bd5eec70cf9d142c16b9e5fb90
+SHA1 (pciutils-3.6.3.tar.gz) = 7e99e6d2962a5720c77c566d08ad4408c71584c0
+RMD160 (pciutils-3.6.3.tar.gz) = 01464766195d76b10337eaeda5e24b116aac37ba
+SHA512 (pciutils-3.6.3.tar.gz) = eb8f3b688a5340f7616c102a85c66c788300c952ed1440ca56ef8150d91df4969ec141b7b98aeca330e8fc2d30d76cf43b4e40e8dc90665f2f3b8710f244eb5d
+Size (pciutils-3.6.3.tar.gz) = 487781 bytes
+SHA1 (patch-aa) = 58eba980d2054f6290de5ad0f49c91f6788cfc82
+SHA1 (patch-ab) = 14786e702cceaea9146f34a5a301650d2092d689
 SHA1 (patch-ac) = 4b90e99c051391b9cd3a6c1f5781f41b4a855c29
 SHA1 (patch-lib_i386-io-sunos.h) = afb666796a6b220d868a41e4fb9fd9e42152faed
diff --git a/sysutils/pciutils/patches/patch-aa b/sysutils/pciutils/patches/patch-aa
index e2233e7a8e8..457c97564b2 100644
--- a/sysutils/pciutils/patches/patch-aa
+++ b/sysutils/pciutils/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.23 2018/08/17 04:03:28 msaitoh Exp $
+$NetBSD: patch-aa,v 1.24 2020/01/23 04:26:41 msaitoh Exp $
 
---- Makefile.orig	2018-08-12 19:59:03.000000000 +0900
-+++ Makefile	2018-08-17 12:29:53.033605064 +0900
+--- Makefile.orig	2020-01-22 19:42:16.000000000 +0900
++++ Makefile	2020-01-23 13:20:37.038889169 +0900
 @@ -1,8 +1,7 @@
  # Makefile for The PCI Utilities
- # (c) 1998--2018 Martin Mares <mj@ucw.cz>
+ # (c) 1998--2020 Martin Mares <mj@ucw.cz>
  
 -OPT=-O2
 -CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
 +CFLAGS=-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
  
- VERSION=3.6.2
- DATE=2018-08-12
+ VERSION=3.6.3
+ DATE=2020-01-20
 @@ -13,7 +12,7 @@ RELEASE=
  CROSS_COMPILE=
  
@@ -54,20 +54,22 @@ $NetBSD: patch-aa,v 1.23 2018/08/17 04:03:28 msaitoh Exp $
  AR=$(CROSS_COMPILE)ar
  RANLIB=$(CROSS_COMPILE)ranlib
  
-@@ -118,12 +117,18 @@ distclean: clean
+@@ -118,13 +117,20 @@ 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
+-	$(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 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
 -	$(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7
+-	$(INSTALL) -c -m 644 pci.ids.5 $(DESTDIR)$(MANDIR)/man5
 +	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(SBINDIR)
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(IDSDIR)
 +	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man8
 +	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man7
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)/$(MANDIR)/man5
 +	$(BSD_INSTALL_PROGRAM) lspci $(DESTDIR)$(SBINDIR)
 +	$(BSD_INSTALL_PROGRAM) setpci $(DESTDIR)$(SBINDIR)
 +	$(BSD_INSTALL_SCRIPT) update-pciids $(DESTDIR)$(SBINDIR)
@@ -76,10 +78,11 @@ $NetBSD: patch-aa,v 1.23 2018/08/17 04:03:28 msaitoh Exp $
 +		$(BSD_INSTALL_MAN) $$fn $(DESTDIR)$(MANDIR)/man8;	\
 +	done
 +	$(BSD_INSTALL_MAN) pcilib.7 $(DESTDIR)$(MANDIR)/man7
++	$(BSD_INSTALL_MAN) pci.ids.5 $(DESTDIR)$(MANDIR)/man5
  ifeq ($(SHARED),yes)
  ifeq ($(LIBEXT),dylib)
  	ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME)$(ABI_VERSION).$(LIBEXT)
-@@ -137,13 +142,14 @@ install: install-pcilib
+@@ -138,13 +144,14 @@ install: install-pcilib
  endif
  
  install-pcilib: lib/$(PCILIB)
diff --git a/sysutils/pciutils/patches/patch-ab b/sysutils/pciutils/patches/patch-ab
index 9c50ce78ec1..d7c177d0964 100644
--- a/sysutils/pciutils/patches/patch-ab
+++ b/sysutils/pciutils/patches/patch-ab
@@ -1,15 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2019/01/25 04:54:36 msaitoh Exp $
+$NetBSD: patch-ab,v 1.5 2020/01/23 04:26:41 msaitoh Exp $
 
 --- lib/configure.orig	2018-03-21 05:36:30.000000000 +0900
 +++ lib/configure	2019-01-25 13:38:50.273095384 +0900
-@@ -116,6 +116,7 @@ case $sys in
- 		echo_n " nbsd-libpci"
- 		echo >>$c '#define PCI_HAVE_PM_NBSD_LIBPCI'
- 		echo >>$c '#define PCI_PATH_NBSD_DEVICE "/dev/pci0"'
-+		echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
- 		echo >>$m 'LIBNAME=libpciutils'
- 		echo >>$m 'WITH_LIBS+=-lpci'
- 		LIBRESOLV=
 @@ -266,7 +267,7 @@ else
  		echo >>$m 'SONAME=-Wl,-soname,$(LIBNAME).$(LIBEXT)$(ABI_VERSION)'
  	fi