Update to hwinfo-23.2

Signed-off-by zhangnaichuan <zhangnaichuan@huawei.com>
2024-02-06 21:27:18 +08:00 · 2024-02-06 21:27:18 +08:00 · 31c2e84d67
commit 31c2e84d67
parent 60f1483035
4 changed files with 50 additions and 47 deletions
--- a/hwinfo-22.2.tar.gz
+++ b/hwinfo-22.2.tar.gz
--- a/hwinfo-23.2-sw.patch
+++ b/hwinfo-23.2-sw.patch
@ -1,6 +1,6 @@
-diff -Naur hwinfo-22.2.org/hwinfo.c hwinfo-22.2.sw/hwinfo.c
--- hwinfo-22.2.org/hwinfo.c	2022-03-01 08:21:36.990000000 +0000
-+++ hwinfo-22.2.sw/hwinfo.c	2022-03-01 08:23:03.890000000 +0000
+diff -Naur hwinfo-23.2.org/hwinfo.c hwinfo-23.2.sw/hwinfo.c
+--- hwinfo-23.2.org/hwinfo.c	2022-03-01 08:21:36.990000000 +0000
+++ hwinfo-23.2.sw/hwinfo.c	2022-03-01 08:23:03.890000000 +0000
@@ -598,6 +598,9 @@
       case arch_alpha:
         s = "Alpha";
@ -31,9 +31,9 @@ diff -Naur hwinfo-22.2.org/hwinfo.c hwinfo-22.2.sw/hwinfo.c
   "TGA", "xtga",
 #endif
 #ifdef __sparc__
-diff -Naur hwinfo-22.2.org/src/hd/cpu.c hwinfo-22.2.sw/src/hd/cpu.c
--- hwinfo-22.2.org/src/hd/cpu.c	2022-03-01 08:21:36.990000000 +0000
-+++ hwinfo-22.2.sw/src/hd/cpu.c	2022-03-01 08:48:25.950000000 +0000
+diff -Naur hwinfo-23.2.org/src/hd/cpu.c hwinfo-23.2.sw/src/hd/cpu.c
+--- hwinfo-23.2.org/src/hd/cpu.c	2022-03-01 08:21:36.990000000 +0000
+++ hwinfo-23.2.sw/src/hd/cpu.c	2022-03-01 08:48:25.950000000 +0000
@@ -101,7 +101,14 @@
   double bogo;
 #endif
@ -116,9 +116,9 @@ diff -Naur hwinfo-22.2.org/src/hd/cpu.c hwinfo-22.2.sw/src/hd/cpu.c
 #ifdef __arm__
   *model_id = *system_id = *serial_number = 0;
   cpu_variation = cpu_revision = 0;
-diff -Naur hwinfo-22.2.org/src/hd/hd.c hwinfo-22.2.sw/src/hd/hd.c
--- hwinfo-22.2.org/src/hd/hd.c	2022-03-01 08:21:37.000000000 +0000
-+++ hwinfo-22.2.sw/src/hd/hd.c	2022-03-01 08:37:04.430000000 +0000
+diff -Naur hwinfo-23.2.org/src/hd/hd.c hwinfo-23.2.sw/src/hd/hd.c
+--- hwinfo-23.2.org/src/hd/hd.c	2022-03-01 08:21:37.000000000 +0000
+++ hwinfo-23.2.sw/src/hd/hd.c	2022-03-01 08:37:04.430000000 +0000
@@ -108,6 +108,10 @@
 #define HD_ARCH "ia64"
 #endif
@ -157,9 +157,9 @@ diff -Naur hwinfo-22.2.org/src/hd/hd.c hwinfo-22.2.sw/src/hd/hd.c
 #endif
 #endif
 #endif
-diff -Naur hwinfo-22.2.org/src/hd/hd.h hwinfo-22.2.sw/src/hd/hd.h
--- hwinfo-22.2.org/src/hd/hd.h	2022-03-01 08:21:37.000000000 +0000
-+++ hwinfo-22.2.sw/src/hd/hd.h	2022-03-01 08:29:20.180000000 +0000
+diff -Naur hwinfo-23.2.org/src/hd/hd.h hwinfo-23.2.sw/src/hd/hd.h
+--- hwinfo-23.2.org/src/hd/hd.h	2022-03-01 08:21:37.000000000 +0000
+++ hwinfo-23.2.sw/src/hd/hd.h	2022-03-01 08:29:20.180000000 +0000
@@ -1438,6 +1438,7 @@
   arch_unknown = 0,
   arch_intel,
@ -168,9 +168,9 @@ diff -Naur hwinfo-22.2.org/src/hd/hd.h hwinfo-22.2.sw/src/hd/hd.h
   arch_sparc, arch_sparc64,
   arch_ppc, arch_ppc64,
   arch_68k,
-diff -Naur hwinfo-22.2.org/src/hd/hd_int.h hwinfo-22.2.sw/src/hd/hd_int.h
--- hwinfo-22.2.org/src/hd/hd_int.h	2022-03-01 08:21:37.000000000 +0000
-+++ hwinfo-22.2.sw/src/hd/hd_int.h	2022-03-01 08:32:28.910000000 +0000
+diff -Naur hwinfo-23.2.org/src/hd/hd_int.h hwinfo-23.2.sw/src/hd/hd_int.h
+--- hwinfo-23.2.org/src/hd/hd_int.h	2022-03-01 08:21:37.000000000 +0000
+++ hwinfo-23.2.sw/src/hd/hd_int.h	2022-03-01 08:32:28.910000000 +0000
@@ -52,7 +52,7 @@
 #define KERNEL_24		0x020400
 #define KERNEL_26		0x020600
@ -180,9 +180,9 @@ diff -Naur hwinfo-22.2.org/src/hd/hd_int.h hwinfo-22.2.sw/src/hd/hd_int.h
 #define WITH_ISDN	0
 #else
 #define WITH_ISDN	1
-diff -Naur hwinfo-22.2.org/src/hd/hddb.c hwinfo-22.2.sw/src/hd/hddb.c
--- hwinfo-22.2.org/src/hd/hddb.c	2022-03-01 08:21:37.000000000 +0000
-+++ hwinfo-22.2.sw/src/hd/hddb.c	2022-03-01 08:31:03.840000000 +0000
+diff -Naur hwinfo-23.2.org/src/hd/hddb.c hwinfo-23.2.sw/src/hd/hddb.c
+--- hwinfo-23.2.org/src/hd/hddb.c	2022-03-01 08:21:37.000000000 +0000
+++ hwinfo-23.2.sw/src/hd/hddb.c	2022-03-01 08:31:03.840000000 +0000
@@ -2278,6 +2278,7 @@
   switch(arch) {
     case arch_intel:
@ -191,9 +191,9 @@ diff -Naur hwinfo-22.2.org/src/hd/hddb.c hwinfo-22.2.sw/src/hd/hddb.c
     case arch_alpha:
       ki->XkbRules = new_str("xfree86");
       ki->XkbModel = new_str(hd->vendor.id == MAKE_ID(TAG_USB, 0x05ac) ? "macintosh" : "pc104");
-diff -Naur hwinfo-22.2.org/src/hd/hdp.c hwinfo-22.2.sw/src/hd/hdp.c
--- hwinfo-22.2.org/src/hd/hdp.c	2022-03-01 08:21:37.000000000 +0000
-+++ hwinfo-22.2.sw/src/hd/hdp.c	2022-03-01 08:30:28.850000000 +0000
+diff -Naur hwinfo-23.2.org/src/hd/hdp.c hwinfo-23.2.sw/src/hd/hdp.c
+--- hwinfo-23.2.org/src/hd/hdp.c	2022-03-01 08:21:37.000000000 +0000
+++ hwinfo-23.2.sw/src/hd/hdp.c	2022-03-01 08:30:28.850000000 +0000
@@ -1078,6 +1078,9 @@
       case arch_intel:
 	dump_line0 ("Intel\n");
@ -204,9 +204,9 @@ diff -Naur hwinfo-22.2.org/src/hd/hdp.c hwinfo-22.2.sw/src/hd/hdp.c
       case arch_alpha:
 	dump_line0 ("Alpha\n");
 	break;
-diff -Naur hwinfo-22.2.org/src/hd/isapnp.c hwinfo-22.2.sw/src/hd/isapnp.c
--- hwinfo-22.2.org/src/hd/isapnp.c	2022-03-01 08:21:37.000000000 +0000
-+++ hwinfo-22.2.sw/src/hd/isapnp.c	2022-03-01 08:32:09.110000000 +0000
+diff -Naur hwinfo-23.2.org/src/hd/isapnp.c hwinfo-23.2.sw/src/hd/isapnp.c
+--- hwinfo-23.2.org/src/hd/isapnp.c	2022-03-01 08:21:37.000000000 +0000
+++ hwinfo-23.2.sw/src/hd/isapnp.c	2022-03-01 08:32:09.110000000 +0000
@@ -15,7 +15,7 @@
  * @{
  */
@ -225,9 +225,9 @@ diff -Naur hwinfo-22.2.org/src/hd/isapnp.c hwinfo-22.2.sw/src/hd/isapnp.c
 
 /** @} **/
 
-diff -Naur hwinfo-22.2.org/src/hd/isdn.c hwinfo-22.2.sw/src/hd/isdn.c
--- hwinfo-22.2.org/src/hd/isdn.c	2022-03-01 08:21:37.000000000 +0000
-+++ hwinfo-22.2.sw/src/hd/isdn.c	2022-03-01 08:30:02.560000000 +0000
+diff -Naur hwinfo-23.2.org/src/hd/isdn.c hwinfo-23.2.sw/src/hd/isdn.c
+--- hwinfo-23.2.org/src/hd/isdn.c	2022-03-01 08:21:37.000000000 +0000
+++ hwinfo-23.2.sw/src/hd/isdn.c	2022-03-01 08:30:02.560000000 +0000
@@ -18,7 +18,7 @@
 
 #ifndef LIBHD_TINY
@ -246,9 +246,9 @@ diff -Naur hwinfo-22.2.org/src/hd/isdn.c hwinfo-22.2.sw/src/hd/isdn.c
 
 #endif		/* !defined(LIBHD_TINY) */
 
-diff -Naur hwinfo-22.2.org/src/hd/misc.c hwinfo-22.2.sw/src/hd/misc.c
--- hwinfo-22.2.org/src/hd/misc.c	2022-03-01 08:21:37.010000000 +0000
-+++ hwinfo-22.2.sw/src/hd/misc.c	2022-03-01 08:49:53.010000000 +0000
+diff -Naur hwinfo-23.2.org/src/hd/misc.c hwinfo-23.2.sw/src/hd/misc.c
+--- hwinfo-23.2.org/src/hd/misc.c	2022-03-01 08:21:37.010000000 +0000
+++ hwinfo-23.2.sw/src/hd/misc.c	2022-03-01 08:49:53.010000000 +0000
@@ -364,7 +364,7 @@
     if(i == 0) {
       /* non-PCI VGA card ??? - really, we shouldn't care... */
@ -267,9 +267,9 @@ diff -Naur hwinfo-22.2.org/src/hd/misc.c hwinfo-22.2.sw/src/hd/misc.c
     if(sscanf(sl->str + j, " %99[^\n]", buf) == 1) {
 #else	/* __i386__ || __x86_64__ || __ia64__ */
     if(sscanf(sl->str + j, " %*s %99[^\n]", buf) == 1) {
-diff -Naur hwinfo-22.2.org/src/ids/Makefile hwinfo-22.2.sw/src/ids/Makefile
--- hwinfo-22.2.org/src/ids/Makefile	2022-03-01 08:21:37.010000000 +0000
-+++ hwinfo-22.2.sw/src/ids/Makefile	2022-03-01 08:25:27.150000000 +0000
+diff -Naur hwinfo-23.2.org/src/ids/Makefile hwinfo-23.2.sw/src/ids/Makefile
+--- hwinfo-23.2.org/src/ids/Makefile	2022-03-01 08:21:37.010000000 +0000
+++ hwinfo-23.2.sw/src/ids/Makefile	2022-03-01 08:25:27.150000000 +0000
@@ -25,6 +25,10 @@
 IDFILES += src/x11.ppc src/x11.ppc.special
 endif
@ -281,9 +281,9 @@ diff -Naur hwinfo-22.2.org/src/ids/Makefile hwinfo-22.2.sw/src/ids/Makefile
 ifeq "$(ARCH)" "alpha"
 IDFILES += src/x11.axp
 endif
-diff -Naur hwinfo-22.2.org/src/ids/src/class hwinfo-22.2.sw/src/ids/src/class
--- hwinfo-22.2.org/src/ids/src/class	2022-03-01 08:21:37.020000000 +0000
-+++ hwinfo-22.2.sw/src/ids/src/class	2022-03-01 08:33:03.390000000 +0000
+diff -Naur hwinfo-23.2.org/src/ids/src/class hwinfo-23.2.sw/src/ids/src/class
+--- hwinfo-23.2.org/src/ids/src/class	2022-03-01 08:21:37.020000000 +0000
+++ hwinfo-23.2.sw/src/ids/src/class	2022-03-01 08:33:03.390000000 +0000
@@ -517,6 +517,10 @@
 
  baseclass.id		0x00b
@ -295,9 +295,9 @@ diff -Naur hwinfo-22.2.org/src/ids/src/class hwinfo-22.2.sw/src/ids/src/class
 +subclass.name		Alpha
 
  baseclass.id		0x00b
-diff -Naur hwinfo-22.2.org/src/ids/src/monitor hwinfo-22.2.sw/src/ids/src/monitor
--- hwinfo-22.2.org/src/ids/src/monitor	2022-03-01 08:21:37.020000000 +0000
-+++ hwinfo-22.2.sw/src/ids/src/monitor	2022-03-01 08:33:36.290000000 +0000
+diff -Naur hwinfo-23.2.org/src/ids/src/monitor hwinfo-23.2.sw/src/ids/src/monitor
+--- hwinfo-23.2.org/src/ids/src/monitor	2022-03-01 08:21:37.020000000 +0000
+++ hwinfo-23.2.sw/src/ids/src/monitor	2022-03-01 08:33:36.290000000 +0000
@@ -242,6 +242,9 @@
 +driver.display		|50-160|30-70
 
@ -308,9 +308,9 @@ diff -Naur hwinfo-22.2.org/src/ids/src/monitor hwinfo-22.2.sw/src/ids/src/monito
 +vendor.name		Alpha
 
  vendor.id		CPL
-diff -Naur hwinfo-22.2.org/src/ids/src/pci hwinfo-22.2.sw/src/ids/src/pci
--- hwinfo-22.2.org/src/ids/src/pci	2022-03-01 08:21:37.040000000 +0000
-+++ hwinfo-22.2.sw/src/ids/src/pci	2022-03-01 08:35:13.420000000 +0000
+diff -Naur hwinfo-23.2.org/src/ids/src/pci hwinfo-23.2.sw/src/ids/src/pci
+--- hwinfo-23.2.org/src/ids/src/pci	2022-03-01 08:21:37.040000000 +0000
+++ hwinfo-23.2.sw/src/ids/src/pci	2022-03-01 08:35:13.420000000 +0000
@@ -28967,6 +28967,10 @@
 
  vendor.id		pci 0x1033
@ -343,9 +343,9 @@ diff -Naur hwinfo-22.2.org/src/ids/src/pci hwinfo-22.2.sw/src/ids/src/pci
 +subclass.name		Alpha
 
  baseclass.id		0x00b
-diff -Naur hwinfo-22.2.org/src/ids/src/usb hwinfo-22.2.sw/src/ids/src/usb
--- hwinfo-22.2.org/src/ids/src/usb	2022-03-01 08:21:37.040000000 +0000
-+++ hwinfo-22.2.sw/src/ids/src/usb	2022-03-01 08:34:13.710000000 +0000
+diff -Naur hwinfo-23.2.org/src/ids/src/usb hwinfo-23.2.sw/src/ids/src/usb
+--- hwinfo-23.2.org/src/ids/src/usb	2022-03-01 08:21:37.040000000 +0000
+++ hwinfo-23.2.sw/src/ids/src/usb	2022-03-01 08:34:13.710000000 +0000
@@ -58487,6 +58487,10 @@
 
  vendor.id		usb 0x0f03
--- a/hwinfo-23.2.tar.gz
+++ b/hwinfo-23.2.tar.gz
--- a/hwinfo.spec
+++ b/hwinfo.spec
@ -1,11 +1,11 @@
 Name:           hwinfo
-Version:        22.2
+Version:        23.2
 Release:        1
 Summary:        Probe for hardware
 License:        GPL+
 URL:            https://github.com/openSUSE/hwinfo
 Source0:        https://github.com/openSUSE/hwinfo/archive/%{version}/%{name}-%{version}.tar.gz
-Patch1:         hwinfo-22.2-sw.patch
+Patch1:         hwinfo-23.2-sw.patch

 BuildRequires:  libx86emu-devel libx86emu doxygen flex perl-XML-Parser pkgconfig udev util-linux-devel gcc

@ -50,6 +50,9 @@ make LDFLAGS="%{__global_ldflags} -Lsrc" LIBDIR=%{_libdir} HWINFO_VERSION=%{vers
 %{_datadir}/hwinfo

 %changelog
+* Tue Feb 06 2024 zhangnaichuan<zhangnaichuan@huawei.com> - 23.2-1
+- update to hwinfo-23.2
+
 * Mon Jan 30 2023 chenhaixiang<chenhaixiang3@huawei.com> - 22.2-1
 - update to hwinfo-22.2