Hello community, here is the log from the commit of package libinput for openSUSE:Factory checked in at 2020-03-25 23:41:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libinput (Old) and /work/SRC/openSUSE:Factory/.libinput.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libinput" Wed Mar 25 23:41:30 2020 rev:86 rq:786086 version:1.15.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libinput/libinput.changes 2020-03-11 18:31:59.802885796 +0100 +++ /work/SRC/openSUSE:Factory/.libinput.new.3160/libinput.changes 2020-03-25 23:41:34.983959976 +0100 @@ -1,0 +2,6 @@ +Wed Mar 18 07:28:38 UTC 2020 - Jan Engelhardt <[email protected]> + +- Update to release 1.15.4 + * record: fix dmi recording + +------------------------------------------------------------------- Old: ---- libinput-1.15.3.tar.xz libinput-1.15.3.tar.xz.sig New: ---- libinput-1.15.4.tar.xz libinput-1.15.4.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libinput.spec ++++++ --- /var/tmp/diff_new_pack.lIP8YR/_old 2020-03-25 23:41:36.155960359 +0100 +++ /var/tmp/diff_new_pack.lIP8YR/_new 2020-03-25 23:41:36.179960367 +0100 @@ -20,7 +20,7 @@ Name: libinput %define lname libinput10 -Version: 1.15.3 +Version: 1.15.4 Release: 0 Summary: Input device and event processing library License: MIT ++++++ libinput-1.15.3.tar.xz -> libinput-1.15.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinput-1.15.3/meson.build new/libinput-1.15.4/meson.build --- old/libinput-1.15.3/meson.build 2020-03-06 05:39:46.000000000 +0100 +++ new/libinput-1.15.4/meson.build 2020-03-18 06:34:28.000000000 +0100 @@ -1,5 +1,5 @@ project('libinput', 'c', - version : '1.15.3', + version : '1.15.4', license : 'MIT/Expat', default_options : [ 'c_std=gnu99', 'warning_level=2' ], meson_version : '>= 0.41.0') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinput-1.15.3/tools/libinput-record.c new/libinput-1.15.4/tools/libinput-record.c --- old/libinput-1.15.3/tools/libinput-record.c 2020-03-06 05:39:46.000000000 +0100 +++ new/libinput-1.15.4/tools/libinput-record.c 2020-03-18 06:34:28.000000000 +0100 @@ -1430,37 +1430,26 @@ struct utsname u; const char *kernel = "unknown"; FILE *dmi, *osrelease; - char buf[2048] = "unknown"; - - if (uname(&u) != -1) - kernel = u.release; - - dmi = fopen("/sys/class/dmi/id/modalias", "r"); - if (dmi) { - if (fgets(buf, sizeof(buf), dmi)) { - buf[strlen(buf) - 1] = '\0'; /* linebreak */ - } else { - sprintf(buf, "unknown"); - } - fclose(dmi); - } + char dmistr[2048] = "unknown"; iprintf(ctx, "system:\n"); indent_push(ctx); + /* /etc/os-release version and distribution name */ osrelease = fopen("/etc/os-release", "r"); if (!osrelease) osrelease = fopen("/usr/lib/os-release", "r"); if (osrelease) { char *distro = NULL, *version = NULL; + char osrstr[256] = "unknown"; - while (fgets(buf, sizeof(buf), osrelease)) { - buf[strlen(buf) - 1] = '\0'; /* linebreak */ + while (fgets(osrstr, sizeof(osrstr), osrelease)) { + osrstr[strlen(osrstr) - 1] = '\0'; /* linebreak */ - if (!distro && strneq(buf, "ID=", 3)) - distro = safe_strdup(&buf[3]); - else if (!version && strneq(buf, "VERSION_ID=", 11)) - version = safe_strdup(&buf[11]); + if (!distro && strneq(osrstr, "ID=", 3)) + distro = safe_strdup(&osrstr[3]); + else if (!version && strneq(osrstr, "VERSION_ID=", 11)) + version = safe_strdup(&osrstr[11]); if (distro && version) { iprintf(ctx, "os: \"%s:%s\"\n", distro, version); @@ -1471,8 +1460,23 @@ free(version); fclose(osrelease); } + + /* kernel version */ + if (uname(&u) != -1) + kernel = u.release; iprintf(ctx, "kernel: \"%s\"\n", kernel); - iprintf(ctx, "dmi: \"%s\"\n", buf); + + /* dmi modalias */ + dmi = fopen("/sys/class/dmi/id/modalias", "r"); + if (dmi) { + if (fgets(dmistr, sizeof(dmistr), dmi)) { + dmistr[strlen(dmistr) - 1] = '\0'; /* linebreak */ + } else { + sprintf(dmistr, "unknown"); + } + fclose(dmi); + } + iprintf(ctx, "dmi: \"%s\"\n", dmistr); indent_pop(ctx); }
