Accepting request 185026 from home:rudi_m:branches:Base:System

- Update to 3.2.0
  * On newer Linux systems, we use libkmod to look up kernel
    modules (modules.pcimap no longer exists.) To facilitate this,
    libpci is able to look up module aliases in sysfs.
  * Various minor bug fixes.
  * Updated pci.ids to the today's snapshot of the database.
- Update to 3.1.10
  * Decoding of LTR/OBFF in PCIe capabilities.
  * Various minor bug fixes.
  * Updated pci.ids to the today's snapshot of the database.
- rebase patches
- require libkmod

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

pciutils-3.1.9.tar.bz2

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

pciutils-3.2.0.tar.xz

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

pciutils-3.2.0_update-dist.patch

@@ -1,8 +1,8 @@
-diff -aur pciutils-3.1.9.orig/Makefile pciutils-3.1.9/Makefile
---- pciutils-3.1.9.orig/Makefile	2012-01-14 09:07:55.000000000 -0500
-+++ pciutils-3.1.9/Makefile	2012-01-28 21:03:25.072209962 -0500
-@@ -78,7 +78,7 @@
- common.o: common.c pciutils.h $(PCIINC)
+diff -aur pciutils-3.2.0.orig//Makefile pciutils-3.2.0/Makefile
+--- pciutils-3.2.0.orig//Makefile	2013-04-19 14:58:49.000000000 +0200
++++ pciutils-3.2.0/Makefile	2013-07-30 23:03:04.385436935 +0200
+@@ -85,7 +85,7 @@
+ 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)@"

pciutils-ocloexec.patch

@@ -73,19 +73,19 @@ 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.1.9.orig/lib/sysfs.c pciutils-3.1.9/lib/sysfs.c
---- pciutils-3.1.9.orig/lib/sysfs.c	2011-01-07 16:04:28.000000000 -0500
-+++ pciutils-3.1.9/lib/sysfs.c	2012-01-28 20:58:27.320932364 -0500
-@@ -93,7 +93,7 @@
-   char namebuf[OBJNAMELEN], buf[256];
+diff -aur pciutils-3.2.0.orig//lib/sysfs.c pciutils-3.2.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
+@@ -95,7 +95,7 @@
+   char namebuf[OBJNAMELEN];
  
    sysfs_obj_name(d, object, namebuf);
 -  fd = open(namebuf, O_RDONLY);
 +  fd = open(namebuf, O_RDONLY|O_CLOEXEC);
    if (fd < 0)
-     a->error("Cannot open %s: %s", namebuf, strerror(errno));
-   n = read(fd, buf, sizeof(buf));
-@@ -115,7 +115,7 @@
+     {
+       if (mandatory)
+@@ -130,7 +130,7 @@
    int i;
  
    sysfs_obj_name(d, "resource", namebuf);
@@ -94,7 +94,7 @@ diff -aur pciutils-3.1.9.orig/lib/sysfs.c pciutils-3.1.9/lib/sysfs.c
    if (!file)
      a->error("Cannot open %s: %s", namebuf, strerror(errno));
    for (i = 0; i < 7; i++)
-@@ -220,7 +220,7 @@
+@@ -235,7 +235,7 @@
        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 +103,7 @@ diff -aur pciutils-3.1.9.orig/lib/sysfs.c pciutils-3.1.9/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
-@@ -283,7 +283,7 @@
+@@ -303,7 +303,7 @@
        if (a->fd_vpd < 0)
  	{
  	  sysfs_obj_name(d, "vpd", namebuf);
@@ -112,7 +112,7 @@ diff -aur pciutils-3.1.9.orig/lib/sysfs.c pciutils-3.1.9/lib/sysfs.c
  	  /* No warning on error; vpd may be absent or accessible only to root */
  	}
        return a->fd_vpd;
-@@ -293,7 +293,7 @@
+@@ -313,7 +313,7 @@
      {
        sysfs_obj_name(d, "config", namebuf);
        a->fd_rw = a->writeable || intent == SETUP_WRITE_CONFIG;

pciutils.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Jul 30 16:58:00 UTC 2013 - sweet_f_a@gmx.de
+
+- Update to 3.2.0
+  * On newer Linux systems, we use libkmod to look up kernel
+    modules (modules.pcimap no longer exists.) To facilitate this,
+    libpci is able to look up module aliases in sysfs.
+  * Various minor bug fixes.
+  * Updated pci.ids to the today's snapshot of the database.
+- Update to 3.1.10
+  * Decoding of LTR/OBFF in PCIe capabilities.
+  * Various minor bug fixes.
+  * Updated pci.ids to the today's snapshot of the database.
+- rebase patches
+- require libkmod
+
 -------------------------------------------------------------------
 Mon Apr 15 12:09:40 UTC 2013 - idonmez@suse.com
 

pciutils.spec

@@ -18,10 +18,11 @@
 
 Name:           pciutils
 %define lname	libpci3
-Version:        3.1.9
+Version:        3.2.0
 Release:        0
 BuildRequires:  pkg-config
-BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(libkmod)
+BuildRequires:  pkgconfig(zlib)
 Requires:       pciutils-ids
 # bug437293
 %ifarch ppc64
@@ -32,11 +33,11 @@ Summary:        PCI utilities for Kernel version 2
 License:        GPL-2.0+
 Group:          Hardware/Other
 Url:            http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
-Source:         ftp://ftp.kernel.org/pub/software/utils/pciutils/%{name}-%{version}.tar.bz2
+Source:         ftp://ftp.kernel.org/pub/software/utils/pciutils/%{name}-%{version}.tar.xz
 Source1:        COPYING
 Source2:        baselibs.conf
-Patch0:         update-pciutils-dist
-Patch1:         %{name}-%{version}_pkgconfig.patch
+Patch0:         pciutils-3.2.0_update-dist.patch
+Patch1:         %{name}-3.1.9_pkgconfig.patch
 Patch2:         pciutils-ocloexec.patch
 Patch3:         pciutils-endianh.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build