diff --git a/lshw-B.02.12.01-config-cap.patch b/lshw-B.02.12.01-config-cap.patch new file mode 100644 index 0000000..5b928d3 --- /dev/null +++ b/lshw-B.02.12.01-config-cap.patch @@ -0,0 +1,32 @@ +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) diff --git a/lshw.spec b/lshw.spec index 4b10e53..b07c6a2 100644 --- a/lshw.spec +++ b/lshw.spec @@ -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 @@ plain, XML or HTML format. %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 @@ desktop-file-install --vendor fedora \ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Tue Apr 15 2008 Terje Rosten - B.02.12.01-4 +- add patch to fix bz #442501 + * Mon Feb 11 2008 Terje Rosten - B.02.12.01-3 - add patch to build with gcc-4.3