Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2025-03-20 19:24:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new.2696 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Thu Mar 20 19:24:02 2025 rev:195 rq:1254489 version:23.4 Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2024-10-22 14:51:29.764333054 +0200 +++ /work/SRC/openSUSE:Factory/.hwinfo.new.2696/hwinfo.changes 2025-03-20 19:24:13.999756234 +0100 @@ -1,0 +2,7 @@ +Wed Mar 19 17:37:53 UTC 2025 - [email protected] + +- merge gh#openSUSE/hwinfo#150 +- do not overdo usb device de-duplication (bsc#1239663) +- 23.4 + +-------------------------------------------------------------------- Old: ---- hwinfo-23.3.tar.xz New: ---- hwinfo-23.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.5nDL0X/_old 2025-03-20 19:24:14.551779048 +0100 +++ /var/tmp/diff_new_pack.5nDL0X/_new 2025-03-20 19:24:14.555779214 +0100 @@ -1,7 +1,7 @@ # # spec file for package hwinfo # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: hwinfo -Version: 23.3 +Version: 23.4 %define lname libhd%(echo "%version" | perl -pe 's{\\D.*}{}') Release: 0 Summary: Hardware Library ++++++ hwinfo-23.3.tar.xz -> hwinfo-23.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-23.3/VERSION new/hwinfo-23.4/VERSION --- old/hwinfo-23.3/VERSION 2024-10-21 12:50:15.000000000 +0200 +++ new/hwinfo-23.4/VERSION 2025-03-19 18:37:53.000000000 +0100 @@ -1 +1 @@ -23.3 +23.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-23.3/changelog new/hwinfo-23.4/changelog --- old/hwinfo-23.3/changelog 2024-10-21 12:50:15.000000000 +0200 +++ new/hwinfo-23.4/changelog 2025-03-19 18:37:53.000000000 +0100 @@ -1,3 +1,7 @@ +2025-03-19: 23.4 + - merge gh#openSUSE/hwinfo#150 + - do not overdo usb device de-duplication (bsc#1239663) + 2024-10-21: 23.3 - merge gh#openSUSE/hwinfo#148 - avoid reporting of spurious usb storage devices (bsc#1223330) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-23.3/src/hd/hd.c new/hwinfo-23.4/src/hd/hd.c --- old/hwinfo-23.3/src/hd/hd.c 2024-10-21 12:50:15.000000000 +0200 +++ new/hwinfo-23.4/src/hd/hd.c 2025-03-19 18:37:53.000000000 +0100 @@ -280,8 +280,8 @@ { pr_s390, 0, 8|4|2|1, "s390", p_bool }, { pr_s390disks, 0, 0, "s390disks", p_bool }, { pr_isapnp, 0, 4|2|1, "isapnp", p_bool }, - { pr_isapnp_old, pr_isapnp, 0, "isapnp.old", p_bool }, - { pr_isapnp_new, pr_isapnp, 0, "isapnp.new", p_bool }, + { pr_no_remove, 0, 0, "no.remove", p_bool }, // replace unused pr_isapnp_old + { pr_loose_match, 0, 0, "loose.match", p_bool }, // replace unused pr_isapnp_new { pr_isapnp_mod, 0, 4 , "isapnp.mod", p_bool }, { pr_isapnp, 0, 0, "pnpdump", p_bool }, /* alias for isapnp */ { pr_net, 0, 8|4|2|1, "net", p_bool }, @@ -2811,6 +2811,8 @@ { hd_t *hd, **prev, **h; + if(hd_probe_feature(hd_data, pr_no_remove)) return; + for(hd = *(prev = &hd_data->hd); hd;) { if(hd->tag.remove) { /* find end of the old list... */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-23.3/src/hd/hd.h new/hwinfo-23.4/src/hd/hd.h --- old/hwinfo-23.3/src/hd/hd.h 2024-10-21 12:50:15.000000000 +0200 +++ new/hwinfo-23.4/src/hd/hd.h 2025-03-19 18:37:53.000000000 +0100 @@ -116,7 +116,7 @@ pr_modem_usb, pr_parallel, pr_parallel_lp, pr_parallel_zip, pr_isa, pr_isa_isdn, pr_isdn, pr_kbd, pr_prom, pr_sbus, pr_int, pr_braille, pr_braille_alva, pr_braille_fhp, pr_braille_ht, pr_ignx11, pr_sys, - pr_bios_vbe, pr_isapnp_old, pr_isapnp_new, pr_isapnp_mod, pr_braille_baum, + pr_bios_vbe, pr_no_remove, pr_loose_match, pr_isapnp_mod, pr_braille_baum, pr_manual, pr_fb, pr_veth, pr_pppoe, pr_scan, pr_pcmcia, pr_fork, pr_parallel_imm, pr_s390, pr_cpuemu, pr_sysfs, pr_s390disks, pr_udev, pr_block, pr_block_cdrom, pr_block_part, pr_edd, pr_edd_mod, pr_bios_ddc, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-23.3/src/hd/hdp.c new/hwinfo-23.4/src/hd/hdp.c --- old/hwinfo-23.3/src/hd/hdp.c 2024-10-21 12:50:15.000000000 +0200 +++ new/hwinfo-23.4/src/hd/hdp.c 2025-03-19 18:37:53.000000000 +0100 @@ -501,12 +501,13 @@ #endif } - if(h->tag.skip_mouse || h->tag.skip_modem || h->tag.skip_braille) { + if(h->tag.skip_mouse || h->tag.skip_modem || h->tag.skip_braille || h->tag.remove) { dump_line_str("Tags:"); i = 0; if(h->tag.skip_mouse) dump_line0("%s mouse", i++ ? "," : ""); if(h->tag.skip_modem) dump_line0("%s modem", i++ ? "," : ""); if(h->tag.skip_braille) dump_line0("%s braille", i++ ? "," : ""); + if(h->tag.remove) dump_line0("%s removed", i++ ? "," : ""); dump_line0("\n"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-23.3/src/hd/usb.c new/hwinfo-23.4/src/hd/usb.c --- old/hwinfo-23.3/src/hd/usb.c 2024-10-21 12:50:15.000000000 +0200 +++ new/hwinfo-23.4/src/hd/usb.c 2025-03-19 18:37:53.000000000 +0100 @@ -91,6 +91,8 @@ str_list_t *sf_bus, *sf_bus_e; char *sf_dev, *sf_dev_2; + int loose_match = hd_probe_feature(hd_data, pr_loose_match); + sf_bus = read_dir("/sys/bus/usb/devices", 'l'); if(!sf_bus) { @@ -342,9 +344,9 @@ if(t) *t = 0; /* same usb device */ - if(!strcmp(s, s1)) { + if(loose_match ? !strcmp(s, s1) : !strcmp(hd->sysfs_id, hd1->sysfs_id)) { hd1->tag.remove = 1; - ADD2LOG("removed: %s\n", hd1->sysfs_id); + ADD2LOG("usb removed: #%d (sysfs id %s), kept #%d\n", hd1->idx, hd1->sysfs_id, hd->idx); } s1 = free_mem(s1);
