Accepting request 101923 from home:tabraham1:branches:Base:System

update to version 3.1.9 OBS-URL: https://build.opensuse.org/request/show/101923 OBS-URL: https://build.opensuse.org/package/show/Base:System/pciutils?expand=0&rev=32
2012-02-01 14:19:40 +00:00 · 2012-02-01 14:19:40 +00:00 · fbc62d411f
commit fbc62d411f
parent feff90ce33
8 changed files with 112 additions and 87 deletions
--- a/pciutils-3.1.7.tar.bz2
+++ b/pciutils-3.1.7.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d8fe23b6966c1abf29b3b38b08b0cf33f731cd6e6a89d9b8d2b8d5e982c3f544
-size 290452
--- a/pciutils-3.1.7_pkgconfig.patch
+++ b/pciutils-3.1.7_pkgconfig.patch
@ -1,11 +0,0 @@
-Index: lib/libpci.pc.in
-===================================================================
--- lib/libpci.pc.in.orig	2008-04-10 21:15:47.000000000 +0200
-+++ lib/libpci.pc.in	2008-04-11 16:31:23.622221413 +0200
-@@ -6,5 +6,4 @@ idsdir=@IDSDIR@
- Name: libpci
- Description: libpci
- Version: @VERSION@
-Libs: -L${libdir} -lpci @LDLIBS@
-Cflags: -I${includedir}
-+Libs: -lpci @LDLIBS@
--- a/pciutils-3.1.9.tar.bz2
+++ b/pciutils-3.1.9.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4ce5d56ae4a9611d51ba0cc2ea45806f9539a18aceb4aa70b8ded50f6923c4f
+size 310611
--- a/pciutils-3.1.9_pkgconfig.patch
+++ b/pciutils-3.1.9_pkgconfig.patch
@ -0,0 +1,10 @@
+--- pciutils-3.1.9.orig/lib/libpci.pc.in	2011-10-02 05:52:11.000000000 -0400
+++ pciutils-3.1.9/lib/libpci.pc.in	2012-01-28 20:50:44.702715889 -0500
+@@ -6,6 +6,5 @@
+ Name: libpci
+ Description: libpci
+ Version: @VERSION@
+-Libs: -L${libdir} -lpci
+Libs: -lpci @LDLIBS@
+ Libs.private: @LDLIBS@
+-Cflags: -I${includedir}
--- a/pciutils-ocloexec.patch
+++ b/pciutils-ocloexec.patch
@ -1,57 +1,19 @@
--- lib/dump.c.orig
-+++ lib/dump.c
-@@ -64,7 +64,7 @@ dump_init(struct pci_access *a)
+diff -aur pciutils-3.1.9.orig/lib/dump.c pciutils-3.1.9/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
+@@ -64,7 +64,7 @@
 
-   if (!a)
+   if (!name)
     a->error("dump: File name not given.");
 -  if (!(f = fopen(name, "r")))
 +  if (!(f = fopen(name, "re")))
     a->error("dump: Cannot open %s: %s", name, strerror(errno));
   while (fgets(buf, sizeof(buf)-1, f))
     {
--- lib/proc.c.orig
-+++ 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");
-  f = fopen(buf, "r");
-+  f = fopen(buf, "re");
-   if (!f)
-     a->error("Cannot open %s", buf);
-   while (fgets(buf, sizeof(buf)-1, f))
-@@ -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;
-      a->fd = open(buf, a->fd_rw ? O_RDWR : O_RDONLY);
-+      a->fd = open(buf, (a->fd_rw ? O_RDWR : O_RDONLY) | O_CLOEXEC);
-       if (a->fd < 0)
- 	{
- 	  e = snprintf(buf, sizeof(buf), "%s/%04x:%02x/%02x.%d",
-@@ -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");
-	  a->fd = open(buf, a->fd_rw ? O_RDWR : O_RDONLY);
-+	  a->fd = open(buf, (a->fd_rw ? O_RDWR : O_RDONLY) | O_CLOEXEC);
- 	}
-       if (a->fd < 0)
- 	a->warning("Cannot open %s", buf);
--- lib/names-parse.c.orig
-+++ 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)
-#define pci_open(a)		fopen(a->id_file_name, "r")
-+#define pci_open(a)		fopen(a->id_file_name, "re")
- #define pci_close(f)		fclose(f)
- #define PCI_ERROR(f, err)	if (!err && ferror(f))	err = "I/O error";
- #endif
--- lib/names-cache.c.orig
-+++ lib/names-cache.c
-@@ -62,7 +62,7 @@ pci_id_cache_load(struct pci_access *a,
+diff -aur pciutils-3.1.9.orig/lib/names-cache.c pciutils-3.1.9/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
+@@ -62,7 +62,7 @@
       return 0;
     }
 
@ -60,7 +22,7 @@
   if (!f)
     {
       a->debug("Cache file does not exist\n");
-@@ -135,7 +135,7 @@ pci_id_cache_flush(struct pci_access *a)
+@@ -135,7 +135,7 @@
   tmpname = pci_malloc(a, strlen(name) + strlen(hostname) + 64);
   sprintf(tmpname, "%s.tmp-%s-%d", name, hostname, this_pid);
 
@ -69,9 +31,52 @@
   if (!f)
     {
       a->warning("Cannot write to %s: %s", name, strerror(errno));
--- lib/sysfs.c.orig
-+++ lib/sysfs.c
-@@ -93,7 +93,7 @@ sysfs_get_value(struct pci_dev *d, char
+diff -aur pciutils-3.1.9.orig/lib/names-parse.c pciutils-3.1.9/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
+@@ -52,7 +52,7 @@
+ typedef FILE * pci_file;
+ #define pci_gets(f, l, s)	fgets(l, s, f)
+ #define pci_eof(f)		feof(f)
+-#define pci_open(a)		fopen(a->id_file_name, "r")
+#define pci_open(a)		fopen(a->id_file_name, "re")
+ #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
+--- 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
+@@ -62,7 +62,7 @@
+ 
+   if (snprintf(buf, sizeof(buf), "%s/devices", pci_get_param(a, "proc.path")) == sizeof(buf))
+     a->error("File name too long");
+-  f = fopen(buf, "r");
+  f = fopen(buf, "re");
+   if (!f)
+     a->error("Cannot open %s", buf);
+   while (fgets(buf, sizeof(buf)-1, f))
+@@ -129,7 +129,7 @@
+       if (e < 0 || e >= (int) sizeof(buf))
+ 	a->error("File name too long");
+       a->fd_rw = a->writeable || rw;
+-      a->fd = open(buf, a->fd_rw ? O_RDWR : O_RDONLY);
+      a->fd = open(buf, (a->fd_rw ? O_RDWR : O_RDONLY) | O_CLOEXEC);
+       if (a->fd < 0)
+ 	{
+ 	  e = snprintf(buf, sizeof(buf), "%s/%04x:%02x/%02x.%d",
+@@ -137,7 +137,7 @@
+ 		       d->domain, d->bus, d->dev, d->func);
+ 	  if (e < 0 || e >= (int) sizeof(buf))
+ 	    a->error("File name too long");
+-	  a->fd = open(buf, a->fd_rw ? O_RDWR : O_RDONLY);
+	  a->fd = open(buf, (a->fd_rw ? O_RDWR : O_RDONLY) | O_CLOEXEC);
+ 	}
+       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];
 
   sysfs_obj_name(d, object, namebuf);
@ -80,7 +85,7 @@
   if (fd < 0)
     a->error("Cannot open %s: %s", namebuf, strerror(errno));
   n = read(fd, buf, sizeof(buf));
-@@ -115,7 +115,7 @@ sysfs_get_resources(struct pci_dev *d)
+@@ -115,7 +115,7 @@
   int i;
 
   sysfs_obj_name(d, "resource", namebuf);
@ -89,7 +94,7 @@
   if (!file)
     a->error("Cannot open %s: %s", namebuf, strerror(errno));
   for (i = 0; i < 7; i++)
-@@ -220,7 +220,7 @@ sysfs_fill_slots(struct pci_access *a)
+@@ -220,7 +220,7 @@
       n = snprintf(namebuf, OBJNAMELEN, "%s/%s/%s", dirname, entry->d_name, "address");
       if (n < 0 || n >= OBJNAMELEN)
 	a->error("File name too long");
@ -98,7 +103,7 @@
       /*
        * 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 @@ sysfs_setup(struct pci_dev *d, int inten
+@@ -283,7 +283,7 @@
       if (a->fd_vpd < 0)
 	{
 	  sysfs_obj_name(d, "vpd", namebuf);
@ -107,7 +112,7 @@
 	  /* No warning on error; vpd may be absent or accessible only to root */
 	}
       return a->fd_vpd;
-@@ -293,7 +293,7 @@ sysfs_setup(struct pci_dev *d, int inten
+@@ -293,7 +293,7 @@
     {
       sysfs_obj_name(d, "config", namebuf);
       a->fd_rw = a->writeable || intent == SETUP_WRITE_CONFIG;
--- a/pciutils.changes
+++ b/pciutils.changes
@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Sun Jan 29 02:18:30 UTC 2012 - tabraham@novell.com
+
+- Update to 3.1.9
+  * Whereever we mention the PCI ID database, we now refer to
+    http://pci-ids.ucw.cz/ and the sf.net site is mentioned only
+    as a mirror. This includes update-pciids.
+  * Decode PCIe Gen 3 speeds and link status fields
+  * various minor bug fixes
+  * Updated pci.ids to the 2012-01-14 snapshot of the database
+
+- Update to 3.1.8
+  * More capabilities: Transaction Processing Hints, Latency 
+    Tolerance Reporting. Thanks to Jesse Barnes.
+  * Added BeOS and Haiku ports. Contributed by Francois Revol.
+  * pciutils.pc now uses Libs.private properly.
+  * When we format a name and it does not fit in the buffer, we 
+    truncate it instead of returning "buffer too small" instead. 
+    This works on all platforms with sane (i.e., C99-compatible) 
+    snprintf().
+  * various minor bug fixes
+
 -------------------------------------------------------------------
 Mon Nov 14 22:34:42 UTC 2011 - crrodriguez@opensuse.org

--- a/pciutils.spec
+++ b/pciutils.spec
@ -1,7 +1,7 @@
 #
 # spec file for package pciutils
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -19,8 +19,8 @@


 Name:           pciutils
-Version:        3.1.7
-Release:        11
+Version:        3.1.9
+Release:        1
 BuildRequires:  zlib-devel
 BuildRequires:  pkg-config
 Requires:       pciutils-ids
@ -84,8 +84,8 @@ Authors:
 %prep
 %setup -q
 %patch -p1
-%patch1
-%patch2
+%patch1 -p1
+%patch2 -p1

 %build
 make %{?_smp_mflags} OPT="$RPM_OPT_FLAGS -Wall" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes"
--- a/25
+++ b/25
@ -1,8 +1,7 @@
-Index: pciutils-3.1.3/Makefile
-===================================================================
--- pciutils-3.1.3.orig/Makefile
-+++ pciutils-3.1.3/Makefile
-@@ -78,7 +78,7 @@ setpci.o: setpci.c pciutils.h $(PCIINC)
+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)
 
 update-pciids: update-pciids.sh
@ -11,29 +10,29 @@ Index: pciutils-3.1.3/Makefile
 	chmod +x $@
 
 # The example of use of libpci
-Index: pciutils-3.1.3/update-pciids.sh
-===================================================================
--- pciutils-3.1.3.orig/update-pciids.sh
-+++ pciutils-3.1.3/update-pciids.sh
+diff -aur pciutils-3.1.9.orig/update-pciids.sh pciutils-3.1.9/update-pciids.sh
+--- pciutils-3.1.9.orig/update-pciids.sh	2012-01-14 09:29:38.000000000 -0500
+++ pciutils-3.1.9/update-pciids.sh	2012-01-28 21:05:57.719301612 -0500
@@ -4,7 +4,7 @@
 
 set -e
- SRC="http://pciids.sourceforge.net/v2.2/pci.ids"
+ 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
 
-@@ -65,6 +65,12 @@ if [ -f $DEST ] ; then
- fi
+@@ -66,6 +66,13 @@
 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