kpriv
/
pkgsrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pciutils: update to 3.11.1. 

2024-02-25  Martin Mares <mj@ucw.cz>

	* Released as 3.11.1.

	* Fixed wrong API version in lib/pci.h.

	* Updated README.Windows.

	* Fix compilation on Windows.

2024-02-24  Martin Mares <mj@ucw.cz>

	* Released as 3.11.0.

	* update-pciids now supports XZ compression. If libpci is configured
	  with support for compression, all downloaded files are recompressed
	  as gzip. Otherwise they are stored as plain text.

	* update-pciids now sends itself as the User-Agent.

	* Added a pcilmr utility for PCIe lane margining. Thanks to Nikita
	  Proshkin for contributing it.

	* Re-factored access to i386 ports on all relevant platforms.

	* Added i386 port access on OpenBSD.

	* Back-ends for Windows received many bug fixes and improvements.

	* ECAM back-end now scans ACPI and BIOS memory faster.

	* Linux systems without pread/pwrite are no longer supported
	  as they are hopefully long gone. This helps avoid the tricky check
	  for presence of pread which was found to fail on musl libc.

	* Improved decoding of PCIe control and status registers.

	* Decoding of CXL capabilities now supports up to CXL 3.0.

	* lspci now displays interrupt message numbers consistently across
	  different capabilities.

	* Cache of IDs resolved via DNS, which was located in ~/.pci-ids
	  by default, is now stored according to the XDG base directory
	  specification in $XDG_CACHE_HOME/pci-ids.

	* All source files now have SPDX license identifiers.

	* Internal: The "aux" fields of structs pci_access and pci_dev
	  reserved for use by back-ends were renamed to backend_data to better
	  reflect their meaning.

	* As usually, various minor bug fixes and updated pci.ids.
This commit is contained in:
wiz 2024-02-25 15:08:50 +00:00
parent 142e98bc51
commit 5d5ddc6214
7 changed files with 35 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/pciutils/Makefile
View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.56 2023/08/03 12:27:04 nia Exp $
# $NetBSD: Makefile,v 1.57 2024/02/25 15:08:50 wiz Exp $
DISTNAME= pciutils-3.10.0
DISTNAME= pciutils-3.11.1
CATEGORIES= sysutils
MASTER_SITES+= https://www.kernel.org/pub/software/utils/pciutils/

4
sysutils/pciutils/PLIST
View File

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.8 2022/05/13 11:41:56 wiz Exp $
@comment $NetBSD: PLIST,v 1.9 2024/02/25 15:08:50 wiz Exp $
include/pci/config.h
include/pci/header.h
include/pci/pci.h
@ -10,9 +10,11 @@ lib/pkgconfig/libpci.pc
man/man5/pci.ids.5
man/man7/pcilib.7
man/man8/lspci.8
man/man8/pcilmr.8
man/man8/setpci.8
man/man8/update-pciids.8
sbin/lspci
sbin/pcilmr
sbin/setpci
sbin/update-pciids
share/pciutils/pci.ids

15
sysutils/pciutils/distinfo
View File

@ -1,10 +1,9 @@
$NetBSD: distinfo,v 1.45 2023/05/08 02:06:37 dholland Exp $
$NetBSD: distinfo,v 1.46 2024/02/25 15:08:50 wiz Exp $
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) = a799af372e1aaba879beb84581d7062f0c6e1bba
SHA1 (patch-ab) = 55e799d9db8206868540e55feefc47cde1c0ddfc
BLAKE2s (pciutils-3.11.1.tar.gz) = fe17f09cc891d755bc000fe8b0c5ee3c364ea0c4d6eebbf01d4f56aa4d1f5e33
SHA512 (pciutils-3.11.1.tar.gz) = 357717dd6798c0400e7004492145a7dd380447541bd10d1c49eec49bc33749d8f02ec898f232d2e9e8c2fafeddf8be349fb24b7802f9b7fbd4cb0871fb368fb1
Size (pciutils-3.11.1.tar.gz) = 649147 bytes
SHA1 (patch-aa) = c8c1088e29f45a8ae94612db122e75444c04626e
SHA1 (patch-ab) = 6a2d52e1c4f39115cd17a46da5b304e71c7d75f1
SHA1 (patch-ac) = 83fd2d79a7a4a05593ccd69b9d1f38e6ec4763c8
SHA1 (patch-lib_i386-io-sunos.h) = 4917244d39b48d38b8173cf3031281ad1c7fec24
SHA1 (patch-lib_internal.h) = 65c32cf803ba52220c0e9eb574041e35241de674
SHA1 (patch-lib_internal.h) = a30dc9fb774f5909a73f29bc21dd32637c22abf9

85
sysutils/pciutils/patches/patch-aa
View File

@ -1,19 +1,19 @@
$NetBSD: patch-aa,v 1.31 2023/05/08 02:06:37 dholland Exp $
$NetBSD: patch-aa,v 1.32 2024/02/25 15:08:50 wiz Exp $
Adapt the Makefile to make it compliant with pkgsrc.
--- Makefile.orig 2023-05-01 12:59:54.000000000 +0000
--- Makefile.orig 2024-02-24 23:10:18.000000000 +0000
+++ Makefile
@@ -1,8 +1,7 @@
# Makefile for The PCI Utilities
# (c) 1998--2023 Martin Mares <mj@ucw.cz>
# (c) 1998--2024 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.10.0
DATE=2023-05-01
VERSION=3.11.1
DATE=2024-02-25
@@ -13,7 +12,7 @@ RELEASE=
CROSS_COMPILE=
@ -23,76 +23,15 @@ Adapt the Makefile to make it compliant with pkgsrc.
# Support for resolving ID's by DNS (yes/no, default: detect)
DNS=
@@ -46,10 +45,10 @@ PKGCFDIR=$(LIBDIR)/pkgconfig
@@ -45,9 +44,9 @@ PKGCFDIR=$(LIBDIR)/pkgconfig
# Commands
INSTALL=install
DIRINSTALL=install -d
ifdef CROSS_COMPILE
-STRIP=--strip-program $(CROSS_COMPILE)-strip
+#STRIP=--strip-program $(CROSS_COMPILE)-strip
CC=$(CROSS_COMPILE)gcc
else
-STRIP=-s
+#STRIP=-s
ifdef CROSS_COMPILE
-STRIP+=--strip-program $(CROSS_COMPILE)strip
+#STRIP+=--strip-program $(CROSS_COMPILE)strip
CC=$(CROSS_COMPILE)gcc
else
CC=cc
endif
AR=$(CROSS_COMPILE)ar
@@ -148,18 +147,21 @@ distclean: clean
install: all
# -c is ignored on Linux, but required on FreeBSD
- $(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 update-pciids $(DESTDIR)$(SBINDIR)
-ifneq ($(IDSDIR),)
- $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
-else
- $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(SBINDIR)
-endif
- $(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)$(BINDIR)
+ $(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)$(LSPCIDIR)
+ $(BSD_INSTALL_PROGRAM) setpci $(DESTDIR)$(SBINDIR)
+ $(BSD_INSTALL_SCRIPT) update-pciids $(DESTDIR)$(SBINDIR)
+ $(BSD_INSTALL_DATA) $(PCI_IDS) $(DESTDIR)$(IDSDIR)
+ for fn in lspci.8 setpci.8 update-pciids.8; do \
+ $(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)
@@ -173,19 +175,14 @@ install: install-pcilib
endif
install-pcilib: lib/$(PCILIB)
- $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
-ifeq ($(SHARED)_$(LIBEXT),yes_dll)
-# DLL library must have executable flag on disk and be placed in same directory as where are EXE files
- $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR)
- $(INSTALL) -c -m 755 lib/$(PCILIB) $(DESTDIR)$(SBINDIR)
-else
- $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
-endif
+ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(LIBDIR)
+ $(BSD_INSTALL_LIB) lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
install-lib: $(PCIINC_INS) install-pcilib
- $(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(PKGCFDIR)
- $(INSTALL) -c -m 644 $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci
- $(INSTALL) -c -m 644 lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR)
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INCDIR)/pci
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PKGCFDIR)
+ $(BSD_INSTALL_DATA) $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci
+ $(BSD_INSTALL_DATA) lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR)
ifneq ($(PCIIMPLIB),$(PCILIB))
$(INSTALL) -c -m 644 lib/$(PCIIMPLIB) $(DESTDIR)$(LIBDIR)
endif

12
sysutils/pciutils/patches/patch-ab
View File

@ -1,19 +1,19 @@
$NetBSD: patch-ab,v 1.7 2022/12/31 22:21:04 msaitoh Exp $
$NetBSD: patch-ab,v 1.8 2024/02/25 15:08:50 wiz Exp $
lspci on Linux is unprivileged and wants to go in bin, not sbin.
But that breaks our PLIST so let's not bother with that.
--- lib/configure.orig 2022-11-18 22:15:08.000000000 +0900
+++ lib/configure 2022-11-24 18:48:25.439715651 +0900
@@ -82,7 +82,6 @@ case $sys in
--- lib/configure.orig 2024-02-23 13:56:07.000000000 +0000
+++ lib/configure
@@ -85,7 +85,6 @@ case $sys in
;;
esac
echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
- LSPCIDIR=BINDIR
;;
sunos)
case $cpu in
@@ -321,7 +320,7 @@ else
echo_n " mem-ports ecam"
@@ -352,7 +351,7 @@ else
echo >>$m 'PCILIB_LDFLAGS+=-Wl,--exclude-all-symbols'
fi
fi

55
sysutils/pciutils/patches/patch-lib_i386-io-sunos.h
View File

@ -1,55 +0,0 @@
$NetBSD: patch-lib_i386-io-sunos.h,v 1.2 2021/12/17 20:07:24 maya Exp $
Fix assembly syntax to work with clang.
--- lib/i386-io-sunos.h.orig 2019-02-13 10:05:03.000000000 +0000
+++ lib/i386-io-sunos.h
@@ -27,7 +27,7 @@ static inline u8
inb (u16 port)
{
u8 v;
- __asm__ __volatile__ ("inb (%w1)":"=a" (v):"Nd" (port));
+ __asm__ __volatile__ ("inb %w1":"=a" (v):"Nd" (port));
return v;
}
@@ -35,7 +35,7 @@ static inline u16
inw (u16 port)
{
u16 v;
- __asm__ __volatile__ ("inw (%w1)":"=a" (v):"Nd" (port));
+ __asm__ __volatile__ ("inw %w1":"=a" (v):"Nd" (port));
return v;
}
@@ -43,26 +43,26 @@ static inline u32
inl (u16 port)
{
u32 v;
- __asm__ __volatile__ ("inl (%w1)":"=a" (v):"Nd" (port));
+ __asm__ __volatile__ ("inl %w1":"=a" (v):"Nd" (port));
return v;
}
static inline void
outb (u8 value, u16 port)
{
- __asm__ __volatile__ ("outb (%w1)": :"a" (value), "Nd" (port));
+ __asm__ __volatile__ ("outb %w1": :"a" (value), "Nd" (port));
}
static inline void
outw (u16 value, u16 port)
{
- __asm__ __volatile__ ("outw (%w1)": :"a" (value), "Nd" (port));
+ __asm__ __volatile__ ("outw %w1": :"a" (value), "Nd" (port));
}
static inline void
outl (u32 value, u16 port)
{
- __asm__ __volatile__ ("outl (%w1)": :"a" (value), "Nd" (port));
+ __asm__ __volatile__ ("outl %w1": :"a" (value), "Nd" (port));
}
static inline void intel_io_lock(void)

10
sysutils/pciutils/patches/patch-lib_internal.h
View File

@ -1,11 +1,11 @@
$NetBSD: patch-lib_internal.h,v 1.3 2023/05/07 10:20:44 wiz Exp $
$NetBSD: patch-lib_internal.h,v 1.4 2024/02/25 15:08:50 wiz Exp $
no symbol versioning available on SunOS
--- lib/internal.h.orig 2023-03-05 13:45:24.000000000 +0000
--- lib/internal.h.orig 2024-02-24 19:47:05.000000000 +0000
+++ lib/internal.h
@@ -18,6 +18,17 @@
#define STATIC_ALIAS(_decl, _for) _decl VERSIONED_ABI { return _for; }
@@ -23,6 +23,17 @@
#define STATIC_ALIAS(_decl, _for) VERSIONED_ABI _decl { return _for; }
#define DEFINE_ALIAS(_decl, _for)
#define SYMBOL_VERSION(_int, _ext)
+#elif defined(__sun__)
@ -20,5 +20,5 @@ no symbol versioning available on SunOS
+#define pci_filter_parse_id_v38 pci_filter_parse_id
+#define pci_filter_match_v38 pci_filter_match
#else
#define STATIC_ALIAS(_decl, _for)
#define DEFINE_ALIAS(_decl, _for) extern _decl __attribute__((alias(#_for))) VERSIONED_ABI
#ifdef _WIN32