Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package umockdev for openSUSE:Factory checked in at 2022-02-11 23:06:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/umockdev (Old) and /work/SRC/openSUSE:Factory/.umockdev.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "umockdev" Fri Feb 11 23:06:49 2022 rev:9 rq:953729 version:0.17.6 Changes: -------- --- /work/SRC/openSUSE:Factory/umockdev/umockdev.changes 2022-02-01 14:03:08.307998117 +0100 +++ /work/SRC/openSUSE:Factory/.umockdev.new.1956/umockdev.changes 2022-02-11 23:07:23.890603952 +0100 @@ -1,0 +2,9 @@ +Tue Feb 8 21:21:59 UTC 2022 - Atri Bhattacharya <[email protected]> + +- Update to version 0.17.6: + * Increase uevent buffer size (gh#martinpitt/umockdev#167). + * Skip /umockdev-testbed-vala/detects_running_outside_testbed + during normal builds for the time being, as it is brittle on + several architectures (gh#martinpitt/umockdev#169). + +------------------------------------------------------------------- Old: ---- umockdev-0.17.5.tar.xz New: ---- umockdev-0.17.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umockdev.spec ++++++ --- /var/tmp/diff_new_pack.RQvXGn/_old 2022-02-11 23:07:24.370605285 +0100 +++ /var/tmp/diff_new_pack.RQvXGn/_new 2022-02-11 23:07:24.374605296 +0100 @@ -19,7 +19,7 @@ %define shlib libumockdev0 %define shlibpre libumockdev-preload0 Name: umockdev -Version: 0.17.5 +Version: 0.17.6 Release: 0 Summary: Mock hardware devices for creating unit tests and bug reporting License: LGPL-2.1-or-later ++++++ umockdev-0.17.5.tar.xz -> umockdev-0.17.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.17.5/NEWS new/umockdev-0.17.6/NEWS --- old/umockdev-0.17.5/NEWS 2022-01-18 11:19:51.448499200 +0100 +++ new/umockdev-0.17.6/NEWS 2022-01-21 13:19:11.024681800 +0100 @@ -1,3 +1,8 @@ +## [0.17.6] - 2022-01-21 +- Increase uevent buffer size (#167) +- Skip /umockdev-testbed-vala/detects_running_outside_testbed during normal + builds for the time being, as it is brittle on several architectures (#169) + ## [0.17.5] - 2022-01-18 - Relax overzealous stat nlink unit test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.17.5/meson.build new/umockdev-0.17.6/meson.build --- old/umockdev-0.17.5/meson.build 2022-01-18 11:19:51.456499300 +0100 +++ new/umockdev-0.17.6/meson.build 2022-01-21 13:19:11.032682000 +0100 @@ -1,5 +1,5 @@ project('umockdev', 'c', 'vala', - version: run_command('sed', '-rn', '1 { s/^.*\[([0-9.]+)\].*/\\1/; p }', 'NEWS').stdout().strip(), + version: run_command('sed', '-rn', '1 { s/^.*\[([0-9.]+)\].*/\\1/; p }', 'NEWS', check: true).stdout().strip(), license: 'LGPLv2.1+') srcdir = meson.current_source_dir() / 'src' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.17.5/src/uevent_sender.c new/umockdev-0.17.6/src/uevent_sender.c --- old/umockdev-0.17.5/src/uevent_sender.c 2022-01-18 11:19:51.456499300 +0100 +++ new/umockdev-0.17.6/src/uevent_sender.c 2022-01-21 13:19:11.036682000 +0100 @@ -33,6 +33,8 @@ #include "utils.h" #include "uevent_sender.h" +#define UEVENT_BUFSIZE 16384 + struct _uevent_sender { char *rootpath; char socket_glob[PATH_MAX]; @@ -226,12 +228,11 @@ void uevent_sender_send(uevent_sender * sender, const char *devpath, const char *action, const char *properties) { - char buffer[1024]; + char buffer[UEVENT_BUFSIZE]; size_t buffer_len = 0; struct msghdr smsg; struct iovec iov[2]; const char *subsystem; - const char *devname; const char *devtype; char seqnumstr[20]; struct udev_device *device; @@ -247,7 +248,6 @@ subsystem = udev_device_get_subsystem(device); assert(subsystem != NULL); - devname = udev_device_get_devnode(device); devtype = udev_device_get_devtype(device); /* build NUL-terminated property array */ @@ -256,10 +256,6 @@ buffer_len += append_property(buffer, sizeof buffer, buffer_len, "SUBSYSTEM=", subsystem); snprintf(seqnumstr, sizeof(seqnumstr), "%llu", seqnum++); buffer_len += append_property(buffer, sizeof buffer, buffer_len, "SEQNUM=", seqnumstr); - if (devname) - buffer_len += append_property(buffer, sizeof buffer, buffer_len, "DEVNAME=", devname); - if (devtype) - buffer_len += append_property(buffer, sizeof buffer, buffer_len, "DEVTYPE=", devtype); /* append udevd (userland) properties, replace \n with \0 */ /* FIXME: more sensible API */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.17.5/src/umockdev.vala new/umockdev-0.17.6/src/umockdev.vala --- old/umockdev-0.17.5/src/umockdev.vala 2022-01-18 11:19:51.460499300 +0100 +++ new/umockdev-0.17.6/src/umockdev.vala 2022-01-21 13:19:11.036682000 +0100 @@ -1111,7 +1111,7 @@ return ret; } - private static static HashTable<string, string> bus_lookup_table; + private static HashTable<string, string> bus_lookup_table; private static HashTable<string, string> create_bus_lookup() { var lookup = new HashTable<string, string?>(str_hash, str_equal); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.17.5/tests/test-umockdev-vala.vala new/umockdev-0.17.6/tests/test-umockdev-vala.vala --- old/umockdev-0.17.5/tests/test-umockdev-vala.vala 2022-01-18 11:19:51.460499300 +0100 +++ new/umockdev-0.17.6/tests/test-umockdev-vala.vala 2022-01-21 13:19:11.040682000 +0100 @@ -793,9 +793,8 @@ void t_detects_not_running_in_testbed () { - - if (Environment.get_variable ("RPM_ARCH") == "s390x" || Environment.get_variable ("RPM_ARCH") == "arm") { - stdout.printf ("[SKIP: test known broken in emulated architectures on koji] "); + if (Environment.get_variable ("BRITTLE_TESTS") == null) { + stdout.printf ("[SKIP: brittle test: does not work on emulated architectures] "); stdout.flush (); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.17.5/tests/test-umockdev.c new/umockdev-0.17.6/tests/test-umockdev.c --- old/umockdev-0.17.5/tests/test-umockdev.c 2022-01-18 11:19:51.460499300 +0100 +++ new/umockdev-0.17.6/tests/test-umockdev.c 2022-01-21 13:19:11.040682000 +0100 @@ -236,6 +236,7 @@ /* attributes */ "idVendor", "0815", "idProduct", "AFFE", NULL, /* properties */ + "DEVTYPE", "usb_device", "DEVNAME", "/dev/mydev", "ID_INPUT", "1", "ID_INPUT_KEYBOARD", "1", NULL); g_assert(syspath); g_assert(g_str_has_suffix(syspath, "/sys/devices/extkeyboard1")); @@ -246,6 +247,8 @@ g_assert(device != NULL); g_assert_cmpstr(udev_device_get_syspath(device), ==, syspath); g_assert_cmpstr(udev_device_get_action(device), ==, "add"); + g_assert_cmpstr(udev_device_get_devnode(device), ==, "/dev/mydev"); + g_assert_cmpstr(udev_device_get_devtype(device), ==, "usb_device"); udev_device_unref(device); udev_monitor_unref(udev_mon); udev_unref(udev); @@ -614,6 +617,7 @@ g_assert(device != NULL); g_assert_cmpstr(udev_device_get_syspath(device), ==, syspath); g_assert_cmpstr(udev_device_get_action(device), ==, "add"); + g_assert_cmpstr(udev_device_get_subsystem(device), ==, "pci"); g_assert_cmpstr(udev_device_get_sysattr_value(device, "idVendor"), ==, "0815"); g_assert_cmpstr(udev_device_get_property_value(device, "ID_INPUT"), ==, "1"); udev_device_unref(device); @@ -622,6 +626,7 @@ g_assert(device != NULL); g_assert_cmpstr(udev_device_get_syspath(device), ==, syspath); g_assert_cmpstr(udev_device_get_action(device), ==, "add"); + g_assert_cmpstr(udev_device_get_subsystem(device), ==, "pci"); g_assert_cmpstr(udev_device_get_sysattr_value(device, "idVendor"), ==, "0815"); g_assert_cmpstr(udev_device_get_property_value(device, "ID_INPUT"), ==, "1"); udev_device_unref(device); @@ -841,7 +846,7 @@ /* overly long action */ if (g_test_subprocess()) { - char long_action[4096]; + char long_action[16384]; memset(long_action, 'a', sizeof(long_action)); long_action[sizeof(long_action)-1] = '\0'; umockdev_testbed_uevent(fixture->testbed, syspath, long_action); @@ -852,6 +857,25 @@ } static void +t_testbed_uevent_property_overflow(UMockdevTestbedFixture * fixture, UNUSED_DATA) +{ + /* overly long property */ + if (g_test_subprocess()) { + char long_name[10000]; + memset(long_name, 'a', sizeof long_name); + long_name[sizeof long_name - 1] = '\0'; + + /* this sends an "add" uevent */ + umockdev_testbed_add_device(fixture->testbed, "pci", "mydev", NULL, + NULL, /* attributes */ + long_name, long_name, NULL); + } + g_test_trap_subprocess(NULL, 0, 0); + g_test_trap_assert_failed(); + g_test_trap_assert_stderr ("*uevent_sender_send*Property buffer overflow*"); +} + +static void t_testbed_add_from_string(UMockdevTestbedFixture * fixture, UNUSED_DATA) { GUdevDevice *device; @@ -2300,6 +2324,8 @@ t_testbed_uevent_null_action, t_testbed_fixture_teardown); g_test_add("/umockdev-testbed/uevent/action_overflow", UMockdevTestbedFixture, NULL, t_testbed_fixture_setup, t_testbed_uevent_action_overflow, t_testbed_fixture_teardown); + g_test_add("/umockdev-testbed/uevent/property_overflow", UMockdevTestbedFixture, NULL, t_testbed_fixture_setup, + t_testbed_uevent_property_overflow, t_testbed_fixture_teardown); /* tests for mocking USB devices */ g_test_add("/umockdev-testbed-usb/lsusb", UMockdevTestbedFixture, NULL, t_testbed_fixture_setup,
