Accepting request 344299 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/344299
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pciutils?expand=0&rev=52

pciutils-3.3.1.tar.xz

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

pciutils-3.4.0.tar.xz

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

pciutils-ocloexec.patch

@@ -1,7 +1,8 @@
-diff -aur pciutils-3.1.9.orig/lib/dump.c pciutils-3.1.9/lib/dump.c
+Index: pciutils-3.4.0/lib/dump.c
---- pciutils-3.1.9.orig/lib/dump.c	2011-11-14 06:08:39.000000000 -0500
+===================================================================
-+++ pciutils-3.1.9/lib/dump.c	2012-01-28 20:53:40.446518788 -0500
+--- pciutils-3.4.0.orig/lib/dump.c
-@@ -64,7 +64,7 @@
++++ pciutils-3.4.0/lib/dump.c
+@@ -64,7 +64,7 @@ dump_init(struct pci_access *a)
  
    if (!name)
      a->error("dump: File name not given.");
@@ -10,10 +11,11 @@ diff -aur pciutils-3.1.9.orig/lib/dump.c pciutils-3.1.9/lib/dump.c
      a->error("dump: Cannot open %s: %s", name, strerror(errno));
    while (fgets(buf, sizeof(buf)-1, f))
      {
-diff -aur pciutils-3.1.9.orig/lib/names-cache.c pciutils-3.1.9/lib/names-cache.c
+Index: pciutils-3.4.0/lib/names-cache.c
---- pciutils-3.1.9.orig/lib/names-cache.c	2011-01-07 16:04:28.000000000 -0500
+===================================================================
-+++ pciutils-3.1.9/lib/names-cache.c	2012-01-28 20:56:42.181246792 -0500
+--- pciutils-3.4.0.orig/lib/names-cache.c
-@@ -62,7 +62,7 @@
++++ pciutils-3.4.0/lib/names-cache.c
+@@ -63,7 +63,7 @@ pci_id_cache_load(struct pci_access *a,
        return 0;
      }
  
@@ -22,7 +24,7 @@ diff -aur pciutils-3.1.9.orig/lib/names-cache.c pciutils-3.1.9/lib/names-cache.c
    if (!f)
      {
        a->debug("Cache file does not exist\n");
-@@ -135,7 +135,7 @@
+@@ -136,7 +136,7 @@ pci_id_cache_flush(struct pci_access *a)
    tmpname = pci_malloc(a, strlen(name) + strlen(hostname) + 64);
    sprintf(tmpname, "%s.tmp-%s-%d", name, hostname, this_pid);
  
@@ -31,10 +33,11 @@ diff -aur pciutils-3.1.9.orig/lib/names-cache.c pciutils-3.1.9/lib/names-cache.c
    if (!f)
      {
        a->warning("Cannot write to %s: %s", name, strerror(errno));
-diff -aur pciutils-3.1.9.orig/lib/names-parse.c pciutils-3.1.9/lib/names-parse.c
+Index: pciutils-3.4.0/lib/names-parse.c
---- pciutils-3.1.9.orig/lib/names-parse.c	2011-01-07 16:04:28.000000000 -0500
+===================================================================
-+++ pciutils-3.1.9/lib/names-parse.c	2012-01-28 20:56:11.462630829 -0500
+--- pciutils-3.4.0.orig/lib/names-parse.c
-@@ -52,7 +52,7 @@
++++ pciutils-3.4.0/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)
  #define pci_eof(f)		feof(f)
@@ -43,10 +46,11 @@ diff -aur pciutils-3.1.9.orig/lib/names-parse.c pciutils-3.1.9/lib/names-parse.c
  #define pci_close(f)		fclose(f)
  #define PCI_ERROR(f, err)	if (!err && ferror(f))	err = "I/O error";
  #endif
-diff -aur pciutils-3.1.9.orig/lib/proc.c pciutils-3.1.9/lib/proc.c
+Index: pciutils-3.4.0/lib/proc.c
---- pciutils-3.1.9.orig/lib/proc.c	2011-01-07 16:04:28.000000000 -0500
+===================================================================
-+++ pciutils-3.1.9/lib/proc.c	2012-01-28 20:55:32.827113838 -0500
+--- pciutils-3.4.0.orig/lib/proc.c
-@@ -62,7 +62,7 @@
++++ pciutils-3.4.0/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))
      a->error("File name too long");
@@ -55,7 +59,7 @@ diff -aur pciutils-3.1.9.orig/lib/proc.c pciutils-3.1.9/lib/proc.c
    if (!f)
      a->error("Cannot open %s", buf);
    while (fgets(buf, sizeof(buf)-1, f))
-@@ -129,7 +129,7 @@
+@@ -129,7 +129,7 @@ proc_setup(struct pci_dev *d, int rw)
        if (e < 0 || e >= (int) sizeof(buf))
  	a->error("File name too long");
        a->fd_rw = a->writeable || rw;
@@ -64,7 +68,7 @@ diff -aur pciutils-3.1.9.orig/lib/proc.c pciutils-3.1.9/lib/proc.c
        if (a->fd < 0)
  	{
  	  e = snprintf(buf, sizeof(buf), "%s/%04x:%02x/%02x.%d",
-@@ -137,7 +137,7 @@
+@@ -137,7 +137,7 @@ proc_setup(struct pci_dev *d, int rw)
  		       d->domain, d->bus, d->dev, d->func);
  	  if (e < 0 || e >= (int) sizeof(buf))
  	    a->error("File name too long");
@@ -73,19 +77,20 @@ diff -aur pciutils-3.1.9.orig/lib/proc.c pciutils-3.1.9/lib/proc.c
  	}
        if (a->fd < 0)
  	a->warning("Cannot open %s", buf);
-diff -aur pciutils-3.2.0.orig//lib/sysfs.c pciutils-3.2.0/lib/sysfs.c
+Index: pciutils-3.4.0/lib/sysfs.c
---- pciutils-3.2.0.orig//lib/sysfs.c	2013-04-01 15:23:18.000000000 +0200
+===================================================================
-+++ pciutils-3.2.0/lib/sysfs.c	2013-07-30 23:30:16.013365441 +0200
+--- pciutils-3.4.0.orig/lib/sysfs.c
-@@ -95,7 +95,7 @@
++++ pciutils-3.4.0/lib/sysfs.c
-   char namebuf[OBJNAMELEN];
+@@ -96,7 +96,7 @@ sysfs_get_string(struct pci_dev *d, char
+   void (*warn)(char *msg, ...) = (mandatory ? a->error : a->warning);
  
    sysfs_obj_name(d, object, namebuf);
 -  fd = open(namebuf, O_RDONLY);
 +  fd = open(namebuf, O_RDONLY|O_CLOEXEC);
    if (fd < 0)
      {
-       if (mandatory)
+       if (mandatory || errno != ENOENT)
-@@ -130,7 +130,7 @@
+@@ -139,7 +139,7 @@ sysfs_get_resources(struct pci_dev *d)
    int i;
  
    sysfs_obj_name(d, "resource", namebuf);
@@ -94,7 +99,7 @@ diff -aur pciutils-3.2.0.orig//lib/sysfs.c pciutils-3.2.0/lib/sysfs.c
    if (!file)
      a->error("Cannot open %s: %s", namebuf, strerror(errno));
    for (i = 0; i < 7; i++)
-@@ -235,7 +235,7 @@
+@@ -245,7 +245,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");
@@ -103,7 +108,7 @@ diff -aur pciutils-3.2.0.orig//lib/sysfs.c pciutils-3.2.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
-@@ -303,7 +303,7 @@
+@@ -331,7 +331,7 @@ sysfs_setup(struct pci_dev *d, int inten
        if (a->fd_vpd < 0)
  	{
  	  sysfs_obj_name(d, "vpd", namebuf);
@@ -112,7 +117,7 @@ diff -aur pciutils-3.2.0.orig//lib/sysfs.c pciutils-3.2.0/lib/sysfs.c
  	  /* No warning on error; vpd may be absent or accessible only to root */
  	}
        return a->fd_vpd;
-@@ -313,7 +313,7 @@
+@@ -341,7 +341,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,13 @@
+-------------------------------------------------------------------
+Fri Nov 13 19:31:49 UTC 2015 - mpluskal@suse.com
+
+- Update to 3.4.0
+  * On Linux, we report NUMA nodes of devices.
+  * The sysfs back-end does not die on read errors
+    of optional attributes. Instead, a warning is produced.
+  * Fixed several minor bugs.
+  * Updated pci.ids to the current snapshot of the database.
+
 -------------------------------------------------------------------
 Sun Sep  6 07:41:51 UTC 2015 - mpluskal@suse.com
 

pciutils.spec

@@ -18,7 +18,7 @@
 
 %define lname   libpci3
 Name:           pciutils
-Version:        3.3.1
+Version:        3.4.0
 Release:        0
 Summary:        PCI utilities for Kernel version 2
 License:        GPL-2.0+