CVS commit: pkgsrc/sysutils/pciutils

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May  7 10:20:44 UTC 2023

Modified Files:
        pkgsrc/sysutils/pciutils: Makefile distinfo
        pkgsrc/sysutils/pciutils/patches: patch-aa patch-lib_internal.h

Log Message:
pciutils: update to 3.10.0.

2023-05-01  Martin Mares <mj%ucw.cz@localhost>

        * Released as 3.10.0.

        * Fixed bug in definition of versioned symbol aliases
          in shared libpci, which made compiling with link-time
          optimization fail.

        * Filters now accept "0x..." syntax for backward compatibility.

        * Windows: The cfgmgr32 back-end which provides the list of devices
          can be combined with another back-end which provides access
          to configuration space.

        * ECAM (Enhanced Configuration Access Mechanism), which is defined
          by the PCIe standard, is now supported. It requires root privileges,
          access to physical memory, and also manual configuration on some
          systems.

        * lspci: Tree view now works on multi-domain systems. It now respects
          filters properly.

        * Last but not least, pci.ids were updated to the current snapshot
          of the database. This includes overall cleanup of entries with
          non-ASCII characters in their names -- such characters are allowed,
          but only if they convey interesting information (e.g., umlauts
          in German company names, but not the "registered trade mark" sign).


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/sysutils/pciutils/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/sysutils/pciutils/distinfo
cvs rdiff -u -r1.29 -r1.30 pkgsrc/sysutils/pciutils/patches/patch-aa
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/pciutils/Makefile
diff -u pkgsrc/sysutils/pciutils/Makefile:1.52 pkgsrc/sysutils/pciutils/Makefile:1.53
--- pkgsrc/sysutils/pciutils/Makefile:1.52      Sat Dec 31 22:21:04 2022
+++ pkgsrc/sysutils/pciutils/Makefile   Sun May  7 10:20:44 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2022/12/31 22:21:04 msaitoh Exp $
+# $NetBSD: Makefile,v 1.53 2023/05/07 10:20:44 wiz Exp $
 
-DISTNAME=      pciutils-3.9.0
+DISTNAME=      pciutils-3.10.0
 CATEGORIES=    sysutils
 MASTER_SITES+= https://www.kernel.org/pub/software/utils/pciutils/
 
@@ -14,6 +14,10 @@ ONLY_FOR_PLATFORM=   AIX-*-* Darwin-*-* Fr
 ONLY_FOR_PLATFORM+=    DragonFly-*-* OpenBSD-*-* SunOS-5.11-* Haiku-*-*
 
 CFLAGS+=               -fPIC
+MAKE_FLAGS+=           PREFIX=${PREFIX:Q}
+MAKE_FLAGS+=           SHAREDIR=${PREFIX:Q}/share/pciutils
+MAKE_FLAGS+=           MANDIR=${PREFIX:Q}/${PKGMANDIR}
+MAKE_FLAGS+=           CC=${CC:Q}
 MAKE_FLAGS+=           CFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=           LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=           SHARED=yes

Index: pkgsrc/sysutils/pciutils/distinfo
diff -u pkgsrc/sysutils/pciutils/distinfo:1.43 pkgsrc/sysutils/pciutils/distinfo:1.44
--- pkgsrc/sysutils/pciutils/distinfo:1.43      Sat Dec 31 22:21:04 2022
+++ pkgsrc/sysutils/pciutils/distinfo   Sun May  7 10:20:44 2023
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.43 2022/12/31 22:21:04 msaitoh Exp $
+$NetBSD: distinfo,v 1.44 2023/05/07 10:20:44 wiz Exp $
 
-BLAKE2s (pciutils-3.9.0.tar.gz) = e13facf202c1f599579b9fe00b205383c8e4e7cb2323aa330236d3c70d31de06
-SHA512 (pciutils-3.9.0.tar.gz) = 27751eb2c9ea35047f62d6025c8dab6036cb3d18850bfd6e4ab906f7c9eb6cff059ed655155f6400bb16f953d7b520e72bdd8c1fce7a587a756902cc562af87d
-Size (pciutils-3.9.0.tar.gz) = 892972 bytes
-SHA1 (patch-aa) = 769b844cfded02ae6e2ed595247f6d15a1722f8c
+BLAKE2s (pciutils-3.10.0.tar.gz) = 9a6ce37e5d34f505da98a98bce794ba0c664ad2a6014edf38970baefea7fb191
+SHA512 (pciutils-3.10.0.tar.gz) = eba9963910854bf7bb2388ed9ea2ff574f3ff710d9cbd42e7763836bea9dfd84ee8839c6a0f1354b56319ba171787a2c55035750154428ae70cab51c0001736e
+Size (pciutils-3.10.0.tar.gz) = 916996 bytes
+SHA1 (patch-aa) = bd5098a2774c2c879f89eef1c574e7c57963e4c3
 SHA1 (patch-ab) = 55e799d9db8206868540e55feefc47cde1c0ddfc
 SHA1 (patch-ac) = 83fd2d79a7a4a05593ccd69b9d1f38e6ec4763c8
 SHA1 (patch-lib_i386-io-sunos.h) = 4917244d39b48d38b8173cf3031281ad1c7fec24
-SHA1 (patch-lib_internal.h) = e326bff29cc546bce2e29b465e220321084e8d93
+SHA1 (patch-lib_internal.h) = 65c32cf803ba52220c0e9eb574041e35241de674

Index: pkgsrc/sysutils/pciutils/patches/patch-aa
diff -u pkgsrc/sysutils/pciutils/patches/patch-aa:1.29 pkgsrc/sysutils/pciutils/patches/patch-aa:1.30
--- pkgsrc/sysutils/pciutils/patches/patch-aa:1.29      Sat Dec 31 22:21:04 2022
+++ pkgsrc/sysutils/pciutils/patches/patch-aa   Sun May  7 10:20:44 2023
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.29 2022/12/31 22:21:04 msaitoh Exp $
+$NetBSD: patch-aa,v 1.30 2023/05/07 10:20:44 wiz Exp $
 
 Adapt the Makefile to make it compliant with pkgsrc.
 
---- Makefile.orig      2022-11-20 20:58:03.000000000 +0900
-+++ Makefile   2022-12-31 20:13:26.593864823 +0900
+--- Makefile.orig      2023-05-01 12:59:54.000000000 +0000
++++ Makefile
 @@ -1,8 +1,7 @@
  # Makefile for The PCI Utilities
- # (c) 1998--2022 Martin Mares <mj%ucw.cz@localhost>
+ # (c) 1998--2023 Martin Mares <mj%ucw.cz@localhost>
  
 -OPT=-O2
 -CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
 +CFLAGS=-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
  
- VERSION=3.9.0
- DATE=2022-11-20
+ VERSION=3.10.0
+ DATE=2023-05-01
 @@ -13,7 +12,7 @@ RELEASE=
  CROSS_COMPILE=
  
@@ -23,44 +23,7 @@ Adapt the Makefile to make it compliant 
  
  # Support for resolving ID's by DNS (yes/no, default: detect)
  DNS=
-@@ -32,25 +31,25 @@ HWDB=
- ABI_VERSION=3
- 
- # Installation directories
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- BINDIR=$(PREFIX)/bin
- SBINDIR=$(PREFIX)/sbin
--SHAREDIR=$(PREFIX)/share
-+SHAREDIR=$(PREFIX)/share/pciutils
- IDSDIR=$(SHAREDIR)
--MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
- INCDIR=$(PREFIX)/include
-+MANDIR=$(PREFIX)/$(PKGMANDIR)
- LIBDIR=$(PREFIX)/lib
- PKGCFDIR=$(LIBDIR)/pkgconfig
- 
- # Commands
--INSTALL=install
--DIRINSTALL=install -d
--STRIP=-s
--ifdef CROSS_COMPILE
--CC=$(CROSS_COMPILE)gcc
--else
--CC=cc
--endif
-+#INSTALL=install
-+#DIRINSTALL=install -d
-+#STRIP=-s
-+#ifdef CROSS_COMPILE
-+#CC=$(CROSS_COMPILE)gcc
-+#else
-+#CC=cc
-+#endif
- AR=$(CROSS_COMPILE)ar
- RANLIB=$(CROSS_COMPILE)ranlib
- DLLTOOL=$(CROSS_COMPILE)dlltool
-@@ -147,18 +146,21 @@ distclean: clean
+@@ -148,18 +147,21 @@ distclean: clean
  
  install: all
  # -c is ignored on Linux, but required on FreeBSD
@@ -94,7 +57,7 @@ Adapt the Makefile to make it compliant 
  ifeq ($(SHARED),yes)
  ifeq ($(LIBEXT),dylib)
        ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).$(ABI_VERSION).$(LIBEXT)
-@@ -172,19 +174,14 @@ install: install-pcilib
+@@ -173,19 +175,14 @@ install: install-pcilib
  endif
  
  install-pcilib: lib/$(PCILIB)

Index: pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h
diff -u pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h:1.2 pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h:1.3
--- pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h:1.2   Sat May 14 16:47:48 2022
+++ pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h       Sun May  7 10:20:44 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_internal.h,v 1.2 2022/05/14 16:47:48 jperkin Exp $
+$NetBSD: patch-lib_internal.h,v 1.3 2023/05/07 10:20:44 wiz Exp $
 
 no symbol versioning available on SunOS
 
---- lib/internal.h.orig        2020-05-26 16:11:35.000000000 +0000
+--- lib/internal.h.orig        2023-03-05 13:45:24.000000000 +0000
 +++ lib/internal.h
 @@ -18,6 +18,17 @@
- #define STATIC_ALIAS(_decl, _for) _decl PCI_ABI { return _for; }
+ #define STATIC_ALIAS(_decl, _for) _decl VERSIONED_ABI { return _for; }
  #define DEFINE_ALIAS(_decl, _for)
  #define SYMBOL_VERSION(_int, _ext)
 +#elif defined(__sun__)
@@ -21,4 +21,4 @@ no symbol versioning available on SunOS
 +#define pci_filter_match_v38 pci_filter_match
  #else
  #define STATIC_ALIAS(_decl, _for)
- #define DEFINE_ALIAS(_decl, _for) extern _decl __attribute__((alias(#_for)))
+ #define DEFINE_ALIAS(_decl, _for) extern _decl __attribute__((alias(#_for))) VERSIONED_ABI