rpms/lshw/devel lshw-B.02.12.01-config-cap.patch, NONE, 1.1 lshw.spec, 1.4, 1.5
Terje Røsten (terjeros)
fedora-extras-commits at redhat.com
Tue Apr 15 19:40:04 UTC 2008
Author: terjeros
Update of /cvs/extras/rpms/lshw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv458
Modified Files:
lshw.spec
Added Files:
lshw-B.02.12.01-config-cap.patch
Log Message:
* Tue Apr 15 2008 Terje Rosten <terjeros at phys.ntnu.no> - B.02.12.01-4
- add patch to fix bz #442501
lshw-B.02.12.01-config-cap.patch:
--- NEW FILE lshw-B.02.12.01-config-cap.patch ---
Index: src/core/pci.cc
===================================================================
--- src/core/pci.cc (revisjon 1933)
+++ src/core/pci.cc (revisjon 1934)
@@ -70,6 +70,7 @@
#define PCI_CAP_LIST_NEXT 1 /* Next capability in the list */
#define PCI_CAP_FLAGS 2 /* Capability defined flags (16 bits) */
#define PCI_CAP_SIZEOF 4
+#define PCI_FIND_CAP_TTL 48
#define PCI_SID_ESR 2 /* Expansion Slot Register */
#define PCI_SID_ESR_NSLOTS 0x1f /* Number of expansion slots available */
@@ -668,8 +669,9 @@
{
unsigned int where = get_conf_byte(d, PCI_CAPABILITY_LIST) & ~3;
string buffer;
+ unsigned int ttl = PCI_FIND_CAP_TTL;
- while(where)
+ while(where && ttl--)
{
unsigned int id, next, cap;
@@ -677,7 +679,7 @@
next = get_conf_byte(d, where + PCI_CAP_LIST_NEXT) & ~3;
cap = get_conf_word(d, where + PCI_CAP_FLAGS);
- if(!id)
+ if(!id || id == 0xff)
return false;
switch(id)
Index: lshw.spec
===================================================================
RCS file: /cvs/extras/rpms/lshw/devel/lshw.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lshw.spec 11 Feb 2008 07:52:59 -0000 1.4
+++ lshw.spec 15 Apr 2008 19:39:24 -0000 1.5
@@ -1,15 +1,16 @@
-Summary: Hardware lister
-Name: lshw
-Version: B.02.12.01
-Release: 3%{?dist}
-License: GPLv2
-Group: Applications/System
-URL: http://ezix.org/project/wiki/HardwareLiSter
-Source0: http://www.ezix.org/software/files/%{name}-%{version}.tar.gz
-Source1: lshw.desktop
-Source2: lshw.consolehelper
-Source3: lshw.pam
-Patch0: lshw-B.02.12.01-gcc43.patch
+Summary: Hardware lister
+Name: lshw
+Version: B.02.12.01
+Release: 4%{?dist}
+License: GPLv2
+Group: Applications/System
+URL: http://ezix.org/project/wiki/HardwareLiSter
+Source0: http://www.ezix.org/software/files/%{name}-%{version}.tar.gz
+Source1: lshw.desktop
+Source2: lshw.consolehelper
+Source3: lshw.pam
+Patch0: lshw-B.02.12.01-gcc43.patch
+Patch1: lshw-B.02.12.01-config-cap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -37,6 +38,7 @@
%prep
%setup -q -n %{name}-%{version}
%patch -p1
+%patch1 -p0
%{__sed} -i 's|-g -Wall -g|%{optflags}|' src/Makefile
%{__sed} -i 's|-g -Wall -Os|%{optflags}|' src/core/Makefile
@@ -108,6 +110,9 @@
%{_datadir}/applications/fedora-%{name}.desktop
%changelog
+* Tue Apr 15 2008 Terje Rosten <terjeros at phys.ntnu.no> - B.02.12.01-4
+- add patch to fix bz #442501
+
* Mon Feb 11 2008 Terje Rosten <terjeros at phys.ntnu.no> - B.02.12.01-3
- add patch to build with gcc-4.3
More information about the fedora-extras-commits
mailing list