Changes of Revision 2
[-] | Added | lshw.changes |
x 1
2 +------------------------------------------------------------------- 3 +Mon Aug 24 14:40:47 UTC 2015 - cs@linux-administrator.com 4 + 5 +- added lshw-fix-segfault_bufferoverflow-in-readlogicalblocks.patch 6 + 7 +------------------------------------------------------------------- 8 +Fri Aug 29 15:25:58 UTC 2014 - cs@linux-administrator.com 9 + 10 +- update to release B.02.17 11 + 12 |
||
[-] | Added | lshw.spec ^ |
201 1
2 +%define disable_gui 0 3 +%define _default_patch_fuzz 3 4 +%if 0%{?sles_version} 5 + %if 0%{?sles_version} == 9 || 0%{?sles_version} == 10 6 + %define disable_gui 1 7 + %endif 8 +%endif 9 +%if 0%{?rhel} == 5 || 0%{?centos_version} == 5 10 + %define disable_gui 1 11 +%endif 12 +%if 0%{?rhel_version} 13 + %if 0%{?rhel_version} == 500 14 + %define disable_gui 1 15 + %endif 16 + %if 0%{?rhel_version} == 501 17 + %define disable_gui 1 18 + %endif 19 + %if 0%{?rhel_version} == 502 20 + %define disable_gui 1 21 + %endif 22 + %if 0%{?rhel_version} == 503 23 + %define disable_gui 1 24 + %endif 25 + %if 0%{?rhel_version} == 504 26 + %define disable_gui 1 27 + %endif 28 + %if 0%{?rhel_version} == 505 29 + %define disable_gui 1 30 + %endif 31 + %if 0%{?rhel_version} == 506 32 + %define disable_gui 1 33 + %endif 34 + %if 0%{?rhel_version} == 507 35 + %define disable_gui 1 36 + %endif 37 + %if 0%{?rhel_version} == 508 38 + %define disable_gui 1 39 + %endif 40 + %if 0%{?rhel_version} == 509 41 + %define disable_gui 1 42 + %endif 43 + %if 0%{?rhel_version} == 510 44 + %define disable_gui 1 45 + %endif 46 + %if 0%{?rhel_version} == 511 47 + %define disable_gui 1 48 + %endif 49 +%endif 50 +%if 0%{?sl_version} 51 + %if 0%{?sl_version} == 500 52 + %define disable_gui 1 53 + %endif 54 + %if 0%{?sl_version} == 501 55 + %define disable_gui 1 56 + %endif 57 + %if 0%{?sl_version} == 502 58 + %define disable_gui 1 59 + %endif 60 + %if 0%{?sl_version} == 503 61 + %define disable_gui 1 62 + %endif 63 + %if 0%{?sl_version} == 504 64 + %define disable_gui 1 65 + %endif 66 + %if 0%{?sl_version} == 505 67 + %define disable_gui 1 68 + %endif 69 + %if 0%{?sl_version} == 506 70 + %define disable_gui 1 71 + %endif 72 + %if 0%{?sl_version} == 507 73 + %define disable_gui 1 74 + %endif 75 + %if 0%{?sl_version} == 508 76 + %define disable_gui 1 77 + %endif 78 + %if 0%{?sl_version} == 509 79 + %define disable_gui 1 80 + %endif 81 + %if 0%{?sl_version} == 510 82 + %define disable_gui 1 83 + %endif 84 + %if 0%{?sl_version} == 511 85 + %define disable_gui 1 86 + %endif 87 +%endif 88 + 89 +Summary: HardWare LiSter 90 +Name: lshw 91 +Version: B.02.17 92 +Release: 1 93 +Source: %{name}-%{version}.tar.bz2 94 +Patch0: lshw-malloc.diff 95 +Patch1: lshw-fix-segfault_bufferoverflow-in-readlogicalblocks.patch 96 +URL: http://ezix.org/project/wiki/HardwareLiSter 97 +License: GPL 98 +Group: Applications/System 99 +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root 100 +BuildRequires: gtk2-devel gcc-c++ pkgconfig glibc-devel gcc 101 +BuildRequires: sqlite-devel >= 3.0 102 + 103 +%description 104 +lshw (Hardware Lister) is a small tool to provide detailed informaton 105 +on the hardware configuration of the machine. It can report 106 +exact memory configuration, firmware version, mainboard configuration, 107 +CPU version and speed, cache configuration, bus speed, etc. 108 +On DMI-capable x86 systems and on some PowerPC 109 +machines (PowerMac G4 is known to work). 110 + 111 +Information can be output in plain text, XML or HTML. 112 + 113 +For detailed information on lshw features and usage, please see the 114 +included documentation or go to the lshw Web page, 115 +http://www.ezix.org/software/lshw.html 116 + 117 + 118 +%if 0%{?disable_gui} == 0 119 + 120 +%package gui 121 +Summary: HardWare LiSter (GUI version) 122 +Group: Applications/System 123 +Requires: %{name} 124 +Requires: gtk2 125 +BuildRequires: gtk2-devel 126 + 127 +%endif 128 + 129 +%if 0%{?disable_gui} == 0 130 + 131 +%description gui 132 +lshw (Hardware Lister) is a small tool to provide detailed informaton on the hardware configuration of the machine. It can report exact memory configuration, firmware version, mainboard configura 133 +tion, CPU version and speed, cache configuration, bus speed, etc. on DMI-capable x86 systems and on some PowerPC machines (PowerMac G4 is known to work). 134 + 135 +This package provides a graphical user interface to display hardware information. 136 + 137 +For detailed information on lshw features and usage, please see the 138 +included documentation or go to the lshw Web page, 139 +http://www.ezix.org/software/lshw.html 140 + 141 +%endif 142 + 143 + 144 +%prep 145 +%setup 146 +%patch0 147 +%patch1 -p1 148 + 149 +%build 150 +## % if 0%{?suse_version} 151 +## % ifarch x86_64 152 +## % define optflags -O2 -g 153 +## % else 154 +## % define optflags -O2 -g 155 +## % endif 156 +## % endif 157 + 158 +%{__make} 159 + 160 +%if 0%{?disable_gui} == 0 161 +%{__make} gui 162 +%endif 163 + 164 +%install 165 +make DESTDIR=$RPM_BUILD_ROOT PREFIX=%_prefix SBINDIR=%_sbindir MANDIR=%_mandir install 166 + 167 +%if 0%{?disable_gui} == 0 168 +make DESTDIR=$RPM_BUILD_ROOT PREFIX=%_prefix SBINDIR=%_sbindir MANDIR=%_mandir install-gui 169 +%endif 170 + 171 +%files 172 +%defattr(-,root,root) 173 +%doc COPYING 174 +%defattr(-,root,root) 175 +%attr(555,bin,bin) %{_sbindir}/lshw 176 +%{_mandir}/man?/* 177 +%{_datadir}/lshw/ 178 +%config(noreplace) %{_datadir}/lshw/pci.ids 179 +%config(noreplace) %{_datadir}/lshw/manuf.txt 180 +%config(noreplace) %{_datadir}/lshw/oui.txt 181 +%config(noreplace) %{_datadir}/lshw/usb.ids 182 +%{_datadir}/locale/fr/LC_MESSAGES/lshw.mo 183 + 184 +%if 0%{?disable_gui} == 0 185 +%files gui 186 +%defattr(-,root,root) 187 +%doc COPYING 188 +%attr(555,bin,bin) %{_sbindir}/gtk-lshw 189 +%endif 190 + 191 +%clean 192 +rm -rf $RPM_BUILD_ROOT 193 + 194 +%changelog 195 +* Wed Jan 11 2012 Carsten Schoene <cs@linux-administrator.com> - B.02.16-1 196 +- updated to version B.02.16 197 + 198 +* Tue Oct 05 2010 Carsten Schoene <cs@linux-administrator.com> - B.02.15-1 199 +- updated to version B.02.15 200 + 201 |
||
[+] | Added | lshw-fix-segfault_bufferoverflow-in-readlogicalblocks.patch ^ |
@@ -0,0 +1,13 @@ +Import buffer overflow fix from lshw-development : svn commit 2528. +Index: src/core/fat.cc +=================================================================== +--- a/src/core/fat.cc (révision 2527) ++++ b/src/core/fat.cc (révision 2528) +@@ -81,6 +81,7 @@ + uint8_t dummy2[164]; + uint8_t pmagic[2]; + } __attribute__((__packed__)) fat32; ++ char sector[512]; // to make sure the whole struct is at least 512 bytes long + } __attribute__((__packed__)) type; + } __attribute__((__packed__)); + | ||
[+] | Added | lshw-malloc.diff ^ |
@@ -0,0 +1,11 @@ +--- src/core/osutils.h.orig 2008-05-14 14:20:22.000000000 +0200 ++++ src/core/osutils.h 2008-05-14 14:20:30.000000000 +0200 +@@ -5,7 +5,7 @@ + #include <vector> + #include <sys/types.h> + #include <stdint.h> +- ++#include <malloc.h> + bool pushd(const std::string & dir = ""); + std::string popd(); + std::string pwd(); | ||
[+] | Added | lshw-scsi-scan.patch ^ |
@@ -0,0 +1,100 @@ +Index: packages/lshw/development/src/core/scsi.cc +=================================================================== +--- a/packages/lshw/development/src/core/scsi.cc ++++ b/packages/lshw/development/src/core/scsi.cc +@@ -30,5 +30,5 @@ + __ID("@(#) $Id$"); + +-#define SG_X "/dev/sg%d" ++#define SG_X "/dev/sg*" + #define SG_MAJOR 21 + +@@ -654,8 +654,7 @@ + + +-static bool scan_sg(int sg, +-hwNode & n) +-{ +- char buffer[20]; ++static void scan_sg(hwNode & n) ++{ ++ int sg; + int fd = -1; + My_sg_scsi_id m_id; +@@ -666,14 +665,22 @@ + int emulated = 0; + bool ghostdeventry = false; +- +- snprintf(buffer, sizeof(buffer), SG_X, sg); +- +- ghostdeventry = !exists(buffer); +- +- if(ghostdeventry) mknod(buffer, (S_IFCHR | S_IREAD), MKDEV(SG_MAJOR, sg)); +- fd = open(buffer, OPEN_FLAG | O_NONBLOCK); +- if(ghostdeventry) unlink(buffer); ++ size_t j; ++ glob_t entries; ++ ++ if(glob(SG_X, 0, NULL, &entries) == 0) ++ { ++ for(j=0; j < entries.gl_pathc; j++) ++ { ++ sg = strtol(strpbrk(entries.gl_pathv[j], "0123456789"), NULL, 10); ++ ++ ghostdeventry = !exists(entries.gl_pathv[j]); ++ ++ if(ghostdeventry) ++ mknod(entries.gl_pathv[j], (S_IFCHR | S_IREAD), MKDEV(SG_MAJOR, sg)); ++ fd = open(entries.gl_pathv[j], OPEN_FLAG | O_NONBLOCK); ++ if(ghostdeventry) ++ unlink(entries.gl_pathv[j]); + if (fd < 0) +- return false; ++ continue; + + memset(&m_id, 0, sizeof(m_id)); +@@ -681,5 +688,5 @@ + { + close(fd); +- return true; // we failed to get info but still hope we can continue ++ continue; // we failed to get info but still hope we can continue + } + +@@ -774,9 +781,6 @@ + parent = n.addChild(hwNode("scsi", hw::storage)); + +- if (!parent) +- { +- close(fd); +- return true; +- } ++ if (parent) ++ { + + if(parent->getBusInfo() == "") +@@ -790,8 +794,10 @@ + } + parent->addChild(device); ++ } + + close(fd); +- +- return true; ++ } ++ globfree(&entries); ++ } + } + +@@ -890,10 +896,7 @@ + bool scan_scsi(hwNode & n) + { +- int i = 0; +- + scan_devices(); + +- while (scan_sg(i, n)) +- i++; ++ scan_sg(n); + + scan_hosts(n); + | ||
[+] | Added | lshw_02.16-1.diff.gz ^ |
@@ -0,0 +1,1467 @@ +--- lshw-02.16.orig/debian/lshw-gtk.manpages ++++ lshw-02.16/debian/lshw-gtk.manpages +@@ -0,0 +1 @@ ++debian/patches/lshw-gtk.1 +--- lshw-02.16.orig/debian/control ++++ lshw-02.16/debian/control +@@ -0,0 +1,32 @@ ++Source: lshw ++Section: utils ++Priority: optional ++Maintainer: Ghe Rivero <ghe@debian.org> ++Build-Depends: debhelper (>> 6.0.0), libgtk2.0-dev, quilt, libsqlite3-dev ++Standards-Version: 3.9.1 ++ ++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: 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.16.orig/debian/watch ++++ lshw-02.16/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 +--- lshw-02.16.orig/debian/changelog ++++ lshw-02.16/debian/changelog +@@ -0,0 +1,251 @@ ++lshw (02.16-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Ghe Rivero <ghe@debian.org> 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 <ghe.rivero@gmail.com> 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 <ghe@debian.org> 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 <ghe@debian.org> 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 <ghe@debian.org> 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 <ghe@debian.org> 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 <ghe@debian.org> 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 <ghe@debian.org> 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 <ghe@debian.org> 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 <ghe@debian.org> 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 <ghe@debian.org> 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 <ghe@debian.org> 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 <ghe@debian.org> Wed, 30 May 2007 13:02:26 +0200 ++ ++lshw (02.10-3) unstable; urgency=low ++ ++ * New URL at debian/copyright. Closes: #405452 ++ ++ -- Ghe Rivero <ghe@debian.org> 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 <ghe@debian.org> 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 <ghe@debian.org> 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 <ghe@upsa.es> 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 | ||
Added | lshw-B.02.16.tar.bz2 ^ | |
Added | lshw-B.02.17.tar.bz2 ^ | |
[+] | Added | lshw_02.16-1.dsc ^ |
@@ -0,0 +1,31 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +Format: 1.0 +Source: lshw +Binary: lshw, lshw-gtk +Architecture: any +Version: 02.16-1 +Maintainer: Ghe Rivero <ghe@debian.org> +Standards-Version: 3.9.1 +Build-Depends: debhelper (>> 6.0.0), libgtk2.0-dev, quilt, libsqlite3-dev +Package-List: + lshw deb utils optional + lshw-gtk deb utils optional +Checksums-Sha1: + d2359c79c28568d8b717060314422542b7fd813c 1845891 lshw_02.16.orig.tar.gz + 7f0abec180b84b34418110afecf86da63e09b369 13263 lshw_02.16-1.diff.gz +Checksums-Sha256: + 809882429555b93259785cc261dbff04c16c93d064db5f445a51945bc47157cb 1845891 lshw_02.16.orig.tar.gz + 57c9b3ff7bac1afa9fa9a72f9e507fcc352f17ca6f20822d0418e2bc95868179 13263 lshw_02.16-1.diff.gz +Files: + 67479167add605e8f001097c30e96d0d 1845891 lshw_02.16.orig.tar.gz + 61c4b70d7805ddfbb398b59d8b98a4f3 13263 lshw_02.16-1.diff.gz + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (GNU/Linux) + +iEYEARECAAYFAk/uuS4ACgkQZttaNibwIPchtACg3KeR+RWI8WflvcYJIT6UQEcY +ZdkAn1IWdiGFgfPWq7WVVu2Yt2meAJzT +=ZhR4 +-----END PGP SIGNATURE----- | ||
Added | lshw_02.16.orig.tar.gz ^ |