Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2021-04-22 18:03:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Thu Apr 22 18:03:07 2021 rev:177 rq:885101 version:21.73 Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2021-01-29 14:56:59.473500046 +0100 +++ /work/SRC/openSUSE:Factory/.hwinfo.new.12324/hwinfo.changes 2021-04-22 18:03:09.518431825 +0200 @@ -1,0 +2,7 @@ +Tue Apr 13 15:07:43 UTC 2021 - wfe...@opensuse.org + +- merge gh#openSUSE/hwinfo#95 +- don't rely on select() updating its timeout arg (bsc#1184339) +- 21.73 + +-------------------------------------------------------------------- Old: ---- hwinfo-21.72.tar.xz New: ---- hwinfo-21.73.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.Q6d6jb/_old 2021-04-22 18:03:09.958432505 +0200 +++ /var/tmp/diff_new_pack.Q6d6jb/_new 2021-04-22 18:03:09.962432511 +0200 @@ -37,7 +37,7 @@ License: GPL-2.0-or-later Group: Hardware/Other Url: http://gitorious.org/opensuse/hwinfo -Version: 21.72 +Version: 21.73 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ hwinfo-21.72.tar.xz -> hwinfo-21.73.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.72/VERSION new/hwinfo-21.73/VERSION --- old/hwinfo-21.72/VERSION 2021-01-27 11:09:24.000000000 +0100 +++ new/hwinfo-21.73/VERSION 2021-04-13 17:07:43.000000000 +0200 @@ -1 +1 @@ -21.72 +21.73 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.72/changelog new/hwinfo-21.73/changelog --- old/hwinfo-21.72/changelog 2021-01-27 11:09:24.000000000 +0100 +++ new/hwinfo-21.73/changelog 2021-04-13 17:07:43.000000000 +0200 @@ -1,3 +1,7 @@ +2021-04-13: 21.73 + - merge gh#openSUSE/hwinfo#95 + - don't rely on select() updating its timeout arg (bsc#1184339) + 2021-01-27: 21.72 - merge gh#openSUSE/hwinfo#92 - improve getting video mode info (bsc#1181101) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.72/src/hd/pppoe.c new/hwinfo-21.73/src/hd/pppoe.c --- old/hwinfo-21.72/src/hd/pppoe.c 2021-01-27 11:09:24.000000000 +0100 +++ new/hwinfo-21.73/src/hd/pppoe.c 2021-04-13 17:07:43.000000000 +0200 @@ -13,6 +13,7 @@ #include <sys/types.h> #include <sys/ioctl.h> #include <sys/socket.h> +#include <sys/time.h> #include <fcntl.h> #include <errno.h> #include <string.h> @@ -447,10 +448,7 @@ fd_set readable; PPPoEPacket packet; PacketCriteria pc; - - struct timeval tv; - tv.tv_sec = PADO_TIMEOUT; - tv.tv_usec = 0; + struct timeval tv_end; while (1) { @@ -459,7 +457,22 @@ if (conns[i].fd != -1) FD_SET (conns[i].fd, &readable); + /* don't rely on select() updating its timeout arg */ + + gettimeofday (&tv_end, NULL); + timeradd (&tv_end, &((struct timeval) { tv_sec: PADO_TIMEOUT }), &tv_end); + do { + struct timeval tv; + + r = 0; + + gettimeofday (&tv, NULL); + timersub (&tv_end, &tv, &tv); + + if (timercmp (&tv, &((struct timeval) {}), <=)) + break; + r = select (FD_SETSIZE, &readable, NULL, NULL, &tv); } while (r == -1 && errno == EINTR);
