From d1645e328455102c73ddd59c601e3e5349cdfcb2 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Tue, 20 Jan 2009 10:08:34 +0000
Subject: [PATCH] update to 3.1.0

---
 .cvsignore                 |  2 +-
 pciutils-2.1.99-gcc4.patch | 10 +++++-----
 pciutils-dir-d.patch       |  2 +-
 pciutils.spec              |  7 ++++---
 sources                    |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 5884c2f..4f6871e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pciutils-3.0.3.tar.gz
+pciutils-3.1.0.tar.gz
diff --git a/pciutils-2.1.99-gcc4.patch b/pciutils-2.1.99-gcc4.patch
index 5d7d4ca..5630e19 100644
--- a/pciutils-2.1.99-gcc4.patch
+++ b/pciutils-2.1.99-gcc4.patch
@@ -1,8 +1,8 @@
-diff -up pciutils-3.0.0/lib/i386-ports.c.glibcmacros pciutils-3.0.0/lib/i386-ports.c
---- pciutils-3.0.0/lib/i386-ports.c.glibcmacros	2008-04-10 21:15:47.000000000 +0200
-+++ pciutils-3.0.0/lib/i386-ports.c	2008-09-01 15:16:42.000000000 +0200
-@@ -70,9 +70,9 @@ intel_sanity_check(struct pci_access *a,
-   for(d.dev = 0; d.dev < 32; d.dev++)
+diff -up pciutils-3.1.0/lib/i386-ports.c.glibcmacros pciutils-3.1.0/lib/i386-ports.c
+--- pciutils-3.1.0/lib/i386-ports.c.glibcmacros	2008-11-21 22:00:38.000000000 +0100
++++ pciutils-3.1.0/lib/i386-ports.c	2009-01-20 10:43:04.766937947 +0100
+@@ -72,9 +72,9 @@ intel_sanity_check(struct pci_access *a,
+   for (d.dev = 0; d.dev < 32; d.dev++)
      {
        u16 class, vendor;
 -      if (m->read(&d, PCI_CLASS_DEVICE, (byte *) &class, sizeof(class)) &&
diff --git a/pciutils-dir-d.patch b/pciutils-dir-d.patch
index f1b0e2a..88abe4a 100644
--- a/pciutils-dir-d.patch
+++ b/pciutils-dir-d.patch
@@ -60,7 +60,7 @@ diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c
 +  int lino, tempsize;
 +  const char *err;
 +  char *temp;
-+  char new_id_path[PATH_MAX] = {0,};
++  char new_id_path[PATH_MAX+1] = {0,};
 +  DIR *pci_ids_dir;
 +  struct dirent *dp;
 +  
diff --git a/pciutils.spec b/pciutils.spec
index becb5d2..b4c10b3 100644
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -1,12 +1,11 @@
 Name:		pciutils
-Version:	3.0.3
+Version:	3.1.0
 Release: 	1%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch1: 	pciutils-2.2.4-buf.patch
 Patch2:		pciutils-2.1.10-scan.patch
 Patch3: 	pciutils-havepread.patch
 Patch6: 	pciutils-2.2.1-idpath.patch
-Patch7:		pciutils-2.1.99-gcc4.patch
 Patch8: 	pciutils-3.0.2-multilib.patch
 Patch9: 	pciutils-dir-d.patch
 Patch10:	pciutils-2.2.10-sparc-support.patch
@@ -49,7 +48,6 @@ devices connected to the PCI bus.
 %patch2 -p1 -b .scan
 %patch3 -p1 -b .pread
 %patch6 -p1 -b .idpath
-%patch7 -p1 -b .glibcmacros
 %patch8 -p1 -b .multilib
 %patch9 -p1 -b .dird
 %patch10 -p1 -b .sparc
@@ -114,6 +112,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jan 19 2009 Michal Hlavinka <mhlavink@redhat.com> 3.1.0-1
+- version 3.1.0
+
 * Tue Dec 09 2008 Michal Hlavinka <mhlavink@redhat.com> 3.0.3-1
 - version 3.0.3
 
diff --git a/sources b/sources
index 4090929..40563d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d07da501bb11e6af40acd036536c2e9a  pciutils-3.0.3.tar.gz
+4b6e4f2b107a534b21c22400f5db9bf4  pciutils-3.1.0.tar.gz