Accepting request 26190 from Base:System

Copy from Base:System/pciutils based on submit request 26190 from user anicka

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

pciutils-3.1.3-fclose.patch

@@ -1,41 +0,0 @@
---- 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

pciutils-3.1.3.tar.bz2

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

pciutils-3.1.4.tar.bz2

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

pciutils.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+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
 

pciutils.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package pciutils (Version 3.1.3)
+# spec file for package pciutils (Version 3.1.4)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,8 +19,8 @@
 
 
 Name:           pciutils
-Version:        3.1.3
-Release:        4
+Version:        3.1.4
+Release:        1
 BuildRequires:  zlib-devel
 BuildRequires:  licenses
 Requires:       licenses
@@ -32,14 +32,13 @@ Obsoletes:      pciutils-64bit
 %endif
 #
 Group:          Hardware/Other
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        PCI-utilities for Kernel version 2.2 and newer
 Url:            http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 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
@@ -60,7 +59,7 @@ Authors:
     Martin Mares <mj@ucw.cz>
 
 %package devel
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Development/Libraries/C and C++
 Summary:        Static Library and Include Files of the PCI-utilities
 # bug437293
@@ -85,7 +84,6 @@ Authors:
 %setup -q
 %patch -p1
 %patch1
-%patch2
 
 %build
 make OPT="$RPM_OPT_FLAGS -Wall" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes"