CVS commit: pkgsrc/sysutils/pciutils

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/pciutils
From: "SAITOH Masanobu" <msaitoh%netbsd.org@localhost>
Date: Sat, 31 Dec 2022 22:21:04 +0000

Module Name:    pkgsrc
Committed By:   msaitoh
Date:           Sat Dec 31 22:21:04 UTC 2022

Modified Files:
        pkgsrc/sysutils/pciutils: Makefile distinfo
        pkgsrc/sysutils/pciutils/patches: patch-aa patch-ab
Removed Files:
        pkgsrc/sysutils/pciutils/patches: patch-lib_filter.c

Log Message:
pciutils: Update to 3.9.0.

2022-11-20  Martin Mares <mj%ucw.cz@localhost>

        * Released as 3.9.0.

        * We decode Compute Express Link (CXL) capabilities.

        * The tree mode of lspci is now compatible with filtering options.

        * When setpci is used with a named register, it checks whether
          the register is present in the particular header type.

        * Linux: The intel-conf[12] back-ends prefer to use ioperm() instead
          of iopl() to gain access to I/O ports.

        * Windows: We have two new back-ends thanks to Pali Rohár.
          One uses the NT SysDbg interface, the other uses kldbgdrv.sys
          (which is a part of the Microsoft WinDbg tool).

        * Windows: We support building libpci as a DLL. Also, Windows
          binaries now include meta-data with version.

        * Hurd: The Hurd back-end works again.

        * mmio-conf1(-ext): Added a new back-end implementing the intel-conf1
          interface over MMIO. This is useful on some ARM machines, but it
          requires manual configuration of the MMIO addresses.

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


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/sysutils/pciutils/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/sysutils/pciutils/distinfo
cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/pciutils/patches/patch-aa
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/pciutils/patches/patch-ab
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/pciutils/patches/patch-lib_filter.c

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.51 pkgsrc/sysutils/pciutils/Makefile:1.52
--- pkgsrc/sysutils/pciutils/Makefile:1.51      Mon Jul 25 11:12:28 2022
+++ pkgsrc/sysutils/pciutils/Makefile   Sat Dec 31 22:21:04 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2022/07/25 11:12:28 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2022/12/31 22:21:04 msaitoh Exp $
 
-DISTNAME=      pciutils-3.8.0
+DISTNAME=      pciutils-3.9.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.42 pkgsrc/sysutils/pciutils/distinfo:1.43
--- pkgsrc/sysutils/pciutils/distinfo:1.42      Sat May 14 16:47:48 2022
+++ pkgsrc/sysutils/pciutils/distinfo   Sat Dec 31 22:21:04 2022
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.42 2022/05/14 16:47:48 jperkin Exp $
+$NetBSD: distinfo,v 1.43 2022/12/31 22:21:04 msaitoh Exp $
 
-BLAKE2s (pciutils-3.8.0.tar.gz) = ed9638a759d045122ae4b466582fa4a763d930ed8de71e59519e1f7370249d51
-SHA512 (pciutils-3.8.0.tar.gz) = 49b8ccc87cc82326744de7f0306c0245a5bb87740d3e96b18378cc07477ca176bd3ffaf699bfe9954d61381c57f65aa703c07fa6406fe2be289917dc1715600d
-Size (pciutils-3.8.0.tar.gz) = 564686 bytes
-SHA1 (patch-aa) = 9d852153dbad858a68b1f3503a98578d48cbcf4d
-SHA1 (patch-ab) = 01ed933aa91fd71b37e73899be816894ef4e3d8f
+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
+SHA1 (patch-ab) = 55e799d9db8206868540e55feefc47cde1c0ddfc
 SHA1 (patch-ac) = 83fd2d79a7a4a05593ccd69b9d1f38e6ec4763c8
-SHA1 (patch-lib_filter.c) = 60ab18c9cd4f9850f500f11fe837006bef93ed3a
 SHA1 (patch-lib_i386-io-sunos.h) = 4917244d39b48d38b8173cf3031281ad1c7fec24
 SHA1 (patch-lib_internal.h) = e326bff29cc546bce2e29b465e220321084e8d93

Index: pkgsrc/sysutils/pciutils/patches/patch-aa
diff -u pkgsrc/sysutils/pciutils/patches/patch-aa:1.28 pkgsrc/sysutils/pciutils/patches/patch-aa:1.29
--- pkgsrc/sysutils/pciutils/patches/patch-aa:1.28      Fri May 13 11:41:57 2022
+++ pkgsrc/sysutils/pciutils/patches/patch-aa   Sat Dec 31 22:21:04 2022
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.28 2022/05/13 11:41:57 wiz Exp $
+$NetBSD: patch-aa,v 1.29 2022/12/31 22:21:04 msaitoh Exp $
 
 Adapt the Makefile to make it compliant with pkgsrc.
 
---- Makefile.orig      2022-04-18 16:47:28.000000000 +0000
-+++ Makefile
+--- Makefile.orig      2022-11-20 20:58:03.000000000 +0900
++++ Makefile   2022-12-31 20:13:26.593864823 +0900
 @@ -1,8 +1,7 @@
  # Makefile for The PCI Utilities
  # (c) 1998--2022 Martin Mares <mj%ucw.cz@localhost>
@@ -12,8 +12,8 @@ Adapt the Makefile to make it compliant 
 -CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
 +CFLAGS=-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
  
- VERSION=3.8.0
- DATE=2022-04-18
+ VERSION=3.9.0
+ DATE=2022-11-20
 @@ -13,7 +12,7 @@ RELEASE=
  CROSS_COMPILE=
  
@@ -24,7 +24,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
+ ABI_VERSION=3
  
  # Installation directories
 -PREFIX=/usr/local
@@ -59,16 +59,20 @@ Adapt the Makefile to make it compliant 
 +#endif
  AR=$(CROSS_COMPILE)ar
  RANLIB=$(CROSS_COMPILE)ranlib
- 
-@@ -130,14 +129,21 @@ distclean: clean
+ DLLTOOL=$(CROSS_COMPILE)dlltool
+@@ -147,18 +146,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
+-      $(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
@@ -89,13 +93,19 @@ Adapt the Makefile to make it compliant 
 +      $(BSD_INSTALL_MAN) pci.ids.5 $(DESTDIR)$(MANDIR)/man5
  ifeq ($(SHARED),yes)
  ifeq ($(LIBEXT),dylib)
-       ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME)$(ABI_VERSION).$(LIBEXT)
-@@ -151,13 +157,14 @@ install: install-pcilib
+       ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).$(ABI_VERSION).$(LIBEXT)
+@@ -172,19 +174,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)
  
@@ -107,6 +117,6 @@ Adapt the Makefile to make it compliant 
 +      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PKGCFDIR)
 +      $(BSD_INSTALL_DATA) $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci
 +      $(BSD_INSTALL_DATA) lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR)
- ifeq ($(SHARED),yes)
- ifeq ($(LIBEXT),dylib)
-       ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME)$(ABI_VERSION).$(LIBEXT)
+ ifneq ($(PCIIMPLIB),$(PCILIB))
+       $(INSTALL) -c -m 644 lib/$(PCIIMPLIB) $(DESTDIR)$(LIBDIR)
+ endif

Index: pkgsrc/sysutils/pciutils/patches/patch-ab
diff -u pkgsrc/sysutils/pciutils/patches/patch-ab:1.6 pkgsrc/sysutils/pciutils/patches/patch-ab:1.7
--- pkgsrc/sysutils/pciutils/patches/patch-ab:1.6       Fri May 13 23:50:46 2022
+++ pkgsrc/sysutils/pciutils/patches/patch-ab   Sat Dec 31 22:21:04 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.6 2022/05/13 23:50:46 tnn Exp $
+$NetBSD: patch-ab,v 1.7 2022/12/31 22:21:04 msaitoh 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-04-15 21:57:59.000000000 +0000
-+++ lib/configure
-@@ -80,7 +80,6 @@ case $sys in
+--- 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
                                                ;;
                esac
                echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
@@ -13,12 +13,12 @@ But that breaks our PLIST so let's not b
                ;;
        sunos)
                case $cpu in
-@@ -301,7 +300,7 @@ else
-               echo >>$m 'SONAME=-Wl,-soname,$(LIBNAME).$(LIBEXT)$(ABI_VERSION)'
+@@ -321,7 +320,7 @@ else
+               echo >>$m 'PCILIB_LDFLAGS+=-Wl,--exclude-all-symbols'
        fi
  fi
 -echo >>$m 'PCILIBPC=$(LIBNAME).pc'
 +echo >>$m 'PCILIBPC=libpci.pc'
  
- echo >>$c "#define PCILIB_VERSION \"$VERSION\""
- sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >>$m
+ if [ "$SHARED" != no ] && [ "$LIBEXT" = dll ]; then
+       echo >>$m 'PCIIMPLIB=$(PCILIB).a'

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/x11/py-sip6
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/x11/py-sip6
Indexes:

Home | Main Index | Thread Index | Old Index