From b88b4820f1f59517a173bad5e5ab3f9dd1782e87de5331d016b026222c402a1e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 6 May 2007 15:17:28 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pciutils?expand=0&rev=5 --- pciutils-2.2.4-noabort.diff | 32 -------------- pciutils-2.2.4.tar.gz | 3 -- ....4-class.diff => pciutils-2.2.5-class.diff | 0 ....4-strip.diff => pciutils-2.2.5-strip.diff | 0 pciutils-2.2.5.tar.bz2 | 3 ++ pciutils.changes | 26 +++++++++++ pciutils.spec | 44 ++++++++++++++----- 7 files changed, 61 insertions(+), 47 deletions(-) delete mode 100644 pciutils-2.2.4-noabort.diff delete mode 100644 pciutils-2.2.4.tar.gz rename pciutils-2.2.4-class.diff => pciutils-2.2.5-class.diff (100%) rename pciutils-2.2.4-strip.diff => pciutils-2.2.5-strip.diff (100%) create mode 100644 pciutils-2.2.5.tar.bz2 diff --git a/pciutils-2.2.4-noabort.diff b/pciutils-2.2.4-noabort.diff deleted file mode 100644 index 06e5183..0000000 --- a/pciutils-2.2.4-noabort.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- lspci.c -+++ lspci.c -@@ -64,6 +64,9 @@ - #define alloca xmalloc - #endif - -+/* error return val */ -+static int error = 0; -+ - /* Our view of the PCI bus */ - - struct device { -@@ -120,8 +123,10 @@ - d->config = xmalloc(64); - d->present = xmalloc(64); - memset(d->present, 1, 64); -- if (!pci_read_block(p, 0, d->config, 64)) -- die("Unable to read the standard configuration space header"); -+ if (!pci_read_block(p, 0, d->config, 64)) { -+ fprintf (stderr, "Unable to read the standard configuration space header\n"); -+ error++; return d; -+ } - if ((d->config[PCI_HEADER_TYPE] & 0x7f) == PCI_HEADER_TYPE_CARDBUS) - { - /* For cardbus bridges, we need to fetch 64 bytes more to get the -@@ -2401,5 +2406,5 @@ - } - pci_cleanup(pacc); - -- return 0; -+ return (error? 2: 0); - } diff --git a/pciutils-2.2.4.tar.gz b/pciutils-2.2.4.tar.gz deleted file mode 100644 index 13902b7..0000000 --- a/pciutils-2.2.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62fc07f688c6d17f0cf8baa540e42be6117530360c2df491ec02031973506a9f -size 210706 diff --git a/pciutils-2.2.4-class.diff b/pciutils-2.2.5-class.diff similarity index 100% rename from pciutils-2.2.4-class.diff rename to pciutils-2.2.5-class.diff diff --git a/pciutils-2.2.4-strip.diff b/pciutils-2.2.5-strip.diff similarity index 100% rename from pciutils-2.2.4-strip.diff rename to pciutils-2.2.5-strip.diff diff --git a/pciutils-2.2.5.tar.bz2 b/pciutils-2.2.5.tar.bz2 new file mode 100644 index 0000000..4777724 --- /dev/null +++ b/pciutils-2.2.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:178070815bd52e08aaafad533e37a47f6fa8ed81edbcbfe7700cc5d055ab8afe +size 204718 diff --git a/pciutils.changes b/pciutils.changes index a46802a..a6d826a 100644 --- a/pciutils.changes +++ b/pciutils.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Fri May 4 20:41:39 CEST 2007 - anicka@suse.cz + +- update to 2.2.5 + * pci.ids: Updated to the current snapshot of the database. + * lspci.c (show_express): Added PCI/PCI-X to PCI-Express + Bridge type. + * pci.ids: Updated to the current snapshot of the database. + * Replaced bzero() by memset() everywhere, it's better to lose + a tiny bit of readability than maintain hacks to make it work + on various systems. + * lib/configure: tr on Solaris is a bit weird and it requires + `[A-Z]' instead of `A-Z'. Fortunately, the extra brackets + don't hurt otherwise. + * lib/types.h, lib/configure: Solaris should use + to get precise integer types. + * lspci.c: alloca() needs . + * lib/dump.c: Fixed a couple of bugs in the dump backend which + caused devices with domains or with extended config space + to be read incorrectly. Also, dumps with partial lines are + allowed now. + * lspci.c (scan_device): If an error occurs when reading the + standard config header of a device, report it and ignore the + device and return with exit code 2 at the end. +- remove noabort.diff (implemented by upstream) + ------------------------------------------------------------------- Thu Mar 29 12:34:27 CEST 2007 - rguenther@suse.de diff --git a/pciutils.spec b/pciutils.spec index caefb2a..98875f8 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -1,5 +1,5 @@ # -# spec file for package pciutils (Version 2.2.4) +# spec file for package pciutils (Version 2.2.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,20 +12,18 @@ Name: pciutils BuildRequires: zlib-devel -Version: 2.2.4 -Release: 25 -%define ver 2.2.4 +Version: 2.2.5 +Release: 1 Requires: pciutils-ids Autoreqprov: on Group: Hardware/Other License: GNU General Public License (GPL) Summary: PCI-utilities for Kernel version 2.2 and newer URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml -Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{ver}.tar.gz -Patch0: %{name}-%{ver}-class.diff -Patch1: %{name}-%{ver}-noabort.diff -Patch2: %{name}-%{ver}-strip.diff -Patch3: update-pciutils-dist +Source: %{name}-%{version}.tar.bz2 +Patch0: %{name}-%{version}-class.diff +Patch1: %{name}-%{version}-strip.diff +Patch2: update-pciutils-dist BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -62,11 +60,10 @@ Authors: Martin Mares %prep -%setup -q -n %{name}-%{ver} +%setup -q -n %{name}-%{version} %patch0 %patch1 -%patch2 -%patch3 -p1 +%patch2 -p1 %build make OPT="$RPM_OPT_FLAGS -Wall" PREFIX=%{_prefix} SBINDIR=/sbin @@ -95,6 +92,29 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libpci.a %changelog +* Fri May 04 2007 - anicka@suse.cz +- update to 2.2.5 + * pci.ids: Updated to the current snapshot of the database. + * lspci.c (show_express): Added PCI/PCI-X to PCI-Express + Bridge type. + * pci.ids: Updated to the current snapshot of the database. + * Replaced bzero() by memset() everywhere, it's better to lose + a tiny bit of readability than maintain hacks to make it work + on various systems. + * lib/configure: tr on Solaris is a bit weird and it requires + `[A-Z]' instead of `A-Z'. Fortunately, the extra brackets + don't hurt otherwise. + * lib/types.h, lib/configure: Solaris should use + to get precise integer types. + * lspci.c: alloca() needs . + * lib/dump.c: Fixed a couple of bugs in the dump backend which + caused devices with domains or with extended config space + to be read incorrectly. Also, dumps with partial lines are + allowed now. + * lspci.c (scan_device): If an error occurs when reading the + standard config header of a device, report it and ignore the + device and return with exit code 2 at the end. +- remove noabort.diff (implemented by upstream) * Thu Mar 29 2007 - rguenther@suse.de - add zlib-devel BuildRequires - require zlib-devel from pciutils-devel package