--- lshw-02.18.orig/debian/README.source +++ lshw-02.18/debian/README.source @@ -0,0 +1,3 @@ +Refer to /usr/share/doc/quilt/README.source + + -- Ghe Rivero , Thu, 17 Feb 2011 09:14:52 +0100 --- lshw-02.18.orig/debian/changelog +++ lshw-02.18/debian/changelog @@ -0,0 +1,306 @@ +lshw (02.18-0.1) unstable; urgency=medium + + * Non-maintainer upload with permission of the maintainer. + * New upstream release. Closes: #823639, #756921, #746616, #758550, + #767023. + - Refresh patches for unfortunate new upstream tarball layout. + - debian/patches/fat-inspection.patch, debian/patches/smbios-noscan.patch: + drop, fixed upstream. + - Drop debian/patches/sparc.patch: no longer applies cleanly, and is + incorrect (double header inclusion). + * debian/patches/Avoid-crash-in-scan_dmi_sysfs-when-running-as-non-ro.patch: + patch taken from Ubuntu to fix an upstream regression when running as + non-root; thanks to dann frazier + * debian/patches/fix-width-handling.patch: Fix regression in detecting + platform width. + + -- Steve Langasek Mon, 15 Aug 2016 13:42:04 -0700 + +lshw (02.17-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Disable the memory scanning for all architectures other + than i386 and x86_64. Patch from Leif Lindholm + (Closes: #740034) + * Prevent segfault if system has FAT partition(s) Patch from + Alban Browaeys (Closes: #757689) + + -- Neil Williams Thu, 06 Nov 2014 12:16:13 +0000 + +lshw (02.17-1) unstable; urgency=medium + + [ Alex Henrie ] + * New upstream release + * SVG icon + * Changed desktop category from Settings to System + + -- Ghe Rivero Tue, 29 Jul 2014 12:20:05 +0200 + +lshw (02.16-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Closes: #572098 + - lshw-gtk.desktop requires su-to-root from the menu package + + -- Alex Henrie Thu, 24 Jul 2014 22:39:07 +0200 + +lshw (02.16-2) unstable; urgency=low + + * Closes: #525217 + - lshw: segfauls on armel (! /proc/efi/systab) + * Closes: #707152 + - lshw can miscount cpus on devicetree platforms + + -- Ghe Rivero Thu, 27 Jun 2013 04:10:58 -0400 + +lshw (02.16-1) unstable; urgency=low + + * New upstream release + + -- Ghe Rivero Sat, 30 Jun 2012 10:15:18 +0200 + +lshw (02.15-2) unstable; urgency=low + + * Relaxed depends on pciutils and usbutils. Closes: #540119 + + -- Ghe Rivero Sun, 18 Dec 2011 13:26:10 +0100 + +lshw (02.15-1) unstable; urgency=low + + * [bbfc08f] Imported Upstream version 02.15 + * [927e643] Updated debian/watch file + * [7ce089a] Clean some patches + * [2ef1ea7] Added libsqlite3-dev as build-depend + * [ea1f7f5] Bumped policy version + * [2254715] New upstream release fixed FTBFS gcc4.5 (Closes: #565031) + * [abac6bb] Added Spanish translation to .desktop. + Thanks to Javier Fernández-Sanguino Peña (JFS) (Closes: #537904) + * [ef94e6e] Added gksu launcher to .desktop. + Thanks to Javier Fernández-Sanguino Peña (JFS) (Closes: #537903) + * [ed92c99] Lintian clean again + * [5e64767] Fixed manpage + + -- Ghe Rivero Thu, 17 Feb 2011 10:10:08 +0100 + +lshw (02.14-1) unstable; urgency=low + + * New upstream release + * Some lintian clean + * Standars Version 3.8.2 + + -- Ghe Rivero Sat, 25 Jul 2009 15:30:52 +0200 + +lshw (02.13-2) unstable; urgency=low + + * Added patch sparc: FTBFS in sparc arch. (Closes: #480628) + + -- Ghe Rivero Sun, 11 May 2008 16:09:55 +0200 + +lshw (02.13-1) unstable; urgency=low + + * New upstream release + - Fixe lshw: no output for memory (Closes: #456896) + * Migrated dpatch to quilt + * Clean lintian (no more copyright-without-copyright-notice) + + -- Ghe Rivero Sat, 10 May 2008 15:36:31 +0200 + +lshw (02.12.01-4) unstable; urgency=low + + * DudesConf2 release + * Added patch 09-sysfs-hang + * Added patch 10-privacy + + -- Ghe Rivero Sat, 03 May 2008 12:37:32 +0200 + +lshw (02.12.01-3) unstable; urgency=low + + * Now really updated Debian-Policy Standards-Version to 3.7.3 + * watch file working again. (Closes: #453535) + * lintian cleans: + - debian-rules-ignores-make-clean-error + - debian-rules-sets-DH_COMPAT + - dpatch-missing-description + + -- Ghe Rivero Sat, 2 Feb 2008 18:04:41 +0100 + +lshw (02.12.01-2) unstable; urgency=low + + * More fixes for gcc4.3. Closes: #462000 + * Updated Debian-Policy Standards-Version to 3.7.3 + + -- Ghe Rivero Wed, 23 Jan 2008 14:20:46 +0100 + +lshw (02.12.01-1) unstable; urgency=low + + * New upstream release + * More fixes for gcc4.3 (Ubuntu Patch). Closes: #441569 + * Some Lintian cleans: + Remove homepage from page description + * Static man-page (no build-depends on docbook-utils) + * Moved icon menu to /usr/share/pixmaps + * Added /usr/share/pixmpas and /usr/share/applications to lshw-gtk.dir + + -- Ghe Rivero Wed, 26 Dec 2007 13:22:07 +0100 + +lshw (02.11.01-2) unstable; urgency=low + + * s/gtk-lshw/lshw-gtk/g Closes: #443771 + * Some lintian cleans (new menu Applications section) + + -- Ghe Rivero Mon, 8 Oct 2007 17:29:45 +0200 + +lshw (02.11.01-1) unstable; urgency=low + + * New upstream release + * Fixed ftbfs with g++-4.3/gcc-snapshot (07-gcc43.dpath). Closes: #441569 + * Explain why lshw -X fail in non X environment. Closes: #434644 + + -- Ghe Rivero Wed, 12 Sep 2007 09:54:48 +0200 + +lshw (02.10-4) unstable; urgency=low + + * Added Upstream Homepage to package description. Closes: #426698 + * Updated Debian-Policy Standards-Version to 3.7.2 + + -- Ghe Rivero Wed, 30 May 2007 13:02:26 +0200 + +lshw (02.10-3) unstable; urgency=low + + * New URL at debian/copyright. Closes: #405452 + + -- Ghe Rivero Mon, 28 May 2007 18:09:22 +0200 + +lshw (02.10-2) unstable; urgency=low + + * New upstream release. Closes: #413800 + * New Maintainer mail address in control file + + -- Ghe Rivero Fri, 25 May 2007 11:02:42 +0200 + +lshw (02.10-1) unstable; urgency=low + + * New upstream release. Closes: #405452 + * Remove lshw-common package. manuf.txt and oui.txt aren't used at all, + and we now depend on pciutils and usbutils for pci.ids and usb.ids + respectively (ubuntu patch) + * New URL at debian/copyright. Closes: #405452 + * Fix FTBFS with GCC 4.3: missing #includes. Closes: #417381 + + -- Ghe Rivero Thu, 03 May 2007 20:02:07 +0200 + +lshw (02.08.01-1) unstable; urgency=low + + * New upstream release. Closes: #360182 + * Added AMD64 to the known platforms that works properly. Closes: #349619 + + -- Ghe Rivero Thu, 20 Jul 2006 00:35:07 +0200 + +lshw (02.06-3) unstable; urgency=low + + * "See you in GUA, Debconf-es2" Release + * Change CXX flags on alpha, so no more segfaults. + Closes: #243752 and similar not reported to BTS. + * Small fix on code for alpha (dpatch 06-alpha) + * gxx transition + * Dedicated to Endesa to switch off the electricity from my university + all the weekend :/ + * Updated DH_COMPAT=4 + * Removed ${shlibs:Depends} variable from lshw-common + + -- Ghe Rivero Wed, 21 Dec 2005 16:58:49 +0100 + +lshw (02.06-2) unstable; urgency=low + + * Updated rules files. Copy logy.xpm instead of move it. + + -- Ghe Rivero Mon, 17 Oct 2005 21:48:29 +0200 + +lshw (02.06-1) unstable; urgency=low + + * New upstream release + + -- Ghe Rivero Sun, 16 Oct 2005 23:59:50 +0200 + +lshw (02.05.01-3) unstable; urgency=low + + * Removed spurious files from source. + * Make works with DEB_BUILD_OPTIONS. + * Now can be compiled twice or more. + + -- Ghe Rivero Sun, 16 Oct 2005 23:11:27 +0200 + +lshw (02.05.01-2) unstable; urgency=low + + * New Free Software Foundation (FSF) address: + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. + + -- Ghe Rivero Tue, 27 Sep 2005 22:10:16 +0200 + +lshw (02.05.01-1) unstable; urgency=low + + * New upstream release + * Added manpage for lshw-gtk (lintian/linda clean) + * Upgraded to Debian Policy 3.6.2 + + -- Ghe Rivero Thu, 21 Jul 2005 23:42:52 +0200 + +lshw (02.04-1) unstable; urgency=low + + * New upstream release + * lshw-common is now arch independent, closes: #308473 + * Added watch file + * Binaries moved to /usr/bin, + Added menu entry for lshw-gtk, closes: #303393 + + -- Ghe Rivero Sun, 17 Jul 2005 13:29:09 +0200 + +lshw (02.03-2) unstable; urgency=low + + * Build fix on AMD64, closes: #298029 + * Build fix on no network machines, Depends on hwdata, closes: #300788 + * Build Depends on dpatch + + -- Ghe Rivero Wed, 23 Mar 2005 00:16:06 +0100 + +lshw (02.03-1) unstable; urgency=low + + * New upstream release + * Recommends pciutils and hwdata, closes: #191506 + + -- Ghe Rivero Sun, 6 Feb 2005 23:09:00 +0100 + +lshw (02.00-1) unstable; urgency=low + + * New upstream release, closes: #233038 + * Updated standards version from 3.5.10 to 3.6.1 + * New binary package: lshw-gtk, a GUI frontend + * New package: lshw-common, hw info files + + -- Ghe Rivero Thu, 6 Jan 2005 23:01:14 +0100 + +lshw (01.03-1) unstable; urgency=low + + * New upstream release. + This release include SCSI support, closes: #182543. + Includes alpha support, closes: #183502. + It also fix html output, closes: #182826. + * Removed the manpage from debian dir because it is there in upstream + sources. This also means that the build dependency on perl is changed + to docbook-utils. + * Updated standards version from 3.5.8 to 3.5.10. + + -- Ola Lundqvist Sat, 30 Aug 2003 12:56:50 +0200 + +lshw (0.06-2) unstable; urgency=low + + * Fixed description, closes: #183321. + + -- Ola Lundqvist Thu, 17 Apr 2003 22:36:19 +0200 + +lshw (0.06-1) unstable; urgency=low + + * Initial release, closes: #181106. + + -- Ola Lundqvist Sat, 15 Feb 2003 13:23:56 +0100 --- lshw-02.18.orig/debian/compat +++ lshw-02.18/debian/compat @@ -0,0 +1 @@ +6 \ No newline at end of file --- lshw-02.18.orig/debian/control +++ lshw-02.18/debian/control @@ -0,0 +1,32 @@ +Source: lshw +Section: utils +Priority: optional +Maintainer: Ghe Rivero +Build-Depends: debhelper (>> 6.0.0), libgtk2.0-dev, quilt, libsqlite3-dev +Standards-Version: 3.9.4 + +Package: lshw +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: pciutils, usbutils +Description: information about hardware configuration + A small tool to provide detailed information on the hardware + configuration of the machine. It can report exact memory + configuration, firmware version, mainboard configuration, CPU version + and speed, cache configuration, bus speed, etc. on DMI-capable x86 + systems, on some PowerPC machines (PowerMac G4 is known to work) and AMD64. + . + Information can be output in plain text, HTML or XML. + +Package: lshw-gtk +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: menu, pciutils, usbutils +Description: graphical information about hardware configuration + A small tool to provide detailed information on the hardware + configuration of the machine. It can report exact memory + configuration, firmware version, mainboard configuration, CPU version + and speed, cache configuration, bus speed, etc. on DMI-capable x86 + systems, on some PowerPC machines (PowerMac G4 is known to work) and AMD64. + . + This package provides lshw-gtk (the GTK+ version) --- lshw-02.18.orig/debian/copyright +++ lshw-02.18/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Ola Lundqvist on +Sat, 15 Feb 2003 13:23:56 +0100. + +It was downloaded from: + http://ezix.org/project/wiki/HardwareLiSter + +Upstream Author: + Lyonel Vincent + +Copyright: 2003-2008 Lyonel Vincent + + This is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2, or (at your option) any later + version. + + This is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License with + your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with + the lshw source package as the file COPYING. If not, write to the Free + Software Foundation, Inc.,51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. --- lshw-02.18.orig/debian/lshw-common.dirs +++ lshw-02.18/debian/lshw-common.dirs @@ -0,0 +1 @@ +usr/share/lshw --- lshw-02.18.orig/debian/lshw-gtk.dirs +++ lshw-02.18/debian/lshw-gtk.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/applications +usr/share/pixmaps \ No newline at end of file --- lshw-02.18.orig/debian/lshw-gtk.manpages +++ lshw-02.18/debian/lshw-gtk.manpages @@ -0,0 +1 @@ +debian/patches/lshw-gtk.1 --- lshw-02.18.orig/debian/lshw-gtk.menu +++ lshw-02.18/debian/lshw-gtk.menu @@ -0,0 +1 @@ +?package(lshw-gtk):needs="x11" section="Applications/System/Monitoring" title="lshw-gtk" command="lshw-gtk" icon="/usr/share/pixmaps/lshw-gtk.xpm" --- lshw-02.18.orig/debian/lshw.dirs +++ lshw-02.18/debian/lshw.dirs @@ -0,0 +1 @@ +usr/bin --- lshw-02.18.orig/debian/patches/Avoid-crash-in-scan_dmi_sysfs-when-running-as-non-ro.patch +++ lshw-02.18/debian/patches/Avoid-crash-in-scan_dmi_sysfs-when-running-as-non-ro.patch @@ -0,0 +1,26 @@ +From: dann frazier +Date: Thu, 9 Jun 2016 17:40:54 -0600 +Subject: [PATCH] Avoid crash in scan_dmi_sysfs() when running as non-root + (#716) + +Instead of just checking that the sysfs files exist, make sure we +can also read them. + +Bug: http://ezix.org/project/ticket/716 +Bug-Ubuntu: http://bugs.launchpad.net/bugs/1590994 +Forwarded: https://github.com/lyonel/lshw/pull/14 +Last-Update: 2016-06-13 + +diff --git a/src/core/dmi.cc b/src/core/dmi.cc +index ced891a..8bfe86f 100644 +--- a/lshw-B.02.18/src/core/dmi.cc ++++ b/lshw-B.02.18/src/core/dmi.cc +@@ -1823,7 +1823,7 @@ static bool smbios_entry_point(const u8 *buf, size_t len, + + static bool scan_dmi_sysfs(hwNode & n) + { +- if (!exists(SYSFSDMI "/smbios_entry_point") || !exists(SYSFSDMI "/DMI")) ++ if (access(SYSFSDMI "/smbios_entry_point", R_OK) || access(SYSFSDMI "/DMI", R_OK)) + return false; + + uint32_t table_len = 0; --- lshw-02.18.orig/debian/patches/alpha.patch +++ lshw-02.18/debian/patches/alpha.patch @@ -0,0 +1,14 @@ +diff -urNad lshw-02.06~/src/core/pcmcia.cc lshw-02.06/src/core/pcmcia.cc +--- lshw-02.06~/src/core/pcmcia.cc 2005-10-13 23:33:55.000000000 +0200 ++++ lshw-02.06/src/core/pcmcia.cc 2005-10-18 10:32:20.000000000 +0200 +@@ -1007,8 +1007,8 @@ + { + if (stab[i][0] == 'S') + { +- unsigned int pos = stab[i].find(':'); +- ++ string::size_type pos = stab[i].find(':'); ++ + socketname = ""; + carddescription = ""; + --- lshw-02.18.orig/debian/patches/arm-disable-smbios-check.patch +++ lshw-02.18/debian/patches/arm-disable-smbios-check.patch @@ -0,0 +1,15 @@ +Index: src/core/dmi.cc +=================================================================== +--- a/lshw-B.02.18/src/core/dmi.cc (revision 2519) ++++ b/lshw-B.02.18/src/core/dmi.cc (working copy) +@@ -1752,8 +1752,8 @@ + u16 dmimaj = 0, dmimin = 0; + currentcpu = 0; + +-#ifdef __hppa__ +- return false; // SMBIOS not supported on PA-RISC machines ++#if defined(__arm__) || defined (__hppa__) ++ return false; // SMBIOS not supported on ARM and PA-RISC machines + #endif + + if (sizeof(u8) != 1 || sizeof(u16) != 2 || sizeof(u32) != 4) --- lshw-02.18.orig/debian/patches/bin.patch +++ lshw-02.18/debian/patches/bin.patch @@ -0,0 +1,14 @@ +Move binaries to /bin instead of /sbin +It can be executed by normal users without privilegesIndex: lshw-02.14/src/Makefile +=================================================================== +--- a/lshw-B.02.18/src/Makefile ++++ b/lshw-B.02.18/src/Makefile +@@ -6,7 +6,7 @@ + + DESTDIR?=/ + PREFIX?=/usr +-SBINDIR=$(PREFIX)/sbin ++SBINDIR=$(PREFIX)/bin + MANDIR=$(PREFIX)/share/man + DATADIR=$(PREFIX)/share + INSTALL?=install -p --- lshw-02.18.orig/debian/patches/cflags.patch +++ lshw-02.18/debian/patches/cflags.patch @@ -0,0 +1,46 @@ +Change of Makefile +* Don't include debug info +* Compile using CXX_DEB_FLAGSIndex: lshw-02.14/src/Makefile +=================================================================== +--- a/lshw-B.02.18/src/gui/Makefile ++++ b/lshw-B.02.18/src/gui/Makefile +@@ -8,7 +8,8 @@ + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" + GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags) + INCLUDES=-I../core $(GTKINCLUDES) +-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) ++#CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) ++CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES) + CFLAGS=$(CXXFLAGS) $(DEFINES) + GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs) + LIBS=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS) +--- a/lshw-B.02.18/src/Makefile ++++ b/lshw-B.02.18/src/Makefile +@@ -21,11 +21,13 @@ + CXX?=c++ + INCLUDES=-I./core/ + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" +-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) ++#CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) ++CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES) + ifeq ($(SQLITE), 1) + CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) + endif +-LDFLAGS=-L./core/ -g ++#LDFLAGS=-L./core/ -g ++LDFLAGS=-L./core/ + ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) + LDFLAGS+= -Wl,--as-needed + endif +--- a/lshw-B.02.18/src/core/Makefile ++++ b/lshw-B.02.18/src/core/Makefile +@@ -3,7 +3,8 @@ + CXX=c++ + INCLUDES= + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" +-CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) ++#CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) ++CXXFLAGS?=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES) + LDFLAGS= + LDSTATIC= + LIBS= --- lshw-02.18.orig/debian/patches/fix-manpage.patch +++ lshw-02.18/debian/patches/fix-manpage.patch @@ -0,0 +1,8 @@ +--- a/lshw-B.02.18/src/lshw.1 ++++ b/lshw-B.02.18/src/lshw.1 +@@ -1,4 +1,4 @@ +-.\\" auto-generated by docbook2man-spec $Revision: 1.2 $ ++.\" auto-generated by docbook2man-spec $Revision: 1.2 $ + .TH "LSHW" "1" "30 May 2010" "$Rev: 2179 $" "" + .SH NAME + lshw \- list hardware --- lshw-02.18.orig/debian/patches/fix-width-handling.patch +++ lshw-02.18/debian/patches/fix-width-handling.patch @@ -0,0 +1,21 @@ +Description: Fix regression in detecting platform width + LONG_BIT is not an argument to sysconf(), it is a static variable that is + set to either 32 or 64 bits. Revert this upstream change so that we + actually query with _SC_LONG_BIT and get a correct answer, instead of + always getting -1 bits as our answer. +Author: Steve Langasek +Forwarded-Upstream: not-needed + +Index: lshw-02.18/lshw-B.02.18/src/core/abi.cc +=================================================================== +--- lshw-02.18.orig/lshw-B.02.18/src/core/abi.cc ++++ lshw-02.18/lshw-B.02.18/src/core/abi.cc +@@ -20,7 +20,7 @@ + bool scan_abi(hwNode & system) + { + // are we compiled as 32- or 64-bit process ? +- system.setWidth(sysconf(LONG_BIT)); ++ system.setWidth(sysconf(_SC_LONG_BIT)); + + pushd(PROC_SYS); + --- lshw-02.18.orig/debian/patches/gcc45.gcc +++ lshw-02.18/debian/patches/gcc45.gcc @@ -0,0 +1,197 @@ +Include headers to build under gcc-4.3Index: lshw-02.14/src/core/cdrom.cc +=================================================================== +--- a/lshw-B.02.18/src/core/cdrom.cc ++++ b/lshw-B.02.18/src/core/cdrom.cc +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + __ID("@(#) $Id: cdrom.cc 1923 2008-02-10 23:04:53Z lyonel $"); + +--- a/lshw-B.02.18/src/core/cpuid.cc ++++ b/lshw-B.02.18/src/core/cpuid.cc +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + + __ID("@(#) $Id: cpuid.cc 2151 2010-03-15 20:26:20Z lyonel $"); + +--- a/lshw-B.02.18/src/core/cpuinfo.cc ++++ b/lshw-B.02.18/src/core/cpuinfo.cc +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- a/lshw-B.02.18/src/core/fb.cc ++++ b/lshw-B.02.18/src/core/fb.cc +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + __ID("@(#) $Id: fb.cc 2038 2008-09-05 19:53:35Z lyonel $"); + +--- a/lshw-B.02.18/src/core/hw.cc ++++ b/lshw-B.02.18/src/core/hw.cc +@@ -19,6 +19,9 @@ + #include + #include + #include ++#include ++#include ++#include + + using namespace hw; + +--- a/lshw-B.02.18/src/core/ideraid.cc ++++ b/lshw-B.02.18/src/core/ideraid.cc +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- a/lshw-B.02.18/src/core/mounts.cc ++++ b/lshw-B.02.18/src/core/mounts.cc +@@ -14,7 +14,7 @@ + #include + #include + #include +- ++#include + + __ID("@(#) $Id: mounts.cc 2066 2009-02-12 19:24:33Z lyonel $"); + +--- a/lshw-B.02.18/src/core/osutils.cc ++++ b/lshw-B.02.18/src/core/osutils.cc +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- a/lshw-B.02.18/src/core/partitions.cc ++++ b/lshw-B.02.18/src/core/partitions.cc +@@ -21,6 +21,8 @@ + #include "volumes.h" + #include "osutils.h" + #include ++#include ++#include + #include + #include + #include +--- a/lshw-B.02.18/src/core/pci.cc ++++ b/lshw-B.02.18/src/core/pci.cc +@@ -12,6 +12,8 @@ + #include + #include + #include ++#include ++#include + + __ID("@(#) $Id: pci.cc 2496 2012-05-15 08:00:13Z lyonel $"); + +--- a/lshw-B.02.18/src/core/pcmcia-legacy.cc ++++ b/lshw-B.02.18/src/core/pcmcia-legacy.cc +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + __ID("@(#) $Id: pcmcia-legacy.cc 2038 2008-09-05 19:53:35Z lyonel $"); + +--- a/lshw-B.02.18/src/core/pcmcia.cc ++++ b/lshw-B.02.18/src/core/pcmcia.cc +@@ -6,6 +6,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +--- a/lshw-B.02.18/src/core/smp.cc ++++ b/lshw-B.02.18/src/core/smp.cc +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + #include "osutils.h" + +--- a/lshw-B.02.18/src/core/spd.cc ++++ b/lshw-B.02.18/src/core/spd.cc +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + __ID("@(#) $Id: spd.cc 1936 2008-03-23 12:29:29Z lyonel $"); + +--- a/lshw-B.02.18/src/core/usb.cc ++++ b/lshw-B.02.18/src/core/usb.cc +@@ -14,6 +14,7 @@ + #include "heuristics.h" + #include "options.h" + #include ++#include + #include + #include + #include +@@ -24,6 +25,7 @@ + #include + #include + #include ++#include + + #define PROCBUSUSBDEVICES "/proc/bus/usb/devices" + #define SYSKERNELDEBUGUSBDEVICES "/sys/kernel/debug/usb/devices" +--- a/lshw-B.02.18/src/core/volumes.cc ++++ b/lshw-B.02.18/src/core/volumes.cc +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + __ID("@(#) $Id: volumes.cc 2488 2012-02-22 00:23:47Z lyonel $"); + +--- a/lshw-B.02.18/src/gui/engine.cc ++++ b/lshw-B.02.18/src/gui/engine.cc +@@ -6,6 +6,8 @@ + #include "osutils.h" + #include "options.h" + ++#include ++#include + #include + #include + #include +--- a/lshw-B.02.18/src/gui/print-gui.cc ++++ b/lshw-B.02.18/src/gui/print-gui.cc +@@ -10,6 +10,7 @@ + #include "version.h" + #include "osutils.h" + #include "stock.h" ++#include + #include + #include + #include --- lshw-02.18.orig/debian/patches/logo.svg +++ lshw-02.18/debian/patches/logo.svg @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + image/svg+xml + + LSHW logo + 2005/07/15 + + + Lyonel Vincent + + + + + ezIX.org + + + logo + $Id: logo.svg 1822 2007-08-07 19:51:34Z lyonel $ + C + + + lshw logo diagnostics + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- lshw-02.18.orig/debian/patches/lshw-X.patch +++ lshw-02.18/debian/patches/lshw-X.patch @@ -0,0 +1,62 @@ +Sanitize error when trying to run GUI without XIndex: lshw-02.14/src/gui/integration/console.apps +=================================================================== +--- a/lshw-B.02.18/src/gui/integration/console.apps ++++ b/lshw-B.02.18/src/gui/integration/console.apps +@@ -1,3 +1,3 @@ + USER=root +-PROGRAM=/usr/sbin/gtk-lshw ++PROGRAM=/usr/sbin/lshw-gtk + SESSION=true +--- a/lshw-B.02.18/src/gui/integration/gtk-lshw.desktop ++++ b/lshw-B.02.18/src/gui/integration/gtk-lshw.desktop +@@ -3,7 +3,7 @@ + Comment=HardWare LiSter + Categories=Application;System;X-Red-Hat-Base;X-Fedora; + Icon=/usr/share/lshw/artwork/logo.svg +-Exec=/usr/bin/gtk-lshw ++Exec=/usr/bin/lshw-gtk + Type=Application + Terminal=false + Encoding=UTF-8 +--- a/lshw-B.02.18/src/lshw.cc ++++ b/lshw-B.02.18/src/lshw.cc +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + #ifndef NONLS + #include +@@ -30,8 +31,8 @@ + fprintf(stderr, _("\t-xml output hardware tree as XML\n")); + fprintf(stderr, _("\t-short output hardware paths\n")); + fprintf(stderr, _("\t-businfo output bus information\n")); +- if(getenv("DISPLAY") && exists(SBINDIR"/gtk-lshw")) +- fprintf(stderr, _("\t-X use graphical interface\n")); ++ if(getenv("DISPLAY") && exists(SBINDIR"/lshw-gtk")) ++ fprintf(stderr, _("\t-X use graphical interface\n")); + fprintf(stderr, _("\noptions can be\n")); + #ifdef SQLITE + fprintf(stderr, _("\t-dump OUTFILE save hardware tree to a file\n")); +@@ -211,7 +212,19 @@ + exit(1); + } + +- if(enabled("output:X")) execl(SBINDIR"/gtk-lshw", SBINDIR"/gtk-lshw", NULL); ++/* if(enabled("output:X")) execl(SBINDIR"/gtk-lshw", SBINDIR"/gtk-lshw", NULL); */ ++ ++ if(enabled("output:X")) { ++ execl(SBINDIR"/lshw-gtk", SBINDIR"/lshw-gtk", NULL); ++ // Execl only returns if an error has occurred. ++ if ( errno == ENOENT ) { ++ fprintf(stderr, "ERROR: Sorry, cannot run the X11/GTK interface because %s/lshw-gtk\n is not available.\n", SBINDIR); ++ fprintf(stderr, "HINT: Install the lshw-gtk package in Debian.\n"); ++ } else { ++ fprintf(stderr, "ERROR: There was an error when trying to execute %s/lshw-gtk: %s\n", SBINDIR, strerror(errno)); ++ fprintf(stderr, "Will just print the information on screen\n"); ++ } ++ } + + if (geteuid() != 0) + { --- lshw-02.18.orig/debian/patches/lshw-common.patch +++ lshw-02.18/debian/patches/lshw-common.patch @@ -0,0 +1,22 @@ +Added paths to look for device idsIndex: lshw-02.14/src/core/pci.cc +=================================================================== +--- a/lshw-B.02.18/src/core/pci.cc ++++ b/lshw-B.02.18/src/core/pci.cc +@@ -18,6 +18,7 @@ + #define PROC_BUS_PCI "/proc/bus/pci" + #define SYS_BUS_PCI "/sys/bus/pci" + #define PCIID_PATH DATADIR"/pci.ids:/usr/share/lshw/pci.ids:/usr/local/share/pci.ids:/usr/share/pci.ids:/etc/pci.ids:/usr/share/hwdata/pci.ids:/usr/share/misc/pci.ids" ++#define PCIID_PATH DATADIR"/pci.ids:/usr/share/lshw-common/pci.ids:/usr/local/share/pci.ids:/usr/share/pci.ids:/etc/pci.ids:/usr/share/hwdata/pci.ids:/usr/share/misc/pci.ids" + + #define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */ + #define PCI_VENDOR_ID 0x00 /* 16 bits */ +--- a/lshw-B.02.18/src/core/usb.cc ++++ b/lshw-B.02.18/src/core/usb.cc +@@ -28,6 +28,7 @@ + #define PROCBUSUSBDEVICES "/proc/bus/usb/devices" + #define SYSKERNELDEBUGUSBDEVICES "/sys/kernel/debug/usb/devices" + #define USBID_PATH DATADIR"/usb.ids:/usr/share/lshw/usb.ids:/usr/local/share/usb.ids:/usr/share/usb.ids:/etc/usb.ids:/usr/share/hwdata/usb.ids:/usr/share/misc/usb.ids" ++#define USBID_PATH DATADIR"/usb.ids:/usr/share/lshw-common/usb.ids:/usr/local/share/usb.ids:/usr/share/usb.ids:/etc/usb.ids:/usr/share/hwdata/usb.ids:/usr/share/misc/usb.ids" + + #define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */ + #define USB_CLASS_AUDIO 1 --- lshw-02.18.orig/debian/patches/lshw-devictree-assume-untyped-cpu-is-cpu.patch +++ lshw-02.18/debian/patches/lshw-devictree-assume-untyped-cpu-is-cpu.patch @@ -0,0 +1,12 @@ +--- a/lshw-B.02.18/src/core/device-tree.cc.orig 2013-05-07 14:57:16.400177000 -0400 ++++ b/lshw-B.02.18/src/core/device-tree.cc 2013-05-07 15:01:51.710177000 -0400 +@@ -193,7 +193,8 @@ + struct dirent **cachelist; + int ncache; + +- if (hw::strip(get_string(basepath + "/device_type")) != "cpu") ++ if (exists(basepath + "/device_type") && ++ hw::strip(get_string(basepath + "/device_type")) != "cpu") + break; // oops, not a CPU! + + cpu.setProduct(get_string(basepath + "/name")); --- lshw-02.18.orig/debian/patches/lshw-gtk.1 +++ lshw-02.18/debian/patches/lshw-gtk.1 @@ -0,0 +1,160 @@ +.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32 +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sh \" Subsection heading +.br +.if t .Sp +.ne 5 +.PP +\fB\\$1\fR +.PP +.. +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +'br\} +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.if \nF \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. nr % 0 +. rr F +.\} +.\" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.hy 0 +.if n .na +.\" +.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). +.\" Fear. Run. Save yourself. No user-serviceable parts. +. \" fudge factors for nroff and troff +.if n \{\ +. ds #H 0 +. ds #V .8m +. ds #F .3m +. ds #[ \f1 +. ds #] \fP +.\} +.if t \{\ +. ds #H ((1u-(\\\\n(.fu%2u))*.13m) +. ds #V .6m +. ds #F 0 +. ds #[ \& +. ds #] \& +.\} +. \" simple accents for nroff and troff +.if n \{\ +. ds ' \& +. ds ` \& +. ds ^ \& +. ds , \& +. ds ~ ~ +. ds / +.\} +.if t \{\ +. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" +. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' +. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' +. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' +. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' +. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' +.\} +. \" troff and (daisy-wheel) nroff accents +.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' +.ds 8 \h'\*(#H'\(*b\h'-\*(#H' +.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] +.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' +.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' +.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] +.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] +.ds ae a\h'-(\w'a'u*4/10)'e +.ds Ae A\h'-(\w'A'u*4/10)'E +. \" corrections for vroff +.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' +.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' +. \" for low resolution devices (crt and lpr) +.if \n(.H>23 .if \n(.V>19 \ +\{\ +. ds : e +. ds 8 ss +. ds o a +. ds d- d\h'-1'\(ga +. ds D- D\h'-1'\(hy +. ds th \o'bp' +. ds Th \o'LP' +. ds ae ae +. ds Ae AE +.\} +.rm #[ #] #H #V #F C +.\" ======================================================================== +.\" +.IX Title "LSHW-GTK 1" +.TH LSHW-GTK 1 "2007-12-05" "perl v5.8.8" "User Contributed Perl Documentation" +.SH "NAME" +lshw\-gtk \- list hardware (GTK version) +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +lshw is a small tool to extract detailed information on the hardware +configuration of the machine. It can report exact memory +configuration, firmware version, mainboard configuration, +\&\s-1CPU\s0 version +and speed, cache configuration, bus speed, etc. on +DMI-capable x86 or \s-1IA\-64\s0 +systems and on some PowerPC +machines (PowerMac G4 is known to work). +.PP +It currently supports \s-1DMI\s0 (x86 and \s-1IA\-64\s0 only), OpenFirmware device tree (PowerPC only), +\&\s-1PCI/AGP\s0, \s-1CPUID\s0 (x86), \s-1IDE/ATA/ATAPI\s0, \s-1PCMCIA\s0 (only tested on x86), \s-1SCSI\s0 and \s-1USB\s0. +.SH "NOTES" +.IX Header "NOTES" +lshw-gtk must be run as super user or it will only report +.SH "COPYING" +.IX Header "COPYING" +lshw is distributed under the \s-1GNU\s0 \s-1GENERAL\s0 \s-1PUBLIC\s0 \s-1LICENSE\s0 (\s-1GPL\s0) version 2. +.SH "AUTOR" +.IX Header "AUTOR" +lshw is maintained by Lyonel Vincent +. +.SH "OTHER INFO" +.IX Header "OTHER INFO" +The webpage for lshw is at http://ezix.org/software/lshw.html --- lshw-02.18.orig/debian/patches/lshw-gtk.desktop +++ lshw-02.18/debian/patches/lshw-gtk.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Type=Application +Name=Hardware Lister +Name[es]=Listar equipamiento +Comment=Provides information on hardware +Comment[ca]=Proveeix informació sobre el maquinari +Comment[es]=Ofrece información sobre el equipamiento instalado +Icon=lshw-gtk +Exec=su-to-root -X -c lshw-gtk +Terminal=false +Categories=System; --- lshw-02.18.orig/debian/patches/lshw-gtk.patch +++ lshw-02.18/debian/patches/lshw-gtk.patch @@ -0,0 +1,15 @@ +Modified install directoriesIndex: lshw-02.14/src/Makefile +=================================================================== +--- a/lshw-B.02.18/src/Makefile ++++ b/lshw-B.02.18/src/Makefile +@@ -104,8 +104,8 @@ + + install-gui: gui + $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR) +- $(INSTALL) -m 0755 gui/gtk-$(PACKAGENAME) $(DESTDIR)/$(SBINDIR) +- $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork ++ $(INSTALL) -m 0755 gui/gtk-$(PACKAGENAME) $(DESTDIR)/$(SBINDIR)/$(PACKAGENAME)-gtk ++ $(INSTALL) -d -m 0754 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork + $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/ui + $(INSTALL) -m 0644 gui/*.ui $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/ui + $(INSTALL) -m 0644 gui/artwork/*.svg $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork --- lshw-02.18.orig/debian/patches/lshw-gtk.pod +++ lshw-02.18/debian/patches/lshw-gtk.pod @@ -0,0 +1,36 @@ +=head1 NAME + +lshw-gtk - list hardware (GTK version) + +=head1 DESCRIPTION + +lshw is a small tool to extract detailed information on the hardware +configuration of the machine. It can report exact memory +configuration, firmware version, mainboard configuration, +CPU version +and speed, cache configuration, bus speed, etc. on +DMI-capable x86 or IA-64 +systems and on some PowerPC +machines (PowerMac G4 is known to work). + +It currently supports DMI (x86 and IA-64 only), OpenFirmware device tree (PowerPC only), +PCI/AGP, CPUID (x86), IDE/ATA/ATAPI, PCMCIA (only tested on x86), SCSI and USB. + +=head1 NOTES + +lshw-gtk must be run as super user or it will only report + +=head1 COPYING + +lshw is distributed under the GNU GENERAL PUBLIC LICENSE (GPL) version 2. + +=head1 AUTOR + +lshw is maintained by Lyonel Vincent +. + +=head1 OTHER INFO + +The webpage for lshw is at http://ezix.org/software/lshw.html + +=cut --- lshw-02.18.orig/debian/patches/privacy.patch +++ lshw-02.18/debian/patches/privacy.patch @@ -0,0 +1,13 @@ +Doesn't look for new version on inte to avoid privacy issuesIndex: lshw-02.14/src/core/version.cc +=================================================================== +--- a/lshw-B.02.18/src/core/version.cc ++++ b/lshw-B.02.18/src/core/version.cc +@@ -112,6 +112,8 @@ + { + static char *latest = NULL; + ++ return NULL; ++ + if(!latest) + latest = txtquery(PACKAGE, "ezix.org", NULL); + --- lshw-02.18.orig/debian/patches/series +++ lshw-02.18/debian/patches/series @@ -0,0 +1,13 @@ +wget.patch +bin.patch +lshw-gtk.patch +lshw-common.patch +cflags.patch +#alpha.patch +gcc45.gcc +lshw-X.patch +privacy.patch +spelling-error.patch +fix-manpage.patch +Avoid-crash-in-scan_dmi_sysfs-when-running-as-non-ro.patch +fix-width-handling.patch --- lshw-02.18.orig/debian/patches/spelling-error.patch +++ lshw-02.18/debian/patches/spelling-error.patch @@ -0,0 +1,11 @@ +--- a/lshw-B.02.18/src/core/network.cc ++++ b/lshw-B.02.18/src/core/network.cc +@@ -414,7 +414,7 @@ + if(ecmd.supported & SUPPORTED_BNC) + interface.addCapability("bnc", _("BNC")); + if(ecmd.supported & SUPPORTED_MII) +- interface.addCapability("mii", _("Media Independant Interface")); ++ interface.addCapability("mii", _("Media Independent Interface")); + if(ecmd.supported & SUPPORTED_FIBRE) + interface.addCapability("fibre",_( "optical fibre")); + if(ecmd.supported & SUPPORTED_10baseT_Half) --- lshw-02.18.orig/debian/patches/sysfs-hang.patch +++ lshw-02.18/debian/patches/sysfs-hang.patch @@ -0,0 +1,32 @@ +Index: lshw-02.12.01/src/core/pci.cc +=================================================================== +--- lshw-02.12.01.orig/src/core/pci.cc 2008-05-04 00:24:49.000000000 +0200 ++++ lshw-02.12.01/src/core/pci.cc 2008-05-04 00:24:49.000000000 +0200 +@@ -68,6 +68,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 */ +@@ -666,8 +667,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; + +@@ -675,7 +677,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) --- lshw-02.18.orig/debian/patches/wget.patch +++ lshw-02.18/debian/patches/wget.patch @@ -0,0 +1,26 @@ +Avoid downloading of files from inet at build time +This is provided by hwdata packageIndex: lshw-02.14/src/Makefile +=================================================================== +--- a/lshw-B.02.18/src/Makefile ++++ b/lshw-B.02.18/src/Makefile +@@ -82,16 +82,16 @@ + docbook2man $< + + pci.ids: +- wget http://pciids.sourceforge.net/pci.ids ++ #wget http://pciids.sourceforge.net/pci.ids + + usb.ids: +- wget http://www.linux-usb.org/usb.ids ++ #wget http://www.linux-usb.org/usb.ids + + oui.txt: +- wget http://standards.ieee.org/regauth/oui/oui.txt ++ #wget http://standards.ieee.org/regauth/oui/oui.txt + + manuf.txt: +- wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf ++ #wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf + + install: all + $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR) --- lshw-02.18.orig/debian/rules +++ lshw-02.18/debian/rules @@ -0,0 +1,125 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatibility version to use. +#export DH_COMPAT=4 + +include /usr/share/quilt/quilt.make + +CXX_DEB_FLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + export CXX_DEB_FLAGS += -O0 +else + export CXX_DEB_FLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + export INSTALL_PROGRAM += -s +endif + +ifeq ($(DEB_BUILD_GNU_TYPE),alpha-linux-gnu) + export CXX_DEB_FLAGS = -Wall -g +endif + + +uver=B.02.18 +srcdir=lshw-$(uver)/src + +configure: configure-stamp +configure-stamp: + dh_testdir + #Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp patch + dh_testdir + + # Add here commands to compile the package. + $(MAKE) -C $(srcdir) core + $(MAKE) -C $(srcdir) gui + #/usr/bin/docbook-to-man debian/lshw.sgml > lshw.1 + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + $(MAKE) -C $(srcdir) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/lshw. + $(MAKE) -C $(srcdir) install DESTDIR=$(CURDIR)/debian/lshw + $(MAKE) -C $(srcdir) install-gui DESTDIR=$(CURDIR)/debian/lshw-gtk + + # data files supplied by pciutils and usbutils + rm -rf $(CURDIR)/debian/lshw/usr/share/lshw + #pod2man --lax $(CURDIR)/debian/patches/lshw-gtk.pod > $(CURDIR)/debian/patches/lshw-gtk.1 + cp $(CURDIR)/debian/patches/lshw-gtk.desktop $(CURDIR)/debian/lshw-gtk/usr/share/applications/lshw-gtk.desktop + cp $(CURDIR)/debian/patches/logo.svg $(CURDIR)/debian/lshw-gtk/usr/share/pixmaps/lshw-gtk.svg + chmod 644 $(CURDIR)/debian/lshw/usr/share/locale/fr/LC_MESSAGES/lshw.mo + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installmenu + dh_installcron + dh_installman + dh_installinfo + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installmenu + dh_installcron + dh_installman + dh_installinfo + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch --- lshw-02.18.orig/debian/watch +++ lshw-02.18/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ezix.org/software/files/ lshw-B.([\d.]*).tar.gz debian uupdate \ No newline at end of file