Hello community, here is the log from the commit of package hwinfo checked in at Fri Mar 7 20:37:33 CET 2008. -------- --- hwinfo/hwinfo.changes 2008-03-04 11:32:12.000000000 +0100 +++ hwinfo/hwinfo.changes 2008-03-06 12:25:34.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Mar 6 12:25:27 CET 2008 - snwint@suse.de + +- fix compilation on x86_64 + +------------------------------------------------------------------- +Thu Mar 6 11:14:10 CET 2008 - snwint@suse.de + +- try a bit harder to find matching card for an interface (bnc #356405) +- fix segfault in new mouse code (bnc #367457) + +------------------------------------------------------------------- Old: ---- hwinfo-14.4.tar.bz2 New: ---- hwinfo-14.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.I32266/_old 2008-03-07 20:36:26.000000000 +0100 +++ /var/tmp/diff_new_pack.I32266/_new 2008-03-07 20:36:26.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 14.4) +# spec file for package hwinfo (Version 14.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,9 +21,9 @@ PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Hardware Library -Version: 14.4 +Version: 14.6 Release: 1 -Source: hwinfo-14.4.tar.bz2 +Source: hwinfo-14.6.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -94,6 +94,11 @@ %doc doc/libhd/html %changelog +* Thu Mar 06 2008 snwint@suse.de +- fix compilation on x86_64 +* Thu Mar 06 2008 snwint@suse.de +- try a bit harder to find matching card for an interface (bnc #356405) +- fix segfault in new mouse code (bnc #367457) * Tue Mar 04 2008 snwint@suse.de - detect vmware mouse (bnc #358460) * Mon Mar 03 2008 snwint@suse.de ++++++ hwinfo-14.4.tar.bz2 -> hwinfo-14.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.4/Changelog new/hwinfo-14.6/Changelog --- old/hwinfo-14.4/Changelog 2008-03-04 11:17:04.000000000 +0100 +++ new/hwinfo-14.6/Changelog 2008-03-06 11:51:10.000000000 +0100 @@ -1,3 +1,10 @@ +6/3/2008: v14.6 + - fix compilation on x86_64 + +5/3/2008: v14.5 + - try a bit harder to find matching card for an interface (bnc #356405) + - fix segfault in new mouse code (bnc #367457) + 4/3/2008: v14.4 - detect vmware mouse (bnc #358460) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.4/src/hd/bios.c new/hwinfo-14.6/src/hd/bios.c --- old/hwinfo-14.4/src/hd/bios.c 2008-03-03 17:36:22.000000000 +0100 +++ new/hwinfo-14.6/src/hd/bios.c 2008-03-06 11:07:33.000000000 +0100 @@ -947,6 +947,7 @@ for(sm = hd_data->smbios; sm; sm = sm->next) { if( sm->any.type == sm_sysinfo && + sm->sysinfo.product && !strcmp(sm->sysinfo.product, "VirtualBox") ) { hd_data->flags.vbox = 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.4/src/hd/net.c new/hwinfo-14.6/src/hd/net.c --- old/hwinfo-14.4/src/hd/net.c 2007-09-03 16:40:33.000000000 +0200 +++ new/hwinfo-14.6/src/hd/net.c 2008-03-05 12:28:36.000000000 +0100 @@ -50,7 +50,7 @@ unsigned u; int if_type, if_carrier; hd_t *hd, *hd_card; - char *s, *hw_addr; + char *s, *t, *hw_addr; hd_res_t *res, *res1, *res2; uint64_t ul0; str_list_t *sf_class, *sf_class_e; @@ -244,9 +244,22 @@ hd_card = NULL; if(sf_dev) { - hd->sysfs_device_link = new_str(hd_sysfs_id(sf_dev)); + s = new_str(hd_sysfs_id(sf_dev)); + + hd->sysfs_device_link = new_str(s); + + hd_card = hd_find_sysfs_id(hd_data, s); + + // try one above, if not found + if(!hd_card) { + t = strrchr(s, '/'); + if(t) { + *t = 0; + hd_card = hd_find_sysfs_id(hd_data, s); + } + } + s = free_mem(s); - hd_card = hd_find_sysfs_id(hd_data, hd_sysfs_id(sf_dev)); if(hd_card) { hd->attached_to = hd_card->idx; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.4/src/hd/sys.c new/hwinfo-14.6/src/hd/sys.c --- old/hwinfo-14.4/src/hd/sys.c 2008-03-04 11:25:42.000000000 +0100 +++ new/hwinfo-14.6/src/hd/sys.c 2008-03-06 11:50:21.000000000 +0100 @@ -142,6 +142,7 @@ if(child == 0) { signal(SIGSEGV, sigsegv_handler); +#ifdef __i386__ asm( "push %ebx\n" "\tpush %edx\n" @@ -156,6 +157,22 @@ "\tpop %edx\n" "\tpop %ebx\n" ); +#else + asm( + "push %rbx\n" + "\tpush %rdx\n" + "\tpush %rax\n" + "\tpush %rcx\n" + "\tmov $0x564d5868,%eax\n" + "\tmov $0xa,%ecx\n" + "\tmov $0x5658,%edx\n" + "\tin (%dx),%eax\n" + "\tpop %rcx\n" + "\tpop %rax\n" + "\tpop %rdx\n" + "\tpop %rbx\n" + ); +#endif _exit(66); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.4/VERSION new/hwinfo-14.6/VERSION --- old/hwinfo-14.4/VERSION 2008-03-04 11:10:27.000000000 +0100 +++ new/hwinfo-14.6/VERSION 2008-03-06 11:50:42.000000000 +0100 @@ -1 +1 @@ -14.4 +14.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org