CVS commit: pkgsrc/sysutils/pciutils

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Fri Feb 28 23:21:14 UTC 2025

Modified Files:
        pkgsrc/sysutils/pciutils: Makefile distinfo
        pkgsrc/sysutils/pciutils/patches: patch-lib_internal.h
Added Files:
        pkgsrc/sysutils/pciutils/patches: patch-Makefile patch-lib_configure
            patch-lib_libpci.pc.in
Removed Files:
        pkgsrc/sysutils/pciutils/patches: patch-aa patch-ab patch-ac

Log Message:
sysutils/pciutils: update to 3.13.0

2024-05-30  Martin Mares <mj%ucw.cz@localhost>
        * Released as 3.13.0.
        * lspci decodes CXL 1.1 device link status information.
          This requires a recent kernel which exports rcd_* atributes via
          sysfs.
        * Further development of the pcilmr (the link margining utility)
        * Dump parsing supports 6-digit domain numbers.
        * Bug fixes in PCIe link state reporting.
        * Decode more fields in PCIe AER capability.
        * Fixed build on Linux systems with musl libc.
        * Updated pci.ids.

2024-04-05  Martin Mares <mj%ucw.cz@localhost>
        * Released as 3.12.0.
        * lspci decodes the IDE (Integrity & Data Encryption) and TEE-IO
          extended capabilities.
        * Several bugs in back-ends for Windows were fixed and the
          README.Windows updated.
        * Fixed building on Haiku.
        * We now use more C99 features.
        * Optimization flags used for compiling individual object files
          should be the same as optimization flags for linking the final
          executable to make link-time optimization possible.
        * We no longer look up subsystems in the HWDB, because there is
          no API for querying only the subsystem. The lookup we used
          previously returned a device name if there was no entry for
          the particular subsystem.
        * Updated pci.ids.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/sysutils/pciutils/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/sysutils/pciutils/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/pciutils/patches/patch-Makefile \
    pkgsrc/sysutils/pciutils/patches/patch-lib_configure \
    pkgsrc/sysutils/pciutils/patches/patch-lib_libpci.pc.in
cvs rdiff -u -r1.32 -r0 pkgsrc/sysutils/pciutils/patches/patch-aa
cvs rdiff -u -r1.8 -r0 pkgsrc/sysutils/pciutils/patches/patch-ab
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/pciutils/patches/patch-ac
cvs rdiff -u -r1.4 -r1.5 \
    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.57 pkgsrc/sysutils/pciutils/Makefile:1.58
--- pkgsrc/sysutils/pciutils/Makefile:1.57      Sun Feb 25 15:08:50 2024
+++ pkgsrc/sysutils/pciutils/Makefile   Fri Feb 28 23:21:14 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2024/02/25 15:08:50 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2025/02/28 23:21:14 pin Exp $
 
-DISTNAME=      pciutils-3.11.1
+DISTNAME=      pciutils-3.13.0
 CATEGORIES=    sysutils
 MASTER_SITES+= https://www.kernel.org/pub/software/utils/pciutils/
 

Index: pkgsrc/sysutils/pciutils/distinfo
diff -u pkgsrc/sysutils/pciutils/distinfo:1.46 pkgsrc/sysutils/pciutils/distinfo:1.47
--- pkgsrc/sysutils/pciutils/distinfo:1.46      Sun Feb 25 15:08:50 2024
+++ pkgsrc/sysutils/pciutils/distinfo   Fri Feb 28 23:21:14 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.46 2024/02/25 15:08:50 wiz Exp $
+$NetBSD: distinfo,v 1.47 2025/02/28 23:21:14 pin Exp $
 
-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_internal.h) = a30dc9fb774f5909a73f29bc21dd32637c22abf9
+BLAKE2s (pciutils-3.13.0.tar.gz) = ae334c70141ef9f02b1651fff58159aab9f60169df4dc71e79bfb397f2c3f718
+SHA512 (pciutils-3.13.0.tar.gz) = 39cf4141c87c9a39fb42ec7a2412525f4283c62a1d1aa3533eb92bae4c59d3beb9a2ab1a9fcfe89b1f6cb8f0a011ef2f32fbed3111d357ce43d9569b3d0253d9
+Size (pciutils-3.13.0.tar.gz) = 661455 bytes
+SHA1 (patch-Makefile) = fa08f05d7d1620859248375f34f88a57b2470f8f
+SHA1 (patch-lib_configure) = c1b3c39459addef566d15913a4cca15ad02207c8
+SHA1 (patch-lib_internal.h) = 01464bd143eeb0748497c02cfa78f9eee2505f6c
+SHA1 (patch-lib_libpci.pc.in) = 7b81272b4ba46690da537b7cde23da2dc80dd09a

Index: pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h
diff -u pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h:1.4 pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h:1.5
--- pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h:1.4   Sun Feb 25 15:08:50 2024
+++ pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h       Fri Feb 28 23:21:14 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_internal.h,v 1.4 2024/02/25 15:08:50 wiz Exp $
+$NetBSD: patch-lib_internal.h,v 1.5 2025/02/28 23:21:14 pin Exp $
 
-no symbol versioning available on SunOS
+No symbol versioning available on SunOS.
 
---- lib/internal.h.orig        2024-02-24 19:47:05.000000000 +0000
+--- lib/internal.h.orig        2025-02-28 18:43:48.758232339 +0000
 +++ lib/internal.h
 @@ -23,6 +23,17 @@
  #define STATIC_ALIAS(_decl, _for) VERSIONED_ABI _decl { return _for; }

Added files:

Index: pkgsrc/sysutils/pciutils/patches/patch-Makefile
diff -u /dev/null pkgsrc/sysutils/pciutils/patches/patch-Makefile:1.1
--- /dev/null   Fri Feb 28 23:21:14 2025
+++ pkgsrc/sysutils/pciutils/patches/patch-Makefile     Fri Feb 28 23:21:14 2025
@@ -0,0 +1,37 @@
+$NetBSD: patch-Makefile,v 1.1 2025/02/28 23:21:14 pin Exp $
+
+Adapt the Makefile to make it compliant with pkgsrc.
+
+--- Makefile.orig      2025-02-28 18:38:40.671186310 +0000
++++ Makefile
+@@ -1,8 +1,7 @@
+ # Makefile for The PCI Utilities
+ # (c) 1998--2024 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.13.0
+ DATE=2024-05-30
+@@ -13,7 +12,7 @@ RELEASE=
+ CROSS_COMPILE=
+ 
+ # Support for compressed pci.ids (yes/no, default: detect)
+-ZLIB=
++ZLIB=no
+ 
+ # Support for resolving ID's by DNS (yes/no, default: detect)
+ DNS=
+@@ -45,9 +44,9 @@ PKGCFDIR=$(LIBDIR)/pkgconfig
+ # Commands
+ INSTALL=install
+ DIRINSTALL=install -d
+-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
Index: pkgsrc/sysutils/pciutils/patches/patch-lib_configure
diff -u /dev/null pkgsrc/sysutils/pciutils/patches/patch-lib_configure:1.1
--- /dev/null   Fri Feb 28 23:21:14 2025
+++ pkgsrc/sysutils/pciutils/patches/patch-lib_configure        Fri Feb 28 23:21:14 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_configure,v 1.1 2025/02/28 23:21:14 pin 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 2025-02-28 18:40:40.619585843 +0000
++++ lib/configure
+@@ -85,7 +85,6 @@ case $sys in
+                                               ;;
+               esac
+               echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
+-              LSPCIDIR=BINDIR
+               ;;
+       sunos)
+               echo_n " mem-ports ecam"
+@@ -355,7 +354,7 @@ else
+               echo >>$m 'PCILIB_LDFLAGS+=-Wl,--exclude-all-symbols'
+       fi
+ fi
+-echo >>$m 'PCILIBPC=$(LIBNAME).pc'
++echo >>$m 'PCILIBPC=libpci.pc'
+ 
+ if [ "$SHARED" != no ] && [ "$LIBEXT" = dll ]; then
+       echo >>$m 'PCIIMPLIB=$(PCILIB).a'
Index: pkgsrc/sysutils/pciutils/patches/patch-lib_libpci.pc.in
diff -u /dev/null pkgsrc/sysutils/pciutils/patches/patch-lib_libpci.pc.in:1.1
--- /dev/null   Fri Feb 28 23:21:14 2025
+++ pkgsrc/sysutils/pciutils/patches/patch-lib_libpci.pc.in     Fri Feb 28 23:21:14 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_libpci.pc.in,v 1.1 2025/02/28 23:21:14 pin Exp $
+
+Fixing library name, avoid clashes with base system library.
+
+--- lib/libpci.pc.in.orig      2025-02-28 18:42:56.800135886 +0000
++++ lib/libpci.pc.in
+@@ -6,6 +6,6 @@ idsdir=@IDSDIR@
+ Name: libpci
+ Description: libpci
+ Version: @VERSION@
+-Libs: -L${libdir} -lpci
++Libs: -L${libdir} -l@PCIUTILS_LIBNAME@
+ Libs.private: @LDLIBS@ @WITH_LIBS@
+ Cflags: -I${includedir}