Mon Nov 20 03:14:42 2017 UTC ()
Update pciutils to 3.5.6.

2017-11-17  Martin Mares <mj@ucw.cz>

	* Released as 3.5.6.

	* Improvements of the FreeBSD back-end: read-only access for non-root,
	  support DragonFly BSD, support extended config space.

	* MN VPD keyword is decoded correctly.

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


(msaitoh)
diff -r1.37 -r1.38 pkgsrc/sysutils/pciutils/Makefile
diff -r1.26 -r1.27 pkgsrc/sysutils/pciutils/distinfo
diff -r1.19 -r1.20 pkgsrc/sysutils/pciutils/patches/patch-aa
diff -r1.1 -r0 pkgsrc/sysutils/pciutils/patches/patch-ad
cvs diff -r1.37 -r1.38 pkgsrc/sysutils/pciutils/Makefile (switch to unified diff)

--- pkgsrc/sysutils/pciutils/Makefile 2017/07/06 04:50:01 1.37
+++ pkgsrc/sysutils/pciutils/Makefile 2017/11/20 03:14:42 1.38
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1# $NetBSD: Makefile,v 1.37 2017/07/06 04:50:01 msaitoh Exp $ 1# $NetBSD: Makefile,v 1.38 2017/11/20 03:14:42 msaitoh Exp $
2 2
3DISTNAME= pciutils-3.5.5 3DISTNAME= pciutils-3.5.6
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ 5MASTER_SITES= ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/
6MASTER_SITES+= http://kernel.org/pub/software/utils/pciutils/ 6MASTER_SITES+= https://www.kernel.org/pub/software/utils/pciutils/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://mj.ucw.cz/pciutils.shtml 9HOMEPAGE= http://mj.ucw.cz/pciutils.shtml
10COMMENT= PCI bus manipulation utility similar to NetBSD pcictl(8) 10COMMENT= PCI bus manipulation utility similar to NetBSD pcictl(8)
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
14ONLY_FOR_PLATFORM= AIX-*-* Darwin-*-* FreeBSD-*-* Linux-*-* NetBSD-*-* 14ONLY_FOR_PLATFORM= AIX-*-* Darwin-*-* FreeBSD-*-* Linux-*-* NetBSD-*-*
15ONLY_FOR_PLATFORM+= DragonFly-*-* OpenBSD-*-* SunOS-5.11-* Haiku-*-* 15ONLY_FOR_PLATFORM+= DragonFly-*-* OpenBSD-*-* SunOS-5.11-* Haiku-*-*
16 16
17MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} 17MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
18MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} 18MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
19 19
20INSTALL_TARGET= install install-lib 20INSTALL_TARGET= install install-lib
21USE_TOOLS+= gmake pkg-config 21USE_TOOLS+= gmake pkg-config
22REPLACE_SH= *.sh 22REPLACE_SH= *.sh
23 23
24PKGCONFIG_OVERRIDE= lib/libpci.pc.in 24PKGCONFIG_OVERRIDE= lib/libpci.pc.in
25 25
26OPSYSVARS+= PCIUTILS_LIBNAME 26OPSYSVARS+= PCIUTILS_LIBNAME
27PCIUTILS_LIBNAME.NetBSD= pciutils 27PCIUTILS_LIBNAME.NetBSD= pciutils
28PCIUTILS_LIBNAME.*= pci 28PCIUTILS_LIBNAME.*= pci
29 29
30PLIST_SUBST+= PCIUTILS_LIBNAME=${PCIUTILS_LIBNAME} 30PLIST_SUBST+= PCIUTILS_LIBNAME=${PCIUTILS_LIBNAME}
31 31
32SUBST_CLASSES= pc 32SUBST_CLASSES= pc
33SUBST_FILES.pc= lib/libpci.pc.in 33SUBST_FILES.pc= lib/libpci.pc.in
34SUBST_MESSAGE.pc= Fixing library link specification in pkg-config file. 34SUBST_MESSAGE.pc= Fixing library link specification in pkg-config file.
35SUBST_STAGE.pc= pre-configure 35SUBST_STAGE.pc= pre-configure
36SUBST_VARS.pc= PCIUTILS_LIBNAME 36SUBST_VARS.pc= PCIUTILS_LIBNAME
37 37
38SUBST_CLASSES.SunOS+= dns 38SUBST_CLASSES.SunOS+= dns
39SUBST_MESSAGE.dns= Disabling DNS support on Solaris 39SUBST_MESSAGE.dns= Disabling DNS support on Solaris
40SUBST_STAGE.dns= pre-configure 40SUBST_STAGE.dns= pre-configure
41SUBST_FILES.dns= Makefile 41SUBST_FILES.dns= Makefile
42SUBST_SED.dns= -e 's/^DNS=/DNS=no/' 42SUBST_SED.dns= -e 's/^DNS=/DNS=no/'
43 43
44.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.26 -r1.27 pkgsrc/sysutils/pciutils/distinfo (switch to unified diff)

--- pkgsrc/sysutils/pciutils/distinfo 2017/07/06 04:50:01 1.26
+++ pkgsrc/sysutils/pciutils/distinfo 2017/11/20 03:14:42 1.27
@@ -1,10 +1,9 @@ @@ -1,10 +1,9 @@
1$NetBSD: distinfo,v 1.26 2017/07/06 04:50:01 msaitoh Exp $ 1$NetBSD: distinfo,v 1.27 2017/11/20 03:14:42 msaitoh Exp $
2 2
3SHA1 (pciutils-3.5.5.tar.gz) = 409e7b0587c6a476ef93a90ecc4ab3b028a554bb 3SHA1 (pciutils-3.5.6.tar.gz) = 9f22fe9fccf1c5089167dc534409df8bd724f43d
4RMD160 (pciutils-3.5.5.tar.gz) = bdfc4cb7b396374ecd3d9ee228cfb6af7faaa9f7 4RMD160 (pciutils-3.5.6.tar.gz) = d4c89bdcff620646de5cc847f93d598822799168
5SHA512 (pciutils-3.5.5.tar.gz) = b2c89e1d742c5a23cad662ed6bb1d47d7587b0d823fcbf3abc6d613735961473f7d29c83a4ccb49b64ec4f674026f17e88693eb34b42cb6c128abd1407c778ba 5SHA512 (pciutils-3.5.6.tar.gz) = d9bac2d1744db21937d84d27ad1fe8d508d421468b6adeb179fb550aab4b9a57c0a67230a425f28dbc0a91caa276f6a069e99d929daf350607c61e65f7918e73
6Size (pciutils-3.5.5.tar.gz) = 437331 bytes 6Size (pciutils-3.5.6.tar.gz) = 436463 bytes
7SHA1 (patch-aa) = e2890ed3646c774a5f72bdff00af6b1d32cc7219 7SHA1 (patch-aa) = d8caa8b69987d14397fd863d776a533e4c19b26e
8SHA1 (patch-ab) = 881db39792c9d72f527438e2b475ac2ea842b536 8SHA1 (patch-ab) = 881db39792c9d72f527438e2b475ac2ea842b536
9SHA1 (patch-ac) = 4b90e99c051391b9cd3a6c1f5781f41b4a855c29 9SHA1 (patch-ac) = 4b90e99c051391b9cd3a6c1f5781f41b4a855c29
10SHA1 (patch-ad) = bfe9069e96fd46798afec73c93ad71db3a0e0e37 
cvs diff -r1.19 -r1.20 pkgsrc/sysutils/pciutils/patches/patch-aa (switch to unified diff)

--- pkgsrc/sysutils/pciutils/patches/patch-aa 2017/07/06 04:50:02 1.19
+++ pkgsrc/sysutils/pciutils/patches/patch-aa 2017/11/20 03:14:42 1.20
@@ -1,99 +1,101 @@ @@ -1,99 +1,101 @@
1--- Makefile.orig 2017-02-26 07:58:49.000000000 +0900 1$NetBSD: patch-aa,v 1.20 2017/11/20 03:14:42 msaitoh Exp $
2+++ Makefile 2017-02-26 15:40:04.602258606 +0900 2
 3--- Makefile.orig 2017-11-17 22:00:27.000000000 +0900
 4+++ Makefile 2017-11-20 12:02:45.561593424 +0900
3@@ -1,8 +1,7 @@ 5@@ -1,8 +1,7 @@
4 # Makefile for The PCI Utilities 6 # Makefile for The PCI Utilities
5 # (c) 1998--2017 Martin Mares <mj@ucw.cz> 7 # (c) 1998--2017 Martin Mares <mj@ucw.cz>
6  8
7-OPT=-O2 9-OPT=-O2
8-CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes 10-CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
9+CFLAGS=-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes 11+CFLAGS=-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
10  12
11 VERSION=3.5.5 13 VERSION=3.5.6
12 DATE=2017-07-05 14 DATE=2017-11-17
13@@ -13,7 +12,7 @@ RELEASE= 15@@ -13,7 +12,7 @@ RELEASE=
14 CROSS_COMPILE= 16 CROSS_COMPILE=
15  17
16 # Support for compressed pci.ids (yes/no, default: detect) 18 # Support for compressed pci.ids (yes/no, default: detect)
17-ZLIB= 19-ZLIB=
18+ZLIB=no 20+ZLIB=no
19  21
20 # Support for resolving ID's by DNS (yes/no, default: detect) 22 # Support for resolving ID's by DNS (yes/no, default: detect)
21 DNS= 23 DNS=
22@@ -29,23 +28,23 @@ HWDB= 24@@ -29,23 +28,23 @@ HWDB=
23  25
24 # ABI version suffix in the name of the shared library 26 # ABI version suffix in the name of the shared library
25 # (as we use proper symbol versioning, this seldom needs changing) 27 # (as we use proper symbol versioning, this seldom needs changing)
26-ABI_VERSION=.3 28-ABI_VERSION=.3
27+ABI_VERSION=-version-info 3:0 29+ABI_VERSION=-version-info 3:0
28  30
29 # Installation directories 31 # Installation directories
30-PREFIX=/usr/local 32-PREFIX=/usr/local
31+#PREFIX=/usr/local 33+#PREFIX=/usr/local
32 SBINDIR=$(PREFIX)/sbin 34 SBINDIR=$(PREFIX)/sbin
33-SHAREDIR=$(PREFIX)/share 35-SHAREDIR=$(PREFIX)/share
34+SHAREDIR=$(PREFIX)/share/pciutils 36+SHAREDIR=$(PREFIX)/share/pciutils
35 IDSDIR=$(SHAREDIR) 37 IDSDIR=$(SHAREDIR)
36-MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi) 38-MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
37-INCDIR=$(PREFIX)/include 39-INCDIR=$(PREFIX)/include
38+MANDIR=$(PREFIX)/$(PKGMANDIR) 40+MANDIR=$(PREFIX)/$(PKGMANDIR)
39+INCDIR=$(PREFIX)/include/pciutils 41+INCDIR=$(PREFIX)/include/pciutils
40 LIBDIR=$(PREFIX)/lib 42 LIBDIR=$(PREFIX)/lib
41 PKGCFDIR=$(LIBDIR)/pkgconfig 43 PKGCFDIR=$(LIBDIR)/pkgconfig
42  44
43 # Commands 45 # Commands
44-INSTALL=install 46-INSTALL=install
45-DIRINSTALL=install -d 47-DIRINSTALL=install -d
46-STRIP=-s 48-STRIP=-s
47-CC=$(CROSS_COMPILE)gcc 49-CC=$(CROSS_COMPILE)gcc
48+#INSTALL=install 50+#INSTALL=install
49+#DIRINSTALL=install -d 51+#DIRINSTALL=install -d
50+#STRIP=-s 52+#STRIP=-s
51+#CC=$(CROSS_COMPILE)gcc 53+#CC=$(CROSS_COMPILE)gcc
52 AR=$(CROSS_COMPILE)ar 54 AR=$(CROSS_COMPILE)ar
53 RANLIB=$(CROSS_COMPILE)ranlib 55 RANLIB=$(CROSS_COMPILE)ranlib
54  56
55@@ -110,12 +109,18 @@ distclean: clean 57@@ -110,12 +109,18 @@ distclean: clean
56  58
57 install: all 59 install: all
58 # -c is ignored on Linux, but required on FreeBSD 60 # -c is ignored on Linux, but required on FreeBSD
59- $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 61- $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
60- $(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR) 62- $(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR)
61- $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR) 63- $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
62- $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR) 64- $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
63- $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8 65- $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
64- $(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7 66- $(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7
65+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(SBINDIR) 67+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(SBINDIR)
66+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(IDSDIR) 68+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(IDSDIR)
67+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man8 69+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man8
68+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man7 70+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man7
69+ $(BSD_INSTALL_PROGRAM) lspci $(DESTDIR)$(SBINDIR) 71+ $(BSD_INSTALL_PROGRAM) lspci $(DESTDIR)$(SBINDIR)
70+ $(BSD_INSTALL_PROGRAM) setpci $(DESTDIR)$(SBINDIR) 72+ $(BSD_INSTALL_PROGRAM) setpci $(DESTDIR)$(SBINDIR)
71+ $(BSD_INSTALL_SCRIPT) update-pciids $(DESTDIR)$(SBINDIR) 73+ $(BSD_INSTALL_SCRIPT) update-pciids $(DESTDIR)$(SBINDIR)
72+ $(BSD_INSTALL_DATA) $(PCI_IDS) $(DESTDIR)$(IDSDIR) 74+ $(BSD_INSTALL_DATA) $(PCI_IDS) $(DESTDIR)$(IDSDIR)
73+ for fn in lspci.8 setpci.8 update-pciids.8; do \ 75+ for fn in lspci.8 setpci.8 update-pciids.8; do \
74+ $(BSD_INSTALL_MAN) $$fn $(DESTDIR)$(MANDIR)/man8; \ 76+ $(BSD_INSTALL_MAN) $$fn $(DESTDIR)$(MANDIR)/man8; \
75+ done 77+ done
76+ $(BSD_INSTALL_MAN) pcilib.7 $(DESTDIR)$(MANDIR)/man7 78+ $(BSD_INSTALL_MAN) pcilib.7 $(DESTDIR)$(MANDIR)/man7
77 ifeq ($(SHARED),yes) 79 ifeq ($(SHARED),yes)
78 ifeq ($(LIBEXT),dylib) 80 ifeq ($(LIBEXT),dylib)
79 ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME)$(ABI_VERSION).$(LIBEXT) 81 ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME)$(ABI_VERSION).$(LIBEXT)
80@@ -129,13 +134,14 @@ install: install-pcilib 82@@ -129,13 +134,14 @@ install: install-pcilib
81 endif 83 endif
82  84
83 install-pcilib: lib/$(PCILIB) 85 install-pcilib: lib/$(PCILIB)
84- $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR) 86- $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
85- $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR) 87- $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
86+ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(LIBDIR) 88+ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(LIBDIR)
87+ $(BSD_INSTALL_LIB) lib/$(PCILIB) $(DESTDIR)$(LIBDIR) 89+ $(BSD_INSTALL_LIB) lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
88  90
89 install-lib: $(PCIINC_INS) lib/$(PCILIBPC) install-pcilib 91 install-lib: $(PCIINC_INS) lib/$(PCILIBPC) install-pcilib
90- $(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(PKGCFDIR) 92- $(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(PKGCFDIR)
91- $(INSTALL) -c -m 644 $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci 93- $(INSTALL) -c -m 644 $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci
92- $(INSTALL) -c -m 644 lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR) 94- $(INSTALL) -c -m 644 lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR)
93+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INCDIR)  95+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INCDIR)
94+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PKGCFDIR) 96+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PKGCFDIR)
95+ $(BSD_INSTALL_DATA) $(PCIINC_INS) $(DESTDIR)$(INCDIR) 97+ $(BSD_INSTALL_DATA) $(PCIINC_INS) $(DESTDIR)$(INCDIR)
96+ $(BSD_INSTALL_DATA) lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR) 98+ $(BSD_INSTALL_DATA) lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR)
97 ifeq ($(SHARED),yes) 99 ifeq ($(SHARED),yes)
98 ifeq ($(LIBEXT),dylib) 100 ifeq ($(LIBEXT),dylib)
99 ln -sf $(LIBNAME)$(ABI_VERSION).$(LIBEXT) $(DESTDIR)$(LIBDIR)/$(LIBNAME).$(LIBEXT) 101 ln -sf $(LIBNAME)$(ABI_VERSION).$(LIBEXT) $(DESTDIR)$(LIBDIR)/$(LIBNAME).$(LIBEXT)
File Deleted: pkgsrc/sysutils/pciutils/patches/Attic/patch-ad