Accepting request 790797 from home:pluskalm:branches:Base:System

- Update to version 3.6.4:
  * A new back-end for the GNU Hurd was contributed by Joan Lledó.
  * When printing VPD item identifiers, non-ASCII characters are escaped.
- Changes for version 3.6.3
  * `lspci -t' (tree mode) can be combined with `-s' to show a sub-tree.
    We also fixed potential buffer overflows in the tree dumper.
  * Cleaned messy code for dumping of I/O, memory, and ROM regions.
    This helped fixing a bug, which caused some 64-bit regions to be
    reported as virtual. All flags are now printed after the address
    (previously, "[virtual]" and "[enhanced]" were before it for no good
    reason).
  * Added pci_find_cap_nr() to the library, which handles capabilities
    which occur multiple times in a single device.
  * Minor improvements in printing of PCIe capabilities.
  * We now decode the Multicast and Secondary PCI Express extended
    capabilities.
  * The list of capability names available to setpci was updated.
  * Minor bugs were fixed in FreeBSD and Solaris ports.
  * We now prefer HTTPS URLs in all documentation
  * The pci.ids file has a man page.
  * As usually, updated pci.ids to the current snapshot of the database.
- Drop no longer relevant pciutils-3.2.0_update-dist.patch
- Do not ship update-pciids script - they are provided via hwdata
  package and we dont want to override data by other packages

OBS-URL: https://build.opensuse.org/request/show/790797
OBS-URL: https://build.opensuse.org/package/show/Base:System/pciutils?expand=0&rev=70

pciutils-3.1.9_pkgconfig.patch

@@ -1,7 +1,7 @@
-Index: pciutils-3.3.1/lib/libpci.pc.in
+Index: pciutils-3.6.4/lib/libpci.pc.in
 ===================================================================
---- pciutils-3.3.1.orig/lib/libpci.pc.in
+--- pciutils-3.6.4.orig/lib/libpci.pc.in
-+++ pciutils-3.3.1/lib/libpci.pc.in
++++ pciutils-3.6.4/lib/libpci.pc.in
 @@ -6,6 +6,5 @@ idsdir=@IDSDIR@
  Name: libpci
  Description: libpci

pciutils-3.2.0_update-dist.patch

@@ -1,40 +0,0 @@
-Index: pciutils-3.3.1/Makefile
-===================================================================
---- pciutils-3.3.1.orig/Makefile
-+++ pciutils-3.3.1/Makefile
-@@ -88,7 +88,7 @@ lspci: LDLIBS+=$(LIBKMOD_LIBS)
- ls-kernel.o: CFLAGS+=$(LIBKMOD_CFLAGS)
- 
- update-pciids: update-pciids.sh
--	sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/$(PCI_IDS)@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@"
-+	sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/pci.ids.d/pci.ids.dist@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=@"
- 	chmod +x $@
- 
- # The example of use of libpci
-Index: pciutils-3.3.1/update-pciids.sh
-===================================================================
---- pciutils-3.3.1.orig/update-pciids.sh
-+++ pciutils-3.3.1/update-pciids.sh
-@@ -4,7 +4,7 @@
- 
- set -e
- SRC="http://pci-ids.ucw.cz/v2.2/pci.ids"
--DEST=pci.ids
-+DEST=pci.ids.d/pci.ids.dist
- PCI_COMPRESSED_IDS=
- GREP=grep
- 
-@@ -66,6 +66,13 @@ fi
- mv $DEST.neww $DEST
- rm $DEST.new
- 
-+if [ -x /usr/bin/merge-pciids -a -x /usr/bin/perl ]; then
-+	merge-pciids
-+else
-+	echo "WARNING: merge-pciids or perl missing"
-+	cp -p $DEST /usr/share/pci.ids
-+fi
-+
- # Older versions did not compress the ids file, so let's make sure we
- # clean that up.
- if [ ${DEST%.gz} != ${DEST} ] ; then

pciutils-3.6.2.tar.sign

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEVVj5OZzXg2hQVTxuwo54R+1w+C0FAltwE0wACgkQwo54R+1w
-+C0FLRAAwqUFV6buopIPK851Tt7ahHGa3TMO/4H0BVuXqPhLF3e+TalfOICxIFKN
-8LiR4shIL6hIi+M0mkyhx7L8qgfDdQZLBcfbXUigxJsF6VspZG3SFRSVJ4NdpudO
-+D2nzKOOYuy1/WwzEB8z2ixe43Fr6jC37iS52/NpLQnov/kvDox17a4KfBOossf3
-HBlWl7ZKpzeqnHR13gbti3Mk/F2e/TCwT+HFkZQnVp79KBKakSi1hrbVFZ3Uqs45
-6mlApnKRnWWQzmco6XSoPRLs1xF32iysxnteGZ5ySgRlwkyOEIj7l7krGEo2mUpv
-M4GHAa6FEHfaVKwozo2VHrCYKacaBnonwYmlPuV2ra8aaCGer7gJbWH8RSv3k7OR
-iVDnhXeKrg+XUapHkFrVrYW4w1iKbYKSVGoB17lalHnF7eEK+NgaFq6lzTM5NnN3
-ifJbDQyYnXu1Rwnx0XZi4rBdwiNRrZGFGuBMGYARn4wSK8czayPbHWSh9GTt6hHu
-7SLzuNaVQSIPclA4ozqTBCjmXNcxfDvkGNAARmHzHKi2u3ELV15k4fVfC5fUliJa
-zYEgbyk83+VTH0vALDxRFx5hqscC9c5tAwC2iqXBp985DvYBI+hqLwjTI0at2nvv
-eCoLDzNdPsFDxxg101cnRY/8RCWrPjaC8ZmCUAxZHzWHU/7nszE=
-=u7Rk
------END PGP SIGNATURE-----

pciutils-3.6.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db452ec986edefd88af0d222d22f6102f8030a8633fdfe846c3ae4bde9bb93f3
-size 344492

pciutils-3.6.4.tar.sign

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEVVj5OZzXg2hQVTxuwo54R+1w+C0FAl4sm/cACgkQwo54R+1w
++C3vPw/+Lp9JTy/YaNJxLnSo4BNbvzj51FSpg1sYOeOEDszkYfdT6jcNnslzhM8A
+K9xf9N9Wpx/R2pBVtcj9aZexZQKTdiBWCVZQ9WE3tTof0jjkOFNwQZqn28ybP3Sm
+d/ARKF9YNNS9Vh1kGQZRc2vrSu+vke70EMU4BT6V4QQJw9ZiMbxsTuloa3TOkf4h
+Ae0K8KZTm5BcMlQYUq6cfRu4PlOddD8FhUL+zHwc2LHjgxlHCzsXdk9aSLIvAZNp
+D7q1bS0i6dPyxPoclqgXrZRFPcpX9Z7FemkzD74sqZZ1oD8+zBxyRRnnRXBm1Aad
+3VhDomxwSuT43ynyTno9frZTY1NSeUG7MiSGOFqxdbpah9po7ThOtACFX4Ib6Dyu
+aZDPD+1FEayityh7W499Gic/tYNHmGbct0e5kO3sTzFPxKwgdu5NvnyQts9I4oHK
+7GAWYT02u9NxuZVHpLr0goZwHHjc2akbJIkO8R6inm0I+QBlj55IZsi46w9qokDX
+c9mvyGm/AahI02fHdjMcgxVDDQhlCqvZmDd9lqKKJIG8VWA/AtMgLVL06h36ohqG
+H3RNo0JWpklKknFbE8p/iVjQ8m4pmXsRg9hIj8OPOsgdUiXTmGFdsMk6iSgm5gyp
+vtqhO0H87SrdXz6T0t4z2VUTPtD62KRDGrhHaotgJL/6W8w/v/Q=
+=2aKb
+-----END PGP SIGNATURE-----

pciutils-3.6.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f67ff732976e2db2a5ccdf3960020796526ba6b05f6b1cdd24b7b206af706055
+size 362528

pciutils-endianh.patch

@@ -1,6 +1,8 @@
---- a/lib/sysdep.h	2014-11-18 14:27:01.054393822 +0100
+Index: pciutils-3.6.4/lib/sysdep.h
-+++ b/lib/sysdep.h	2014-11-18 14:28:43.420561080 +0100
+===================================================================
-@@ -18,93 +18,8 @@
+--- pciutils-3.6.4.orig/lib/sysdep.h
++++ pciutils-3.6.4/lib/sysdep.h
+@@ -20,93 +20,8 @@
  typedef u8 byte;
  typedef u16 word;
  
@@ -94,7 +96,7 @@
 -#endif
 -
 -#endif
-+#define cpu_to_le16 htole16                                                   
++#define cpu_to_le16 htole16
-+#define cpu_to_le32 htole32                                                   
++#define cpu_to_le32 htole32
-+#define le16_to_cpu le16toh                                                   
++#define le16_to_cpu le16toh
 +#define le32_to_cpu le32toh

pciutils-ocloexec.patch

@@ -1,7 +1,7 @@
-Index: pciutils-3.4.0/lib/dump.c
+Index: pciutils-3.6.4/lib/dump.c
 ===================================================================
---- pciutils-3.4.0.orig/lib/dump.c
+--- pciutils-3.6.4.orig/lib/dump.c
-+++ pciutils-3.4.0/lib/dump.c
++++ pciutils-3.6.4/lib/dump.c
 @@ -64,7 +64,7 @@ dump_init(struct pci_access *a)
  
    if (!name)
@@ -11,10 +11,10 @@ Index: pciutils-3.4.0/lib/dump.c
      a->error("dump: Cannot open %s: %s", name, strerror(errno));
    while (fgets(buf, sizeof(buf)-1, f))
      {
-Index: pciutils-3.4.0/lib/names-cache.c
+Index: pciutils-3.6.4/lib/names-cache.c
 ===================================================================
---- pciutils-3.4.0.orig/lib/names-cache.c
+--- pciutils-3.6.4.orig/lib/names-cache.c
-+++ pciutils-3.4.0/lib/names-cache.c
++++ pciutils-3.6.4/lib/names-cache.c
 @@ -63,7 +63,7 @@ pci_id_cache_load(struct pci_access *a,
        return 0;
      }
@@ -33,10 +33,10 @@ Index: pciutils-3.4.0/lib/names-cache.c
    if (!f)
      {
        a->warning("Cannot write to %s: %s", name, strerror(errno));
-Index: pciutils-3.4.0/lib/names-parse.c
+Index: pciutils-3.6.4/lib/names-parse.c
 ===================================================================
---- pciutils-3.4.0.orig/lib/names-parse.c
+--- pciutils-3.6.4.orig/lib/names-parse.c
-+++ pciutils-3.4.0/lib/names-parse.c
++++ pciutils-3.6.4/lib/names-parse.c
 @@ -52,7 +52,7 @@ static pci_file pci_open(struct pci_acce
  typedef FILE * pci_file;
  #define pci_gets(f, l, s)	fgets(l, s, f)
@@ -46,10 +46,10 @@ Index: pciutils-3.4.0/lib/names-parse.c
  #define pci_close(f)		fclose(f)
  #define PCI_ERROR(f, err)	if (!err && ferror(f))	err = "I/O error";
  #endif
-Index: pciutils-3.4.0/lib/proc.c
+Index: pciutils-3.6.4/lib/proc.c
 ===================================================================
---- pciutils-3.4.0.orig/lib/proc.c
+--- pciutils-3.6.4.orig/lib/proc.c
-+++ pciutils-3.4.0/lib/proc.c
++++ pciutils-3.6.4/lib/proc.c
 @@ -62,7 +62,7 @@ proc_scan(struct pci_access *a)
  
    if (snprintf(buf, sizeof(buf), "%s/devices", pci_get_param(a, "proc.path")) == sizeof(buf))
@@ -77,10 +77,10 @@ Index: pciutils-3.4.0/lib/proc.c
  	}
        if (a->fd < 0)
  	a->warning("Cannot open %s", buf);
-Index: pciutils-3.4.0/lib/sysfs.c
+Index: pciutils-3.6.4/lib/sysfs.c
 ===================================================================
---- pciutils-3.4.0.orig/lib/sysfs.c
+--- pciutils-3.6.4.orig/lib/sysfs.c
-+++ pciutils-3.4.0/lib/sysfs.c
++++ pciutils-3.6.4/lib/sysfs.c
 @@ -96,7 +96,7 @@ sysfs_get_string(struct pci_dev *d, char
    void (*warn)(char *msg, ...) = (mandatory ? a->error : a->warning);
  
@@ -90,7 +90,7 @@ Index: pciutils-3.4.0/lib/sysfs.c
    if (fd < 0)
      {
        if (mandatory || errno != ENOENT)
-@@ -139,7 +139,7 @@ sysfs_get_resources(struct pci_dev *d)
+@@ -157,7 +157,7 @@ sysfs_get_resources(struct pci_dev *d)
    int i;
  
    sysfs_obj_name(d, "resource", namebuf);
@@ -99,7 +99,7 @@ Index: pciutils-3.4.0/lib/sysfs.c
    if (!file)
      a->error("Cannot open %s: %s", namebuf, strerror(errno));
    for (i = 0; i < 7; i++)
-@@ -245,7 +245,7 @@ sysfs_fill_slots(struct pci_access *a)
+@@ -271,7 +271,7 @@ sysfs_fill_slots(struct pci_access *a)
        n = snprintf(namebuf, OBJNAMELEN, "%s/%s/%s", dirname, entry->d_name, "address");
        if (n < 0 || n >= OBJNAMELEN)
  	a->error("File name too long");
@@ -108,7 +108,7 @@ Index: pciutils-3.4.0/lib/sysfs.c
        /*
         * Old versions of Linux had a fakephp which didn't have an 'address'
         * file.  There's no useful information to be gleaned from these
-@@ -331,7 +331,7 @@ sysfs_setup(struct pci_dev *d, int inten
+@@ -367,7 +367,7 @@ sysfs_setup(struct pci_dev *d, int inten
        if (a->fd_vpd < 0)
  	{
  	  sysfs_obj_name(d, "vpd", namebuf);
@@ -117,7 +117,7 @@ Index: pciutils-3.4.0/lib/sysfs.c
  	  /* No warning on error; vpd may be absent or accessible only to root */
  	}
        return a->fd_vpd;
-@@ -341,7 +341,7 @@ sysfs_setup(struct pci_dev *d, int inten
+@@ -377,7 +377,7 @@ sysfs_setup(struct pci_dev *d, int inten
      {
        sysfs_obj_name(d, "config", namebuf);
        a->fd_rw = a->writeable || intent == SETUP_WRITE_CONFIG;

pciutils.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Thu Apr  2 07:38:52 UTC 2020 - Martin Pluskal <mpluskal@suse.com>
+
+- Update to version 3.6.4:
+  * A new back-end for the GNU Hurd was contributed by Joan Lledó.
+  * When printing VPD item identifiers, non-ASCII characters are escaped.
+- Changes for version 3.6.3
+  * `lspci -t' (tree mode) can be combined with `-s' to show a sub-tree.
+    We also fixed potential buffer overflows in the tree dumper.
+  * Cleaned messy code for dumping of I/O, memory, and ROM regions.
+    This helped fixing a bug, which caused some 64-bit regions to be
+    reported as virtual. All flags are now printed after the address
+    (previously, "[virtual]" and "[enhanced]" were before it for no good
+    reason).
+  * Added pci_find_cap_nr() to the library, which handles capabilities
+    which occur multiple times in a single device.
+  * Minor improvements in printing of PCIe capabilities.
+  * We now decode the Multicast and Secondary PCI Express extended
+    capabilities.
+  * The list of capability names available to setpci was updated.
+  * Minor bugs were fixed in FreeBSD and Solaris ports.
+  * We now prefer HTTPS URLs in all documentation
+  * The pci.ids file has a man page.
+  * As usually, updated pci.ids to the current snapshot of the database.
+- Drop no longer relevant pciutils-3.2.0_update-dist.patch
+- Do not ship update-pciids script - they are provided via hwdata
+  package and we dont want to override data by other packages
+
 -------------------------------------------------------------------
 Thu Feb 28 08:21:59 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
 

pciutils.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pciutils
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %define lname   libpci3
 Name:           pciutils
-Version:        3.6.2
+Version:        3.6.4
 Release:        0
 Summary:        PCI utilities for the Linux Kernel
 License:        GPL-2.0-or-later
@@ -27,7 +27,6 @@ URL:            https://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 Source:         https://www.kernel.org/pub/software/utils/%{name}/%{name}-%{version}.tar.xz
 Source1:        https://www.kernel.org/pub/software/utils/%{name}/%{name}-%{version}.tar.sign
 Source2:        baselibs.conf
-Patch0:         pciutils-3.2.0_update-dist.patch
 Patch1:         pciutils-3.1.9_pkgconfig.patch
 Patch2:         pciutils-ocloexec.patch
 Patch3:         pciutils-endianh.patch
@@ -64,14 +63,10 @@ This package contains the files that are necessary for software
 development using the PCI utilities.
 
 %prep
-%setup -q
+%autosetup -p1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
-make %{?_smp_mflags} OPT="%{optflags}" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes"
+%make_build OPT="%{optflags}" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes"
 
 %install
 make install PREFIX=%{buildroot}%{_prefix} SBINDIR=%{buildroot}/sbin \
@@ -91,11 +86,12 @@ ln -sf /%{_lib}/libpci.so.3 %{buildroot}%{_libdir}/libpci.so
 %doc README
 /sbin/lspci
 /sbin/setpci
-/sbin/update-pciids
+%exclude /sbin/update-pciids
 %{_mandir}/man7/pcilib.7%{?ext_man}
 %{_mandir}/man8/lspci.8%{?ext_man}
 %{_mandir}/man8/setpci.8%{?ext_man}
-%{_mandir}/man8/update-pciids.8%{?ext_man}
+%exclude %{_mandir}/man8/update-pciids.8%{?ext_man}
+%{_mandir}/man5/pci.ids.5%{?ext_man}
 
 %files -n %{lname}
 /%{_lib}/libpci.so.*