From 7fa5fb77c206ca929c918210f66f0f03e9559df7e39af041a361f5574950416e Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 11 Dec 2009 12:34:05 +0000
Subject: [PATCH] checked in

OBS-URL: https://build.opensuse.org/package/show/Base:System/pciutils?expand=0&rev=12
---
 pciutils-3.1.3-fclose.patch                   | 41 +++++++++++++++++++
 pciutils-3.1.3.tar.bz2                        |  3 ++
 ...ig.patch => pciutils-3.1.3_pkgconfig.patch |  0
 pciutils-3.1.4.tar.bz2                        |  3 --
 pciutils.changes                              | 11 -----
 pciutils.spec                                 |  4 +-
 6 files changed, 47 insertions(+), 15 deletions(-)
 create mode 100644 pciutils-3.1.3-fclose.patch
 create mode 100644 pciutils-3.1.3.tar.bz2
 rename pciutils-3.1.4_pkgconfig.patch => pciutils-3.1.3_pkgconfig.patch (100%)
 delete mode 100644 pciutils-3.1.4.tar.bz2

diff --git a/pciutils-3.1.3-fclose.patch b/pciutils-3.1.3-fclose.patch
new file mode 100644
index 0000000..39fca81
--- /dev/null
+++ b/pciutils-3.1.3-fclose.patch
@@ -0,0 +1,41 @@
+--- lib/dump.c
++++ lib/dump.c
+@@ -70,7 +70,10 @@
+     {
+       char *z = strchr(buf, '\n');
+       if (!z)
+-	a->error("dump: line too long or unterminated");
++	{
++	  fclose(f);
++	  a->error("dump: line too long or unterminated");
++	}
+       *z-- = 0;
+       if (z >= buf && *z == '\r')
+ 	*z-- = 0;
+@@ -95,7 +98,10 @@
+ 		 sscanf(z, "%x", &j) == 1 && j < 256)
+ 	    {
+ 	      if (i >= 4096)
+-		a->error("dump: At most 4096 bytes of config space are supported");
++		{
++		  fclose(f);
++		  a->error("dump: At most 4096 bytes of config space are supported");
++		}
+ 	      if (i >= dd->allocated)	/* Need to re-allocate the buffer */
+ 		{
+ 		  dump_alloc_data(dev, 4096);
+@@ -111,9 +117,13 @@
+ 		z++;
+ 	    }
+ 	  if (*z)
+-	    a->error("dump: Malformed line");
++	    {
++	      fclose(f);
++	      a->error("dump: Malformed line");
++	    }
+ 	}
+     }
++  fclose(f);
+ }
+ 
+ static void
diff --git a/pciutils-3.1.3.tar.bz2 b/pciutils-3.1.3.tar.bz2
new file mode 100644
index 0000000..06a0d17
--- /dev/null
+++ b/pciutils-3.1.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a3de80921e493c52e5c69f6d399a511b0ebc0464d10dcdda3924cd42ae69c78
+size 271733
diff --git a/pciutils-3.1.4_pkgconfig.patch b/pciutils-3.1.3_pkgconfig.patch
similarity index 100%
rename from pciutils-3.1.4_pkgconfig.patch
rename to pciutils-3.1.3_pkgconfig.patch
diff --git a/pciutils-3.1.4.tar.bz2 b/pciutils-3.1.4.tar.bz2
deleted file mode 100644
index f8ea1e6..0000000
--- a/pciutils-3.1.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:38acb0e479d4096d5cbb805e64aa1362d70215d73271fbba227b32efb45ba13a
-size 276864
diff --git a/pciutils.changes b/pciutils.changes
index 54d79b8..756546c 100644
--- a/pciutils.changes
+++ b/pciutils.changes
@@ -1,14 +1,3 @@
--------------------------------------------------------------------
-Thu Dec 10 14:45:15 CET 2009 - anicka@suse.cz
-
-- update to 3.1.4
- * Updated pci.ids to the today's snapshot of the database.
- * Fixed memory and file descriptor leak in the dump back-end.
- * The SR-IOV capability decoder now prints the VF BAR's.
- * On request of certain company's lawyers, we now include a copy
-   of the GPL with our package. It seems that the pciutils are getting
-   mature if the most important bug of the month was this one ;-)
-
 -------------------------------------------------------------------
 Tue Nov  3 19:09:37 UTC 2009 - coolo@novell.com
 
diff --git a/pciutils.spec b/pciutils.spec
index 7fb407e..246e066 100644
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -19,7 +19,7 @@
 
 
 Name:           pciutils
-Version:        3.1.4
+Version:        3.1.3
 Release:        4
 BuildRequires:  zlib-devel
 BuildRequires:  licenses
@@ -39,6 +39,7 @@ Source:         %{name}-%{version}.tar.bz2
 Source1:        COPYING
 Patch:          update-pciutils-dist
 Patch1:         %{name}-%{version}_pkgconfig.patch
+Patch2:         %{name}-%{version}-fclose.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -84,6 +85,7 @@ Authors:
 %setup -q
 %patch -p1
 %patch1
+%patch2
 
 %build
 make OPT="$RPM_OPT_FLAGS -Wall" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes"