December 2021 - openSUSE Commits - openSUSE Mailing Lists

commit umockdev for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package umockdev for openSUSE:Factory checked in at 2021-12-30 15:55:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/umockdev (Old) and /work/SRC/openSUSE:Factory/.umockdev.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "umockdev" Thu Dec 30 15:55:35 2021 rev:7 rq:943063 version:0.17.1 Changes: -------- --- /work/SRC/openSUSE:Factory/umockdev/umockdev.changes 2021-09-28 19:16:31.528185375 +0200 +++ /work/SRC/openSUSE:Factory/.umockdev.new.1896/umockdev.changes 2021-12-30 15:56:00.140681458 +0100 @@ -1,0 +2,12 @@ +Fri Dec 24 20:39:50 UTC 2021 - Atri Bhattacharya <badshah400(a)gmail.com> + +- Update to version 0.17.1: + * Fix /sys/dev/* symlinks; regression from 0.15.3 + (gh#martinpitt/umockdev#155). +- Changes from version 0.17.0: + * Add ioctls necessary to record/replay hidraw devices. + * meson: Respect includedir option. + * tests: Fix for Fedora koji emulated architectures s390x and + arm. + +------------------------------------------------------------------- Old: ---- umockdev-0.16.3.tar.xz New: ---- umockdev-0.17.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umockdev.spec ++++++ --- /var/tmp/diff_new_pack.cafPiv/_old 2021-12-30 15:56:00.716681902 +0100 +++ /var/tmp/diff_new_pack.cafPiv/_new 2021-12-30 15:56:00.720681904 +0100 @@ -19,7 +19,7 @@ %define shlib libumockdev0 %define shlibpre libumockdev-preload0 Name: umockdev -Version: 0.16.3 +Version: 0.17.1 Release: 0 Summary: Mock hardware devices for creating unit tests and bug reporting License: LGPL-2.1-or-later ++++++ umockdev-0.16.3.tar.xz -> umockdev-0.17.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/NEWS new/umockdev-0.17.1/NEWS --- old/umockdev-0.16.3/NEWS 2021-09-15 07:38:31.155431500 +0200 +++ new/umockdev-0.17.1/NEWS 2021-12-14 07:27:23.384868000 +0100 @@ -1,3 +1,12 @@ +## [0.17.1] - 2021-12-14 +- Fix /sys/dev/* symlinks; regression from 0.15.3 (#155) + +## [0.17.0] - 2021-12-11 +- Add ioctls necessary to record/replay hidraw devices (thanks Daiki Ueno) +- meson: Respect includedir option (thanks Florentin Dubois) +- tests: Fix for Fedora koji emulated architectures s390x and arm +- Enable automatic Fedora package updates with packit + ## [0.16.3] - 2021-09-15 - Several pcap replay fixes (thanks Benjamin Berg) - Immediately create "bus" and "class" directories in /sys to fix udev enumerator diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/devices/hidraw/fido2.ioctl new/umockdev-0.17.1/devices/hidraw/fido2.ioctl --- old/umockdev-0.16.3/devices/hidraw/fido2.ioctl 1970-01-01 01:00:00.000000000 +0100 +++ new/umockdev-0.17.1/devices/hidraw/fido2.ioctl 2021-12-14 07:27:23.392867800 +0100 @@ -0,0 +1,3 @@ +@DEV /dev/hidraw5 +HIDIOCGRDESCSIZE 0 22000000 +HIDIOCGRDESC 0 2200000006D0F10901A1010920150026FF007508954081020921150026FF00750895409102C0000082D63061000000000000000000000000B4E03E6100000000E2BC9928000000000000000000000000000000000000000000000000000000002F6C696236342F6C0000000400000000E0C1A517807F0000E05FFBB7FF7F000000B0A517807F0000705AFBB7FF7F00000000000000000000882EA317807F000001000000000000000000000400000000685AFBB7FF7F000000000000000000000000000000000000010000000000000000000000000000000075A217807F0000E0C1A517807F0000000000000000000019000000000000000000000000000000000000000000000000000000000000000075A217807F00009064FBB7FF7F00009064FBB7FF7F000000040000000000009064FBB7FF7F000003003E0001000000D0370000000000004000000000000000D84101000000000000000000400038000B0040001D001C000100000004000000000000000000000000000000000000000000000000000000D02D000000000000D02D00000000000000100000000000000100000005000000003000000000000000300000000000000030000000000000259200000000000025920000000000000010000000000000010000000400000000D000000000000000D000 000000000000D0000000000000B83F000000000000B83F00000000000000100000000000000100000006000000003C9F9EE58D9189782B0100000000000691FBB7FF7F00009064FBB7FF7F000000000000000000008064FBB7FF7F000002000000000000000691FBB7FF7F0000B8495517807F0000982B010000000000C084A017807F00003060FBB7FF7F0000205CFBB7FF7F00001191FBB7FF7F00001291FBB7FF7F00009064FBB7FF7F00002060FBB7FF7F00002000000000000000200000000000000008000000000000000400000004000000205CFBB7FF7F00000004000000000000C80200000000000024000000000000002400000000000000040000000000000053E5746404000000A802000000000000A802000000000000A80200000000000020000000000000002000000000000000080000000000000050E5746404000000D4F5000000000000D4F5000000000000D4F50000000000000C030000000000000C03000000000000040000000000000051E574640600000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000052E5746404000000781B010000000000782B010000000000782B010000000000880400000000000088040000000000000100000000000000040000001000000005000000474 E5500020000C0040000000300000000000000040000001400000003000000474E5500055148683701BA67CEB970BFD1400D1DCA8FD5E100000000430000003700000008000000090000004180C30042D0E9444C34611C0B80018204200020100111801CC40190001A9110224200088A408004BB8001044238C1220E902040610000A120910101C4820412000000000000000000000000000000000400000000000000F064FBB7FF7F00006F26A317807F00000000000000000000006002000000000068540200000000006854020000000000000000000000000001000000807F000000600200000000000030170000000000FC28170000000000FC2817000000000000600200000000000500000000000000003017000000000000F01B0000000000E2E41B0000000000E2E41B00000000000030170000000000010000000000000000001C000000000000601C000000000070541C0000000000D8E11C000000000000F01B0000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000003A0000000000000000000000000000000000000000000000000000000000 805FFBB7FF7F0000E370A417807F000000000000000000000000000000000000000000000000000000000000000000000400000000000000E05FFBB7FF7F0000E606A517807F0000FFA7A217807F00000000000000000000000000000000000100000000000000000000000000000000E05FFBB7FF7F0000E0C1A517807F000000000004000000002075A217807F0000E29EFBB7FF7F00007F03A517807F0000E05FFBB7FF7F0000F6B4A217807F0000000000000000000018000000000000006C6962756D6F636B6465762D7072656C6F61642E736F2E30002F72616E646F6D2E736F00000000000000000000000000000000000000000000000000000000003060FBB7FF7F0000000400000000000000000000000000000400000000000000B063FBB7FF7F00001B1AA317807F000000000000000000000020000000000000981F000000000000981F00000000000000000000000000000100000000000000002000000000000000D006000000000031C206000000000031C20600000000000020000000000000050000000000000000D00600000000000040090000000000CC3C090000000000CC3C09000000000000D0060000000000010000000000000000500900000000000070090000000000556109000000000030620900000000000040090000000000030000000000000090A10 1000000000048A40100000000000080010000000000030000000000000000700000000000000100000000000000009000000000000000B000000000000078A0000000000000E0A900000000000000800000000000000300000000000000009002000000000003000000000000000CEE0000000000000CEE00000000000000C0000000000000010000000000000000000100000000000020010000000000C010010000000000C81001000000000000F00000000000000300000000000000E88F010000000000000000000000000000B64717807F0000E05BA317807F00000040000000000000E0B54717807F00001700000000000000100000000000000088BA4717807F000000000000000000001500000000000000CC58A317807F0000B063FBB7FF7F000000B0A517807F0000B063FBB7FF7F0000C8D23917807F0000020000C000000000C424A317807F00000A6CFFF6FF0F00008864FBB7FF7F00000000000000000000C424A3170300000030324317807F00005060FBB7FF7F00006062FBB7FF7F00003062090000000000000000000000000000000000807F0000C0C0A517807F0000000000000000000058D13917807F0000FD364517807F0000E0B54717807F0000000000000300000005FD000000000000EC1400080000000005FD000000000000EC140008000000000100000000 000000ED81000000000000000000000000000000000000000000006871090000000000BC3BA317807F00003084A217807F0000F0165117807F000030B8820D00000000010000000000000068FF5017807F0000CF3FA317807F00009103000000000000B8F95117807F00003084A217807F00000864FBB7FF7F00000464FBB7FF7F00000000000000000000302B5017807F000000000000807F0000B8F95117807F0000DF23A217807F000030B8820D000000000464FBB7FF7F0000E00A36000000000028BC4717807F00001000000000000000D822A217807F0000D064FBB7FF7F0000C064FBB7FF7F00000000000000000000E0B54717807F0000E0C1A517000000000000000000000000100000000000000030B8820D000000006865FBB7FF7F0000DF23A217807F00007073A217807F0000C064FBB7FF7F0000D064FBB7FF7F00003149A317807F0000050000000000000010BE4717807F00000100000000000000000000000000000001000000000000000070A217807F00009064FBB7FF7F000010BE4717807F00000070A217807F00007073A217807F00000000000000000000762F6173736572745F706172616D00000100000000000000FFFFFFFF000000000020000000000000886C5117807F00003084A217807F000031A206000000000031A2060000000000001000000000000 0010000000400000000D006000000000000D006000000000000D00600000000002060A217807F00007069FBB7FF7F00001391FBB7FF7F00001391FBB7FF7F000020E3FDBB625500009002FEBB62550000148CA317807F00000100000000000000728CA317807F00000010000000000000886C5117807F00003069FBB7FF7F00003E02A417807F0000B0F7FDBB62550000001E6F17807F000008000000000000000100000000000000B0F7FDBB62550000B0F7FDBB6255000060DA6C17807F0000A802000000000000200000000000000020000000000000000800000000000000801F0000FFFF0200C802000000000000C802000000000000C80200000000000024000000000000002400000000000000040000000000000053E5746404000000A802000000000000A802000000000000A80200000000000020000000000000002000000000000000080000000000000050E574640400000050D10800000000009E515917807F00000000000000000000000000000000000040F7FDBB6255000040000000000000004D61594256775170626165734A392F426D4D57436C674A69356A394A634976310025732F696F63746C2F25730025732FFFFB8B17000000008977FBB7FF7F00006400000000000000200EDABB62550000000000000000000000000000000000006468693A6F3A7072743A 757600696E700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000310000000000000000000000000000000000000000000000000000007C000000770000006E0000005B000000000D4F17807F000000DA6C17807F00003800000000000000A0FFFFFFFFFFFFFFF8F5FDBB6255000090F5FDBB625500000200000000000000060000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080418317807F000000000000000000000100000000000000857F7A17807F000030000000000000009068FBB7FF7F0000D002FEBB62550000FF03000000000000D7FCFDBB625500009A457917807F00009068FBB7FF7F000004917917807F0000D002FEBB62550000D0F6FDBB625500000C00000000000000D002FEBB6255000020C29E17807F0000886AFBB7FF7F0000D002FEBB625500008D188817807F0000D0F6FDBB62550000806AFBB7FF7F0000D002FEBB62550000806AFBB7FF7F0000D002FEBB62550000544E8317807F0000D002FEBB625500000C4F59178 07F0000D002FEBB625500000000000000000000070000000000000007000000000000009000000000000000800000000000000009000000000000001700000000000000B0000000000000000200000000000000D0F6FDBB625500000070A217807F000001000000000000004131A217807F00007C000000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/devices/hidraw/fido2.script new/umockdev-0.17.1/devices/hidraw/fido2.script --- old/umockdev-0.16.3/devices/hidraw/fido2.script 1970-01-01 01:00:00.000000000 +0100 +++ new/umockdev-0.17.1/devices/hidraw/fido2.script 2021-12-14 07:27:23.392867800 +0100 @@ -0,0 +1,19 @@ +d 0 /dev/hidraw5 +w 2 ^@��^@^H^A^A^A^A^A^A^A^A^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 1 ��^@^Q^A^A^A^A^A^A^A^A^A�^@^C^B^E^A^B^E^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +w 1 ^@^A�^@^C�^@^A^D^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 1 ^A�^@^C�^@V^@�^A�fU2F_V2hFIDO_2_0^B�khmac-secret^CP��^Q��^JM^U�^F^W^Q^_��}^D�brk^A�^@^C^@�bup�dplat�iclientPin�^E^Y^D�^F�^A^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +w 1 ^@^A�^@^C�^@�^B�^Amrelying party^BX ��YF�^[^A#H�/�V�r��^L�Z�jP��^U{/��^C��bi^@^A�^@^C^@dX@N��[��Q2=�G^X��^]&c^V^JX^I��%�/��2O�+�t"��^Jh��^E\^P��^G�^@^A�^@^C^A�K��FJ1dtypejpublic-key^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 269 ^A�^@^C�^@^A^B^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 287 ^A�^@^C�^@^A^B^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 289 ^A�^@^C�^@^A^B^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 287 ^A�^@^C�^@^A^B^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 288 ^A�^@^C�^@^A^B^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 288 ^A�^@^C�^@^A^B^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 288 ^A�^@^C�^@^A^B^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 288 ^A�^@^C�^@^A^B^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 288 ^A�^@^C�^@^A^B^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 287 ^A�^@^C�^@^A^B^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 288 ^A�^@^C�^@^A^B^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 288 ^A�^@^C�^@^A^B^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ +r 124 ^A�^@^C�^@�^@�^A�bidX@N��[��Q2=�G^X��^]&c^V^JX^I��%�/��2O�+�t"��^Jh��^E\^P^A�^@^C^@��^G��K��FJ1dtypejpublic-key^BX%��8��u�W�r^F��xx��^J��^A�^@^C^A�7/�]�[T^A^@^@^A�^CXG0E^B!^@�mwhP?� 2�<^Y\I|��^OQ/^P�^X1��as�d�^B lz�w^A�^@^C^Br��H~(>��b=^I?^V^_��$U��^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/devices/hidraw/fido2.umockdev new/umockdev-0.17.1/devices/hidraw/fido2.umockdev --- old/umockdev-0.16.3/devices/hidraw/fido2.umockdev 1970-01-01 01:00:00.000000000 +0100 +++ new/umockdev-0.17.1/devices/hidraw/fido2.umockdev 2021-12-14 07:27:23.392867800 +0100 @@ -0,0 +1,428 @@ +P: /devices/pci0000:00/0000:00:08.1/0000:05:00.3/usb1/1-2/1-2.3/1-2.3:1.0/0003:1050:0120.000A/hidraw/hidraw5 +N: hidraw5 +E: DEVNAME=/dev/hidraw5 +E: MAJOR=240 +E: MINOR=5 +E: SUBSYSTEM=hidraw +E: ID_FIDO_TOKEN=1 +E: ID_SECURITY_TOKEN=1 +E: ID_PATH=pci-0000:05:00.3-usb-0:2.3:1.0 +E: ID_PATH_TAG=pci-0000_05_00_3-usb-0_2_3_1_0 +E: ID_FOR_SEAT=hidraw-pci-0000_05_00_3-usb-0_2_3_1_0 +E: TAGS=:seat:uaccess:security-device: +E: CURRENT_TAGS=:seat:uaccess:security-device: +A: dev=240:5\n +L: device=../../../0003:1050:0120.000A +A: power/control=auto\n +A: power/runtime_active_time=0\n +A: power/runtime_status=unsupported\n +A: power/runtime_suspended_time=0\n + +P: /devices/pci0000:00/0000:00:08.1/0000:05:00.3/usb1/1-2/1-2.3/1-2.3:1.0/0003:1050:0120.000A +E: DRIVER=hid-generic +E: HID_ID=0003:00001050:00000120 +E: HID_NAME=Yubico Security Key by Yubico +E: HID_PHYS=usb-0000:05:00.3-2.3/input0 +E: HID_UNIQ= +E: MODALIAS=hid:b0003g0001v00001050p00000120 +E: SUBSYSTEM=hid +A: country=00\n +L: driver=../../../../../../../../../bus/hid/drivers/hid-generic +A: modalias=hid:b0003g0001v00001050p00000120\n +A: power/control=auto\n +A: power/runtime_active_time=0\n +A: power/runtime_status=unsupported\n +A: power/runtime_suspended_time=0\n +H: report_descriptor=06D0F10901A1010920150026FF007508954081020921150026FF00750895409102C0 + +P: /devices/pci0000:00/0000:00:08.1/0000:05:00.3/usb1/1-2/1-2.3/1-2.3:1.0 +E: DEVTYPE=usb_interface +E: DRIVER=usbhid +E: PRODUCT=1050/120/512 +E: TYPE=0/0/0 +E: INTERFACE=3/0/0 +E: MODALIAS=usb:v1050p0120d0512dc00dsc00dp00ic03isc00ip00in00 +E: SUBSYSTEM=usb +E: ID_VENDOR_FROM_DATABASE=Yubico.com +E: ID_MODEL_FROM_DATABASE=Yubikey Touch U2F Security Key +E: ID_PATH=pci-0000:05:00.3-usb-0:2.3:1.0 +E: ID_PATH_TAG=pci-0000_05_00_3-usb-0_2_3_1_0 +A: authorized=1\n +A: bAlternateSetting= 0\n +A: bInterfaceClass=03\n +A: bInterfaceNumber=00\n +A: bInterfaceProtocol=00\n +A: bInterfaceSubClass=00\n +A: bNumEndpoints=02\n +L: driver=../../../../../../../../bus/usb/drivers/usbhid +A: modalias=usb:v1050p0120d0512dc00dsc00dp00ic03isc00ip00in00\n +A: supports_autosuspend=1\n + +P: /devices/pci0000:00/0000:00:08.1/0000:05:00.3/usb1/1-2/1-2.3 +N: bus/usb/001/012=12010002000000405010200112050102000109022900010100800F0904000002030000000921100100012222000705040340000207058403400002 +E: DEVNAME=/dev/bus/usb/001/012 +E: DEVTYPE=usb_device +E: DRIVER=usb +E: PRODUCT=1050/120/512 +E: TYPE=0/0/0 +E: BUSNUM=001 +E: DEVNUM=012 +E: MAJOR=189 +E: MINOR=11 +E: SUBSYSTEM=usb +E: ID_VENDOR=Yubico +E: ID_VENDOR_ENC=Yubico +E: ID_VENDOR_ID=1050 +E: ID_MODEL=Security_Key_by_Yubico +E: ID_MODEL_ENC=Security\x20Key\x20by\x20Yubico +E: ID_MODEL_ID=0120 +E: ID_REVISION=0512 +E: ID_SERIAL=Yubico_Security_Key_by_Yubico +E: ID_BUS=usb +E: ID_USB_INTERFACES=:030000: +E: ID_VENDOR_FROM_DATABASE=Yubico.com +E: ID_MODEL_FROM_DATABASE=Yubikey Touch U2F Security Key +E: ID_PATH=pci-0000:05:00.3-usb-0:2.3 +E: ID_PATH_TAG=pci-0000_05_00_3-usb-0_2_3 +E: ID_FOR_SEAT=usb-pci-0000_05_00_3-usb-0_2_3 +E: TAGS=:seat: +E: CURRENT_TAGS=:seat: +A: authorized=1\n +A: avoid_reset_quirk=0\n +A: bConfigurationValue=1\n +A: bDeviceClass=00\n +A: bDeviceProtocol=00\n +A: bDeviceSubClass=00\n +A: bMaxPacketSize0=64\n +A: bMaxPower=30mA\n +A: bNumConfigurations=1\n +A: bNumInterfaces= 1\n +A: bcdDevice=0512\n +A: bmAttributes=80\n +A: busnum=1\n +A: configuration= +H: descriptors=12010002000000405010200112050102000109022900010100800F0904000002030000000921100100012222000705040340000207058403400002 +A: dev=189:11\n +A: devnum=12\n +A: devpath=2.3\n +L: driver=../../../../../../../bus/usb/drivers/usb +A: idProduct=0120\n +A: idVendor=1050\n +A: ltm_capable=no\n +A: manufacturer=Yubico\n +A: maxchild=0\n +L: port=../1-2:1.0/1-2-port3 +A: power/active_duration=7291\n +A: power/autosuspend=2\n +A: power/autosuspend_delay_ms=2000\n +A: power/connected_duration=7292\n +A: power/control=on\n +A: power/level=on\n +A: power/persist=1\n +A: power/runtime_active_time=7118\n +A: power/runtime_status=active\n +A: power/runtime_suspended_time=0\n +A: product=Security Key by Yubico\n +A: quirks=0x0\n +A: removable=unknown\n +A: rx_lanes=1\n +A: speed=12\n +A: tx_lanes=1\n +A: urbnum=13\n +A: version= 2.00\n + +P: /devices/pci0000:00/0000:00:08.1/0000:05:00.3/usb1/1-2 +N: bus/usb/001/002=1201100209000240DA0B115404010102000109022900010100E0000904000001090001000705810301000C0904000101090002000705810301000C +E: DEVNAME=/dev/bus/usb/001/002 +E: DEVTYPE=usb_device +E: DRIVER=usb +E: PRODUCT=bda/5411/104 +E: TYPE=9/0/2 +E: BUSNUM=001 +E: DEVNUM=002 +E: MAJOR=189 +E: MINOR=1 +E: SUBSYSTEM=usb +E: ID_VENDOR=Generic +E: ID_VENDOR_ENC=Generic +E: ID_VENDOR_ID=0bda +E: ID_MODEL=4-Port_USB_2.0_Hub +E: ID_MODEL_ENC=4-Port\x20USB\x202.0\x20Hub +E: ID_MODEL_ID=5411 +E: ID_REVISION=0104 +E: ID_SERIAL=Generic_4-Port_USB_2.0_Hub +E: ID_BUS=usb +E: ID_USB_INTERFACES=:090001:090002: +E: ID_VENDOR_FROM_DATABASE=Realtek Semiconductor Corp. +E: ID_MODEL_FROM_DATABASE=RTS5411 Hub +E: ID_PATH=pci-0000:05:00.3-usb-0:2 +E: ID_PATH_TAG=pci-0000_05_00_3-usb-0_2 +E: ID_FOR_SEAT=usb-pci-0000_05_00_3-usb-0_2 +E: TAGS=:seat: +E: CURRENT_TAGS=:seat: +A: authorized=1\n +A: avoid_reset_quirk=0\n +A: bConfigurationValue=1\n +A: bDeviceClass=09\n +A: bDeviceProtocol=02\n +A: bDeviceSubClass=00\n +A: bMaxPacketSize0=64\n +A: bMaxPower=0mA\n +A: bNumConfigurations=1\n +A: bNumInterfaces= 1\n +A: bcdDevice=0104\n +A: bmAttributes=e0\n +A: busnum=1\n +A: configuration= +H: descriptors=1201100209000240DA0B115404010102000109022900010100E0000904000001090001000705810301000C0904000101090002000705810301000C +A: dev=189:1\n +A: devnum=2\n +A: devpath=2\n +L: driver=../../../../../../bus/usb/drivers/usb +L: firmware_node=../../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:0e/device:16/device:17/device:19 +A: idProduct=5411\n +A: idVendor=0bda\n +A: ltm_capable=no\n +A: manufacturer=Generic\n +A: maxchild=4\n +L: port=../1-0:1.0/usb1-port2 +A: power/active_duration=40292203\n +A: power/autosuspend=0\n +A: power/autosuspend_delay_ms=0\n +A: power/connected_duration=40292204\n +A: power/control=auto\n +A: power/level=auto\n +A: power/runtime_active_time=40291955\n +A: power/runtime_status=active\n +A: power/runtime_suspended_time=0\n +A: power/wakeup=disabled\n +A: power/wakeup_abort_count=\n +A: power/wakeup_active=\n +A: power/wakeup_active_count=\n +A: power/wakeup_count=\n +A: power/wakeup_expire_count=\n +A: power/wakeup_last_time_ms=\n +A: power/wakeup_max_time_ms=\n +A: power/wakeup_total_time_ms=\n +A: product=4-Port USB 2.0 Hub\n +A: quirks=0x0\n +A: removable=removable\n +A: rx_lanes=1\n +A: speed=480\n +A: tx_lanes=1\n +A: urbnum=157\n +A: version= 2.10\n + +P: /devices/pci0000:00/0000:00:08.1/0000:05:00.3/usb1 +N: bus/usb/001/001=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C +E: DEVNAME=/dev/bus/usb/001/001 +E: DEVTYPE=usb_device +E: DRIVER=usb +E: PRODUCT=1d6b/2/513 +E: TYPE=9/0/1 +E: BUSNUM=001 +E: DEVNUM=001 +E: MAJOR=189 +E: MINOR=0 +E: SUBSYSTEM=usb +E: ID_VENDOR=Linux_5.13.16-200.fc34.x86_64_xhci-hcd +E: ID_VENDOR_ENC=Linux\x205.13.16-200.fc34.x86_64\x20xhci-hcd +E: ID_VENDOR_ID=1d6b +E: ID_MODEL=xHCI_Host_Controller +E: ID_MODEL_ENC=xHCI\x20Host\x20Controller +E: ID_MODEL_ID=0002 +E: ID_REVISION=0513 +E: ID_SERIAL=Linux_5.13.16-200.fc34.x86_64_xhci-hcd_xHCI_Host_Controller_0000:05:00.3 +E: ID_SERIAL_SHORT=0000:05:00.3 +E: ID_BUS=usb +E: ID_USB_INTERFACES=:090000: +E: ID_VENDOR_FROM_DATABASE=Linux Foundation +E: ID_AUTOSUSPEND=1 +E: ID_MODEL_FROM_DATABASE=2.0 root hub +E: ID_PATH=pci-0000:05:00.3 +E: ID_PATH_TAG=pci-0000_05_00_3 +E: ID_FOR_SEAT=usb-pci-0000_05_00_3 +E: TAGS=:seat: +E: CURRENT_TAGS=:seat: +A: authorized=1\n +A: authorized_default=1\n +A: avoid_reset_quirk=0\n +A: bConfigurationValue=1\n +A: bDeviceClass=09\n +A: bDeviceProtocol=01\n +A: bDeviceSubClass=00\n +A: bMaxPacketSize0=64\n +A: bMaxPower=0mA\n +A: bNumConfigurations=1\n +A: bNumInterfaces= 1\n +A: bcdDevice=0513\n +A: bmAttributes=e0\n +A: busnum=1\n +A: configuration= +H: descriptors=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C +A: dev=189:0\n +A: devnum=1\n +A: devpath=0\n +L: driver=../../../../../bus/usb/drivers/usb +L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:0e/device:16/device:17 +A: idProduct=0002\n +A: idVendor=1d6b\n +A: interface_authorized_default=1\n +A: ltm_capable=no\n +A: manufacturer=Linux 5.13.16-200.fc34.x86_64 xhci-hcd\n +A: maxchild=4\n +A: power/active_duration=40292347\n +A: power/autosuspend=0\n +A: power/autosuspend_delay_ms=0\n +A: power/connected_duration=40292347\n +A: power/control=auto\n +A: power/level=auto\n +A: power/runtime_active_time=40292345\n +A: power/runtime_status=active\n +A: power/runtime_suspended_time=0\n +A: power/wakeup=disabled\n +A: power/wakeup_abort_count=\n +A: power/wakeup_active=\n +A: power/wakeup_active_count=\n +A: power/wakeup_count=\n +A: power/wakeup_expire_count=\n +A: power/wakeup_last_time_ms=\n +A: power/wakeup_max_time_ms=\n +A: power/wakeup_total_time_ms=\n +A: product=xHCI Host Controller\n +A: quirks=0x0\n +A: removable=unknown\n +A: rx_lanes=1\n +A: serial=0000:05:00.3\n +A: speed=480\n +A: tx_lanes=1\n +A: urbnum=44\n +A: version= 2.00\n + +P: /devices/pci0000:00/0000:00:08.1/0000:05:00.3 +E: DRIVER=xhci_hcd +E: PCI_CLASS=C0330 +E: PCI_ID=1022:15E0 +E: PCI_SUBSYS_ID=1849:7914 +E: PCI_SLOT_NAME=0000:05:00.3 +E: MODALIAS=pci:v00001022d000015E0sv00001849sd00007914bc0Csc03i30 +E: SUBSYSTEM=pci +E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller +E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller +E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI +E: ID_VENDOR_FROM_DATABASE=Advanced Micro Devices, Inc. [AMD] +E: ID_MODEL_FROM_DATABASE=Raven USB 3.1 +A: ari_enabled=0\n +A: broken_parity_status=0\n +A: class=0x0c0330\n +H: config=2210E015070410000030030C10008000040080FC00000000000000000000000000000000000000000000000049181479000000004800000000000000FF040000 +A: consistent_dma_mask_bits=64\n +A: current_link_speed=8.0 GT/s PCIe\n +A: current_link_width=16\n +A: d3cold_allowed=1\n +A: dbc=disabled\n +A: device=0x15e0\n +A: dma_mask_bits=64\n +L: driver=../../../../bus/pci/drivers/xhci_hcd +A: driver_override=(null)\n +A: enable=1\n +L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:0e/device:16 +L: iommu=../../0000:00:00.2/iommu/ivhd0 +L: iommu_group=../../../../kernel/iommu_groups/14 +A: irq=34\n +A: link/l0s_aspm=0\n +A: link/l1_aspm=0\n +A: local_cpulist=0-3\n +A: local_cpus=0000000f\n +A: max_link_speed=8.0 GT/s PCIe\n +A: max_link_width=16\n +A: modalias=pci:v00001022d000015E0sv00001849sd00007914bc0Csc03i30\n +A: msi_bus=1\n +A: msi_irqs/35=msix\n +A: msi_irqs/36=msix\n +A: msi_irqs/37=msix\n +A: msi_irqs/38=msix\n +A: msi_irqs/39=msix\n +A: numa_node=-1\n +A: pools=poolinfo - 0.1\nbuffer-2048 0 0 2048 0\nbuffer-512 0 0 512 0\nbuffer-128 0 0 128 0\nbuffer-32 0 0 32 0\nxHCI 1KB stream ctx arrays 0 0 1024 0\nxHCI 256 byte stream ctx arrays 0 0 256 0\nxHCI input/output contexts 17 18 2112 18\nxHCI ring segments 52 54 4096 54\nbuffer-2048 0 6 2048 3\nbuffer-512 0 0 512 0\nbuffer-128 18 32 128 1\nbuffer-32 0 0 32 0\n +A: power/control=on\n +A: power/runtime_active_time=40292436\n +A: power/runtime_status=active\n +A: power/runtime_suspended_time=0\n +A: power/wakeup=enabled\n +A: power/wakeup_abort_count=0\n +A: power/wakeup_active=0\n +A: power/wakeup_active_count=0\n +A: power/wakeup_count=0\n +A: power/wakeup_expire_count=0\n +A: power/wakeup_last_time_ms=0\n +A: power/wakeup_max_time_ms=0\n +A: power/wakeup_total_time_ms=0\n +A: power_state=D0\n +A: resource=0x00000000fc800000 0x00000000fc8fffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n +A: revision=0x00\n +A: subsystem_device=0x7914\n +A: subsystem_vendor=0x1849\n +A: vendor=0x1022\n + +P: /devices/pci0000:00/0000:00:08.1 +E: DRIVER=pcieport +E: PCI_CLASS=60400 +E: PCI_ID=1022:15DB +E: PCI_SUBSYS_ID=1022:0000 +E: PCI_SLOT_NAME=0000:00:08.1 +E: MODALIAS=pci:v00001022d000015DBsv00001022sd00000000bc06sc04i00 +E: SUBSYSTEM=pci +E: ID_PCI_CLASS_FROM_DATABASE=Bridge +E: ID_PCI_SUBCLASS_FROM_DATABASE=PCI bridge +E: ID_PCI_INTERFACE_FROM_DATABASE=Normal decode +E: ID_VENDOR_FROM_DATABASE=Advanced Micro Devices, Inc. [AMD] +E: ID_MODEL_FROM_DATABASE=Raven/Raven2 Internal PCIe GPP Bridge 0 to Bus A +A: ari_enabled=0\n +A: broken_parity_status=0\n +A: class=0x060400\n +H: config=2210DB15070410000000040610008100000000000000000000050500E1E1000070FCA0FC01E011F00000000000000000000000005000000000000000FF011200 +A: consistent_dma_mask_bits=32\n +A: current_link_speed=8.0 GT/s PCIe\n +A: current_link_width=16\n +A: d3cold_allowed=1\n +A: device=0x15db\n +A: dma_mask_bits=32\n +L: driver=../../../bus/pci/drivers/pcieport +A: driver_override=(null)\n +A: enable=2\n +L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:0e +L: iommu=../0000:00:00.2/iommu/ivhd0 +L: iommu_group=../../../kernel/iommu_groups/6 +A: irq=30\n +A: local_cpulist=0-3\n +A: local_cpus=0000000f\n +A: max_link_speed=8.0 GT/s PCIe\n +A: max_link_width=16\n +A: modalias=pci:v00001022d000015DBsv00001022sd00000000bc06sc04i00\n +A: msi_bus=1\n +A: msi_irqs/30=msi\n +A: numa_node=-1\n +A: power/autosuspend_delay_ms=100\n +A: power/control=auto\n +A: power/runtime_active_time=40292453\n +A: power/runtime_status=active\n +A: power/runtime_suspended_time=0\n +A: power/wakeup=enabled\n +A: power/wakeup_abort_count=0\n +A: power/wakeup_active=0\n +A: power/wakeup_active_count=0\n +A: power/wakeup_count=0\n +A: power/wakeup_expire_count=0\n +A: power/wakeup_last_time_ms=0\n +A: power/wakeup_max_time_ms=0\n +A: power/wakeup_total_time_ms=0\n +A: power_state=D0\n +A: resource=0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x000000000000e000 0x000000000000efff 0x0000000000000101\n0x00000000fc700000 0x00000000fcafffff 0x0000000000000200\n0x00000000e0000000 0x00000000f01fffff 0x0000000000102201\n0x0000000000000000 0x0000000000000000 0x0000000000000000\ n +A: revision=0x00\n +A: secondary_bus_number=5\n +A: subordinate_bus_number=5\n +A: subsystem_device=0x0000\n +A: subsystem_vendor=0x1022\n +A: vendor=0x1022\n + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/meson.build new/umockdev-0.17.1/meson.build --- old/umockdev-0.16.3/meson.build 2021-09-15 07:38:31.167431600 +0200 +++ new/umockdev-0.17.1/meson.build 2021-12-14 07:27:23.396868000 +0100 @@ -86,6 +86,7 @@ preload_lib = shared_library('umockdev-preload', ['src/libumockdev-preload.c', 'src/debug.c', + 'src/utils.c', 'src/ioctl_tree.c'], c_args: ['-fvisibility=default'], version: '0.0.0', @@ -111,6 +112,7 @@ 'src/uevent_sender.c', 'src/ioctl_tree.vapi', 'src/ioctl_tree.c', + 'src/utils.c', 'src/debug.c'], vala_vapi: 'umockdev-1.0.vapi', vala_gir: 'UMockdev-1.0.gir', @@ -128,7 +130,7 @@ include_directories: include_directories('src'), version: lib_version, install: true, - install_dir: [true, 'include/umockdev-1.0', true, true]) + install_dir: [true, get_option('includedir') / 'umockdev-1.0', true, true]) # no way to insert "Rename to:" into annotations, so hack it hacked_gir = custom_target('UMockdev-1.0 hacked gir', @@ -172,6 +174,7 @@ 'src/umockdev-spi.vala', 'src/ioctl_tree.vapi', 'src/ioctl_tree.c', + 'src/utils.c', 'src/debug.c'], dependencies: [glib, gobject, gio_unix, vapi_posix, vapi_config, vapi_ioctl, libpcap], link_with: [umockdev_utils_lib], @@ -238,6 +241,7 @@ test('ioctl-tree', executable('test-ioctl-tree', ['tests/test-ioctl-tree.c', 'src/ioctl_tree.c', + 'src/utils.c', 'src/debug.c'], include_directories: include_directories('src'), dependencies: [glib])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/packaging/umockdev.spec new/umockdev-0.17.1/packaging/umockdev.spec --- old/umockdev-0.16.3/packaging/umockdev.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/umockdev-0.17.1/packaging/umockdev.spec 2021-12-14 07:27:23.396868000 +0100 @@ -0,0 +1,74 @@ +Name: umockdev +Version: 0 +Release: 1%{?dist} +Summary: Mock hardware devices + +License: LGPLv2+ +URL: https://github.com/martinpitt/%{name} +Source0: https://github.com/martinpitt/%{name}/releases/download/%{version}/%{name}-… + +BuildRequires: git +BuildRequires: meson +BuildRequires: gtk-doc +BuildRequires: gobject-introspection-devel +BuildRequires: glib2-devel +BuildRequires: libgudev1-devel systemd-devel +BuildRequires: libpcap-devel +BuildRequires: vala +BuildRequires: chrpath +BuildRequires: systemd-udev + +%description +With this program and libraries you can easily create mock udev objects. +This is useful for writing tests for software which talks to +hardware devices. + +%package devel +Summary: Development packages for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains the libraries to develop +using %{name}. + +%prep +%autosetup -S git -n %{name}-%{version} + +%build +%meson -Dgtk_doc=true +%meson_build + +%check +%meson_test + +%install +%meson_install + +# Remove rpath +chrpath --delete %{buildroot}%{_bindir}/umockdev-record \ + %{buildroot}%{_bindir}/umockdev-run +chrpath --delete %{buildroot}%{_libdir}/libumockdev.so.* +chrpath --delete %{buildroot}%{_libdir}/libumockdev-preload.so.* + +rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/umockdev + +%ldconfig_scriptlets + +%files +%license COPYING +%doc README.md +%{_bindir}/umockdev-* +%{_libdir}/libumockdev.so.* +%{_libdir}/libumockdev-preload.so* +%{_libdir}/girepository-1.0/UMockdev-1.0.typelib + +%files devel +%doc docs/script-format.txt docs/examples/battery.c docs/examples/battery.py +%{_libdir}/libumockdev.so +%{_libdir}/pkgconfig/umockdev-1.0.pc +%{_datadir}/gir-1.0/UMockdev-1.0.gir +%{_includedir}/umockdev-1.0 +%{_datadir}/gtk-doc/html/umockdev/ +%{_datadir}/vala/vapi/umockdev-1.0.vapi + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/packit.yaml new/umockdev-0.17.1/packit.yaml --- old/umockdev-0.16.3/packit.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/umockdev-0.17.1/packit.yaml 2021-12-14 07:27:23.396868000 +0100 @@ -0,0 +1,30 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ +specfile_path: packaging/umockdev.spec +upstream_project_url: https://github.com/martinpitt/umockdev +copy_upstream_release_description: true +upstream_package_name: umockdev +downstream_package_name: umockdev + +synced_files: + - src: packaging/umockdev.spec + dest: umockdev.spec + +jobs: + - job: copr_build + trigger: pull_request + metadata: + targets: + - fedora-development-x86_64 + - fedora-development-i386 + - fedora-development-aarch64 + - fedora-development-ppc64le + - fedora-development-s390x + - fedora-development-armhfp + + - job: propose_downstream + trigger: release + metadata: + dist_git_branches: + - fedora-development + - fedora-stable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/src/debug.c new/umockdev-0.17.1/src/debug.c --- old/umockdev-0.16.3/src/debug.c 2021-09-15 07:38:31.167431600 +0200 +++ new/umockdev-0.17.1/src/debug.c 2021-12-14 07:27:23.396868000 +0100 @@ -3,6 +3,7 @@ #include <stdio.h> #include "debug.h" +#include "utils.h" unsigned debug_categories = 0; @@ -13,7 +14,7 @@ char *d_copy, *token; if (d == NULL) return; - d_copy = strdup(d); + d_copy = strdupx(d); for (token = strtok(d_copy, " ,"); token; token = strtok(NULL, " ,")) { if (strcmp (token, "all") == 0) debug_categories = ~0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/src/ioctl.vapi new/umockdev-0.17.1/src/ioctl.vapi --- old/umockdev-0.16.3/src/ioctl.vapi 2021-09-15 07:38:31.167431600 +0200 +++ new/umockdev-0.17.1/src/ioctl.vapi 2021-12-14 07:27:23.396868000 +0100 @@ -119,5 +119,17 @@ uint8 word_delay_usecs; uint8 pad; } + + [CCode (cheader_filename = "linux/hidraw.h")] + public const int HIDIOCGRDESCSIZE; + [CCode (cheader_filename = "linux/hidraw.h")] + public const int HIDIOCGRDESC; + [CCode (cheader_filename = "linux/hid.h")] + public const int HID_MAX_DESCRIPTOR_SIZE; + [CCode (cname = "struct hidraw_report_descriptor", cheader_filename = "linux/hidraw.h")] + public struct hidraw_report_descriptor { + uint32 size; + uint8 value[HID_MAX_DESCRIPTOR_SIZE]; + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/src/ioctl_tree.c new/umockdev-0.17.1/src/ioctl_tree.c --- old/umockdev-0.16.3/src/ioctl_tree.c 2021-09-15 07:38:31.167431600 +0200 +++ new/umockdev-0.17.1/src/ioctl_tree.c 2021-12-14 07:27:23.396868000 +0100 @@ -24,8 +24,10 @@ #include <linux/ioctl.h> #include <linux/usbdevice_fs.h> #include <linux/input.h> +#include <linux/hidraw.h> #include "debug.h" +#include "utils.h" #include "ioctl_tree.h" #define TRUE 1 @@ -33,16 +35,6 @@ #define UNUSED __attribute__ ((unused)) -static void * -callocx (size_t nmemb, size_t size) -{ - void *r = calloc (nmemb, size); - if (r == NULL) { - perror ("failed to allocate memory"); - abort (); - } - return r; -} /*********************************** * @@ -327,7 +319,7 @@ ioctl_node_list_new(void) { ioctl_node_list *l; - l = malloc(sizeof(ioctl_node_list)); + l = mallocx(sizeof(ioctl_node_list)); l->n = 0; l->capacity = 10; l->items = callocx(sizeof(ioctl_tree *), l->capacity); @@ -495,7 +487,7 @@ ioctl_simplestruct_init_from_bin(ioctl_tree * node, const void *data) { DBG(DBG_IOCTL_TREE, "ioctl_simplestruct_init_from_bin: %s(%X): size is %u bytes\n", node->type->name, (unsigned) node->id, (unsigned) NSIZE(node)); - node->data = malloc(NSIZE(node)); + node->data = mallocx(NSIZE(node)); memcpy(node->data, data, NSIZE(node)); } @@ -506,7 +498,7 @@ * correct length for data; this happens for variable length ioctls such as * EVIOCGBIT */ size_t data_len = strlen(data) / 2; - node->data = malloc(data_len); + node->data = mallocx(data_len); if (NSIZE(node) != data_len) { DBG(DBG_IOCTL_TREE, "ioctl_simplestruct_init_from_text: adjusting ioctl ID %X (size %u) to actual data length %zu\n", @@ -569,7 +561,7 @@ { size_t size = node->type->get_data_size(node->id, data); DBG(DBG_IOCTL_TREE, "ioctl_varlenstruct_init_from_bin: %s(%X): size is %zu bytes\n", node->type->name, (unsigned) node->id, size); - node->data = malloc(size); + node->data = mallocx(size); memcpy(node->data, data, size); } @@ -578,7 +570,7 @@ { size_t data_len = strlen(data) / 2; - node->data = malloc(data_len); + node->data = mallocx(data_len); if (!read_hex(data, node->data, data_len)) { fprintf(stderr, "ioctl_varlenstruct_init_from_text: failed to parse '%s'\n", data); @@ -944,6 +936,27 @@ I_NAMED_SIMPLE_STRUCT_IN(EVIOCGMTSLOTS(32), "EVIOCGMTSLOTS", 0, ioctl_insertion_parent_stateless), #endif + /* hidraw */ + I_SIMPLE_STRUCT_IN(HIDIOCGRDESCSIZE, 0, ioctl_insertion_parent_stateless), + I_SIMPLE_STRUCT_IN(HIDIOCGRDESC, 0, ioctl_insertion_parent_stateless), + I_SIMPLE_STRUCT_IN(HIDIOCGRAWINFO, 0, ioctl_insertion_parent_stateless), + /* we define these with len==32, but they apply to any len */ + I_NAMED_SIMPLE_STRUCT_IN(HIDIOCGRAWNAME(32), "HIDIOCGRAWNAME", 0, ioctl_insertion_parent_stateless), + I_NAMED_SIMPLE_STRUCT_IN(HIDIOCGRAWPHYS(32), "HIDIOCGRAWPHYS", 0, ioctl_insertion_parent_stateless), + I_NAMED_SIMPLE_STRUCT_IN(HIDIOCSFEATURE(32), "HIDIOCSFEATURE", 0, ioctl_insertion_parent_stateless), + I_NAMED_SIMPLE_STRUCT_IN(HIDIOCGFEATURE(32), "HIDIOCGFEATURE", 0, ioctl_insertion_parent_stateless), + /* this was introduced not too long ago */ +#ifdef HIDIOCGRAWUNIQ + I_NAMED_SIMPLE_STRUCT_IN(HIDIOCGRAWUNIQ(32), "HIDIOCGRAWUNIQ", 0, ioctl_insertion_parent_stateless), +#endif + /* these were introduced not too long ago */ +#ifdef HIDIOCSINPUT + I_NAMED_SIMPLE_STRUCT_IN(HIDIOCSINPUT(32), "HIDIOCSINPUT", 0, ioctl_insertion_parent_stateless), + I_NAMED_SIMPLE_STRUCT_IN(HIDIOCGINPUT(32), "HIDIOCGINPUT", 0, ioctl_insertion_parent_stateless), + I_NAMED_SIMPLE_STRUCT_IN(HIDIOCSOUTPUT(32), "HIDIOCSOUTPUT", 0, ioctl_insertion_parent_stateless), + I_NAMED_SIMPLE_STRUCT_IN(HIDIOCGOUTPUT(32), "HIDIOCGOUTPUT", 0, ioctl_insertion_parent_stateless), +#endif + /* terminator */ {0, 0, 0, "", NULL, NULL, NULL, NULL, NULL} }; @@ -977,7 +990,7 @@ long offset = 0; /* chop off real name from offset */ - real_name = strdup(name); + real_name = strdupx(name); parens = strchr(real_name, '('); if (parens != NULL) { *parens = '\0'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/src/libumockdev-preload.c new/umockdev-0.17.1/src/libumockdev-preload.c --- old/umockdev-0.16.3/src/libumockdev-preload.c 2021-09-15 07:38:31.167431600 +0200 +++ new/umockdev-0.17.1/src/libumockdev-preload.c 2021-12-14 07:27:23.396868000 +0100 @@ -57,6 +57,7 @@ #include "config.h" #include "debug.h" +#include "utils.h" #include "ioctl_tree.h" /* fix missing O_TMPFILE on some systems */ @@ -483,9 +484,9 @@ } } - fdinfo = malloc(sizeof(struct ioctl_fd_info)); + fdinfo = mallocx(sizeof(struct ioctl_fd_info)); fdinfo->ioctl_sock = sock; - fdinfo->dev_path = strdup(dev_path); + fdinfo->dev_path = strdupx(dev_path); fdinfo->is_default = is_default; pthread_mutex_init(&fdinfo->sock_lock, NULL); @@ -856,7 +857,7 @@ } } - srinfo = malloc(sizeof(struct script_record_info)); + srinfo = mallocx(sizeof(struct script_record_info)); srinfo->log = log; if (clock_gettime(CLOCK_MONOTONIC, &srinfo->time) < 0) { fprintf(stderr, "libumockdev-preload: failed to clock_gettime: %m\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/src/uevent_sender.c new/umockdev-0.17.1/src/uevent_sender.c --- old/umockdev-0.16.3/src/uevent_sender.c 2021-09-15 07:38:31.167431600 +0200 +++ new/umockdev-0.17.1/src/uevent_sender.c 2021-12-14 07:27:23.396868000 +0100 @@ -30,6 +30,7 @@ #include <libudev.h> +#include "utils.h" #include "uevent_sender.h" struct _uevent_sender { @@ -49,7 +50,7 @@ perror("uevent_sender_open: cannot allocate struct"); abort(); } - s->rootpath = strdup(rootpath); + s->rootpath = strdupx(rootpath); s->udev = udev_new(); snprintf(s->socket_glob, sizeof(s->socket_glob), "%s/event[0-9]*", rootpath); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/src/umockdev.vala new/umockdev-0.17.1/src/umockdev.vala --- old/umockdev-0.16.3/src/umockdev.vala 2021-09-15 07:38:31.167431600 +0200 +++ new/umockdev-0.17.1/src/umockdev.vala 2021-12-14 07:27:23.400868000 +0100 @@ -511,18 +511,18 @@ for (int i = 0; i < attributes.length - 1; i += 2) { this.set_attribute(dev_path, attributes[i], attributes[i+1]); if (attributes[i] == "dev" && dev_node != null) { + var val = attributes[i+1].strip(); // strip off trailing \n /* put the major/minor information into /dev for our preload */ string infodir = Path.build_filename(this.root_dir, "dev", ".node"); DirUtils.create_with_parents(infodir, 0755); - assert(FileUtils.symlink(attributes[i+1], - Path.build_filename(infodir, dev_node.replace("/", "_"))) == 0); + assert(FileUtils.symlink(val, Path.build_filename(infodir, dev_node.replace("/", "_"))) == 0); /* create a /sys/dev link for it, like in real sysfs */ string sysdev_dir = Path.build_filename(this.sys_dir, "dev", (dev_path.contains("/block/") ? "block" : "char")); if (DirUtils.create_with_parents(sysdev_dir, 0755) != 0) error("cannot create dir '%s': %s", sysdev_dir, strerror(errno)); - string dest = Path.build_filename(sysdev_dir, attributes[i+1]); + string dest = Path.build_filename(sysdev_dir, val); if (!FileUtils.test(dest, FileTest.EXISTS)) { if (FileUtils.symlink("../../" + dev_path.substring(5), dest) < 0) error("add_device %s: failed to symlink %s to %s: %s", name, dest, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/src/utils.c new/umockdev-0.17.1/src/utils.c --- old/umockdev-0.16.3/src/utils.c 1970-01-01 01:00:00.000000000 +0100 +++ new/umockdev-0.17.1/src/utils.c 2021-12-14 07:27:23.400868000 +0100 @@ -0,0 +1,40 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "utils.h" + +static void +abort_errno (const char *msg) +{ + perror (msg); + abort (); +} + +void * +callocx (size_t nmemb, size_t size) +{ + void *r = calloc (nmemb, size); + if (r == NULL) + abort_errno ("failed to allocate memory"); + return r; +} + +void * +mallocx (size_t size) +{ + void *r = malloc (size); + if (r == NULL) + abort_errno ("failed to allocate memory"); + return r; +} + + +char * +strdupx (const char *s) +{ + char *r = strdup (s); + if (r == NULL) + abort_errno ("failed to allocate memory for strdup"); + return r; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/src/utils.h new/umockdev-0.17.1/src/utils.h --- old/umockdev-0.16.3/src/utils.h 1970-01-01 01:00:00.000000000 +0100 +++ new/umockdev-0.17.1/src/utils.h 2021-12-14 07:27:23.400868000 +0100 @@ -0,0 +1,6 @@ +#pragma once + +/* variants of glibc functions that abort() on ENOMEM */ +void *mallocx (size_t size); +void *callocx (size_t nmemb, size_t size); +char *strdupx (const char *s); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/tests/run-apt new/umockdev-0.17.1/tests/run-apt --- old/umockdev-0.16.3/tests/run-apt 2021-09-15 07:38:31.171431800 +0200 +++ new/umockdev-0.17.1/tests/run-apt 2021-12-14 07:27:23.400868000 +0100 @@ -27,8 +27,8 @@ apt-get install -y eatmydata eatmydata apt-get -y --purge dist-upgrade -# install build dependencies -eatmydata apt-get install -y --no-install-recommends meson git pkg-config valac libglib2.0-dev libudev-dev libgudev-1.0-dev libpcap-dev python3-gi gobject-introspection libgirepository1.0-dev gir1.2-glib-2.0 gir1.2-gudev-1.0 gtk-doc-tools udev xserver-xorg-video-dummy xserver-xorg-input-evdev xserver-xorg-input-synaptics xinput usbutils gphoto2 valgrind +# install build and test dependencies +eatmydata apt-get install -y --no-install-recommends meson git pkg-config valac libglib2.0-dev libudev-dev libgudev-1.0-dev libpcap-dev python3-gi gobject-introspection libgirepository1.0-dev gir1.2-glib-2.0 gir1.2-gudev-1.0 gtk-doc-tools udev xserver-xorg-video-dummy xserver-xorg-input-evdev xserver-xorg-input-synaptics xinput usbutils evtest gphoto2 valgrind # run build as user useradd build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/tests/run-dnf new/umockdev-0.17.1/tests/run-dnf --- old/umockdev-0.16.3/tests/run-dnf 2021-09-15 07:38:31.171431800 +0200 +++ new/umockdev-0.17.1/tests/run-dnf 2021-12-14 07:27:23.400868000 +0100 @@ -30,15 +30,15 @@ gtk_doc=true fi -# install build dependencies -dnf -y \${repos:-} install meson git gcc clang glib2-devel gtk-doc libgudev1-devel libtool libudev-devel libpcap-devel make python3 python3-gobject-base usbutils vala xz systemd-udev valgrind \$packages +# install build and test dependencies +dnf -y \${repos:-} install meson git gcc clang glib2-devel gtk-doc libgudev1-devel libtool libudev-devel libpcap-devel make python3 python3-gobject-base usbutils vala xz systemd-udev evtest gphoto2 valgrind \$packages # run build as user useradd guest su -s /bin/sh - guest << EOG set -eux cd /source -meson setup /tmp/dbg --buildtype debug --prefix /usr -Dgtk_doc=\${gtk_doc} -Db_coverage=\$coverage --werror +CFLAGS="-fanalyzer" meson setup /tmp/dbg --buildtype debug --prefix /usr -Dgtk_doc=\${gtk_doc} -Db_coverage=\$coverage --werror cd /tmp/dbg DESTDIR=/tmp/inst meson install meson test -v --num-processes=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/tests/test-umockdev-run.vala new/umockdev-0.17.1/tests/test-umockdev-run.vala --- old/umockdev-0.16.3/tests/test-umockdev-run.vala 2021-09-15 07:38:31.171431800 +0200 +++ new/umockdev-0.17.1/tests/test-umockdev-run.vala 2021-12-14 07:27:23.400868000 +0100 @@ -156,7 +156,6 @@ assert (Process.if_signaled (exit)); assert_cmpint (Process.term_sig (exit), CompareOperator.EQ, ProcessSignal.SEGV); assert_cmpstr (sout, CompareOperator.EQ, ""); - assert_cmpstr (serr, CompareOperator.EQ, ""); } static void @@ -183,6 +182,46 @@ } static void +t_run_udevadm_block () +{ + string umockdev_file; + + Posix.close (checked_open_tmp ("loop23.XXXXXX.umockdev", out umockdev_file)); + + checked_file_set_contents (umockdev_file, """P: /devices/virtual/block/loop23 +N: loop23 +E: DEVNAME=/dev/loop23 +E: DEVTYPE=disk +E: MAJOR=7 +E: MINOR=23 +E: SUBSYSTEM=block +A: dev=7:23\n +A: size=1048576\n +"""); + + string sout; + string serr; + int exit; + + // unfortunately the udevadm output between distros is not entirely constant + assert (get_program_out ( + "udevadm", + umockdev_run_command + "-d " + umockdev_file + " -- udevadm info --query=all --name=/dev/loop23", + out sout, out serr, out exit)); + + assert_cmpstr (serr, CompareOperator.EQ, ""); + assert_cmpint (exit, CompareOperator.EQ, 0); + assert (sout.contains ("P: /devices/virtual/block/loop23\n")); + assert (sout.contains ("P: /devices/virtual/block/loop23\n")); + assert (sout.contains ("E: DEVPATH=/devices/virtual/block/loop23")); + assert (sout.contains ("E: DEVNAME=/dev/loop23")); + assert (sout.contains ("E: MAJOR=7")); + assert (sout.contains ("E: MINOR=23")); + + FileUtils.remove (umockdev_file); +} + +static void t_run_invalid_args () { // missing program to run @@ -517,11 +556,15 @@ get_program_out ("xinput", "env DISPLAY=:5 xinput --list-props 'SynPS/2 Synaptics TouchPad'", out props_out, out props_err, out props_exit); - /* shut down X */ + /* shut down X; this requires extra force due to https://launchpad.net/bugs/1853266 */ #if VALA_0_40 Posix.kill (xorg_pid, Posix.Signal.TERM); + Posix.kill (xorg_pid, Posix.Signal.QUIT); + Posix.kill (xorg_pid, Posix.Signal.KILL); #else Posix.kill (xorg_pid, Posix.SIGTERM); + Posix.kill (xorg_pid, Posix.SIGQUIT); + Posix.kill (xorg_pid, Posix.SIGKILL); #endif int status; Posix.waitpid (xorg_pid, out status, 0); @@ -552,6 +595,12 @@ return; } + unowned string? preload = Environment.get_variable ("LD_PRELOAD"); + if (preload != null && preload.contains ("vgpreload")) { + stdout.printf ("[SKIP: this test does not work under valgrind] "); + return; + } + Pid evtest_pid; int outfd, errfd; @@ -626,6 +675,12 @@ return; } + unowned string? preload = Environment.get_variable ("LD_PRELOAD"); + if (preload != null && preload.contains ("vgpreload")) { + stdout.printf ("[SKIP: this test does not work under valgrind] "); + return; + } + Pid evtest_pid; int outfd, errfd; @@ -713,6 +768,9 @@ Test.add_func ("/umockdev-run/version", t_run_version); Test.add_func ("/umockdev-run/pipes", t_run_pipes); + // udevadm emulation + Test.add_func ("/umockdev-run/udevadm-block", t_run_udevadm_block); + // error conditions Test.add_func ("/umockdev-run/invalid-args", t_run_invalid_args); Test.add_func ("/umockdev-run/invalid-device", t_run_invalid_device); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umockdev-0.16.3/tests/test-umockdev-vala.vala new/umockdev-0.17.1/tests/test-umockdev-vala.vala --- old/umockdev-0.16.3/tests/test-umockdev-vala.vala 2021-09-15 07:38:31.171431800 +0200 +++ new/umockdev-0.17.1/tests/test-umockdev-vala.vala 2021-12-14 07:27:23.400868000 +0100 @@ -685,6 +685,42 @@ } void +t_hidraw_ioctl () +{ + var tb = new UMockdev.Testbed (); + + string device; + checked_file_get_contents (Path.build_filename(rootdir + "/devices/hidraw/fido2.umockdev"), out device); + tb_add_from_string (tb, device); + + try { + tb.load_ioctl ("/dev/hidraw5", Path.build_filename(rootdir + "/devices/hidraw/fido2.ioctl")); + } catch (Error e) { + error ("Cannot load ioctl file: %s", e.message); + } + + int fd = Posix.open ("/dev/hidraw5", Posix.O_RDWR, 0); + assert_cmpint (fd, CompareOperator.GE, 0); + + int i = 0; + assert_cmpint (Posix.ioctl (fd, Ioctl.HIDIOCGRDESCSIZE, ref i), CompareOperator.EQ, 0); + assert_cmpint (Posix.errno, CompareOperator.EQ, 0); + // HACK: This actually works fine on real s390x (big endian), but fails in emulated QEMU (such as COPR) + if (Environment.get_variable ("RPM_ARCH") != "s390x") + assert_cmpint (i, CompareOperator.EQ, 34); + Ioctl.hidraw_report_descriptor desc = { 34, }; + assert_cmpint (Posix.ioctl (fd, Ioctl.HIDIOCGRDESC, ref desc), CompareOperator.EQ, 0); + assert_cmpint (Posix.errno, CompareOperator.EQ, 0); + uint8 desc_value[] = { + 0x06, 0xD0, 0xF1, 0x09, 0x01, 0xA1, 0x01, 0x09, 0x20, 0x15, 0x00, 0x26, + 0xFF, 0x00, 0x75, 0x08, 0x95, 0x40, 0x81, 0x02, 0x09, 0x21, 0x15, 0x00, + 0x26, 0xFF, 0x00, 0x75, 0x08, 0x95, 0x40, 0x91, 0x02, 0xC0 + }; + assert_cmpint (Posix.memcmp(desc.value, desc_value, 34), CompareOperator.EQ, 0); + Posix.close (fd); +} + +void t_tty_stty () { var tb = new UMockdev.Testbed (); @@ -757,6 +793,13 @@ 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] "); + stdout.flush (); + return; + } + int pipefds[2]; assert_cmpint (Posix.pipe(pipefds), CompareOperator.EQ, 0); @@ -1049,6 +1092,8 @@ Test.add_func ("/umockdev-testbed-vala/spidev_ioctl", t_spidev_ioctl); + Test.add_func ("/umockdev-testbed-vala/hidraw_ioctl", t_hidraw_ioctl); + /* tests for mocking TTYs */ Test.add_func ("/umockdev-testbed-vala/tty_stty", t_tty_stty); Test.add_func ("/umockdev-testbed-vala/tty_data", t_tty_data);

1 0

commit slf4j for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package slf4j for openSUSE:Factory checked in at 2021-12-30 15:55:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slf4j (Old) and /work/SRC/openSUSE:Factory/.slf4j.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "slf4j" Thu Dec 30 15:55:34 2021 rev:25 rq:943057 version:1.7.32 Changes: -------- --- /work/SRC/openSUSE:Factory/slf4j/slf4j-sources.changes 2020-04-23 18:29:14.819951067 +0200 +++ /work/SRC/openSUSE:Factory/.slf4j.new.1896/slf4j-sources.changes 2021-12-30 15:55:59.072680634 +0100 @@ -1,0 +2,11 @@ +Wed Dec 29 10:53:06 UTC 2021 - Pedro Monreal <pmonreal(a)suse.com> + +- Update to upstream version 1.7.32 + * In the slf4j-simple module, SimpleLogger now caters for + concurrent access. +- Update to upstream version 1.7.31 + * In the jcl-over-slf4j module avoid Object to String conversion. + * In the log4j-over-slf4j module added empty constructors for + ConsoleAppender. + +------------------------------------------------------------------- slf4j.changes: same change Old: ---- v_1.7.30.tar.gz New: ---- v_1.7.32.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slf4j-sources.spec ++++++ --- /var/tmp/diff_new_pack.W3TxFe/_old 2021-12-30 15:55:59.724681137 +0100 +++ /var/tmp/diff_new_pack.W3TxFe/_new 2021-12-30 15:55:59.728681139 +0100 @@ -1,7 +1,7 @@ # -# spec file for package slf4j-sources +# spec file # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -19,11 +19,11 @@ %global base_name slf4j Name: %{base_name}-sources -Version: 1.7.30 +Version: 1.7.32 Release: 0 Summary: SLF4J Source JARs # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT -License: MIT AND Apache-2.0 +License: Apache-2.0 AND MIT Group: Development/Libraries/Java URL: https://www.slf4j.org/ Source0: https://github.com/qos-ch/%{base_name}/archive/v_%{version}.tar.gz ++++++ slf4j.spec ++++++ --- /var/tmp/diff_new_pack.W3TxFe/_old 2021-12-30 15:55:59.744681152 +0100 +++ /var/tmp/diff_new_pack.W3TxFe/_new 2021-12-30 15:55:59.748681155 +0100 @@ -1,7 +1,7 @@ # # spec file for package slf4j # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -18,11 +18,11 @@ Name: slf4j -Version: 1.7.30 +Version: 1.7.32 Release: 0 Summary: Simple Logging Facade for Java # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT -License: MIT AND Apache-2.0 +License: Apache-2.0 AND MIT Group: Development/Libraries/Java URL: https://www.slf4j.org/ Source0: https://github.com/qos-ch/%{name}/archive/v_%{version}.tar.gz ++++++ build.xml.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/integration/maven-build.properties new/integration/maven-build.properties --- old/integration/maven-build.properties 2020-02-26 13:38:51.445570720 +0100 +++ new/integration/maven-build.properties 2021-12-29 12:04:25.396677431 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:44 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=integration-1.7.30 +maven.build.finalName=integration-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/integration/maven-build.xml new/integration/maven-build.xml --- old/integration/maven-build.xml 2020-02-26 13:38:51.445570720 +0100 +++ new/integration/maven-build.xml 2021-12-29 12:04:25.404677523 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="integration-1.7.30"/> + <property name="maven.build.finalName" value="integration-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,7 +44,7 @@  <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/> <pathelement location="${maven.repo.local}/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/> <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.main/2.0.2/org.apache.felix.main-2.0.2.jar"/> @@ -54,7 +54,7 @@ <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.4.2/org.apache.felix.bundlerepository-1.4.2.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/> <pathelement location="${maven.repo.local}/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/> <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.main/2.0.2/org.apache.felix.main-2.0.2.jar"/> @@ -210,9 +210,9 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1…" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1…" + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/3.8.1"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jcl-over-slf4j/maven-build.properties new/jcl-over-slf4j/maven-build.properties --- old/jcl-over-slf4j/maven-build.properties 2020-02-26 13:38:51.445570720 +0100 +++ new/jcl-over-slf4j/maven-build.properties 2021-12-29 12:04:25.408677570 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:43 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=jcl-over-slf4j-1.7.30 +maven.build.finalName=jcl-over-slf4j-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jcl-over-slf4j/maven-build.xml new/jcl-over-slf4j/maven-build.xml --- old/jcl-over-slf4j/maven-build.xml 2020-02-26 13:38:51.445570720 +0100 +++ new/jcl-over-slf4j/maven-build.xml 2021-12-29 12:04:25.416677663 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="jcl-over-slf4j-1.7.30"/> + <property name="maven.build.finalName" value="jcl-over-slf4j-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,11 +44,11 @@  <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.32/slf4j-jdk14-1.7.32.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> </path> @@ -242,14 +242,14 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1…" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1…" + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk…" - dest="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.7.32/slf4j-jdk…" + dest="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.32/slf4j-jdk14-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jul-to-slf4j/maven-build.properties new/jul-to-slf4j/maven-build.properties --- old/jul-to-slf4j/maven-build.properties 2020-02-26 13:38:51.445570720 +0100 +++ new/jul-to-slf4j/maven-build.properties 2021-12-29 12:04:25.424677755 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:43 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=jul-to-slf4j-1.7.30 +maven.build.finalName=jul-to-slf4j-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jul-to-slf4j/maven-build.xml new/jul-to-slf4j/maven-build.xml --- old/jul-to-slf4j/maven-build.xml 2020-02-26 13:38:51.445570720 +0100 +++ new/jul-to-slf4j/maven-build.xml 2021-12-29 12:04:25.432677848 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="jul-to-slf4j-1.7.30"/> + <property name="maven.build.finalName" value="jul-to-slf4j-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,11 +44,11 @@  <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.30/slf4j-log4j12-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.32/slf4j-log4j12-1.7.32.jar"/> <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> @@ -246,14 +246,14 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1…" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1…" + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-log4j12/1.7.30/slf4j-l…" - dest="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.30/slf4j-log4j12-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-log4j12/1.7.32/slf4j-l…" + dest="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.32/slf4j-log4j12-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/log4j/log4j/1.2.17"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/log4j-over-slf4j/maven-build.properties new/log4j-over-slf4j/maven-build.properties --- old/log4j-over-slf4j/maven-build.properties 2020-02-26 13:38:51.441570700 +0100 +++ new/log4j-over-slf4j/maven-build.properties 2021-12-29 12:04:25.436677894 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:43 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=log4j-over-slf4j-1.7.30 +maven.build.finalName=log4j-over-slf4j-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/log4j-over-slf4j/maven-build.xml new/log4j-over-slf4j/maven-build.xml --- old/log4j-over-slf4j/maven-build.xml 2020-02-26 13:38:51.445570720 +0100 +++ new/log4j-over-slf4j/maven-build.xml 2021-12-29 12:04:25.440677941 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="log4j-over-slf4j-1.7.30"/> + <property name="maven.build.finalName" value="log4j-over-slf4j-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,11 +44,11 @@  <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.32/slf4j-jdk14-1.7.32.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> </path> @@ -242,14 +242,14 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1…" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1…" + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk…" - dest="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.7.32/slf4j-jdk…" + dest="${maven.repo.local}/org/slf4j/slf4j-jdk14/1.7.32/slf4j-jdk14-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osgi-over-slf4j/maven-build.properties new/osgi-over-slf4j/maven-build.properties --- old/osgi-over-slf4j/maven-build.properties 2020-02-26 13:38:51.441570700 +0100 +++ new/osgi-over-slf4j/maven-build.properties 2021-12-29 12:04:25.448678033 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:44 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=osgi-over-slf4j-1.7.30 +maven.build.finalName=osgi-over-slf4j-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osgi-over-slf4j/maven-build.xml new/osgi-over-slf4j/maven-build.xml --- old/osgi-over-slf4j/maven-build.xml 2020-02-26 13:38:51.441570700 +0100 +++ new/osgi-over-slf4j/maven-build.xml 2021-12-29 12:04:25.456678126 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="osgi-over-slf4j-1.7.30"/> + <property name="maven.build.finalName" value="osgi-over-slf4j-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -46,14 +46,14 @@ <path id="build.classpath"> <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.2.0/org.osgi.core-4.2.0.jar"/> <pathelement location="${maven.repo.local}/org/osgi/org.osgi.enterprise/4.2.0/org.osgi.enterprise-4.2.0.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.32/slf4j-simple-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> </path> <path id="build.test.classpath"> <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.2.0/org.osgi.core-4.2.0.jar"/> <pathelement location="${maven.repo.local}/org/osgi/org.osgi.enterprise/4.2.0/org.osgi.enterprise-4.2.0.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.32/slf4j-simple-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> </path> @@ -208,14 +208,14 @@ dest="${maven.repo.local}/org/osgi/org.osgi.enterprise/4.2.0/org.osgi.enterprise-4.2.0.jar" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-simple/1.7.30/slf4j-si…" - dest="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-simple/1.7.32/slf4j-si…" + dest="${maven.repo.local}/org/slf4j/slf4j-simple/1.7.32/slf4j-simple-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1…" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1…" + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-android/maven-build.properties new/slf4j-android/maven-build.properties --- old/slf4j-android/maven-build.properties 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-android/maven-build.properties 2021-12-29 12:04:25.460678172 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:43 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-android-1.7.30 +maven.build.finalName=slf4j-android-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-android/maven-build.xml new/slf4j-android/maven-build.xml --- old/slf4j-android/maven-build.xml 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-android/maven-build.xml 2021-12-29 12:04:25.468678265 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-android-1.7.30"/> + <property name="maven.build.finalName" value="slf4j-android-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,7 +44,7 @@  <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> <pathelement location="${maven.repo.local}/com/google/android/android/1.5_r4/android-1.5_r4.jar"/> <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar"/> @@ -55,7 +55,7 @@ <pathelement location="${maven.repo.local}/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> <pathelement location="${maven.repo.local}/com/google/android/android/1.5_r4/android-1.5_r4.jar"/> <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar"/> @@ -257,9 +257,9 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1…" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1…" + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/com/google/android/android/1.5_r4"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-api/maven-build.properties new/slf4j-api/maven-build.properties --- old/slf4j-api/maven-build.properties 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-api/maven-build.properties 2021-12-29 12:04:25.472678311 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:42 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-api-1.7.30 +maven.build.finalName=slf4j-api-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-api/maven-build.xml new/slf4j-api/maven-build.xml --- old/slf4j-api/maven-build.xml 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-api/maven-build.xml 2021-12-29 12:04:25.480678404 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-api-1.7.30"/> + <property name="maven.build.finalName" value="slf4j-api-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-ext/maven-build.properties new/slf4j-ext/maven-build.properties --- old/slf4j-ext/maven-build.properties 2020-02-26 13:38:51.441570700 +0100 +++ new/slf4j-ext/maven-build.properties 2021-12-29 12:04:25.484678450 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:43 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-ext-1.7.30 +maven.build.finalName=slf4j-ext-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-ext/maven-build.xml new/slf4j-ext/maven-build.xml --- old/slf4j-ext/maven-build.xml 2020-02-26 13:38:51.441570700 +0100 +++ new/slf4j-ext/maven-build.xml 2021-12-29 12:04:25.492678543 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-ext-1.7.30"/> + <property name="maven.build.finalName" value="slf4j-ext-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,14 +44,14 @@  <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> <pathelement location="${maven.repo.local}/ch/qos/cal10n/cal10n-api/0.8.1/cal10n-api-0.8.1.jar"/> <pathelement location="${maven.repo.local}/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/> <pathelement location="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.30/slf4j-log4j12-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.32/slf4j-log4j12-1.7.32.jar"/> <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/> <pathelement location="${maven.repo.local}/ch/qos/cal10n/cal10n-api/0.8.1/cal10n-api-0.8.1.jar"/> <pathelement location="${maven.repo.local}/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/> @@ -252,14 +252,14 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1…" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1…" + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-log4j12/1.7.30/slf4j-l…" - dest="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.30/slf4j-log4j12-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-log4j12/1.7.32/slf4j-l…" + dest="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.32/slf4j-log4j12-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/log4j/log4j/1.2.17"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-jcl/maven-build.properties new/slf4j-jcl/maven-build.properties --- old/slf4j-jcl/maven-build.properties 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-jcl/maven-build.properties 2021-12-29 12:04:25.496678589 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:42 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-jcl-1.7.30 +maven.build.finalName=slf4j-jcl-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-jcl/maven-build.xml new/slf4j-jcl/maven-build.xml --- old/slf4j-jcl/maven-build.xml 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-jcl/maven-build.xml 2021-12-29 12:04:25.504678682 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-jcl-1.7.30"/> + <property name="maven.build.finalName" value="slf4j-jcl-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,11 +44,11 @@  <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> @@ -243,9 +243,9 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1…" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1…" + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/commons-logging/commons-logging/1.1.1"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-jdk14/maven-build.properties new/slf4j-jdk14/maven-build.properties --- old/slf4j-jdk14/maven-build.properties 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-jdk14/maven-build.properties 2021-12-29 12:04:25.508678728 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:42 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-jdk14-1.7.30 +maven.build.finalName=slf4j-jdk14-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-jdk14/maven-build.xml new/slf4j-jdk14/maven-build.xml --- old/slf4j-jdk14/maven-build.xml 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-jdk14/maven-build.xml 2021-12-29 12:04:25.516678820 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-jdk14-1.7.30"/> + <property name="maven.build.finalName" value="slf4j-jdk14-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,11 +44,11 @@  <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-tests.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32-tests.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> </path> @@ -242,14 +242,14 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1…" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1…" + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1…" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-tests.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1…" + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32-tests.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-log4j12/maven-build.properties new/slf4j-log4j12/maven-build.properties --- old/slf4j-log4j12/maven-build.properties 2020-02-26 13:38:51.445570720 +0100 +++ new/slf4j-log4j12/maven-build.properties 2021-12-29 12:04:25.520678867 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:42 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-log4j12-1.7.30 +maven.build.finalName=slf4j-log4j12-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-log4j12/maven-build.xml new/slf4j-log4j12/maven-build.xml --- old/slf4j-log4j12/maven-build.xml 2020-02-26 13:38:51.445570720 +0100 +++ new/slf4j-log4j12/maven-build.xml 2021-12-29 12:04:25.524678913 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-log4j12-1.7.30"/> + <property name="maven.build.finalName" value="slf4j-log4j12-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,11 +44,11 @@  <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> @@ -246,9 +246,9 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1…" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1…" + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/log4j/log4j/1.2.17"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-migrator/maven-build.properties new/slf4j-migrator/maven-build.properties --- old/slf4j-migrator/maven-build.properties 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-migrator/maven-build.properties 2021-12-29 12:04:25.532679006 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:44 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-migrator-1.7.30 +maven.build.finalName=slf4j-migrator-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-migrator/maven-build.xml new/slf4j-migrator/maven-build.xml --- old/slf4j-migrator/maven-build.xml 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-migrator/maven-build.xml 2021-12-29 12:04:25.536679052 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-migrator-1.7.30"/> + <property name="maven.build.finalName" value="slf4j-migrator-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-nop/maven-build.properties new/slf4j-nop/maven-build.properties --- old/slf4j-nop/maven-build.properties 2020-02-26 13:38:51.441570700 +0100 +++ new/slf4j-nop/maven-build.properties 2021-12-29 12:04:25.544679145 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:42 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-nop-1.7.30 +maven.build.finalName=slf4j-nop-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-nop/maven-build.xml new/slf4j-nop/maven-build.xml --- old/slf4j-nop/maven-build.xml 2020-02-26 13:38:51.441570700 +0100 +++ new/slf4j-nop/maven-build.xml 2021-12-29 12:04:25.548679191 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-nop-1.7.30"/> + <property name="maven.build.finalName" value="slf4j-nop-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,10 +44,10 @@  <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> </path> @@ -241,9 +241,9 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1…" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1…" + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-simple/maven-build.properties new/slf4j-simple/maven-build.properties --- old/slf4j-simple/maven-build.properties 2020-02-26 13:38:51.445570720 +0100 +++ new/slf4j-simple/maven-build.properties 2021-12-29 12:04:25.556679284 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:42 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-simple-1.7.30 +maven.build.finalName=slf4j-simple-1.7.32 maven.build.resourceDir.0=src/main/resources maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-simple/maven-build.xml new/slf4j-simple/maven-build.xml --- old/slf4j-simple/maven-build.xml 2020-02-26 13:38:51.449570740 +0100 +++ new/slf4j-simple/maven-build.xml 2021-12-29 12:04:25.560679330 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-simple-1.7.30"/> + <property name="maven.build.finalName" value="slf4j-simple-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> @@ -44,10 +44,10 @@  <path id="build.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> </path> <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar"/> <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> </path> @@ -244,9 +244,9 @@ description="Download all dependencies" unless="maven.mode.offline"> <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30"/> - <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1…" - dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32"/> + <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1…" + dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" usetimestamp="false" ignoreerrors="true"/> <mkdir dir="${maven.repo.local}/junit/junit/4.10"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-site/maven-build.properties new/slf4j-site/maven-build.properties --- old/slf4j-site/maven-build.properties 2020-02-26 13:38:51.445570720 +0100 +++ new/slf4j-site/maven-build.properties 2021-12-29 12:04:25.568679422 +0100 @@ -2,7 +2,7 @@ #Fri Oct 23 09:31:44 CEST 2015 slf4j.api.minimum.compatible.version=1.6.0 maven.settings.offline=false -maven.build.finalName=slf4j-site-1.7.30 +maven.build.finalName=slf4j-site-1.7.32 maven.build.resourceDir.0=src/site/pages maven.build.testOutputDir=${maven.build.dir}/test-classes javadoc.plugin.version=2.10.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-site/maven-build.xml new/slf4j-site/maven-build.xml --- old/slf4j-site/maven-build.xml 2020-02-26 13:38:51.445570720 +0100 +++ new/slf4j-site/maven-build.xml 2021-12-29 12:04:25.572679469 +0100 @@ -24,7 +24,7 @@ <property file="${user.home}/.m2/maven.properties"/> <property file="maven-build.properties"/> - <property name="maven.build.finalName" value="slf4j-site-1.7.30"/> + <property name="maven.build.finalName" value="slf4j-site-1.7.32"/> <property name="maven.build.dir" value="target"/> <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> <property name="maven.build.srcDir.0" value="src/main/java"/> ++++++ v_1.7.30.tar.gz -> v_1.7.32.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/integration/pom.xml new/slf4j-v_1.7.32/integration/pom.xml --- old/slf4j-v_1.7.30/integration/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/integration/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>integration</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/jcl-over-slf4j/pom.xml new/slf4j-v_1.7.32/jcl-over-slf4j/pom.xml --- old/slf4j-v_1.7.30/jcl-over-slf4j/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/jcl-over-slf4j/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <modelVersion>4.0.0</modelVersion> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java new/slf4j-v_1.7.32/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java --- old/slf4j-v_1.7.30/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java 2021-07-29 20:27:41.000000000 +0200 @@ -104,7 +104,9 @@ * the message to log. Converted to {@link String} */ public void trace(Object message) { - logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(message), null, null); + if (isTraceEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(message), null, null); + } } /** @@ -117,7 +119,9 @@ * the exception to log */ public void trace(Object message, Throwable t) { - logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(message), null, t); + if (isTraceEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(message), null, t); + } } /** @@ -128,7 +132,9 @@ * the message to log. Converted to {@link String} */ public void debug(Object message) { - logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(message), null, null); + if (isDebugEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(message), null, null); + } } /** @@ -141,7 +147,9 @@ * the exception to log */ public void debug(Object message, Throwable t) { - logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(message), null, t); + if (isDebugEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(message), null, t); + } } /** @@ -152,7 +160,9 @@ * the message to log. Converted to {@link String} */ public void info(Object message) { - logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(message), null, null); + if (isInfoEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(message), null, null); + } } /** @@ -165,7 +175,9 @@ * the exception to log */ public void info(Object message, Throwable t) { - logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(message), null, t); + if (isInfoEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(message), null, t); + } } /** @@ -176,7 +188,9 @@ * the message to log. Converted to {@link String} */ public void warn(Object message) { - logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(message), null, null); + if (isWarnEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(message), null, null); + } } /** @@ -189,7 +203,9 @@ * the exception to log */ public void warn(Object message, Throwable t) { - logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(message), null, t); + if (isWarnEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(message), null, t); + } } /** @@ -200,7 +216,9 @@ * the message to log. Converted to {@link String} */ public void error(Object message) { - logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, null); + if (isErrorEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, null); + } } /** @@ -213,7 +231,9 @@ * the exception to log */ public void error(Object message, Throwable t) { - logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, t); + if (isErrorEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, t); + } } /** @@ -224,7 +244,9 @@ * the message to log. Converted to {@link String} */ public void fatal(Object message) { - logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, null); + if (isErrorEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, null); + } } /** @@ -237,7 +259,9 @@ * the exception to log */ public void fatal(Object message, Throwable t) { - logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, t); + if (isErrorEnabled()) { + logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, t); + } } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/jcl-over-slf4j/src/test/java/org/apache/commons/logging/InvokeJCLTest.java new/slf4j-v_1.7.32/jcl-over-slf4j/src/test/java/org/apache/commons/logging/InvokeJCLTest.java --- old/slf4j-v_1.7.30/jcl-over-slf4j/src/test/java/org/apache/commons/logging/InvokeJCLTest.java 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/jcl-over-slf4j/src/test/java/org/apache/commons/logging/InvokeJCLTest.java 2021-07-29 20:27:41.000000000 +0200 @@ -27,6 +27,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertEquals; import org.junit.Test; @@ -85,4 +86,56 @@ log.fatal(null, e); log.fatal("fatal message", e); } + + @Test + public void testAvoidConvertingObjectToString() { + Log log = LogFactory.getLog(InvokeJCLTest.class); + Exception e = new Exception("just testing"); + + TestMessage fatalMsg = new TestMessage("fatal msg"); + TestMessage errorMsg = new TestMessage("error msg"); + TestMessage warnMsg = new TestMessage("warn msg"); + TestMessage infoMsg = new TestMessage("info msg"); + TestMessage debugMsg = new TestMessage("debug msg"); + TestMessage traceMsg = new TestMessage("trace msg"); + + log.fatal(fatalMsg); + log.fatal(fatalMsg, e); + assertEquals(2, fatalMsg.invokedCount); + + log.error(errorMsg); + log.error(errorMsg, e); + assertEquals(2, errorMsg.invokedCount); + + log.warn(warnMsg); + log.warn(warnMsg, e); + assertEquals(2, warnMsg.invokedCount); + + log.info(infoMsg); + log.info(infoMsg, e); + assertEquals(2, infoMsg.invokedCount); + + log.debug(debugMsg); + log.debug(debugMsg, e); + assertEquals(0, debugMsg.invokedCount); + + log.trace(traceMsg); + log.trace(traceMsg, e); + assertEquals(0, traceMsg.invokedCount); + } + + static class TestMessage { + + private final String msg; + int invokedCount = 0; + + TestMessage(String msg) {this.msg = msg;} + + @Override + public String toString() { + invokedCount++; + return msg; + } + } + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/jul-to-slf4j/pom.xml new/slf4j-v_1.7.32/jul-to-slf4j/pom.xml --- old/slf4j-v_1.7.30/jul-to-slf4j/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/jul-to-slf4j/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>jul-to-slf4j</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/log4j-over-slf4j/pom.xml new/slf4j-v_1.7.32/log4j-over-slf4j/pom.xml --- old/slf4j-v_1.7.30/log4j-over-slf4j/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/log4j-over-slf4j/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/log4j-over-slf4j/src/main/java/org/apache/log4j/ConsoleAppender.java new/slf4j-v_1.7.32/log4j-over-slf4j/src/main/java/org/apache/log4j/ConsoleAppender.java --- old/slf4j-v_1.7.30/log4j-over-slf4j/src/main/java/org/apache/log4j/ConsoleAppender.java 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/log4j-over-slf4j/src/main/java/org/apache/log4j/ConsoleAppender.java 2021-07-29 20:27:41.000000000 +0200 @@ -15,6 +15,18 @@ */ package org.apache.log4j; +/** + * Skeleton implementation of ConsoleAppender + */ public class ConsoleAppender extends WriterAppender { + public ConsoleAppender() { + } + + public ConsoleAppender(Layout layout) { + } + + public ConsoleAppender(Layout layout, String target) { + } + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/osgi-over-slf4j/pom.xml new/slf4j-v_1.7.32/osgi-over-slf4j/pom.xml --- old/slf4j-v_1.7.30/osgi-over-slf4j/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/osgi-over-slf4j/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>osgi-over-slf4j</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/pom.xml new/slf4j-v_1.7.32/pom.xml --- old/slf4j-v_1.7.30/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -6,7 +6,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> <packaging>pom</packaging> <name>SLF4J</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-android/pom.xml new/slf4j-v_1.7.32/slf4j-android/pom.xml --- old/slf4j-v_1.7.30/slf4j-android/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-android/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-android</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-api/pom.xml new/slf4j-v_1.7.32/slf4j-api/pom.xml --- old/slf4j-v_1.7.30/slf4j-api/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-api/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-api</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-ext/pom.xml new/slf4j-v_1.7.32/slf4j-ext/pom.xml --- old/slf4j-v_1.7.30/slf4j-ext/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-ext/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-ext</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-jcl/pom.xml new/slf4j-v_1.7.32/slf4j-jcl/pom.xml --- old/slf4j-v_1.7.30/slf4j-jcl/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-jcl/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-jcl</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-jdk14/pom.xml new/slf4j-v_1.7.32/slf4j-jdk14/pom.xml --- old/slf4j-v_1.7.30/slf4j-jdk14/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-jdk14/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-jdk14</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-log4j12/pom.xml new/slf4j-v_1.7.32/slf4j-log4j12/pom.xml --- old/slf4j-v_1.7.30/slf4j-log4j12/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-log4j12/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-log4j12</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-migrator/pom.xml new/slf4j-v_1.7.32/slf4j-migrator/pom.xml --- old/slf4j-v_1.7.30/slf4j-migrator/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-migrator/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-migrator</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-nop/pom.xml new/slf4j-v_1.7.32/slf4j-nop/pom.xml --- old/slf4j-v_1.7.30/slf4j-nop/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-nop/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-nop</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-simple/pom.xml new/slf4j-v_1.7.32/slf4j-simple/pom.xml --- old/slf4j-v_1.7.30/slf4j-simple/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-simple/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-simple</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java new/slf4j-v_1.7.32/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java --- old/slf4j-v_1.7.30/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java 2021-07-29 20:27:41.000000000 +0200 @@ -157,7 +157,7 @@ protected static final int LOG_LEVEL_OFF = LOG_LEVEL_ERROR + 10; private static boolean INITIALIZED = false; - static SimpleLoggerConfiguration CONFIG_PARAMS = null; + static final private SimpleLoggerConfiguration CONFIG_PARAMS = new SimpleLoggerConfiguration(); static void lazyInit() { if (INITIALIZED) { @@ -170,7 +170,6 @@ // external software might be invoking this method directly. Do not rename // or change its semantics. static void init() { - CONFIG_PARAMS = new SimpleLoggerConfiguration(); CONFIG_PARAMS.init(); } @@ -312,12 +311,22 @@ throw new IllegalStateException("Unrecognized level [" + level + "]"); } + /** + * To avoid intermingling of log messages and associated stack traces, the two + * operations are done in a synchronized block. + * + * @param buf + * @param t + */ void write(StringBuilder buf, Throwable t) { PrintStream targetStream = CONFIG_PARAMS.outputChoice.getTargetPrintStream(); - targetStream.println(buf.toString()); - writeThrowable(t, targetStream); - targetStream.flush(); + synchronized (CONFIG_PARAMS) { + targetStream.println(buf.toString()); + writeThrowable(t, targetStream); + targetStream.flush(); + } + } protected void writeThrowable(Throwable t, PrintStream targetStream) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/MultithereadedExecutionTest.java new/slf4j-v_1.7.32/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/MultithereadedExecutionTest.java --- old/slf4j-v_1.7.30/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/MultithereadedExecutionTest.java 1970-01-01 01:00:00.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/MultithereadedExecutionTest.java 2021-07-29 20:27:41.000000000 +0200 @@ -0,0 +1,128 @@ +/** + * Copyright (c) 2004-2021 QOS.ch + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ +package org.slf4j.simple.multiThreadedExecution; + +import java.io.PrintStream; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Tests that output in multi-threaded environments is not mingled. + * + * See also https://jira.qos.ch/browse/SLF4J-515 + */ +public class MultithereadedExecutionTest { + + private static int THREAD_COUNT = 2; + private static long TEST_DURATION_IN_MILLIS = 100; + + private Thread[] threads = new Thread[THREAD_COUNT]; + + private final PrintStream oldOut = System.out; + StateCheckingPrintStream scps = new StateCheckingPrintStream(oldOut); + + volatile boolean signal = false; + + @Before + public void setup() { + System.setErr(scps); + // System.setProperty(SimpleLogger.LOG_FILE_KEY, "System.err"); + // LoggerFactoryFriend.reset(); + } + + @After + public void tearDown() throws Exception { + // LoggerFactoryFriend.reset(); + // System.clearProperty(SimpleLogger.LOG_FILE_KEY); + System.setErr(oldOut); + } + + @Test + public void test() throws Throwable { + WithException withException = new WithException(); + Other other = new Other(); + threads[0] = new Thread(withException); + threads[1] = new Thread(other); + threads[0].start(); + threads[1].start(); + Thread.sleep(TEST_DURATION_IN_MILLIS); + signal = true; + threads[0].join(); + threads[1].join(); + + if (withException.throwable != null) { + throw withException.throwable; + } + + if (other.throwable != null) { + throw other.throwable; + } + + } + + class WithException implements Runnable { + + volatile Throwable throwable; + Logger logger = LoggerFactory.getLogger(WithException.class); + + public void run() { + int i = 0; + + while (!signal) { + try { + logger.info("Hello {}", i, new Throwable("i=" + i)); + i++; + } catch (Throwable t) { + throwable = t; + MultithereadedExecutionTest.this.signal = true; + return; + } + } + + } + } + + class Other implements Runnable { + volatile Throwable throwable; + Logger logger = LoggerFactory.getLogger(Other.class); + + public void run() { + int i = 0; + while (!signal) { + try { + logger.info("Other {}", i++); + } catch (Throwable t) { + throwable = t; + MultithereadedExecutionTest.this.signal = true; + return; + } + } + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/StateCheckingPrintStream.java new/slf4j-v_1.7.32/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/StateCheckingPrintStream.java --- old/slf4j-v_1.7.30/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/StateCheckingPrintStream.java 1970-01-01 01:00:00.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/StateCheckingPrintStream.java 2021-07-29 20:27:41.000000000 +0200 @@ -0,0 +1,141 @@ +/** + * Copyright (c) 2004-2021 QOS.ch + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ +package org.slf4j.simple.multiThreadedExecution; + +import java.io.PrintStream; +import java.util.regex.Pattern; + +/** + * This PrintStream checks that output lines are in an expected order. + * + * @author ceki + */ +public class StateCheckingPrintStream extends PrintStream { + + enum State { + INITIAL, UNKNOWN, HELLO, THROWABLE, AT1, AT2, OTHER; + } + + volatile State currentState = State.INITIAL; + + public StateCheckingPrintStream(PrintStream ps) { + super(ps); + } + + public void print(String s) { + } + + public void println(String s) { + + State next = computeState(s); + //System.out.println(next + " " + s); + switch (currentState) { + case INITIAL: + currentState = next; + break; + + case UNKNOWN: + // ignore garbage + currentState = next; + break; + + case OTHER: + if (next == State.UNKNOWN) { + currentState = State.UNKNOWN; + return; + } + + if (next != State.OTHER && next != State.HELLO) { + throw badState(s, currentState, next); + } + currentState = next; + break; + + case HELLO: + if (next != State.THROWABLE) { + throw badState(s, currentState, next); + } + currentState = next; + break; + case THROWABLE: + if (next != State.AT1) { + throw badState(s, currentState, next); + } + currentState = next; + break; + + case AT1: + if (next != State.AT2) { + throw badState(s, currentState, next); + } + currentState = next; + break; + + case AT2: + currentState = next; + break; + default: + throw new IllegalStateException("Unreachable code"); + } + } + + private IllegalStateException badState(String s, State currentState2, State next) { + return new IllegalStateException("Unexpected state " + next + " for current state " + currentState2 + " for " + s); + + } + + String OTHER_PATTERN_STR = ".*Other \\d{1,5}"; + String HELLO_PATTERN_STR = ".*Hello \\d{1,5}"; + String THROWABLE_PATTERN_STR = "java.lang.Throwable: i=\\d{1,5}"; + String AT1_PATTERN_STR = "\\s*at " + this.getClass().getPackage().getName() + ".*"; + String AT2_PATTERN_STR = "\\s*at " + ".*Thread.java.*"; + + Pattern PATTERN_OTHER = Pattern.compile(OTHER_PATTERN_STR); + Pattern PATTERN_HELLO = Pattern.compile(HELLO_PATTERN_STR); + Pattern PATTERN_THROWABLE = Pattern.compile(THROWABLE_PATTERN_STR); + Pattern PATTERN_AT1 = Pattern.compile(AT1_PATTERN_STR); + Pattern PATTERN_AT2 = Pattern.compile(AT2_PATTERN_STR); + + private State computeState(String s) { + + if (PATTERN_OTHER.matcher(s).matches()) { + return State.OTHER; + } else if (PATTERN_HELLO.matcher(s).matches()) { + return State.HELLO; + } else if (PATTERN_THROWABLE.matcher(s).matches()) { + return State.THROWABLE; + } else if (PATTERN_AT1.matcher(s).matches()) { + return State.AT1; + } else if (PATTERN_AT2.matcher(s).matches()) { + return State.AT2; + } else { + return State.UNKNOWN; + } + } + + public void println(Object o) { + println(o.toString()); + } +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slf4j-v_1.7.30/slf4j-site/pom.xml new/slf4j-v_1.7.32/slf4j-site/pom.xml --- old/slf4j-v_1.7.30/slf4j-site/pom.xml 2019-12-16 22:01:36.000000000 +0100 +++ new/slf4j-v_1.7.32/slf4j-site/pom.xml 2021-07-29 20:27:41.000000000 +0200 @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.30</version> + <version>1.7.32</version> </parent> <artifactId>slf4j-site</artifactId>

1 0

commit nginx for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nginx for openSUSE:Factory checked in at 2021-12-30 15:55:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nginx (Old) and /work/SRC/openSUSE:Factory/.nginx.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nginx" Thu Dec 30 15:55:30 2021 rev:73 rq:943052 version:1.21.5 Changes: -------- --- /work/SRC/openSUSE:Factory/nginx/nginx.changes 2021-11-09 23:54:14.775941489 +0100 +++ /work/SRC/openSUSE:Factory/.nginx.new.1896/nginx.changes 2021-12-30 15:55:57.956679773 +0100 @@ -1,0 +2,10 @@ +Wed Dec 29 11:03:27 UTC 2021 - Andreas Stieger <andreas.stieger(a)gmx.de> + +- Updated to 1.21.5 + * https://nginx.org/en/CHANGES + * Build with the PCRE2. + * Supported the $ssl_curve variable. + * Fixed connections might hang when using HTTP/2 without SSL + with the "sendfile" and "aio" directives. + +------------------------------------------------------------------- Old: ---- nginx-1.21.4.tar.gz nginx-1.21.4.tar.gz.asc New: ---- nginx-1.21.5.tar.gz nginx-1.21.5.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nginx.spec ++++++ --- /var/tmp/diff_new_pack.LydjDb/_old 2021-12-30 15:55:58.516680206 +0100 +++ /var/tmp/diff_new_pack.LydjDb/_new 2021-12-30 15:55:58.520680208 +0100 @@ -23,7 +23,7 @@ %bcond_with ngx_google_perftools # Name: nginx -Version: 1.21.4 +Version: 1.21.5 Release: 0 Summary: A HTTP server and IMAP/POP3 proxy server License: BSD-2-Clause @@ -53,7 +53,7 @@ BuildRequires: libxslt-devel BuildRequires: nginx-macros BuildRequires: openssl-devel -BuildRequires: pcre-devel +BuildRequires: pcre2-devel BuildRequires: pkgconfig BuildRequires: sysuser-shadow BuildRequires: sysuser-tools @@ -88,7 +88,7 @@ Requires: libxslt-devel Requires: nginx = %{version} Requires: openssl-devel -Requires: pcre-devel +Requires: pcre2-devel Requires: pkgconfig Requires: vim Requires: zlib-devel ++++++ nginx-1.21.4.tar.gz -> nginx-1.21.5.tar.gz ++++++ ++++ 8194 lines of diff (skipped)

1 0

commit mozilla-nspr for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mozilla-nspr for openSUSE:Factory checked in at 2021-12-30 15:55:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozilla-nspr (Old) and /work/SRC/openSUSE:Factory/.mozilla-nspr.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozilla-nspr" Thu Dec 30 15:55:29 2021 rev:82 rq:943050 version:4.33 Changes: -------- --- /work/SRC/openSUSE:Factory/mozilla-nspr/mozilla-nspr.changes 2021-08-11 11:47:26.089730791 +0200 +++ /work/SRC/openSUSE:Factory/.mozilla-nspr.new.1896/mozilla-nspr.changes 2021-12-30 15:55:56.968679012 +0100 @@ -1,0 +2,6 @@ +Wed Dec 29 11:14:31 UTC 2021 - Andreas Stieger <andreas.stieger(a)gmx.de> + +- update to 4.33: + * fixes to build system and export of private symbols + +------------------------------------------------------------------- Old: ---- nspr-4.32.tar.gz New: ---- nspr-4.33.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nspr.spec ++++++ --- /var/tmp/diff_new_pack.uGYCBD/_old 2021-12-30 15:55:57.492679416 +0100 +++ /var/tmp/diff_new_pack.uGYCBD/_new 2021-12-30 15:55:57.492679416 +0100 @@ -20,7 +20,7 @@ %define useccache 1 Name: mozilla-nspr -Version: 4.32 +Version: 4.33 Release: 0 Summary: Netscape Portable Runtime License: MPL-2.0 ++++++ nspr-4.32.tar.gz -> nspr-4.33.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.32/nspr/.hg_archival.txt new/nspr-4.33/nspr/.hg_archival.txt --- old/nspr-4.32/nspr/.hg_archival.txt 2021-06-30 23:43:23.000000000 +0200 +++ new/nspr-4.33/nspr/.hg_archival.txt 2021-12-17 16:29:39.000000000 +0100 @@ -1,4 +1,4 @@ repo: a4b34919bf34db2ee22acbbc305693c8980b6dc6 -node: 40050f21eeeddfdc919f42f7552fcbf472f7b9e4 +node: 5f753966dc01e1872eb4fee6e7b6d0a4fd3daad2 branch: default -tag: NSPR_4_32_RTM +tag: NSPR_4_33_RTM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.32/nspr/configure new/nspr-4.33/nspr/configure --- old/nspr-4.32/nspr/configure 2021-06-30 23:43:23.000000000 +0200 +++ new/nspr-4.33/nspr/configure 2021-12-17 16:29:39.000000000 +0100 @@ -2486,7 +2486,7 @@ program_prefix=${target_alias}- MOD_MAJOR_VERSION=4 -MOD_MINOR_VERSION=32 +MOD_MINOR_VERSION=33 MOD_PATCH_VERSION=0 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.32/nspr/configure.in new/nspr-4.33/nspr/configure.in --- old/nspr-4.32/nspr/configure.in 2021-06-30 23:43:23.000000000 +0200 +++ new/nspr-4.33/nspr/configure.in 2021-12-17 16:29:39.000000000 +0100 @@ -8,14 +8,14 @@ AC_INIT AC_CONFIG_SRCDIR([pr/include/nspr.h]) -AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) +AC_CONFIG_AUX_DIR(build/autoconf) AC_CANONICAL_TARGET dnl ======================================================== dnl = Defaults dnl ======================================================== MOD_MAJOR_VERSION=4 -MOD_MINOR_VERSION=32 +MOD_MINOR_VERSION=33 MOD_PATCH_VERSION=0 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.32/nspr/pr/include/prinit.h new/nspr-4.33/nspr/pr/include/prinit.h --- old/nspr-4.32/nspr/pr/include/prinit.h 2021-06-30 23:43:23.000000000 +0200 +++ new/nspr-4.33/nspr/pr/include/prinit.h 2021-12-17 16:29:39.000000000 +0100 @@ -31,9 +31,9 @@ ** The format of the version string is ** "<major version>.<minor version>[.<patch level>] [<Beta>]" */ -#define PR_VERSION "4.32" +#define PR_VERSION "4.33" #define PR_VMAJOR 4 -#define PR_VMINOR 32 +#define PR_VMINOR 33 #define PR_VPATCH 0 #define PR_BETA PR_FALSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.32/nspr/pr/include/private/pprthred.h new/nspr-4.33/nspr/pr/include/private/pprthred.h --- old/nspr-4.32/nspr/pr/include/private/pprthred.h 2021-06-30 23:43:23.000000000 +0200 +++ new/nspr-4.33/nspr/pr/include/private/pprthred.h 2021-12-17 16:29:39.000000000 +0100 @@ -301,9 +301,9 @@ ---------------------------------------------------------------------------*/ #ifdef XP_UNIX -extern void PR_XLock(void); -extern void PR_XUnlock(void); -extern PRBool PR_XIsLocked(void); +extern void _PR_XLock(void); +extern void _PR_XUnlock(void); +extern PRBool _PR_XIsLocked(void); #endif /* XP_UNIX */ PR_END_EXTERN_C diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.32/nspr/pr/src/md/unix/unix.c new/nspr-4.33/nspr/pr/src/md/unix/unix.c --- old/nspr-4.32/nspr/pr/src/md/unix/unix.c 2021-06-30 23:43:23.000000000 +0200 +++ new/nspr-4.33/nspr/pr/src/md/unix/unix.c 2021-12-17 16:29:39.000000000 +0100 @@ -3301,36 +3301,21 @@ ** in a pre-emptive threaded environment, we need to use a lock. */ -void PR_XLock(void) +void _PR_XLock(void) { PR_EnterMonitor(_pr_Xfe_mon); } -void PR_XUnlock(void) +void _PR_XUnlock(void) { PR_ExitMonitor(_pr_Xfe_mon); } -PRBool PR_XIsLocked(void) +PRBool _PR_XIsLocked(void) { return (PR_InMonitor(_pr_Xfe_mon)) ? PR_TRUE : PR_FALSE; } -void PR_XWait(int ms) -{ - PR_Wait(_pr_Xfe_mon, PR_MillisecondsToInterval(ms)); -} - -void PR_XNotify(void) -{ - PR_Notify(_pr_Xfe_mon); -} - -void PR_XNotifyAll(void) -{ - PR_NotifyAll(_pr_Xfe_mon); -} - #if defined(HAVE_FCNTL_FILE_LOCKING) PRStatus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.32/nspr/pr/src/md/unix/uxwrap.c new/nspr-4.33/nspr/pr/src/md/unix/uxwrap.c --- old/nspr-4.32/nspr/pr/src/md/unix/uxwrap.c 2021-06-30 23:43:23.000000000 +0200 +++ new/nspr-4.33/nspr/pr/src/md/unix/uxwrap.c 2021-12-17 16:29:39.000000000 +0100 @@ -187,10 +187,10 @@ needToLockXAgain = 0; if (rd && (_pr_xt_hack_fd != -1) - && FD_ISSET(_pr_xt_hack_fd, rd) && PR_XIsLocked() + && FD_ISSET(_pr_xt_hack_fd, rd) && _PR_XIsLocked() && (!_pr_xt_hack_okayToReleaseXLock || _pr_xt_hack_okayToReleaseXLock())) { - PR_XUnlock(); + _PR_XUnlock(); needToLockXAgain = 1; } @@ -198,7 +198,7 @@ retVal = _PR_WaitForMultipleFDs(unixpds, pdcnt, timeout); if (needToLockXAgain) { - PR_XLock(); + _PR_XLock(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.32/nspr/pr/tests/vercheck.c new/nspr-4.33/nspr/pr/tests/vercheck.c --- old/nspr-4.32/nspr/pr/tests/vercheck.c 2021-06-30 23:43:23.000000000 +0200 +++ new/nspr-4.33/nspr/pr/tests/vercheck.c 2021-12-17 16:29:39.000000000 +0100 @@ -42,7 +42,7 @@ "4.10.10", "4.11", "4.12", "4.13", "4.14", "4.15", "4.16", "4.17", "4.18", "4.19", "4.20", "4.21", "4.22", "4.23", "4.24", "4.25", "4,26", "4.27", "4.28", "4.29", - "4.30", "4.31", + "4.30", "4.31", "4.32", PR_VERSION }; @@ -58,8 +58,8 @@ "3.0", "3.0.1", "3.1", "3.1.1", "3.1.2", "3.1.3", "3.5", "3.5.1", - "4.32.1", - "4.33", "4.33.1", + "4.33.1", + "4.34", "4.34.1", "10.0", "11.1", "12.14.20" };

1 0

commit MozillaFirefox for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2021-12-30 15:55:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox" Thu Dec 30 15:55:28 2021 rev:353 rq:943041 version:95.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2021-12-18 20:29:34.698220294 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new.1896/MozillaFirefox.changes 2021-12-30 15:55:43.856668902 +0100 @@ -1,0 +2,16 @@ +Tue Dec 28 17:45:28 UTC 2021 - Bj��rn Lie <bjorn.lie(a)gmail.com> + +- Add upstream patches: + * mozilla-bmo1745560.patch: Fix build against wayland 1.20. + * mozilla-bmo1744896.patch: Create WaylandVsyncSource on window + creation + +------------------------------------------------------------------- +Mon Dec 20 21:57:30 UTC 2021 - Wolfgang Rosenauer <wr(a)rosenauer.org> + +- Mozilla Firefox 95.0.2 + * Addresses frequent crashes experienced by users with C/E/Z-Series + "Bobcat" CPUs running on Windows 7, 8, and 8.1. +- updated constraints for ppc and x86-64 + +------------------------------------------------------------------- Old: ---- firefox-95.0.1.source.tar.xz firefox-95.0.1.source.tar.xz.asc l10n-95.0.1.tar.xz New: ---- firefox-95.0.2.source.tar.xz firefox-95.0.2.source.tar.xz.asc l10n-95.0.2.tar.xz mozilla-bmo1744896.patch mozilla-bmo1745560.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.hqBgVp/_old 2021-12-30 15:55:56.416678586 +0100 +++ /var/tmp/diff_new_pack.hqBgVp/_new 2021-12-30 15:55:56.420678590 +0100 @@ -29,8 +29,8 @@ # major 69 # mainver %major.99 %define major 95 -%define mainver %major.0.1 -%define orig_version 95.0.1 +%define mainver %major.0.2 +%define orig_version 95.0.2 %define orig_suffix %{nil} %define update_channel release %define branding 1 @@ -223,6 +223,8 @@ Patch28: mozilla-libavcodec58_91.patch Patch29: mozilla-silence-no-return-type.patch Patch31: mozilla-bmo531915.patch +Patch32: mozilla-bmo1745560.patch +Patch33: mozilla-bmo1744896.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -351,6 +353,8 @@ %patch28 -p1 %patch29 -p1 %patch31 -p1 +%patch32 -p1 +%patch33 -p1 # Firefox %patch101 -p1 %patch102 -p1 ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.hqBgVp/_old 2021-12-30 15:55:56.508678657 +0100 +++ /var/tmp/diff_new_pack.hqBgVp/_new 2021-12-30 15:55:56.512678660 +0100 @@ -51,7 +51,7 @@ </conditions> <hardware> <memory> - <size unit="G">16</size> + <size unit="G">18</size> </memory> </hardware> </overwrite> @@ -62,10 +62,10 @@ </conditions> <hardware> <disk> - <size unit="G">25</size> + <size unit="G">36</size> </disk> <physicalmemory> - <size unit="G">10</size> + <size unit="G">11</size> </physicalmemory> <memoryperjob> <size unit="M">2500</size> ++++++ firefox-95.0.1.source.tar.xz -> firefox-95.0.2.source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-95.0.1.source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new.1896/firefox-95.0.2.source.tar.xz differ: char 15, line 1 ++++++ l10n-95.0.1.tar.xz -> l10n-95.0.2.tar.xz ++++++ ++++++ mozilla-bmo1744896.patch ++++++ diff -up firefox-95.0.2/widget/gtk/nsWindow.cpp.1744896 firefox-95.0.2/widget/gtk/nsWindow.cpp --- firefox-95.0.2/widget/gtk/nsWindow.cpp.1744896 2021-12-23 11:54:31.522539340 +0100 +++ firefox-95.0.2/widget/gtk/nsWindow.cpp 2021-12-23 11:55:56.070270174 +0100 @@ -5765,6 +5765,17 @@ nsresult nsWindow::Create(nsIWidget* aPa } } #endif +#ifdef MOZ_WAYLAND + // Initialize the window specific VsyncSource early in order to avoid races + // with BrowserParent::UpdateVsyncParentVsyncSource(). + // Only use for toplevel windows for now, see bug 1619246. + if (GdkIsWaylandDisplay() && + StaticPrefs::widget_wayland_vsync_enabled_AtStartup() && + mWindowType == eWindowType_toplevel) { + mWaylandVsyncSource = new WaylandVsyncSource(); + MOZ_RELEASE_ASSERT(mWaylandVsyncSource); + } +#endif // We create input contexts for all containers, except for // toplevel popup windows @@ -6077,19 +6088,12 @@ void nsWindow::ResumeCompositorFromCompo void nsWindow::WaylandStartVsync() { #ifdef MOZ_WAYLAND - // only use for toplevel windows for now - see bug 1619246 - if (!GdkIsWaylandDisplay() || - !StaticPrefs::widget_wayland_vsync_enabled_AtStartup() || - mWindowType != eWindowType_toplevel) { + if (!mWaylandVsyncSource) { return; } LOG("nsWindow::WaylandStartVsync() [%p]\n", (void*)this); - if (!mWaylandVsyncSource) { - mWaylandVsyncSource = new WaylandVsyncSource(); - } - WaylandVsyncSource::WaylandDisplay& display = static_cast<WaylandVsyncSource::WaylandDisplay&>( mWaylandVsyncSource->GetGlobalDisplay()); ++++++ mozilla-bmo1745560.patch ++++++ diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c --- a/widget/gtk/mozwayland/mozwayland.c +++ b/widget/gtk/mozwayland/mozwayland.c @@ -200,3 +200,10 @@ MOZ_EXPORT void wl_list_insert_list(struct wl_list* list, struct wl_list* other) {} + +MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags( + struct wl_proxy* proxy, uint32_t opcode, + const struct wl_interface* interface, uint32_t version, uint32_t flags, + ...) { + return NULL; +} ++++++ tar_stamps ++++++ --- /var/tmp/diff_new_pack.hqBgVp/_old 2021-12-30 15:55:56.816678895 +0100 +++ /var/tmp/diff_new_pack.hqBgVp/_new 2021-12-30 15:55:56.816678895 +0100 @@ -1,11 +1,11 @@ PRODUCT="firefox" CHANNEL="release" -VERSION="95.0.1" +VERSION="95.0.2" VERSION_SUFFIX="" -PREV_VERSION="95.0" +PREV_VERSION="95.0.1" PREV_VERSION_SUFFIX="" #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release" -RELEASE_TAG="5a1a2f3b06c23a27532ba48f9999c59c643f3f36" -RELEASE_TIMESTAMP="20211129150630" +RELEASE_TAG="1ff2cec0bb36e389df1a209a9f882b443ed48495" +RELEASE_TIMESTAMP="20211218203254"

1 0

commit MozillaThunderbird for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at 2021-12-30 15:55:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old) and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird" Thu Dec 30 15:55:28 2021 rev:270 rq:943034 version:91.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes 2021-12-22 20:17:47.423839282 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaThunderbird.new.1896/MozillaThunderbird.changes 2021-12-30 15:55:40.996666697 +0100 @@ -1,0 +2,5 @@ +Tue Dec 28 20:20:30 UTC 2021 - Bj��rn Lie <bjorn.lie(a)gmail.com> + +- Add mozilla-bmo1745560.patch: Fix build against wayland 1.20. + +------------------------------------------------------------------- New: ---- mozilla-bmo1745560.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.nNTbU1/_old 2021-12-30 15:55:43.384668538 +0100 +++ /var/tmp/diff_new_pack.nNTbU1/_new 2021-12-30 15:55:43.388668541 +0100 @@ -207,6 +207,7 @@ Patch29: mozilla-silence-no-return-type.patch Patch30: mozilla-bmo531915.patch Patch31: mozilla-bmo1724679.patch +Patch32: mozilla-bmo1745560.patch %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /bin/sh @@ -309,6 +310,7 @@ %patch29 -p1 %patch30 -p1 %patch31 -p1 +%patch32 -p1 %endif %build ++++++ mozilla-bmo1745560.patch ++++++ diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c --- a/widget/gtk/mozwayland/mozwayland.c +++ b/widget/gtk/mozwayland/mozwayland.c @@ -200,3 +200,10 @@ MOZ_EXPORT void wl_list_insert_list(struct wl_list* list, struct wl_list* other) {} + +MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags( + struct wl_proxy* proxy, uint32_t opcode, + const struct wl_interface* interface, uint32_t version, uint32_t flags, + ...) { + return NULL; +}

1 0

commit python-pytest-relaxed for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pytest-relaxed for openSUSE:Factory checked in at 2021-12-30 15:55:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pytest-relaxed (Old) and /work/SRC/openSUSE:Factory/.python-pytest-relaxed.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pytest-relaxed" Thu Dec 30 15:55:27 2021 rev:8 rq:943004 version:1.1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pytest-relaxed/python-pytest-relaxed.changes 2021-11-21 23:51:52.670311788 +0100 +++ /work/SRC/openSUSE:Factory/.python-pytest-relaxed.new.1896/python-pytest-relaxed.changes 2021-12-30 15:55:39.564665593 +0100 @@ -1,0 +2,5 @@ +Tue Dec 28 20:34:06 UTC 2021 - Ben Greiner <code(a)bnavigator.de> + +- Skip python310 -- gh#bitprophet/pytest-relaxed#12 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pytest-relaxed.spec ++++++ --- /var/tmp/diff_new_pack.7GZ4cK/_old 2021-12-30 15:55:40.748666506 +0100 +++ /var/tmp/diff_new_pack.7GZ4cK/_new 2021-12-30 15:55:40.756666512 +0100 @@ -17,6 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python310 1 Name: python-pytest-relaxed Version: 1.1.5 Release: 0

1 0

commit python-lupa for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-lupa for openSUSE:Factory checked in at 2021-12-30 15:55:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-lupa (Old) and /work/SRC/openSUSE:Factory/.python-lupa.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-lupa" Thu Dec 30 15:55:26 2021 rev:10 rq:943002 version:1.10 Changes: -------- --- /work/SRC/openSUSE:Factory/python-lupa/python-lupa.changes 2021-12-16 21:20:26.650547082 +0100 +++ /work/SRC/openSUSE:Factory/.python-lupa.new.1896/python-lupa.changes 2021-12-30 15:55:37.712664165 +0100 @@ -1,0 +2,5 @@ +Wed Dec 29 00:48:53 UTC 2021 - Matej Cepl <mcepl(a)suse.com> + +- Adjust BuildRequires for lua + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-lupa.spec ++++++ --- /var/tmp/diff_new_pack.6FKyaE/_old 2021-12-30 15:55:38.288664609 +0100 +++ /var/tmp/diff_new_pack.6FKyaE/_new 2021-12-30 15:55:38.292664612 +0100 @@ -30,7 +30,7 @@ BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: python-rpm-macros -BuildRequires: pkgconfig(lua5.4) +BuildRequires: pkgconfig(lua) Recommends: luajit Suggests: lua %ifnarch riscv64

1 0

commit python-diskcache for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-diskcache for openSUSE:Factory checked in at 2021-12-30 15:55:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-diskcache (Old) and /work/SRC/openSUSE:Factory/.python-diskcache.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-diskcache" Thu Dec 30 15:55:25 2021 rev:8 rq:943001 version:5.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-diskcache/python-diskcache.changes 2020-11-17 21:26:28.897449002 +0100 +++ /work/SRC/openSUSE:Factory/.python-diskcache.new.1896/python-diskcache.changes 2021-12-30 15:55:36.904663542 +0100 @@ -1,0 +2,14 @@ +Mon Dec 27 13:20:49 UTC 2021 - Ben Greiner <code(a)bnavigator.de> + +- Update to 5.3.0 + * Support for Python 3.10 in testing (#238) + * Add support for Python 3.10 + * Update copyright to 2022 + * Bump version to 5.3.0 + * Add Python 3.10 to the README +- Avoid django test collections errors on python 3.6:# + no python36-Django 4 +- Keep ignoring djangocache tests due to + gh#grantjenks/python-diskcache#210 + +------------------------------------------------------------------- Old: ---- v5.1.0.tar.gz New: ---- diskcache-5.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-diskcache.spec ++++++ --- /var/tmp/diff_new_pack.VgoDhi/_old 2021-12-30 15:55:37.396663921 +0100 +++ /var/tmp/diff_new_pack.VgoDhi/_new 2021-12-30 15:55:37.400663924 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-diskcache # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,19 +19,20 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %global skip_python2 1 Name: python-diskcache -Version: 5.1.0 +Version: 5.3.0 Release: 0 Summary: Disk and file backed cache License: Apache-2.0 URL: http://www.grantjenks.com/docs/diskcache/ -Source: https://github.com/grantjenks/python-diskcache/archive/v%{version}.tar.gz -BuildRequires: %{python_module Django} -BuildRequires: %{python_module mock} +Source: https://github.com/grantjenks/python-diskcache/archive/v%{version}.tar.gz#/… +BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{pythons} BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: %{python_module Django if (%python-base without python36-base)} +BuildRequires: %{python_module pytest-django if (%python-base without python36-base)} Requires: python BuildArch: noarch %python_subpackages @@ -44,6 +45,7 @@ %prep %setup -q +sed -i '/--cov/d' tox.ini %build %python_build @@ -53,13 +55,16 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -sed -i '/-n auto/d' tox.ini -rm tests/test_djangocache.py -%pytest +# No python36-Django 4 on TW +python36_flags=("--ignore" "tests/test_doctest.py" "-k" "not README.rst") +# Broken since Django 3.2 -- https://github.com/grantjenks/python-diskcache/issues/210 +donttest_djangocache="--ignore tests/test_djangocache.py" +%pytest "${$python_flags[@]}" ${donttest_djangocache} %files %{python_files} %license LICENSE %doc README.rst -%{python_sitelib}/* +%{python_sitelib}/diskcache +%{python_sitelib}/diskcache-%{version}*-info %changelog

1 0

commit python-sphinx-autodoc-typehints for openSUSE:Factory
by Source-Sync 30 Dec '21

30 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-sphinx-autodoc-typehints for openSUSE:Factory checked in at 2021-12-30 15:55:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-sphinx-autodoc-typehints (Old) and /work/SRC/openSUSE:Factory/.python-sphinx-autodoc-typehints.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-sphinx-autodoc-typehints" Thu Dec 30 15:55:23 2021 rev:9 rq:943000 version:1.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-sphinx-autodoc-typehints/python-sphinx-autodoc-typehints.changes 2021-08-03 22:49:28.816443347 +0200 +++ /work/SRC/openSUSE:Factory/.python-sphinx-autodoc-typehints.new.1896/python-sphinx-autodoc-typehints.changes 2021-12-30 15:55:35.740662645 +0100 @@ -1,0 +2,6 @@ +Mon Dec 27 17:20:01 UTC 2021 - Ben Greiner <code(a)bnavigator.de> + +- Skip python310: Not ready yet. Factory needs only the primary + python3 flavor + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-sphinx-autodoc-typehints.spec ++++++ --- /var/tmp/diff_new_pack.uuM0Ev/_old 2021-12-30 15:55:36.208663006 +0100 +++ /var/tmp/diff_new_pack.uuM0Ev/_new 2021-12-30 15:55:36.208663006 +0100 @@ -18,6 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 +%define skip_python310 1 Name: python-sphinx-autodoc-typehints Version: 1.12.0 Release: 0

1 0