[packages/lshw] - up to B.02.20
adwol
adwol at pld-linux.org
Thu Aug 6 13:14:12 CEST 2026
commit 85c0008f2d24b08f3e422da0b9235dbd1f697b60
Author: Adam Osuchowski <>
Date: Thu Aug 6 13:13:52 2026 +0200
- up to B.02.20
hwdata.patch | 16 ++++++++--------
lshw.spec | 4 ++--
sanity.patch | 56 +++++++++++++++++++++++---------------------------------
3 files changed, 33 insertions(+), 43 deletions(-)
---
diff --git a/lshw.spec b/lshw.spec
index be3c5ea..81f57a1 100644
--- a/lshw.spec
+++ b/lshw.spec
@@ -8,12 +8,12 @@
Summary: Hardware Lister
Summary(pl.UTF-8): Narzędzie wypisujące sprzęt
Name: lshw
-Version: B.02.19.2
+Version: B.02.20
Release: 1
License: GPL v2
Group: Applications/System
Source0: https://ezix.org/software/files/%{name}-%{version}.tar.gz
-# Source0-md5: 8c70d46e906688309095c73ecb9396e3
+# Source0-md5: a8f75206b13a5a482b6c1d6a927f4510
Patch0: sanity.patch
Patch1: hwdata.patch
Patch2: %{name}-buffer_overflow.patch
diff --git a/hwdata.patch b/hwdata.patch
index 81c5527..6e92988 100644
--- a/hwdata.patch
+++ b/hwdata.patch
@@ -1,7 +1,7 @@
-diff -ur lshw-B.02.17.orig/src/core/pci.cc lshw-B.02.17/src/core/pci.cc
---- lshw-B.02.17.orig/src/core/pci.cc 2012-05-15 08:00:13.000000000 +0000
-+++ lshw-B.02.17/src/core/pci.cc 2014-07-14 20:35:43.539000000 +0000
-@@ -17,7 +17,7 @@
+diff -ruNp lshw-B.02.20.orig/src/core/pci.cc lshw-B.02.20/src/core/pci.cc
+--- lshw-B.02.20.orig/src/core/pci.cc 2024-01-06 10:59:47.000000000 +0100
++++ lshw-B.02.20/src/core/pci.cc 2026-08-06 12:53:40.697411272 +0200
+@@ -20,7 +20,7 @@ __ID("@(#) $Id$");
#define PROC_BUS_PCI "/proc/bus/pci"
#define SYS_BUS_PCI "/sys/bus/pci"
@@ -10,10 +10,10 @@ diff -ur lshw-B.02.17.orig/src/core/pci.cc lshw-B.02.17/src/core/pci.cc
#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */
#define PCI_VENDOR_ID 0x00 /* 16 bits */
-diff -ur lshw-B.02.17.orig/src/core/usb.cc lshw-B.02.17/src/core/usb.cc
---- lshw-B.02.17.orig/src/core/usb.cc 2012-10-24 16:49:18.000000000 +0000
-+++ lshw-B.02.17/src/core/usb.cc 2014-07-14 20:36:22.940000000 +0000
-@@ -27,7 +27,7 @@
+diff -ruNp lshw-B.02.20.orig/src/core/usb.cc lshw-B.02.20/src/core/usb.cc
+--- lshw-B.02.20.orig/src/core/usb.cc 2024-01-06 10:59:47.000000000 +0100
++++ lshw-B.02.20/src/core/usb.cc 2026-08-06 12:53:40.697753900 +0200
+@@ -29,7 +29,7 @@
#define PROCBUSUSBDEVICES "/proc/bus/usb/devices"
#define SYSKERNELDEBUGUSBDEVICES "/sys/kernel/debug/usb/devices"
diff --git a/sanity.patch b/sanity.patch
index 8ac706b..75ec575 100644
--- a/sanity.patch
+++ b/sanity.patch
@@ -1,26 +1,26 @@
-diff -ruNp lshw-B.02.18.orig/src/gui/Makefile lshw-B.02.18/src/gui/Makefile
---- lshw-B.02.18.orig/src/gui/Makefile 2016-04-22 21:49:30.000000000 +0200
-+++ lshw-B.02.18/src/gui/Makefile 2017-06-17 21:37:34.254783020 +0200
+diff -ruNp lshw-B.02.20.orig/src/gui/Makefile lshw-B.02.20/src/gui/Makefile
+--- lshw-B.02.20.orig/src/gui/Makefile 2024-01-06 10:59:47.000000000 +0100
++++ lshw-B.02.20/src/gui/Makefile 2026-08-06 12:13:58.281009001 +0200
@@ -1,5 +1,7 @@
PACKAGENAME?=lshw
+SQLITE?=0
+
CXX?=$(CROSS_COMPILE)c++
+ PKG_CONFIG ?= pkg-config
CC?=$(CROSS_COMPILE)cc
- STRIP?=strip
-@@ -8,7 +10,7 @@
+@@ -9,7 +11,7 @@ OBJCOPY?=objcopy
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
- GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
+ GTKINCLUDES=$(shell $(PKG_CONFIG) gtk+-3.0 --cflags)
INCLUDES=-I../core $(GTKINCLUDES)
-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+CXXFLAGS += -g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
ifeq ($(SQLITE), 1)
- CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
+ CXXFLAGS+= -DSQLITE $(shell $(PKG_CONFIG) --cflags sqlite3)
endif
-@@ -18,10 +20,6 @@
+@@ -19,10 +21,6 @@ LIBS+=-L../core -llshw -lresolv $(GTKLIB
ifeq ($(SQLITE), 1)
- LIBS+= $(shell pkg-config --libs sqlite3)
+ LIBS+= $(shell $(PKG_CONFIG) --libs sqlite3)
endif
-LDFLAGS=
-ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
@@ -29,37 +29,27 @@ diff -ruNp lshw-B.02.18.orig/src/gui/Makefile lshw-B.02.18/src/gui/Makefile
OBJS = gtk-lshw.o callbacks.o engine.o print-gui.o stock.o
SRCS = $(OBJS:.o=.c)
-@@ -39,8 +42,7 @@ gtk-$(PACKAGENAME): $(OBJS) ../core/libl
- $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- install: all
-- $(STRIP) gtk-$(PACKAGENAME)
--
-+
- clean:
- rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak callbacks.c.bak callbacks.h.bak Makefile.bak
-
-diff -ruNp lshw-B.02.18.orig/src/Makefile lshw-B.02.18/src/Makefile
---- lshw-B.02.18.orig/src/Makefile 2016-04-22 21:49:30.000000000 +0200
-+++ lshw-B.02.18/src/Makefile 2017-06-17 21:34:48.390265690 +0200
-@@ -23,14 +23,14 @@
- CXX?=$(CROSS_COMPILE)c++
- INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" -DVERSION=\"$(VERSION)\"
+diff -ruNp lshw-B.02.20.orig/src/Makefile lshw-B.02.20/src/Makefile
+--- lshw-B.02.20.orig/src/Makefile 2024-01-06 10:59:47.000000000 +0100
++++ lshw-B.02.20/src/Makefile 2026-08-06 12:15:21.351403401 +0200
+@@ -28,14 +28,14 @@ ifneq ($(NO_VERSION_CHECK), 1)
+ REMOTE_VERSION_CHECK?=-DREMOTE_VERSION_CHECK
+ endif
+ DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" -DVERSION=\"$(VERSION)\" $(REMOTE_VERSION_CHECK)
-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+CXXFLAGS += -g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
ifeq ($(SQLITE), 1)
- CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
+ CXXFLAGS+= -DSQLITE $(shell $(PKG_CONFIG) --cflags sqlite3)
endif
ifeq ($(ZLIB), 1)
- CXXFLAGS+= -DZLIB $(shell pkg-config --cflags zlib)
+ CXXFLAGS+= -DZLIB $(shell $(PKG_CONFIG) --cflags zlib)
endif
-LDFLAGS+=-L./core/ -g
+LDFLAGS+=-L./core/
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
LDFLAGS+= -Wl,--as-needed
endif
-@@ -47,13 +47,7 @@
+@@ -55,13 +55,7 @@ export CXXFLAGS
export LIBS
export LDFLAGS
@@ -74,7 +64,7 @@ diff -ruNp lshw-B.02.18.orig/src/Makefile lshw-B.02.18/src/Makefile
.cc.o:
$(CXX) $(CXXFLAGS) -c $< -o $@
-@@ -63,18 +57,18 @@
+@@ -71,18 +65,18 @@ all: $(PACKAGENAME) $(PACKAGENAME).1 $(D
.PHONY: core
core:
@@ -96,7 +86,7 @@ diff -ruNp lshw-B.02.18.orig/src/Makefile lshw-B.02.18/src/Makefile
.PHONY: nologo
nologo:
-@@ -85,7 +79,6 @@
+@@ -93,7 +87,6 @@ static: $(PACKAGENAME)-static
$(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
@@ -104,7 +94,7 @@ diff -ruNp lshw-B.02.18.orig/src/Makefile lshw-B.02.18/src/Makefile
.PHONY: compressed
compressed: $(PACKAGENAME)-compressed
-@@ -114,14 +107,13 @@
+@@ -122,14 +115,13 @@ pnp.ids:
pnpid.txt:
wget http://www-pc.uni-regensburg.de/hardware/TECHNIK/PCI_PNP/pnpid.txt
@@ -121,7 +111,7 @@ diff -ruNp lshw-B.02.18.orig/src/Makefile lshw-B.02.18/src/Makefile
install-gui: gui
$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
-@@ -134,8 +126,8 @@
+@@ -142,8 +134,8 @@ install-gui: gui
clean:
rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed
rm -f $(addsuffix .gz,$(DATAFILES))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lshw.git/commitdiff/85c0008f2d24b08f3e422da0b9235dbd1f697b60
More information about the pld-cvs-commit
mailing list