October 2022 - openSUSE Commits - openSUSE Mailing Lists

commit xdg-desktop-portal-gnome for openSUSE:Factory
by Source-Sync 20 Oct '22

20 Oct '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xdg-desktop-portal-gnome for openSUSE:Factory checked in at 2022-10-20 11:09:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdg-desktop-portal-gnome (Old) and /work/SRC/openSUSE:Factory/.xdg-desktop-portal-gnome.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xdg-desktop-portal-gnome" Thu Oct 20 11:09:38 2022 rev:7 rq:1029918 version:43.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome.changes 2022-09-21 14:40:39.049458496 +0200 +++ /work/SRC/openSUSE:Factory/.xdg-desktop-portal-gnome.new.2275/xdg-desktop-portal-gnome.changes 2022-10-20 11:09:42.411775990 +0200 @@ -1,0 +2,7 @@ +Tue Oct 18 07:59:00 UTC 2022 - Bj��rn Lie <bjorn.lie(a)gmail.com> + +- Update to version 43.1: + + Close dialogs with the Escape key. + + Updated translations. + +------------------------------------------------------------------- Old: ---- xdg-desktop-portal-gnome-43.0.tar.xz New: ---- xdg-desktop-portal-gnome-43.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-desktop-portal-gnome.spec ++++++ --- /var/tmp/diff_new_pack.qVuNhO/_old 2022-10-20 11:09:43.115777416 +0200 +++ /var/tmp/diff_new_pack.qVuNhO/_new 2022-10-20 11:09:43.119777425 +0200 @@ -17,7 +17,7 @@ Name: xdg-desktop-portal-gnome -Version: 43.0 +Version: 43.1 Release: 0 Summary: A backend implementation for xdg-desktop-portal License: LGPL-2.1-or-later ++++++ xdg-desktop-portal-gnome-43.0.tar.xz -> xdg-desktop-portal-gnome-43.1.tar.xz ++++++ ++++ 5560 lines of diff (skipped)

1 0

commit xcb-util-keysyms for openSUSE:Factory
by Source-Sync 20 Oct '22

20 Oct '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xcb-util-keysyms for openSUSE:Factory checked in at 2022-10-20 11:09:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xcb-util-keysyms (Old) and /work/SRC/openSUSE:Factory/.xcb-util-keysyms.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xcb-util-keysyms" Thu Oct 20 11:09:39 2022 rev:10 rq:1029923 version:0.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xcb-util-keysyms/xcb-util-keysyms.changes 2014-10-07 18:23:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xcb-util-keysyms.new.2275/xcb-util-keysyms.changes 2022-10-20 11:09:43.431778057 +0200 @@ -1,0 +2,15 @@ +Wed Oct 19 08:01:33 UTC 2022 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 0.4.1 + * Update README for gitlab migration + * Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters + * Update m4 to xorg/util/xcb-util-m4@c617eee22ae5c285e79e81 + * gitlab CI: add a basic build test + * configure: Drop AM_MAINTAINER_MODE + * autogen.sh: Honor NOCONFIGURE=1 + * Add COPYING file + * autogen.sh: use quoted string variables + * autogen: add default patch prefix + * autogen.sh: use exec instead of waiting for configure to finish + +------------------------------------------------------------------- Old: ---- xcb-util-keysyms-0.4.0.tar.bz2 New: ---- xcb-util-keysyms-0.4.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xcb-util-keysyms.spec ++++++ --- /var/tmp/diff_new_pack.xRHJuQ/_old 2022-10-20 11:09:43.883778972 +0200 +++ /var/tmp/diff_new_pack.xRHJuQ/_new 2022-10-20 11:09:43.891778989 +0200 @@ -1,7 +1,7 @@ # # spec file for package xcb-util-keysyms # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,22 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: xcb-util-keysyms %define lname libxcb-keysyms1 -Version: 0.4.0 +Version: 0.4.1 Release: 0 Summary: XCB utility module for X keycode constants and conversions License: MIT Group: Development/Libraries/C and C++ -Url: http://xcb.freedesktop.org/ +URL: http://xcb.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/xcb/util-keysyms #Git-Web: http://cgit.freedesktop.org/xcb/util-keysyms/ -Source: %name-%version.tar.bz2 +Source: %name-%version.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.59c, automake, libtool

1 0

commit gnome-control-center for openSUSE:Factory
by Source-Sync 20 Oct '22

20 Oct '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnome-control-center for openSUSE:Factory checked in at 2022-10-20 11:09:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old) and /work/SRC/openSUSE:Factory/.gnome-control-center.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-control-center" Thu Oct 20 11:09:37 2022 rev:217 rq:1029917 version:43.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes 2022-09-21 14:40:58.877513485 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-control-center.new.2275/gnome-control-center.changes 2022-10-20 11:09:39.059769200 +0200 @@ -1,0 +2,9 @@ +Tue Oct 18 08:00:32 UTC 2022 - Bj��rn Lie <bjorn.lie(a)gmail.com> + +- Update to version 43.1: + + Network: Fix crashes editing networks. + + Power: Don't assert if we can't find the widget for a profile. + + Printers: Small visual improvements. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-control-center-43.0.tar.xz New: ---- gnome-control-center-43.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-control-center.spec ++++++ --- /var/tmp/diff_new_pack.uidKpg/_old 2022-10-20 11:09:40.567772255 +0200 +++ /var/tmp/diff_new_pack.uidKpg/_new 2022-10-20 11:09:40.571772263 +0200 @@ -26,7 +26,7 @@ %endif Name: gnome-control-center -Version: 43.0 +Version: 43.1 Release: 0 Summary: The GNOME Control Center License: GPL-2.0-or-later ++++++ gnome-control-center-43.0.tar.xz -> gnome-control-center-43.1.tar.xz ++++++ ++++ 62459 lines of diff (skipped)

1 0

commit NetworkManager for openSUSE:Factory
by Source-Sync 20 Oct '22

20 Oct '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at 2022-10-20 11:09:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old) and /work/SRC/openSUSE:Factory/.NetworkManager.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager" Thu Oct 20 11:09:36 2022 rev:247 rq:1029916 version:1.40.2 Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes 2022-09-01 22:10:25.488121704 +0200 +++ /work/SRC/openSUSE:Factory/.NetworkManager.new.2275/NetworkManager.changes 2022-10-20 11:09:37.595766233 +0200 @@ -1,0 +2,29 @@ +Tue Oct 18 08:57:13 UTC 2022 - Bj��rn Lie <bjorn.lie(a)gmail.com> + +- Update to version 1.40.2: + + Ensure that resolv.conf gets updated when the configuration + changes. + + Fix setting as bond primary an interface that doesn't exist yet + when the bond is activated. + + The number of autoconnect retries is now accounted + independently for each device when there are profiles with + multi-connect=multiple. + + Don't print duplicate entries in the output of "NetworkManager + --print-config". + + Fix the ifcfg-rh plugin to properly read infiniband P-Key + connection profiles without an explicit interface name. + + Allow the removal of a bond port connection profile from the + bond via nmcli. + + Fix race condition during the activation of veth profiles when + the peer already exists. + + Decline the DHCPv6 lease if all addresses fail IPv6 duplicate + address detection (DAD). + + Wait that devices get carrier before trying to resolve the + system hostname on them via DNS. + + Fix race condition during the initial activation of OVS + interfaces. + + Profiles generated by nm-initrd-generator now have lower than + default priority. + + Fix error when adding many SR-IOV virtual functions (VFs). + +------------------------------------------------------------------- Old: ---- NetworkManager-1.40.0.tar.xz New: ---- NetworkManager-1.40.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.cgxFF2/_old 2022-10-20 11:09:38.535768138 +0200 +++ /var/tmp/diff_new_pack.cgxFF2/_new 2022-10-20 11:09:38.543768154 +0200 @@ -57,7 +57,7 @@ %endif Name: NetworkManager -Version: 1.40.0 +Version: 1.40.2 Release: 0 Summary: Network Link Manager and user applications for it License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ NetworkManager-1.40.0.tar.xz -> NetworkManager-1.40.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager-1.40.0.tar.xz /work/SRC/openSUSE:Factory/.NetworkManager.new.2275/NetworkManager-1.40.2.tar.xz differ: char 27, line 1

1 0

commit python-lupa for openSUSE:Factory
by Source-Sync 20 Oct '22

20 Oct '22

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 2022-10-20 11:09:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-lupa (Old) and /work/SRC/openSUSE:Factory/.python-lupa.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-lupa" Thu Oct 20 11:09:34 2022 rev:13 rq:1029884 version:1.13 Changes: -------- --- /work/SRC/openSUSE:Factory/python-lupa/python-lupa.changes 2022-10-03 13:44:12.965277373 +0200 +++ /work/SRC/openSUSE:Factory/.python-lupa.new.2275/python-lupa.changes 2022-10-20 11:09:36.671764362 +0200 @@ -1,0 +2,5 @@ +Tue Oct 18 17:10:06 UTC 2022 - Sarah Kriesch <sarah.kriesch(a)opensuse.org> + +- No upstream LuaJIT on s390x + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-lupa.spec ++++++ --- /var/tmp/diff_new_pack.ESARJ5/_old 2022-10-20 11:09:37.171765374 +0200 +++ /var/tmp/diff_new_pack.ESARJ5/_new 2022-10-20 11:09:37.175765382 +0200 @@ -34,7 +34,7 @@ BuildRequires: pkgconfig(lua) Suggests: lua %if 0%{suse_version} >= 1550 || 0%{?sle_version} >= 150400 -%ifnarch riscv64 +%ifnarch riscv64 s390x BuildRequires: pkgconfig(luajit) %endif Recommends: luajit

1 0

commit xcb-util-image for openSUSE:Factory
by Source-Sync 20 Oct '22

20 Oct '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xcb-util-image for openSUSE:Factory checked in at 2022-10-20 11:09:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xcb-util-image (Old) and /work/SRC/openSUSE:Factory/.xcb-util-image.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xcb-util-image" Thu Oct 20 11:09:33 2022 rev:9 rq:1029882 version:0.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xcb-util-image/xcb-util-image.changes 2014-10-17 08:50:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xcb-util-image.new.2275/xcb-util-image.changes 2022-10-20 11:09:36.079763162 +0200 @@ -1,0 +2,16 @@ +Tue Oct 18 21:25:31 UTC 2022 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 0.4.1 + * Update README for gitlab migration + * Add README.md to EXTRA_DIST + * Update configure.ac bug URL for gitlab migration + * Update m4 to xorg/util/xcb-util-m4@c617eee22ae5c285e79e81 + * gitlab CI: add a basic build test + * configure: Drop AM_MAINTAINER_MODE + * autogen.sh: Honor NOCONFIGURE=1 + * test: add XCB_SHM_LIBS to all test + * autogen.sh: use quoted string variables + * autogen: add default patch prefix + * autogen.sh: use exec instead of waiting for configure to finish + +------------------------------------------------------------------- Old: ---- xcb-util-image-0.4.0.tar.bz2 New: ---- xcb-util-image-0.4.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xcb-util-image.spec ++++++ --- /var/tmp/diff_new_pack.IFsifK/_old 2022-10-20 11:09:36.463763940 +0200 +++ /var/tmp/diff_new_pack.IFsifK/_new 2022-10-20 11:09:36.467763948 +0200 @@ -1,7 +1,7 @@ # # spec file for package xcb-util-image # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,22 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: xcb-util-image %define lname libxcb-image0 -Version: 0.4.0 +Version: 0.4.1 Release: 0 Summary: XCB utility module for XImage/XShmImage-like functions License: MIT Group: Development/Libraries/C and C++ -Url: http://xcb.freedesktop.org/ +URL: http://xcb.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/xcb/util-image #Git-Web: http://cgit.freedesktop.org/xcb/util-image/ -Source: %name-%version.tar.bz2 +Source: %name-%version.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.59c, automake, libtool

1 0

commit virtualbox for openSUSE:Factory
by Source-Sync 20 Oct '22

20 Oct '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2022-10-20 11:09:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virtualbox" Thu Oct 20 11:09:29 2022 rev:245 rq:1029813 version:6.1.40 Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2022-10-10 18:45:09.122944785 +0200 +++ /work/SRC/openSUSE:Factory/.virtualbox.new.2275/virtualbox.changes 2022-10-20 11:09:32.091755083 +0200 @@ -1,0 +2,18 @@ +Tue Oct 18 15:42:42 UTC 2022 - Larry Rainey <llrainey15(a)gmail.com> + +This is a maintenance release. The following items were fixed and/or added: + + GUI: Fixed missed machine-items state translation on language change + USB: Fixed possible crash when the device got detached while the controller is resetting the port + Main: Provide guest's absolute pointing mouse device with buttons state when mouse integration is ON + Linux Host and Guest Additions: Prevented build failure on 5.8+ 32-bit kernels + Linux Host and Guest Additions: Introduced additional fixes for kernel 6.0 + Linux Host and Guest Additions: Introduced additional fixes for Debian specific kernels + Solaris and Linux Guest Additions: Added better handling of negative screen sizes which some X11 desktop environments are reporting + Windows Guest Additions: Added fixes related to VBoxTray IPC + +- Fix boo#1204233 boo#1204331 boo#1202851 + +- Remove file fix_error_in_USB_header.patch - fixed upstream + +------------------------------------------------------------------- Old: ---- VirtualBox-6.1.38-patched.tar.bz2 fix_error_in_USB_header.patch New: ---- VirtualBox-6.1.40-patched.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.091759134 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.095759143 +0200 @@ -52,7 +52,7 @@ %endif # ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!! Name: virtualbox%{?dash}%{?name_suffix} -Version: 6.1.38 +Version: 6.1.40 Release: 0 Summary: %{package_summary} # FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" @@ -173,7 +173,7 @@ Patch142: fixes_for_leap15.3.patch Patch143: vb-6.1.16-modal-dialog-parent.patch Patch144: fixes_for_leap15.4.patch -Patch145: fix_error_in_USB_header.patch + Patch999: virtualbox-fix-ui-background-color.patch # # Common BuildRequires for both virtualbox and virtualbox-kmp @@ -299,9 +299,6 @@ the terms of the GNU Public License (GPL). - - - ########################################## %package qt @@ -332,9 +329,6 @@ The VirtualBox web server is used to control headless VMs using a browser. - - - ########################################### %package guest-tools @@ -359,10 +353,7 @@ VirtualBox guest addition tools. - - - -########################################### +########################################## %package -n python3-%{name} Summary: Python bindings for %{name} @@ -382,10 +373,7 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. - - - -########################################### +########################################## %package devel Summary: Devel files for %{name} @@ -400,10 +388,7 @@ Development file for %{name} - - - -########################################### +########################################## %package host-source Summary: Source files for %{name} host kernel modules @@ -435,10 +420,7 @@ sudo %{_sbindir}/vboxguestconfig - - - -########################################### +########################################## %package guest-desktop-icons Summary: Icons for guest desktop files @@ -451,10 +433,7 @@ This package contains icons for guest desktop files that were created on the desktop. - - - -########################################### +########################################## %package vnc Summary: VNC desktop sharing @@ -532,7 +511,6 @@ %patch144 -p1 %endif %patch143 -p1 -%patch145 -p1 # make VB UI background colors look sane again %patch999 -p1 @@ -648,7 +626,7 @@ install -m 744 src/VBox/Additions/linux/installer/vboxadd-service.sh %{buildroot}%{_vbox_instdir}/vboxadd-service install -d %{buildroot}%{_userunitdir} # udev rule for guest (virtualbox-guest-tools) -install -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules +install -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/90-vboxguest.rules install -p -m 0644 -D %{SOURCE12} %{buildroot}%{_unitdir}/vboxclient.service install -p -m 0644 -D %{SOURCE13} %{buildroot}%{_unitdir}/vboxservice.service # /media is used for auto-mounting of shared folders @@ -1076,7 +1054,7 @@ %{_sbindir}/VBoxService %{_sbindir}/vboxguestconfig %{_sbindir}/mount.vboxsf -%{_udevrulesdir}/60-vboxguest.rules +%{_udevrulesdir}/90-vboxguest.rules %{_vbox_instdir}/vboxadd-service %{_unitdir}/vboxadd-service.service %{_unitdir}/multi-user.target.wants/vboxadd-service.service ++++++ Fix_for_server_1.19.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.127759207 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.131759216 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/vboxvideo.c +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/vboxvideo.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.c @@ -1236,7 +1236,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc #endif @@ -14,10 +14,10 @@ /* software cursor */ miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/pointer.c +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/pointer.c -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/pointer.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/pointer.c ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c @@ -39,6 +39,10 @@ #include "cursorstr.h" #include "servermd.h" @@ -29,10 +29,10 @@ #include "vboxvideo.h" #ifdef XORG_7X -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/edid.c +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/edid.c -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/edid.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/edid.c ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c @@ -35,6 +35,10 @@ * Michael Thayer <michael.thayer(a)oracle.com> */ ++++++ UserManual.pdf ++++++ (binary differes) ++++++ VirtualBox-5.2.10-xclient.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.183759321 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.187759329 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/Installer/98vboxadd-xclient +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/Installer/98vboxadd-xclient =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/Installer/98vboxadd-xclient +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/Installer/98vboxadd-xclient @@ -21,18 +21,11 @@ for i in $HOME/.vboxclient-*.pid; do test -w $i || rm -f $i done ++++++ VirtualBox-6.1.38-patched.tar.bz2 -> VirtualBox-6.1.40-patched.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/virtualbox/VirtualBox-6.1.38-patched.tar.bz2 /work/SRC/openSUSE:Factory/.virtualbox.new.2275/VirtualBox-6.1.40-patched.tar.bz2 differ: char 11, line 1 ++++++ fix-missing-includes-with-qt-5.15.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.267759491 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.271759499 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp @@ -18,6 +18,7 @@ /* Qt includes: */ #include <QApplication> @@ -10,10 +10,10 @@ #include <QPaintEvent> #include <QStyle> #include <QVBoxLayout> -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h @@ -37,7 +37,6 @@ class QIcon; class QLabel; class QMouseEvent; ++++++ fix_conflict_between_host_and_guest.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.287759532 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.291759540 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c +Index: VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c -+++ VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c ++++ VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c @@ -130,7 +130,7 @@ static struct vboxguest_module_info g_VB RTMemAllocExTag, RTMemContAlloc, ++++++ fix_lib_search.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.307759572 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.311759580 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/configure +Index: VirtualBox-6.1.40/configure =================================================================== ---- VirtualBox-6.1.38.orig/configure -+++ VirtualBox-6.1.38/configure +--- VirtualBox-6.1.40.orig/configure ++++ VirtualBox-6.1.40/configure @@ -1591,14 +1591,14 @@ EOF INCQT5="$q/include $q/include/QtCore" FLGQT5="-DQT_SHARED" ++++++ fixes_for_Leap42.3.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.335759629 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.339759637 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/sharedfolders/regops.c +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/sharedfolders/regops.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/sharedfolders/regops.c -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/sharedfolders/regops.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/sharedfolders/regops.c ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/sharedfolders/regops.c @@ -1451,7 +1451,7 @@ DECLINLINE(int) vbsf_lock_user_pages(uin # elif RTLNX_VER_MIN(4,6,0) ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, fWrite, 1 /*force*/, papPages); ++++++ fixes_for_Qt5.11.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.351759661 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.355759669 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h @@ -83,6 +83,7 @@ #include <QtWidgets/qgraphicsitem.h> #include <QtWidgets/qgraphicslayoutitem.h> @@ -10,10 +10,10 @@ #include <QtCore/QMetaType> #include <QtGui/qevent.h> #include <QtGui/qtouchdevice.h> -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp @@ -18,6 +18,7 @@ /* Qt includes: */ #include <QButtonGroup> ++++++ fixes_for_gcc10.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.367759694 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.371759702 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/Config.kmk +Index: VirtualBox-6.1.40/Config.kmk =================================================================== ---- VirtualBox-6.1.38.orig/Config.kmk -+++ VirtualBox-6.1.38/Config.kmk +--- VirtualBox-6.1.40.orig/Config.kmk ++++ VirtualBox-6.1.40/Config.kmk @@ -2642,11 +2642,17 @@ else # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)). # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`. @@ -24,10 +24,10 @@ ifndef DONT_USE_YASM include $(KBUILD_PATH)/tools/YASM.kmk if1of ($(KBUILD_HOST), win os2) -Index: VirtualBox-6.1.38/src/VBox/Debugger/DBGCDumpImage.cpp +Index: VirtualBox-6.1.40/src/VBox/Debugger/DBGCDumpImage.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Debugger/DBGCDumpImage.cpp -+++ VirtualBox-6.1.38/src/VBox/Debugger/DBGCDumpImage.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Debugger/DBGCDumpImage.cpp ++++ VirtualBox-6.1.40/src/VBox/Debugger/DBGCDumpImage.cpp @@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(int3 { switch (iType) ++++++ fixes_for_leap15.2.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.387759734 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.391759742 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -+++ VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c ++++ VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c @@ -76,6 +76,10 @@ #define VBOXNETFLT_OS_SPECFIC 1 #include "../VBoxNetFltInternal.h" @@ -13,10 +13,10 @@ typedef struct VBOXNETFLTNOTIFIER { struct notifier_block Notifier; PVBOXNETFLTINS pThis; -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.c +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_drv.c -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.c @@ -342,12 +342,15 @@ static void vbox_master_drop(struct drm_ } @@ -36,10 +36,10 @@ #else /* >= 5.4.0 && RHEL >= 8.3 && SLES >= 15-SP3 */ .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ, #endif /* < 5.4.0 */ -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_main.c +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_main.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_main.c -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_main.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_main.c ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_main.c @@ -659,8 +659,12 @@ static inline u64 vbox_bo_mmap_offset(st #elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0) return bo->bo.addr_space_offset; @@ -53,10 +53,10 @@ } int -Index: VirtualBox-6.1.38/include/iprt/cdefs.h +Index: VirtualBox-6.1.40/include/iprt/cdefs.h =================================================================== ---- VirtualBox-6.1.38.orig/include/iprt/cdefs.h -+++ VirtualBox-6.1.38/include/iprt/cdefs.h +--- VirtualBox-6.1.40.orig/include/iprt/cdefs.h ++++ VirtualBox-6.1.40/include/iprt/cdefs.h @@ -1184,14 +1184,15 @@ * Tell the compiler that we're falling through to the next case in a switch. * @sa RT_FALL_THRU */ @@ -76,10 +76,10 @@ /** @def RT_IPRT_FORMAT_ATTR -Index: VirtualBox-6.1.38/kBuild/header.kmk +Index: VirtualBox-6.1.40/kBuild/header.kmk =================================================================== ---- VirtualBox-6.1.38.orig/kBuild/header.kmk -+++ VirtualBox-6.1.38/kBuild/header.kmk +--- VirtualBox-6.1.40.orig/kBuild/header.kmk ++++ VirtualBox-6.1.40/kBuild/header.kmk @@ -754,7 +754,7 @@ RMDIR_EXT := $(KBUILD_BIN_PATH)/kmk_rm RMDIR_INT := kmk_builtin_rmdir RMDIR := $(RMDIR_INT) @@ -89,10 +89,10 @@ SED_INT := $(SED_EXT) SED := $(SED_EXT) -Index: VirtualBox-6.1.38/configure +Index: VirtualBox-6.1.40/configure =================================================================== ---- VirtualBox-6.1.38.orig/configure -+++ VirtualBox-6.1.38/configure +--- VirtualBox-6.1.40.orig/configure ++++ VirtualBox-6.1.40/configure @@ -1886,7 +1886,7 @@ check_kbuild() fi echo "export PATH" >> $ENV @@ -115,10 +115,10 @@ else fail fi -Index: VirtualBox-6.1.38/tools/bin/backport-commit.sh +Index: VirtualBox-6.1.40/tools/bin/backport-commit.sh =================================================================== ---- VirtualBox-6.1.38.orig/tools/bin/backport-commit.sh -+++ VirtualBox-6.1.38/tools/bin/backport-commit.sh +--- VirtualBox-6.1.40.orig/tools/bin/backport-commit.sh ++++ VirtualBox-6.1.40/tools/bin/backport-commit.sh @@ -19,7 +19,7 @@ # # Determin script dir so we can source the common bits. @@ -128,10 +128,10 @@ MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^$.*$/[^/][^/]*$|\1|'` # \ -> / is for windows. if test "${MY_SCRIPT_DIR}" = "$0"; then MY_SCRIPT_DIR=`pwd -L` -Index: VirtualBox-6.1.38/tools/bin/backport-common.sh +Index: VirtualBox-6.1.40/tools/bin/backport-common.sh =================================================================== ---- VirtualBox-6.1.38.orig/tools/bin/backport-common.sh -+++ VirtualBox-6.1.38/tools/bin/backport-common.sh +--- VirtualBox-6.1.40.orig/tools/bin/backport-common.sh ++++ VirtualBox-6.1.40/tools/bin/backport-common.sh @@ -1,4 +1,4 @@ -# $Id: backport-common.sh $ + $Id: backport-common.sh $ @@ -147,10 +147,10 @@ # # Functions. -Index: VirtualBox-6.1.38/tools/bin/backport-merge-and-commit.sh +Index: VirtualBox-6.1.40/tools/bin/backport-merge-and-commit.sh =================================================================== ---- VirtualBox-6.1.38.orig/tools/bin/backport-merge-and-commit.sh -+++ VirtualBox-6.1.38/tools/bin/backport-merge-and-commit.sh +--- VirtualBox-6.1.40.orig/tools/bin/backport-merge-and-commit.sh ++++ VirtualBox-6.1.40/tools/bin/backport-merge-and-commit.sh @@ -19,7 +19,7 @@ # # Determin script dir so we can invoke the two worker scripts. @@ -160,10 +160,10 @@ MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^$.*$/[^/][^/]*$|\1|'` # \ -> / is for windows. if test "${MY_SCRIPT_DIR}" = "$0"; then MY_SCRIPT_DIR=`pwd -L` -Index: VirtualBox-6.1.38/tools/bin/backport-merge.sh +Index: VirtualBox-6.1.40/tools/bin/backport-merge.sh =================================================================== ---- VirtualBox-6.1.38.orig/tools/bin/backport-merge.sh -+++ VirtualBox-6.1.38/tools/bin/backport-merge.sh +--- VirtualBox-6.1.40.orig/tools/bin/backport-merge.sh ++++ VirtualBox-6.1.40/tools/bin/backport-merge.sh @@ -19,7 +19,7 @@ # # Determin script dir so we can source the common bits. @@ -173,10 +173,10 @@ MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^$.*$/[^/][^/]*$|\1|'` # \ -> / is for windows. if test "${MY_SCRIPT_DIR}" = "$0"; then MY_SCRIPT_DIR=`pwd -L` -Index: VirtualBox-6.1.38/tools/bin/gen-slickedit-workspace.sh +Index: VirtualBox-6.1.40/tools/bin/gen-slickedit-workspace.sh =================================================================== ---- VirtualBox-6.1.38.orig/tools/bin/gen-slickedit-workspace.sh -+++ VirtualBox-6.1.38/tools/bin/gen-slickedit-workspace.sh +--- VirtualBox-6.1.40.orig/tools/bin/gen-slickedit-workspace.sh ++++ VirtualBox-6.1.40/tools/bin/gen-slickedit-workspace.sh @@ -23,7 +23,7 @@ MY_CAT="kmk_cat" MY_CP="kmk_cp" MY_MKDIR="kmk_mkdir" @@ -186,10 +186,10 @@ MY_RM="kmk_rm" MY_SLEEP="kmk_sleep" MY_EXPR="kmk_expr" -Index: VirtualBox-6.1.38/src/VBox/Main/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Main/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Main/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Main/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Main/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Main/Makefile.kmk @@ -235,7 +235,7 @@ $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE | $$(dir $$@) $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) @@ -199,11 +199,11 @@ $(QUIET)$(RM) -- $(VBOX_XIDL_FILE).ts-tmp $(QUIET)$(CP) --changed -fv -- $(VBOX_XIDL_FILE).ts $(VBOX_XIDL_FILE) -Index: VirtualBox-6.1.38/src/VBox/Runtime/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Runtime/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Runtime/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Runtime/Makefile.kmk -@@ -3689,6 +3689,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V +--- VirtualBox-6.1.40.orig/src/VBox/Runtime/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Runtime/Makefile.kmk +@@ -3690,6 +3690,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V # # Generate the status code data. # ++++++ fixes_for_leap15.3.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.407759775 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.411759783 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +Index: VirtualBox-6.1.40/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -+++ VirtualBox-6.1.38/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +--- VirtualBox-6.1.40.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h ++++ VirtualBox-6.1.40/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h @@ -137,9 +137,9 @@ #include <linux/interrupt.h> #include <linux/completion.h> ++++++ fixes_for_makefile.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.427759815 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.431759824 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/HostDrivers/linux/Makefile +Index: VirtualBox-6.1.40/src/VBox/HostDrivers/linux/Makefile =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/linux/Makefile -+++ VirtualBox-6.1.38/src/VBox/HostDrivers/linux/Makefile +--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/linux/Makefile ++++ VirtualBox-6.1.40/src/VBox/HostDrivers/linux/Makefile @@ -35,9 +35,6 @@ endif ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),) obj-m += vboxnetadp/ @@ -133,10 +133,10 @@ if test -f $$module.ko; then \ echo "Installing $$module module"; \ /sbin/insmod $$module.ko; \ -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/Makefile +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/Makefile =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/Makefile -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/Makefile +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/Makefile ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/Makefile @@ -24,6 +24,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/ else # ! KERNELRELEASE @@ -177,10 +177,10 @@ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \ fi -Index: VirtualBox-6.1.38/include/iprt/x86.h +Index: VirtualBox-6.1.40/include/iprt/x86.h =================================================================== ---- VirtualBox-6.1.38.orig/include/iprt/x86.h -+++ VirtualBox-6.1.38/include/iprt/x86.h +--- VirtualBox-6.1.40.orig/include/iprt/x86.h ++++ VirtualBox-6.1.40/include/iprt/x86.h @@ -860,37 +860,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI * reserved flags. * @{ */ @@ -782,10 +782,10 @@ /** SMM MSRs. */ #define MSR_K7_SMBASE UINT32_C(0xc0010111) -Index: VirtualBox-6.1.38/include/VBox/vmm/hm_vmx.h +Index: VirtualBox-6.1.40/include/VBox/vmm/hm_vmx.h =================================================================== ---- VirtualBox-6.1.38.orig/include/VBox/vmm/hm_vmx.h -+++ VirtualBox-6.1.38/include/VBox/vmm/hm_vmx.h +--- VirtualBox-6.1.40.orig/include/VBox/vmm/hm_vmx.h ++++ VirtualBox-6.1.40/include/VBox/vmm/hm_vmx.h @@ -1462,7 +1462,9 @@ AssertCompileSize(VMXABORT, 4); /** VMCS (and related regions) memory type - Uncacheable. */ #define VMX_BASIC_MEM_TYPE_UC 0 @@ -796,10 +796,10 @@ /** Width of physical addresses used for VMCS and associated memory regions * (1=32-bit, 0=processor's physical address width). */ #define VMX_BASIC_PHYSADDR_WIDTH_32BIT RT_BIT_64(48) -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.h +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_drv.h -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.h +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_drv.h ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.h @@ -87,6 +87,12 @@ #else # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) ++++++ fixes_for_python.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.451759864 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.455759872 +0200 @@ -6,10 +6,10 @@ Larry Finger -Index: VirtualBox-6.1.38/src/VBox/Frontends/VBoxShell/vboxshell.py +Index: VirtualBox-6.1.40/src/VBox/Frontends/VBoxShell/vboxshell.py =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VBoxShell/vboxshell.py -+++ VirtualBox-6.1.38/src/VBox/Frontends/VBoxShell/vboxshell.py +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VBoxShell/vboxshell.py ++++ VirtualBox-6.1.40/src/VBox/Frontends/VBoxShell/vboxshell.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 ++++++ fixes_for_qt5.13.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.467759896 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.471759905 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/include/VBox/VBoxGL2D.h +Index: VirtualBox-6.1.40/include/VBox/VBoxGL2D.h =================================================================== ---- VirtualBox-6.1.38.orig/include/VBox/VBoxGL2D.h -+++ VirtualBox-6.1.38/include/VBox/VBoxGL2D.h +--- VirtualBox-6.1.40.orig/include/VBox/VBoxGL2D.h ++++ VirtualBox-6.1.40/include/VBox/VBoxGL2D.h @@ -113,7 +113,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN /* GL_ARB_pixel_buffer_object*/ #ifndef Q_WS_MAC @@ -11,10 +11,10 @@ #endif #ifndef GL_READ_ONLY -Index: VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h +Index: VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h -+++ VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h +--- VirtualBox-6.1.40.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h ++++ VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h @@ -465,7 +465,12 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 @@ -28,10 +28,10 @@ typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h @@ -614,7 +614,11 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 @@ -44,10 +44,10 @@ typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h @@ -465,7 +465,11 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 @@ -60,10 +60,10 @@ typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h @@ -3708,7 +3708,11 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ @@ -76,10 +76,10 @@ #endif #ifndef GL_ARB_vertex_buffer_object -Index: VirtualBox-6.1.38/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +Index: VirtualBox-6.1.40/src/VBox/Devices/Graphics/vmsvga_glext/glext.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h -+++ VirtualBox-6.1.38/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +--- VirtualBox-6.1.40.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h ++++ VirtualBox-6.1.40/src/VBox/Devices/Graphics/vmsvga_glext/glext.h @@ -6194,7 +6194,11 @@ typedef char GLchar; #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ ++++++ fixes_for_sle12.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.487759937 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.491759945 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.c +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_drv.c -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.c @@ -362,7 +362,9 @@ static struct drm_driver driver = { .master_drop = vbox_master_drop, #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2) @@ -12,10 +12,10 @@ # endif #endif -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_main.c +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_main.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_main.c -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_main.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_main.c ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_main.c @@ -622,11 +622,13 @@ int vbox_dumb_destroy(struct drm_file *f #endif @@ -30,10 +30,10 @@ void vbox_gem_free_object(struct drm_gem_object *obj) { -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_ttm.c +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_ttm.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_ttm.c -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_ttm.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_ttm.c ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_ttm.c @@ -297,7 +297,7 @@ static struct ttm_backend_func vbox_tt_b }; #endif @@ -133,10 +133,10 @@ ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); # else ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx); -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.h +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_drv.h -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.h +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_drv.h ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.h @@ -87,6 +87,9 @@ #else # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) @@ -147,10 +147,10 @@ /** @def RTLNX_RHEL_RANGE * Check that it's a RedHat kernel in the given version range. -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_mode.c +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_mode.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_mode.c -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_mode.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_mode.c ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_mode.c @@ -552,7 +552,8 @@ static void vbox_set_edid(struct drm_con for (i = 0; i < EDID_SIZE - 1; ++i) sum += edid[i]; ++++++ gcc5-real-support.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.503759969 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.511759986 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/configure +Index: VirtualBox-6.1.40/configure =================================================================== ---- VirtualBox-6.1.38.orig/configure -+++ VirtualBox-6.1.38/configure +--- VirtualBox-6.1.40.orig/configure ++++ VirtualBox-6.1.40/configure @@ -442,8 +442,13 @@ check_gcc() log_failure "cannot execute '$CXX -dumpversion'" fail really ++++++ handle_gsoap_208103.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.523760010 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.527760018 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Main/webservice/vboxweb.cpp +Index: VirtualBox-6.1.40/src/VBox/Main/webservice/vboxweb.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Main/webservice/vboxweb.cpp -+++ VirtualBox-6.1.38/src/VBox/Main/webservice/vboxweb.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Main/webservice/vboxweb.cpp ++++ VirtualBox-6.1.40/src/VBox/Main/webservice/vboxweb.cpp @@ -945,9 +945,9 @@ static void doQueuesLoop() continue; // timeout, not necessary to bother gsoap // r < 0, errno ++++++ internal-headers.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.543760050 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.547760059 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk @@ -23,6 +23,9 @@ vboxvideo_70_DEFS := \ ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here. vboxvideo_70_DEFS += __EXTENSIONS__ ## @todo Why this? @@ -12,10 +12,10 @@ vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13 vboxvideo_15_DEFS := \ $(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_ -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/edid.c +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/edid.c -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/edid.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/edid.c ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c @@ -35,10 +35,6 @@ * Michael Thayer <michael.thayer(a)oracle.com> */ @@ -27,10 +27,10 @@ #include "misc.h" #include "xf86DDC.h" #include "xf86Crtc.h" -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/pointer.c +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/pointer.c -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/pointer.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/pointer.c ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c @@ -39,10 +39,6 @@ #include "cursorstr.h" #include "servermd.h" @@ -42,10 +42,10 @@ #include "vboxvideo.h" #ifdef XORG_7X -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/vboxvideo.h +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/vboxvideo.h +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.h @@ -42,8 +42,8 @@ # pragma once #endif ++++++ modify_for_4_8_bo_move.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.563760091 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.567760099 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +Index: VirtualBox-6.1.40/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c -+++ VirtualBox-6.1.38/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +--- VirtualBox-6.1.40.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c ++++ VirtualBox-6.1.40/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c @@ -35,7 +35,7 @@ #include <iprt/assert.h> #include <iprt/errcore.h> @@ -11,7 +11,7 @@ #if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP) # if RTLNX_VER_MIN(2,6,23) && RTLNX_VER_MAX(5,8,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) -@@ -296,6 +296,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb +@@ -301,6 +301,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb fFlags &= ~RTMEMHDR_FLAG_KMALLOC; pHdr = vmalloc(cb + sizeof(*pHdr)); } ++++++ remove_vbox_video_build.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.583760131 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.587760139 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/Makefile.kmk +Index: VirtualBox-6.1.40/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/Makefile.kmk -+++ VirtualBox-6.1.38/Makefile.kmk +--- VirtualBox-6.1.40.orig/Makefile.kmk ++++ VirtualBox-6.1.40/Makefile.kmk @@ -724,7 +724,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \ src/VBox/Additions/x11/vboxmouse \ src/VBox/Additions/x11/vboxmouse/xorg70 \ @@ -10,10 +10,10 @@ src/VBox/NetworkServices \ src/VBox/NetworkServices/Dhcpd \ src/VBox/NetworkServices/NAT \ -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk @@ -398,7 +398,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s vboxvideo_drv_118_SOURCES := $(vboxvideo_drv_17_SOURCES) vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS) @@ -24,10 +24,10 @@ # Build using local X.Org headers. We assume X.Org Server 1.7 or later. DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS)) -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/Makefile.kmk @@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk ++++++ security_fixes.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.599760163 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.603760172 +0200 @@ -5,11 +5,11 @@ # # January 31, 2019 - Larry Finger # -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/installer/vboxadd.sh -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh -@@ -611,9 +611,11 @@ dmnstatus() +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/installer/vboxadd.sh ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh +@@ -838,9 +838,11 @@ dmnstatus() fi } @@ -24,10 +24,10 @@ case "$1" in # Does setup without clean-up first and marks all kernels currently found on the # system so that we can see later if any were added. -Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxdrv.sh +Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxdrv.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/vboxdrv.sh -+++ VirtualBox-6.1.38/src/VBox/Installer/linux/vboxdrv.sh +--- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/vboxdrv.sh ++++ VirtualBox-6.1.40/src/VBox/Installer/linux/vboxdrv.sh @@ -38,6 +38,9 @@ DEVICE=/dev/vboxdrv MODPROBE=/sbin/modprobe SCRIPTNAME=vboxdrv.sh ++++++ smap.diff ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.619760204 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.623760212 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +Index: VirtualBox-6.1.40/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -+++ VirtualBox-6.1.38/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c ++++ VirtualBox-6.1.40/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c @@ -51,6 +51,12 @@ # include <iprt/power.h> # define VBOX_WITH_SUSPEND_NOTIFICATION ++++++ turn_off_cloud_net.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.635760236 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.643760253 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/Config.kmk +Index: VirtualBox-6.1.40/Config.kmk =================================================================== ---- VirtualBox-6.1.38.orig/Config.kmk -+++ VirtualBox-6.1.38/Config.kmk +--- VirtualBox-6.1.40.orig/Config.kmk ++++ VirtualBox-6.1.40/Config.kmk @@ -806,7 +806,7 @@ endif # Use new VBoxNetDhcpd instead of old VBoxNetDHCP VBOX_WITH_DHCPD = 1 ++++++ vb-6.1.16-modal-dialog-parent.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.663760293 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.667760301 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp @@ -16,6 +16,7 @@ */ @@ -19,10 +19,10 @@ QString strFilePath; if (!fileNames.isEmpty()) -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp @@ -397,10 +397,10 @@ void UIFilePathSelector::selectPath() switch (m_enmMode) { @@ -45,10 +45,10 @@ } /* Do nothing if nothing chosen: */ -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp @@ -232,16 +232,16 @@ void UIEmptyFilePathSelector::choose() switch (mMode) { @@ -69,10 +69,10 @@ } if (path.isEmpty()) return; -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp @@ -441,7 +441,7 @@ void UIMediumSelector::sltButtonLeaveEmp void UIMediumSelector::sltAddMedium() @@ -82,10 +82,10 @@ if (uMediumID.isNull()) return; repopulateTreeWidget(); -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp @@ -3197,7 +3197,7 @@ void UICommon::updateMachineStorage(cons } else if (target.type == UIMediumTarget::UIMediumTargetType_WithFileDialog) @@ -95,10 +95,10 @@ strMachineFolder, false /* fUseLastFolder */); } else if(target.type == UIMediumTarget::UIMediumTargetType_CreateAdHocVISO) -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp @@ -486,7 +486,7 @@ void UIMediumManagerWidget::sltHandleMac void UIMediumManagerWidget::sltAddMedium() { @@ -108,10 +108,10 @@ strDefaultMachineFolder, true /* use most recent medium folder */); } -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp @@ -1176,7 +1176,7 @@ void UIExtraDataManagerWindow::sltSave() /* Compose initial file-name: */ const QString strInitialFileName = QDir(uiCommon().homeFolder()).absoluteFilePath(QString("%1_ExtraData.xml").arg(currentChooserName())); @@ -130,10 +130,10 @@ "Choose file to load extra-data from.."); /* Make sure file-name was chosen: */ if (strFileName.isEmpty()) -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp @@ -78,7 +78,7 @@ void UITextEditor::retranslateUi() void UITextEditor::open() ++++++ vbox-default-os-type.diff ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.683760334 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.687760342 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp @@ -306,15 +306,15 @@ void UINameAndSystemEditor::sltFamilyCha if (iIndexWin7 != -1) m_pComboType->setCurrentIndex(iIndexWin7); ++++++ vbox-deprec-gsoap-service-proxies.diff ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.699760366 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.707760382 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Main/webservice/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Main/webservice/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Main/webservice/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Main/webservice/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Main/webservice/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Main/webservice/Makefile.kmk @@ -772,7 +772,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@) $(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT)) ++++++ vbox-disable-updates.diff ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.719760407 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.723760415 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp @@ -104,8 +104,8 @@ void UIGlobalSettingsUpdate::getFromCach /* Get old update data from the cache: */ const UIDataSettingsGlobalUpdate &oldUpdateData = m_pCache->base(); @@ -13,10 +13,10 @@ if (m_pCheckBoxUpdate->isChecked()) { m_pComboBoxUpdatePeriod->setCurrentIndex(oldUpdateData.m_periodIndex); -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp @@ -86,8 +86,6 @@ void UISettingsDialogGlobal::retranslate m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input")); ++++++ vbox-fpie.diff ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.739760447 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.743760455 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/Config.kmk +Index: VirtualBox-6.1.40/Config.kmk =================================================================== ---- VirtualBox-6.1.38.orig/Config.kmk -+++ VirtualBox-6.1.38/Config.kmk +--- VirtualBox-6.1.40.orig/Config.kmk ++++ VirtualBox-6.1.40/Config.kmk @@ -5663,6 +5663,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi ifeq ($(KBUILD_TARGET),linux) # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp ++++++ vbox-gsoapssl-deps.diff ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.759760488 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.763760496 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Main/webservice/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Main/webservice/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Main/webservice/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Main/webservice/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Main/webservice/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Main/webservice/Makefile.kmk @@ -355,6 +355,7 @@ ifdef VBOX_GSOAP_INSTALLED vboxwebsrv_LIBS += \ $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \ ++++++ vbox-no-build-dates.diff ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.775760520 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.779760528 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Frontends/VBoxFB/VBoxFB.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VBoxFB/VBoxFB.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VBoxFB/VBoxFB.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VBoxFB/VBoxFB.cpp @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) printf("VirtualBox DirectFB GUI built %s %s\n" @@ -11,10 +11,10 @@ for (;;) { -Index: VirtualBox-6.1.38/src/VBox/Runtime/common/string/uniread.cpp +Index: VirtualBox-6.1.40/src/VBox/Runtime/common/string/uniread.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Runtime/common/string/uniread.cpp -+++ VirtualBox-6.1.38/src/VBox/Runtime/common/string/uniread.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Runtime/common/string/uniread.cpp ++++ VirtualBox-6.1.40/src/VBox/Runtime/common/string/uniread.cpp @@ -1036,7 +1036,7 @@ int PrintHeader(const char *argv0, const " * IPRT - Unicode Tables.\n" " *\n" @@ -24,10 +24,10 @@ " */\n" "\n" "/*\n" -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -50,10 +50,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c @@ -44,16 +44,10 @@ #ifndef XP_MAC #include "_pr_bld.h" @@ -73,10 +73,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -99,10 +99,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -125,10 +125,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-6.1.38/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp +Index: VirtualBox-6.1.40/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp -+++ VirtualBox-6.1.38/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp ++++ VirtualBox-6.1.40/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp @@ -308,7 +308,7 @@ static int vboxInitLogging(const char *p #endif "Log opened %s\n", @@ -138,10 +138,10 @@ vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: VirtualBox-6.1.38/src/VBox/Devices/PC/BIOS/bios.c +Index: VirtualBox-6.1.40/src/VBox/Devices/PC/BIOS/bios.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Devices/PC/BIOS/bios.c -+++ VirtualBox-6.1.38/src/VBox/Devices/PC/BIOS/bios.c +--- VirtualBox-6.1.40.orig/src/VBox/Devices/PC/BIOS/bios.c ++++ VirtualBox-6.1.40/src/VBox/Devices/PC/BIOS/bios.c @@ -143,7 +143,7 @@ void set_mode(uint8_t mode); #define BX_PCIBIOS 1 @@ -151,10 +151,10 @@ //-------------------------------------------------------------------------- // print_bios_banner // displays a the bios version -Index: VirtualBox-6.1.38/src/VBox/Additions/common/VBoxService/VBoxService.cpp +Index: VirtualBox-6.1.40/src/VBox/Additions/common/VBoxService/VBoxService.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp -+++ VirtualBox-6.1.38/src/VBox/Additions/common/VBoxService/VBoxService.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp ++++ VirtualBox-6.1.40/src/VBox/Additions/common/VBoxService/VBoxService.cpp @@ -245,7 +245,7 @@ static DECLCALLBACK(void) vgsvcLogHeader "VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n" "Log opened %s\n", @@ -164,10 +164,10 @@ int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: VirtualBox-6.1.38/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk @@ -187,7 +187,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA $(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.signature @@ -177,10 +177,10 @@ # Clean up $(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/ -Index: VirtualBox-6.1.38/src/VBox/ExtPacks/Skeleton/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/ExtPacks/Skeleton/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/ExtPacks/Skeleton/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/ExtPacks/Skeleton/Makefile.kmk @@ -161,7 +161,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_SKELETON_MA $(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.signature @@ -190,10 +190,10 @@ # Clean up $(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/ -Index: VirtualBox-6.1.38/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk @@ -343,7 +343,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) $(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature @@ -203,10 +203,10 @@ # Clean up $(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/ -Index: VirtualBox-6.1.38/src/VBox/ExtPacks/VNC/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/ExtPacks/VNC/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/VNC/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/ExtPacks/VNC/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/VNC/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/ExtPacks/VNC/Makefile.kmk @@ -154,7 +154,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED $(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.signature @@ -216,10 +216,10 @@ # Clean up $(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/ -Index: VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +Index: VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp -+++ VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp ++++ VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp @@ -319,7 +319,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv } VGDrvCommonInitLoggers(); @@ -229,10 +229,10 @@ /* * Check if the NT version is supported and initialize g_enmVGDrvNtVer. -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp @@ -872,7 +872,7 @@ static DECLCALLBACK(void) vboxGreeterLog "vbox-greeter %s r%s (verbosity: %d) %s (%s %s) release log\n" "Log opened %s\n", @@ -242,10 +242,10 @@ int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: VirtualBox-6.1.38/src/VBox/Additions/solaris/Mouse/vboxms.c +Index: VirtualBox-6.1.40/src/VBox/Additions/solaris/Mouse/vboxms.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/solaris/Mouse/vboxms.c -+++ VirtualBox-6.1.38/src/VBox/Additions/solaris/Mouse/vboxms.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/solaris/Mouse/vboxms.c ++++ VirtualBox-6.1.40/src/VBox/Additions/solaris/Mouse/vboxms.c @@ -256,7 +256,7 @@ static VBMSSTATE g_OpenNodeSt int _init(void) { @@ -255,10 +255,10 @@ mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL); /* * Prevent module autounloading. -Index: VirtualBox-6.1.38/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c +Index: VirtualBox-6.1.40/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c -+++ VirtualBox-6.1.38/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c +--- VirtualBox-6.1.40.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c ++++ VirtualBox-6.1.40/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c @@ -247,10 +247,10 @@ Returns: UTILITY_NAME, UTILITY_MAJOR_VERSION, @@ -272,10 +272,10 @@ Usage (); return -1; } -Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp +Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp -+++ VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp +--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp ++++ VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp @@ -118,7 +118,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject) { @@ -294,10 +294,10 @@ NTSTATUS Status = vboxUsbRtGlobalsInit(); Assert(Status == STATUS_SUCCESS); -Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp +Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp -+++ VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp +--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp ++++ VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp @@ -1516,7 +1516,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB RTLogDestinations(0, "debugger"); #endif @@ -307,10 +307,10 @@ memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals)); -Index: VirtualBox-6.1.38/src/VBox/Main/glue/VBoxLogRelCreate.cpp +Index: VirtualBox-6.1.40/src/VBox/Main/glue/VBoxLogRelCreate.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp -+++ VirtualBox-6.1.38/src/VBox/Main/glue/VBoxLogRelCreate.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp ++++ VirtualBox-6.1.40/src/VBox/Main/glue/VBoxLogRelCreate.cpp @@ -61,7 +61,7 @@ static DECLCALLBACK(void) vboxHeaderFoot #endif "Log opened %s\n", @@ -320,10 +320,10 @@ pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE); int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c @@ -141,7 +141,7 @@ int main(int argc, char **argv) { PRIntn tab = 0; @@ -333,10 +333,10 @@ printf("Depend.c build time is %s %s\n", buildDate, buildTime); -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp @@ -458,7 +458,7 @@ int main() { @@ -346,10 +346,10 @@ #ifdef TEST_STD_STRING cout << "Testing std::string." << endl; #else -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp @@ -425,7 +425,7 @@ int main() { @@ -359,10 +359,10 @@ #if 0 { -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp @@ -102,7 +102,7 @@ class test_message public: test_message() @@ -372,10 +372,10 @@ } ~test_message() -Index: VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c +Index: VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c -+++ VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c ++++ VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c @@ -29,9 +29,8 @@ #include "build_id.h" @@ -387,10 +387,10 @@ #ifndef ElfW #define ElfW(type) Elf_##type -Index: VirtualBox-6.1.38/src/libs/zlib-1.2.11/os400/make.sh +Index: VirtualBox-6.1.40/src/libs/zlib-1.2.11/os400/make.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/zlib-1.2.11/os400/make.sh -+++ VirtualBox-6.1.38/src/libs/zlib-1.2.11/os400/make.sh +--- VirtualBox-6.1.40.orig/src/libs/zlib-1.2.11/os400/make.sh ++++ VirtualBox-6.1.40/src/libs/zlib-1.2.11/os400/make.sh @@ -258,8 +258,8 @@ fi # Create and compile the identification source file. @@ -402,10 +402,10 @@ echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c make_module OS400 os400.c LINK= # No need to rebuild service program yet. -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/VBoxClient/logging.cpp +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/VBoxClient/logging.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/VBoxClient/logging.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/VBoxClient/logging.cpp @@ -162,10 +162,10 @@ static DECLCALLBACK(void) vbClLogHeaderF case RTLOGPHASE_BEGIN: { ++++++ vbox-permissions_warning.diff ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.795760561 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.803760577 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/apps/Makefile.kmk +Index: VirtualBox-6.1.40/src/apps/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/apps/Makefile.kmk -+++ VirtualBox-6.1.38/src/apps/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/apps/Makefile.kmk ++++ VirtualBox-6.1.40/src/apps/Makefile.kmk @@ -31,5 +31,7 @@ if1of ($(KBUILD_TARGET_ARCH), $(VBOX_SUP endif endif @@ -10,10 +10,10 @@ + include $(FILE_KBUILD_SUB_FOOTER) -Index: VirtualBox-6.1.38/src/apps/VBoxPermissionMessage/Makefile.kmk +Index: VirtualBox-6.1.40/src/apps/VBoxPermissionMessage/Makefile.kmk =================================================================== --- /dev/null -+++ VirtualBox-6.1.38/src/apps/VBoxPermissionMessage/Makefile.kmk ++++ VirtualBox-6.1.40/src/apps/VBoxPermissionMessage/Makefile.kmk @@ -0,0 +1,32 @@ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +## @file @@ -47,10 +47,10 @@ + +include $(KBUILD_PATH)/subfooter.kmk + -Index: VirtualBox-6.1.38/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp +Index: VirtualBox-6.1.40/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp =================================================================== --- /dev/null -+++ VirtualBox-6.1.38/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp ++++ VirtualBox-6.1.40/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp @@ -0,0 +1,12 @@ +#include <QtWidgets/QApplication> +#include <QtWidgets/QMessageBox> ++++++ vbox-python-py310.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.823760617 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.827760626 +0200 @@ -1,9 +1,9 @@ # https://www.virtualbox.org/changeset/90537/vbox -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/Makefile.kmk +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/Makefile.kmk -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/Makefile.kmk ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/Makefile.kmk @@ -625,6 +625,52 @@ VBoxPython3_10m_x86_LIBS = $(VBOX_ endif endif @@ -57,10 +57,10 @@ ifdef VBOX_PYTHONDEF_INC # # Python without versioning -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/PyXPCOM.h +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/PyXPCOM.h =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/PyXPCOM.h +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/PyXPCOM.h @@ -137,7 +137,7 @@ inline PyObject *PyBool_FromLong(long ok # define PyInt_Check(o) PyLong_Check(o) # define PyInt_AsLong(o) PyLong_AsLong(o) ++++++ vbox-python-selection.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.839760650 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.847760666 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/bldprogs/scm.cpp +Index: VirtualBox-6.1.40/src/bldprogs/scm.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/bldprogs/scm.cpp -+++ VirtualBox-6.1.38/src/bldprogs/scm.cpp +--- VirtualBox-6.1.40.orig/src/bldprogs/scm.cpp ++++ VirtualBox-6.1.40/src/bldprogs/scm.cpp @@ -2206,7 +2206,7 @@ static int scmProcessFileInner(PSCMRWSTA pszTreatAs = "shell"; else if ( (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0) @@ -11,10 +11,10 @@ else if ( (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0) || (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) ) pszTreatAs = "perl"; -Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/configure +Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/configure =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/libxml2-2.9.4/configure -+++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/configure +--- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/configure ++++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/configure @@ -15153,10 +15153,10 @@ PYTHON_SITE_PACKAGES= PYTHON_TESTS= pythondir= @@ -39,10 +39,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_PYTHON+:} false; then : -Index: VirtualBox-6.1.38/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec +Index: VirtualBox-6.1.40/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec -+++ VirtualBox-6.1.38/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec +--- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec ++++ VirtualBox-6.1.40/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec @@ -22,6 +22,9 @@ %define VBOXDOCDIR %{_defaultdocdir}/%NAME% %global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$|^/usr/lib/python.*$|^.*\\.py$ @@ -53,10 +53,10 @@ Summary: Oracle VM VirtualBox Name: %NAME% -Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml.spec.in +Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/libxml2-2.9.4/libxml.spec.in -+++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml.spec.in +--- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/libxml.spec.in ++++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in @@ -1,3 +1,4 @@ +%global with_python2 0 %global with_python3 1 @@ -121,10 +121,10 @@ %if 0%{?with_python3} %files python3 -Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml2.spec +Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml2.spec =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/libxml2-2.9.4/libxml2.spec -+++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml2.spec +--- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/libxml2.spec ++++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml2.spec @@ -103,7 +103,7 @@ make install DESTDIR=%{buildroot} %if 0%{?with_python3} @@ -134,10 +134,10 @@ make install DESTDIR=%{buildroot} %endif # with_python3 -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/ErrorUtils.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/ErrorUtils.cpp @@ -439,6 +439,8 @@ char *PyTraceback_AsString(PyObject *exc { // a temp scope so I can use temp locals. #if PY_MAJOR_VERSION <= 2 @@ -147,10 +147,10 @@ #else /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */ const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult); -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/PyGBase.cpp +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/PyGBase.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/PyGBase.cpp +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/PyGBase.cpp @@ -183,7 +183,11 @@ PyG_Base::~PyG_Base() // Get the correct interface pointer for this object given the IID. void *PyG_Base::ThisAsIID( const nsIID &iid ) @@ -164,10 +164,10 @@ if (iid.Equals(NS_GET_IID(nsISupports))) return (nsISupports *)(nsIInternalPython *)this; if (iid.Equals(NS_GET_IID(nsISupportsWeakReference))) -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/gen_python_deps.py +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/gen_python_deps.py =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/gen_python_deps.py -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/gen_python_deps.py +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/gen_python_deps.py ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/gen_python_deps.py @@ -86,7 +86,7 @@ def main(argv): else: multi = 1 ++++++ vbox-smc-napa.diff ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.859760690 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.863760699 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Devices/PC/vbox.dsl +Index: VirtualBox-6.1.40/src/VBox/Devices/PC/vbox.dsl =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Devices/PC/vbox.dsl -+++ VirtualBox-6.1.38/src/VBox/Devices/PC/vbox.dsl +--- VirtualBox-6.1.40.orig/src/VBox/Devices/PC/vbox.dsl ++++ VirtualBox-6.1.40/src/VBox/Devices/PC/vbox.dsl @@ -1197,7 +1197,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, Device (SMC) { ++++++ vbox-suid-warning.diff ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.875760723 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.879760731 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/apps/Makefile.kmk +Index: VirtualBox-6.1.40/src/apps/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/apps/Makefile.kmk -+++ VirtualBox-6.1.38/src/apps/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/apps/Makefile.kmk ++++ VirtualBox-6.1.40/src/apps/Makefile.kmk @@ -35,5 +35,7 @@ include $(PATH_SUB_CURRENT)/VBoxPermissi include $(PATH_SUB_CURRENT)/VBoxUSB_DevRules/Makefile.kmk @@ -10,10 +10,10 @@ + include $(FILE_KBUILD_SUB_FOOTER) -Index: VirtualBox-6.1.38/src/apps/VBoxSUIDMessage/Makefile.kmk +Index: VirtualBox-6.1.40/src/apps/VBoxSUIDMessage/Makefile.kmk =================================================================== --- /dev/null -+++ VirtualBox-6.1.38/src/apps/VBoxSUIDMessage/Makefile.kmk ++++ VirtualBox-6.1.40/src/apps/VBoxSUIDMessage/Makefile.kmk @@ -0,0 +1,33 @@ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +## @file @@ -48,10 +48,10 @@ +include $(KBUILD_PATH)/subfooter.kmk + + -Index: VirtualBox-6.1.38/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp +Index: VirtualBox-6.1.40/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp =================================================================== --- /dev/null -+++ VirtualBox-6.1.38/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp ++++ VirtualBox-6.1.40/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp @@ -0,0 +1,15 @@ +#include <QtWidgets/QApplication> +#include <QtWidgets/QMessageBox> ++++++ vbox-usb-warning.diff ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.895760763 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.899760771 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/apps/Makefile.kmk +Index: VirtualBox-6.1.40/src/apps/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/apps/Makefile.kmk -+++ VirtualBox-6.1.38/src/apps/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/apps/Makefile.kmk ++++ VirtualBox-6.1.40/src/apps/Makefile.kmk @@ -33,5 +33,7 @@ endif include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk @@ -10,10 +10,10 @@ + include $(FILE_KBUILD_SUB_FOOTER) -Index: VirtualBox-6.1.38/src/apps/VBoxUSB_DevRules/Makefile.kmk +Index: VirtualBox-6.1.40/src/apps/VBoxUSB_DevRules/Makefile.kmk =================================================================== --- /dev/null -+++ VirtualBox-6.1.38/src/apps/VBoxUSB_DevRules/Makefile.kmk ++++ VirtualBox-6.1.40/src/apps/VBoxUSB_DevRules/Makefile.kmk @@ -0,0 +1,30 @@ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +## @file @@ -45,10 +45,10 @@ +include $(KBUILD_PATH)/subfooter.kmk + + -Index: VirtualBox-6.1.38/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp +Index: VirtualBox-6.1.40/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp =================================================================== --- /dev/null -+++ VirtualBox-6.1.38/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp ++++ VirtualBox-6.1.40/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp @@ -0,0 +1,25 @@ +#include <QtWidgets/QApplication> +#include <QtWidgets/QMessageBox> ++++++ vbox-vboxadd-init-script.diff ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.911760796 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.919760812 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/installer/vboxadd.sh -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/installer/vboxadd.sh ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh @@ -26,11 +26,14 @@ # Provides: vboxadd # Required-Start: @@ -74,7 +74,7 @@ fi done for i in ${OLDMODULES}; do -@@ -376,9 +358,9 @@ create_udev_rule() +@@ -528,9 +510,9 @@ create_udev_rule() udevcontrol reload_rules >/dev/null 2>&1 || true fi } @@ -87,42 +87,7 @@ # And a post-installation script for rebuilding modules when a new kernel # is installed. mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d -@@ -497,25 +479,18 @@ setup() - chcon -t bin_t "$BUILDINTMP" 2>/dev/null - - if test -z "$INSTALL_NO_MODULE_BUILDS"; then -- # Check whether modules setup is already complete for currently running kernel. -- # Prevent unnecessary rebuilding in order to speed up booting process. -- if test "$(setup_complete)" = "1"; then -- info "VirtualBox Guest Additions kernel modules $VBOX_VERSION $VBOX_REVISION are" -- info "already available for kernel $TARGET_VER and do not require to be rebuilt." -+ info "Building the VirtualBox Guest Additions kernel modules. This may take a while." -+ info "To build modules for other installed kernels, run" -+ info " /sbin/rcvboxadd quicksetup <version>" -+ info "or" -+ info " /sbin/rcvboxadd quicksetup all" -+ if test -d /lib/modules/"$TARGET_VER"/build; then -+ setup_modules "$TARGET_VER" -+ depmod - else -- info "Building the VirtualBox Guest Additions kernel modules. This may take a while." -- info "To build modules for other installed kernels, run" -- info " /sbin/rcvboxadd quicksetup <version>" -- info "or" -- info " /sbin/rcvboxadd quicksetup all" -- if test -d /lib/modules/"$TARGET_VER"/build; then -- setup_modules "$TARGET_VER" -- depmod -- else -- info "Kernel headers not found for target kernel $TARGET_VER. \ -+ info "Kernel headers not found for target kernel $TARGET_VER. \ - Please install them and execute - /sbin/rcvboxadd setup" -- fi - fi - fi - create_vbox_user -@@ -529,17 +504,14 @@ Please install them and execute +@@ -736,17 +718,14 @@ Please install them and execute # Put the X.Org driver in place. This is harmless if it is not needed. # Also set up the OpenGL library. myerr=`"${INSTALL_DIR}/init/vboxadd-x11" setup 2>&1` @@ -143,7 +108,7 @@ depmod # Remove old module sources -@@ -549,12 +521,13 @@ cleanup() +@@ -756,12 +735,13 @@ cleanup() fi # Clean-up X11-related bits @@ -161,7 +126,7 @@ fi rm -f /sbin/mount.vboxsf 2>/dev/null rm -f /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null -@@ -587,7 +560,7 @@ start() +@@ -807,7 +787,7 @@ for your Linux distribution." rm -f $userdev || { fail "Cannot remove $userdev" } @@ -170,10 +135,10 @@ fail "modprobe vboxguest failed" case "$no_udev" in 1) sleep .5;; -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd-service.sh +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd-service.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd-service.sh +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd-service.sh @@ -26,7 +26,7 @@ # Provides: vboxadd-service # Required-Start: vboxadd @@ -183,10 +148,10 @@ # Default-Stop: 0 1 6 # X-Conflicts-With: systemd-timesyncd.service # Description: VirtualBox Additions Service -Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxautostart-service.sh +Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxautostart-service.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/vboxautostart-service.sh -+++ VirtualBox-6.1.38/src/VBox/Installer/linux/vboxautostart-service.sh +--- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/vboxautostart-service.sh ++++ VirtualBox-6.1.40/src/VBox/Installer/linux/vboxautostart-service.sh @@ -23,7 +23,7 @@ # Provides: vboxautostart-service # Required-Start: vboxdrv @@ -196,10 +161,10 @@ # Default-Stop: 0 1 6 # Description: VirtualBox autostart service ### END INIT INFO -Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxballoonctrl-service.sh +Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxballoonctrl-service.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh -+++ VirtualBox-6.1.38/src/VBox/Installer/linux/vboxballoonctrl-service.sh +--- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh ++++ VirtualBox-6.1.40/src/VBox/Installer/linux/vboxballoonctrl-service.sh @@ -23,7 +23,7 @@ # Provides: vboxballoonctrl-service # Required-Start: vboxdrv @@ -209,10 +174,10 @@ # Default-Stop: 0 1 6 # Description: VirtualBox watchdog daemon ### END INIT INFO -Index: VirtualBox-6.1.38/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh +Index: VirtualBox-6.1.40/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh -+++ VirtualBox-6.1.38/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh +--- VirtualBox-6.1.40.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh ++++ VirtualBox-6.1.40/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh @@ -31,7 +31,7 @@ # Provides: testboxscript-service # Required-Start: $network @@ -222,10 +187,10 @@ # Default-Stop: 0 1 6 # Description: TestBoxScript service ### END INIT INFO -Index: VirtualBox-6.1.38/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh +Index: VirtualBox-6.1.40/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh -+++ VirtualBox-6.1.38/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh +--- VirtualBox-6.1.40.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh ++++ VirtualBox-6.1.40/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh @@ -31,7 +31,7 @@ # Provides: vboxtxs # Required-Start: $network @@ -235,10 +200,10 @@ # Default-Stop: 0 1 6 # Description: VirtualBox Test Execution Service ### END INIT INFO -Index: VirtualBox-6.1.38/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh +Index: VirtualBox-6.1.40/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh -+++ VirtualBox-6.1.38/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh +--- VirtualBox-6.1.40.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh ++++ VirtualBox-6.1.40/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh @@ -31,7 +31,7 @@ # Provides: vboxtxs # Required-Start: $network ++++++ vbox-vboxdrv-init-script.diff ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.931760836 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.935760844 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxdrv.sh +Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxdrv.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/vboxdrv.sh -+++ VirtualBox-6.1.38/src/VBox/Installer/linux/vboxdrv.sh +--- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/vboxdrv.sh ++++ VirtualBox-6.1.40/src/VBox/Installer/linux/vboxdrv.sh @@ -19,11 +19,12 @@ # ### BEGIN INIT INFO @@ -19,7 +19,7 @@ ### END INIT INFO ## @todo This file duplicates a lot of script with vboxadd.sh. When making -@@ -393,13 +394,6 @@ See the documentation for your Linux dis +@@ -510,13 +511,6 @@ See the documentation for your Linux dis fi fi # ensure permissions @@ -33,55 +33,4 @@ if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" fi -@@ -531,17 +525,6 @@ setup() - { - begin_msg "Building VirtualBox kernel modules" console - log "Building the main VirtualBox module." -- -- # Detect if kernel was built with clang. -- unset LLVM -- vbox_cc_is_clang=$(/lib/modules/"$KERN_VER"/build/scripts/config \ -- --file /lib/modules/"$KERN_VER"/build/.config \ -- --state CONFIG_CC_IS_CLANG 2>/dev/null) -- if test "${vbox_cc_is_clang}" = "y"; then -- log "Using clang compiler." -- export LLVM=1 -- fi -- - if ! myerr=`$BUILDINTMP \ - --save-module-symvers /tmp/vboxdrv-Module.symvers \ - --module-source "$MODULE_SRC/vboxdrv" \ -@@ -559,31 +542,7 @@ setup() - log "Error building the module:" - module_build_log "$myerr" - failure "Look at $LOG to find out what went wrong" -- fi -- log "Building the net adaptor module." -- if ! myerr=`$BUILDINTMP \ -- --use-module-symvers /tmp/vboxdrv-Module.symvers \ -- --module-source "$MODULE_SRC/vboxnetadp" \ -- --no-print-directory install 2>&1`; then -- log "Error building the module:" -- module_build_log "$myerr" -- failure "Look at $LOG to find out what went wrong" -- fi -- if test -e "$MODULE_SRC/vboxpci"; then -- log "Building the PCI pass-through module." -- if ! myerr=`$BUILDINTMP \ -- --use-module-symvers /tmp/vboxdrv-Module.symvers \ -- --module-source "$MODULE_SRC/vboxpci" \ -- --no-print-directory install 2>&1`; then -- log "Error building the module:" -- module_build_log "$myerr" -- failure "Look at $LOG to find out what went wrong" -- fi -- fi -- rm -f /etc/vbox/module_not_compiled -- depmod -a -- sync -- succ_msg "VirtualBox kernel modules built" -+ /sbin/vboxconfig - # Secure boot on Ubuntu and Debian. - if test -n "$HAVE_SEC_BOOT" && - type update-secureboot-policy >/dev/null 2>&1; then ++++++ vbox_remove_smp_mflags.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:34.951760877 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:34.955760885 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml.spec.in +Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/libxml2-2.9.4/libxml.spec.in -+++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml.spec.in +--- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/libxml.spec.in ++++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in @@ -94,7 +94,7 @@ at parse time or later once the document %build @@ -11,10 +11,10 @@ %install rm -fr %{buildroot} -Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml2.spec +Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml2.spec =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/libxml2-2.9.4/libxml2.spec -+++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml2.spec +--- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/libxml2.spec ++++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml2.spec @@ -94,7 +94,7 @@ at parse time or later once the document %build ++++++ virtualbox-sed-params.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:35.199761379 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:35.203761388 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Main/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Main/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Main/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Main/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Main/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Main/Makefile.kmk @@ -1648,7 +1648,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \ $(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \ --stringparam generating "dtrace-probes" \ @@ -11,10 +11,10 @@ "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-start$(if-expr "$(VBOX_HOST_DTRACE_VERSION)" == "dtrace: Sun D 1.6.2",-alternative,).d" \ "$@" \ "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-end$(if-expr "$(VBOX_HOST_DTRACE_VERSION)" == "dtrace: Sun D 1.6.2",-alternative,).d" -Index: VirtualBox-6.1.38/src/VBox/Devices/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Devices/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Devices/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Devices/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Devices/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Devices/Makefile.kmk @@ -880,8 +880,7 @@ endif $(call MSG_TOOL,iasl,VBoxDD,$<,$@) $(QUIET)$(RM) -f $@ $@.tmp $@.pre ++++++ virtualbox-snpritnf-buffer-overflow.patch ++++++ --- /var/tmp/diff_new_pack.qY5Rhc/_old 2022-10-20 11:09:35.215761412 +0200 +++ /var/tmp/diff_new_pack.qY5Rhc/_new 2022-10-20 11:09:35.223761428 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c +Index: VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c -+++ VirtualBox-6.1.38/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c +--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c ++++ VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c @@ -833,6 +833,7 @@ dt_gmatch(const char *s, const char *p) #else return (p == NULL || *p == '\0' || RTStrSimplePatternMatch(p, s)); /** @todo implement gmatch. */

1 0

commit libcamera for openSUSE:Factory
by Source-Sync 20 Oct '22

20 Oct '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libcamera for openSUSE:Factory checked in at 2022-10-20 11:09:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcamera (Old) and /work/SRC/openSUSE:Factory/.libcamera.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcamera" Thu Oct 20 11:09:27 2022 rev:14 rq:1029811 version:0.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libcamera/libcamera.changes 2022-09-13 15:07:35.680339482 +0200 +++ /work/SRC/openSUSE:Factory/.libcamera.new.2275/libcamera.changes 2022-10-20 11:09:29.207749240 +0200 @@ -1,0 +2,32 @@ +Tue Oct 18 10:15:03 UTC 2022 - Bj��rn Lie <bjorn.lie(a)gmail.com> + +- Update to version 0.0.1: + * This patch release commences the package release procedures for + the project. + * Initial releases will include a bump to the patch (0.0.x) + version number, as well as a corresponding increment to the + soname. + * utils: + - Provide a release script + - semver: Add version helper + * meson: + - Shared Object version handling + - Fix typo + * pipeline: + - rkisp1: Set bytesused before queuing parameters buffer + - ipu3: Set bytesused before queuing parameters buffer + * libcamera: + - v4l2_videodevice: Warn if bytesused == 0 when queuing output + buffer + - framebuffer: Move remaining private data to Private class + - base: utils: Drop defopt +- Change service to use explicit tags and obs_scm. +- Drop vers.diff patch and fix-ppc64.patch: Fixed upstream. +- Change lname define to new upstream soname libcamera0_0_1 and in + baselibs.conf. +- Split out libcamera-base0_0_1 shared library, add to baselibs. + Package the shared librarys in individual packages. +- Use ldconfig_scriptlets macro for post(un) handling. +- Stop exporting -Wno-error to C(XX)FLAGS, no longer needed. + +------------------------------------------------------------------- Old: ---- fix-ppc64.patch libcamera-0.0.0+g3887.f1776100.tar.xz vers.diff New: ---- _servicedata libcamera-0.0.1.obscpio libcamera.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcamera.spec ++++++ --- /var/tmp/diff_new_pack.L1hVaR/_old 2022-10-20 11:09:29.739750318 +0200 +++ /var/tmp/diff_new_pack.L1hVaR/_new 2022-10-20 11:09:29.743750326 +0200 @@ -16,9 +16,10 @@ # -%define lname libcamera-suse7 +%define lname libcamera0_0_1 +%define lname_base libcamera-base0_0_1 Name: libcamera -Version: 0.0.0+g3887.f1776100 +Version: 0.0.1 Release: 0 Summary: A complex camera support library in C++ License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -27,8 +28,7 @@ Source: %name-%version.tar.xz Source1: baselibs.conf -Patch1: vers.diff -Patch2: fix-ppc64.patch + BuildRequires: boost-devel BuildRequires: c++_compiler %if 0%{?suse_version} <= 1500 @@ -38,7 +38,7 @@ BuildRequires: libQt5Core-devel BuildRequires: libQt5Gui-devel BuildRequires: libQt5Widgets-devel -BuildRequires: meson >= 0.53 +BuildRequires: meson >= 0.56 BuildRequires: pkgconfig BuildRequires: python3-Jinja2 BuildRequires: python3-PyYAML @@ -73,10 +73,23 @@ the pipeline. The libcamera API groups and exposes these pieces as what users consider one "camera". +%package -n %lname_base +Summary: A complex camera support library in C++ +Group: System/Libraries + +%description -n %lname_base +libcamera is an experimental camera user-space API. + +A camera may consist of multiple sensors or function blocks, and can +expose multiple kernel device nodes in /dev for different stages of +the pipeline. The libcamera API groups and exposes these pieces as +what users consider one "camera". + %package devel Summary: Development for libcamera, a camera support library Group: Development/Libraries/C and C++ Requires: %lname = %version +Requires: %lname_base = %version %description devel libcamera is an experimental camera user-space API. @@ -103,19 +116,13 @@ This is its integration plugin for gstreamer. %prep -%autosetup -p1 -N -%patch1 -p1 -%ifarch ppc64 ppc64le -%patch2 -p1 -%endif +%autosetup -p1 %build %if %{pkg_vcmp gcc < 8} export CC=gcc-9 export CXX=g++-9 %endif -export CFLAGS="%optflags -Wno-error" -export CXXFLAGS="$CFLAGS" %meson \ -Ddocumentation=disabled \ -Dqcam=enabled \ @@ -126,19 +133,15 @@ %install %meson_install -# libtool's -release would be so much more direct, but alas, meson... -mv "%buildroot/%_libdir/libcamera-suse.so" "%buildroot/%_libdir/libcamera.so" -mv "%buildroot/%_libdir/libcamera-base-suse.so" "%buildroot/%_libdir/libcamera-base.so" -mv "%buildroot/%_libdir/pkgconfig/libcamera-suse.pc" "%buildroot/%_libdir/pkgconfig/libcamera.pc" -mv "%buildroot/%_libdir/pkgconfig/libcamera-base-suse.pc" "%buildroot/%_libdir/pkgconfig/libcamera-base.pc" -perl -i -pe 's{camera-suse}{camera}' "%buildroot/%_libdir/pkgconfig"/*.pc -perl -i -pe 's{camera-base-suse}{camera-base}' "%buildroot/%_libdir/pkgconfig"/*.pc -%post -n %lname -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%ldconfig_scriptlets -n %lname +%ldconfig_scriptlets -n %lname_base %files -n %lname -%_libdir/libcamera*.so.* +%_libdir/libcamera.so.* + +%files -n %lname_base +%_libdir/libcamera-base.so.* %files devel %license LICENSES/*GPL* ++++++ _service ++++++ --- /var/tmp/diff_new_pack.L1hVaR/_old 2022-10-20 11:09:29.775750391 +0200 +++ /var/tmp/diff_new_pack.L1hVaR/_new 2022-10-20 11:09:29.775750391 +0200 @@ -1,15 +1,18 @@ +<?xml version="1.0"?> <services> - <service name="tar_scm" mode="disabled"> + <service name="obs_scm" mode="manual"> <param name="scm">git</param> <param name="url">git://linuxtv.org/libcamera</param> - <param name="revision">f1776100f55e70320a8938586bc8bf2f242addd4</param> - <param name="parent-tag">v0.0.0</param> - <param name="versionformat">0.0.0+g@TAG_OFFSET@.%h</param> + <param name="revision">refs/tags/v0.0.1</param> + <param name="versionformat">@PARENT_TAG@</param> + <param name="versionrewrite-pattern">v([0-9\.]*)</param> + <param name="changesgenerate">enable</param> </service> - <service name="recompress" mode="disabled"> + <service name="tar" mode="buildtime" /> + <service name="recompress" mode="buildtime"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> - <service name="set_version" mode="disabled"/> + <service name="set_version" mode="manual"/> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://linuxtv.org/libcamera</param> <param name="changesrevision">a83aed77df1258e469c0eb42d9cb4f1938db53f2</param></service></servicedata> (No newline at EOF) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.L1hVaR/_old 2022-10-20 11:09:29.815750472 +0200 +++ /var/tmp/diff_new_pack.L1hVaR/_new 2022-10-20 11:09:29.819750480 +0200 @@ -1,2 +1,3 @@ -libcamera-suse7 +libcamera0_0_1 +libcamera-base0_0_1 ++++++ libcamera.obsinfo ++++++ name: libcamera version: 0.0.1 mtime: 1665755326 commit: a83aed77df1258e469c0eb42d9cb4f1938db53f2

1 0

commit sanlock for openSUSE:Factory
by Source-Sync 20 Oct '22

20 Oct '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sanlock for openSUSE:Factory checked in at 2022-10-20 11:09:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sanlock (Old) and /work/SRC/openSUSE:Factory/.sanlock.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sanlock" Thu Oct 20 11:09:26 2022 rev:29 rq:1029802 version:3.8.5 Changes: -------- --- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes 2021-12-02 02:26:27.376357852 +0100 +++ /work/SRC/openSUSE:Factory/.sanlock.new.2275/sanlock.changes 2022-10-20 11:09:27.747746282 +0200 @@ -1,0 +2,9 @@ +Tue Oct 18 14:27:20 UTC 2022 - James Fehlig <jfehlig(a)suse.com> + +- Update to sanlock 3.8.5 + - python: Replace distutils with setuptools + - sanlock: fix memory leak of lockspace renewal_history + - sanlock: fix pthread_create error check + - sanlock: use helper to set max_sectors_kb + +------------------------------------------------------------------- Old: ---- sanlock-3.8.4.tar.xz New: ---- sanlock-3.8.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sanlock.spec ++++++ --- /var/tmp/diff_new_pack.UCirHa/_old 2022-10-20 11:09:28.467747741 +0200 +++ /var/tmp/diff_new_pack.UCirHa/_new 2022-10-20 11:09:28.471747749 +0200 @@ -1,7 +1,7 @@ # -# spec file for package sanlock +# spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,7 +40,7 @@ %endif %define pname sanlock Name: %{pprefix}%{pname} -Version: 3.8.4 +Version: 3.8.5 Release: 0 %if ! %{with python} Summary: A shared disk lock manager @@ -65,6 +65,7 @@ Patch104: harden_fence_sanlockd.service.patch Patch105: harden_sanlk-resetd.service.patch BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} BuildRequires: libaio-devel BuildRequires: pkgconfig BuildRequires: python-rpm-macros ++++++ _service ++++++ --- /var/tmp/diff_new_pack.UCirHa/_old 2022-10-20 11:09:28.519747846 +0200 +++ /var/tmp/diff_new_pack.UCirHa/_new 2022-10-20 11:09:28.523747854 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> <param name="filename">sanlock</param> - <param name="revision">a181e951376d49a82eef17920c8ebedec80b4823</param> + <param name="revision">b820c63093c4ae85d7da4f719cf3026d7fca5d09</param> <param name="scm">git</param> <param name="submodules">disable</param> <param name="url">https://pagure.io/sanlock</param> ++++++ harden_fence_sanlockd.service.patch ++++++ --- /var/tmp/diff_new_pack.UCirHa/_old 2022-10-20 11:09:28.559747927 +0200 +++ /var/tmp/diff_new_pack.UCirHa/_new 2022-10-20 11:09:28.563747935 +0200 @@ -1,7 +1,7 @@ -Index: sanlock-3.8.4/init.d/fence_sanlockd.service +Index: sanlock-3.8.5/init.d/fence_sanlockd.service =================================================================== ---- sanlock-3.8.4.orig/init.d/fence_sanlockd.service -+++ sanlock-3.8.4/init.d/fence_sanlockd.service +--- sanlock-3.8.5.orig/init.d/fence_sanlockd.service ++++ sanlock-3.8.5/init.d/fence_sanlockd.service @@ -4,6 +4,17 @@ After=syslog.target wdmd.service sanlock Before=corosync.service ++++++ harden_sanlk-resetd.service.patch ++++++ --- /var/tmp/diff_new_pack.UCirHa/_old 2022-10-20 11:09:28.575747959 +0200 +++ /var/tmp/diff_new_pack.UCirHa/_new 2022-10-20 11:09:28.579747967 +0200 @@ -1,7 +1,7 @@ -Index: sanlock-3.8.4/init.d/sanlk-resetd.service +Index: sanlock-3.8.5/init.d/sanlk-resetd.service =================================================================== ---- sanlock-3.8.4.orig/init.d/sanlk-resetd.service -+++ sanlock-3.8.4/init.d/sanlk-resetd.service +--- sanlock-3.8.5.orig/init.d/sanlk-resetd.service ++++ sanlock-3.8.5/init.d/sanlk-resetd.service @@ -4,6 +4,17 @@ After=wdmd.service sanlock.service Requires=wdmd.service sanlock.service ++++++ sanlock-3.8.4.tar.xz -> sanlock-3.8.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sanlock-3.8.4/.gitignore new/sanlock-3.8.5/.gitignore --- old/sanlock-3.8.4/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/sanlock-3.8.5/.gitignore 2022-10-18 15:45:33.000000000 +0200 @@ -0,0 +1,27 @@ +*.co +*.swp +*.tar.gz +.tox/ +.vimdir +cscope.* +python/*.so +python/build/ +python/usr/ +reset/sanlk-reset +reset/sanlk-resetd +sanlock.spec +src/libsanlock.pc +src/libsanlock.so* +src/libsanlock_client.pc +src/libsanlock_client.so* +src/sanlock +tests/*.pyc +tests/__pycache__/ +tests/devcount +tests/killpath +tests/sanlk_client +tests/sanlk_load +tests/sanlk_path +wdmd/libwdmd.so* +wdmd/wdmd +wdmd/wdmd_client diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sanlock-3.8.4/VERSION new/sanlock-3.8.5/VERSION --- old/sanlock-3.8.4/VERSION 2021-06-01 23:04:27.000000000 +0200 +++ new/sanlock-3.8.5/VERSION 2022-10-18 15:45:33.000000000 +0200 @@ -1 +1 @@ -3.8.4 +3.8.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sanlock-3.8.4/python/setup.py new/sanlock-3.8.5/python/setup.py --- old/sanlock-3.8.4/python/setup.py 2021-06-01 23:04:27.000000000 +0200 +++ new/sanlock-3.8.5/python/setup.py 2022-10-18 15:45:33.000000000 +0200 @@ -4,7 +4,7 @@ # modify, copy, or redistribute it subject to the terms and conditions # of the GNU General Public License v.2. -from distutils.core import setup, Extension +from setuptools import setup, Extension sanlocklib = ['sanlock'] sanlock = Extension(name='sanlock', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sanlock-3.8.4/src/client.c new/sanlock-3.8.5/src/client.c --- old/sanlock-3.8.4/src/client.c 2021-06-01 23:04:27.000000000 +0200 +++ new/sanlock-3.8.5/src/client.c 2022-10-18 15:45:33.000000000 +0200 @@ -1140,7 +1140,8 @@ datalen += sizeof(struct sanlk_options); if (opt_in) { memcpy(&opt, opt_in, sizeof(struct sanlk_options)); - datalen += opt_in->len; + /* data beyond opt is not used */ + /* datalen += opt_in->len; */ } else { memset(&opt, 0, sizeof(opt)); } @@ -1187,6 +1188,7 @@ goto out; } + /* if (opt.len) { rv = send_data(fd, opt_in->str, opt.len, 0); if (rv < 0) { @@ -1194,6 +1196,7 @@ goto out; } } + */ rv = recv_result(fd); out: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sanlock-3.8.4/src/cmd.c new/sanlock-3.8.5/src/cmd.c --- old/sanlock-3.8.4/src/cmd.c 2021-06-01 23:04:27.000000000 +0200 +++ new/sanlock-3.8.5/src/cmd.c 2022-10-18 15:45:33.000000000 +0200 @@ -199,7 +199,6 @@ struct space_info spi; char killpath[SANLK_HELPER_PATH_LEN]; char killargs[SANLK_HELPER_ARGS_LEN]; - char *opt_str; int token_len, disks_len; int fd, rv, i, j, empty_slots, lvl; int alloc_count = 0, acquire_count = 0; @@ -361,6 +360,8 @@ strncpy(cl->owner_name, opt.owner_name, SANLK_NAME_LEN); + /* data after opt is not used */ + /* if (opt.len) { opt_str = malloc(opt.len); if (!opt_str) { @@ -379,6 +380,7 @@ goto done; } } + */ /* TODO: warn if header.length != sizeof(header) + pos ? */ recv_done = 1; @@ -2395,6 +2397,7 @@ "external_used=%d " "used_by_orphans=%d " "renewal_read_extend_sec=%u " + "set_max_sectors_kb=%u " "corrupt_result=%d " "acquire_last_result=%d " "renewal_last_result=%d " @@ -2415,6 +2418,7 @@ (sp->flags & SP_EXTERNAL_USED) ? 1 : 0, (sp->flags & SP_USED_BY_ORPHANS) ? 1 : 0, sp->renewal_read_extend_sec, + sp->set_max_sectors_kb, sp->lease_status.corrupt_result, sp->lease_status.acquire_last_result, sp->lease_status.renewal_last_result, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sanlock-3.8.4/src/diskio.c new/sanlock-3.8.5/src/diskio.c --- old/sanlock-3.8.4/src/diskio.c 2021-06-01 23:04:27.000000000 +0200 +++ new/sanlock-3.8.5/src/diskio.c 2022-10-18 15:45:33.000000000 +0200 @@ -32,25 +32,13 @@ #include "direct.h" #include "log.h" -int read_sysfs_size(const char *disk_path, const char *name, unsigned int *val) +int read_sysfs_uint(char *path, unsigned int *val) { - char path[PATH_MAX]; - char buf[32]; - struct stat st; - int major, minor; - size_t len; + char buf[32] = { 0 }; + int len; int fd; int rv = -1; - rv = stat(disk_path, &st); - if (rv < 0) - return -1; - - major = (int)major(st.st_rdev); - minor = (int)minor(st.st_rdev); - - snprintf(path, sizeof(path), "/sys/dev/block/%d:%d/queue/%s", major, minor, name); - fd = open(path, O_RDONLY, 0); if (fd < 0) return -1; @@ -73,38 +61,23 @@ return rv; } -static int write_sysfs_size(const char *disk_path, const char *name, unsigned int val) +int write_sysfs_uint(char *path, unsigned int val) { - char path[PATH_MAX]; - char buf[32]; - struct stat st; - int major, minor; + char buf[32] = { 0 }; int fd; int rv; - rv = stat(disk_path, &st); - if (rv < 0) { - log_debug("write_sysfs_size stat error %d %s", errno, disk_path); - return -1; - } - - major = (int)major(st.st_rdev); - minor = (int)minor(st.st_rdev); - - snprintf(path, sizeof(path), "/sys/dev/block/%d:%d/queue/%s", major, minor, name); - - memset(buf, 0, sizeof(buf)); - snprintf(buf, sizeof(buf), "%u", val); - fd = open(path, O_RDWR, 0); if (fd < 0) { - log_debug("write_sysfs_size open error %d %s", errno, path); + log_debug("write_sysfs_uint open error %d %s", errno, path); return -1; } + snprintf(buf, sizeof(buf), "%u", val); + rv = write(fd, buf, strlen(buf)); if (rv < 0) { - log_debug("write_sysfs_size write %s error %d %s", buf, errno, path); + log_debug("write_sysfs_uint write %s error %d %s", buf, errno, path); close(fd); return -1; } @@ -113,6 +86,52 @@ return 0; } +int read_sysfs_size(const char *disk_path, const char *name, unsigned int *val) +{ + char sysfs_path[PATH_MAX] = { 0 }; + struct stat st; + int ma, mi; + int rv; + + rv = stat(disk_path, &st); + if (rv < 0) + return -1; + + ma = (int)major(st.st_rdev); + mi = (int)minor(st.st_rdev); + + snprintf(sysfs_path, sizeof(sysfs_path), "/sys/dev/block/%d:%d/queue/%s", ma, mi, name); + sysfs_path[PATH_MAX-1] = '\0'; + + rv = read_sysfs_uint(sysfs_path, val); + + return rv; +} + +static int write_sysfs_size(const char *disk_path, const char *name, unsigned int val) +{ + char sysfs_path[PATH_MAX] = { 0 }; + struct stat st; + int major, minor; + int rv; + + rv = stat(disk_path, &st); + if (rv < 0) { + log_debug("write_sysfs_size stat error %d %s", errno, disk_path); + return -1; + } + + major = (int)major(st.st_rdev); + minor = (int)minor(st.st_rdev); + + snprintf(sysfs_path, sizeof(sysfs_path), "/sys/dev/block/%d:%d/queue/%s", major, minor, name); + sysfs_path[PATH_MAX-1] = '\0'; + + rv = write_sysfs_uint(sysfs_path, val); + + return rv; +} + /* * The default max_sectors_kb is 512 (KB), so a 1MB read is split into two * 512KB reads. Adjust this to at least do 1MB io's. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sanlock-3.8.4/src/diskio.h new/sanlock-3.8.5/src/diskio.h --- old/sanlock-3.8.4/src/diskio.h 2021-06-01 23:04:27.000000000 +0200 +++ new/sanlock-3.8.5/src/diskio.h 2022-10-18 15:45:33.000000000 +0200 @@ -20,6 +20,8 @@ int read_sysfs_size(const char *path, const char *name, unsigned int *val); int set_max_sectors_kb(struct sync_disk *disk, uint32_t max_sectors_kb); int get_max_sectors_kb(struct sync_disk *disk, uint32_t *max_sectors_kb); +int read_sysfs_uint(char *path, unsigned int *val); +int write_sysfs_uint(char *path, unsigned int val); /* * iobuf functions require the caller to allocate iobuf using posix_memalign diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sanlock-3.8.4/src/helper.c new/sanlock-3.8.5/src/helper.c --- old/sanlock-3.8.4/src/helper.c 2021-06-01 23:04:27.000000000 +0200 +++ new/sanlock-3.8.5/src/helper.c 2022-10-18 15:45:33.000000000 +0200 @@ -31,6 +31,11 @@ #include "monotime.h" #include "helper.h" +/* only need sysfs functions */ +struct sync_disk; +struct task; +#include "diskio.h" + #define MAX_AV_COUNT 8 static void run_path(struct helper_msg *hm) @@ -139,7 +144,7 @@ #define log_debug(fmt, args...) \ do { \ if (log_stderr) \ - fprintf(stderr, "%ld " fmt "\n", time(NULL), ##args); \ + fprintf(stderr, "helper %ld " fmt "\n", time(NULL), ##args); \ } while (0) #define STANDARD_TIMEOUT_MS (HELPER_STATUS_INTERVAL*1000) @@ -147,6 +152,7 @@ int run_helper(int in_fd, int out_fd, int log_stderr) { + unsigned int sysfs_val; char name[16]; struct pollfd pollfd; struct helper_msg hm; @@ -215,6 +221,11 @@ */ } else if (hm.type == HELPER_MSG_KILLPID) { kill(hm.pid, hm.sig); + + } else if (hm.type == HELPER_MSG_WRITE_SYSFS) { + sysfs_val = atoi(hm.args); + rv = write_sysfs_uint(hm.path, sysfs_val); + log_debug("write_sysfs %s %u rv %d", hm.path, sysfs_val, rv); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sanlock-3.8.4/src/helper.h new/sanlock-3.8.5/src/helper.h --- old/sanlock-3.8.4/src/helper.h 2021-06-01 23:04:27.000000000 +0200 +++ new/sanlock-3.8.5/src/helper.h 2022-10-18 15:45:33.000000000 +0200 @@ -19,6 +19,7 @@ #define HELPER_MSG_RUNPATH 1 #define HELPER_MSG_KILLPID 2 +#define HELPER_MSG_WRITE_SYSFS 3 struct helper_msg { uint8_t type; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sanlock-3.8.4/src/lockspace.c new/sanlock-3.8.5/src/lockspace.c --- old/sanlock-3.8.4/src/lockspace.c 2021-06-01 23:04:27.000000000 +0200 +++ new/sanlock-3.8.5/src/lockspace.c 2022-10-18 15:45:33.000000000 +0200 @@ -24,6 +24,7 @@ #include <sys/time.h> #include <sys/un.h> #include <sys/stat.h> +#include <sys/sysmacros.h> #include "sanlock_internal.h" #include "sanlock_admin.h" @@ -38,9 +39,85 @@ #include "task.h" #include "timeouts.h" #include "direct.h" +#include "helper.h" static uint32_t space_id_counter = 1; +/* + * When the sanlock daemon is not root, set_max_sectors_kb() needs to use the + * root helper process to write to sysfs. + */ + +static int helper_set_max_sectors_kb(struct sync_disk *disk, uint32_t set_kb) +{ + char sysfs_path[SANLK_HELPER_PATH_LEN] = { 0 }; + struct helper_msg hm; + struct stat st; + int ma, mi; + unsigned int max_kb = 0; + int rv; + + rv = stat(disk->path, &st); + if (rv < 0) { + log_debug("helper_set_max_sectors_kb stat error %d %s", errno, disk->path); + return -1; + } + ma = (int)major(st.st_rdev); + mi = (int)minor(st.st_rdev); + + snprintf(sysfs_path, sizeof(sysfs_path), "/sys/dev/block/%d:%d/queue/max_sectors_kb", ma, mi); + sysfs_path[SANLK_HELPER_PATH_LEN-1] = '\0'; + + rv = read_sysfs_uint(sysfs_path, &max_kb); + if (rv < 0) { + /* max_sectors_kb setting may not exist */ + return -1; + } + + if (max_kb == set_kb) + return 0; + + if (helper_kill_fd == -1) + return -1; + + memset(&hm, 0, sizeof(hm)); + hm.type = HELPER_MSG_WRITE_SYSFS; + memcpy(hm.path, sysfs_path, SANLK_HELPER_PATH_LEN); + snprintf(hm.args, sizeof(hm.args), "%u", set_kb); + + retry: + rv = write(helper_kill_fd, &hm, sizeof(hm)); + if (rv == -1 && errno == EINTR) + goto retry; + + /* pipe is full, we'll try again in a second */ + if (rv == -1 && errno == EAGAIN) { + log_error("helper_set_max_sectors_kb send EAGAIN"); + return -1; + } + + /* helper exited or closed fd, quit using helper */ + if (rv == -1 && errno == EPIPE) { + log_error("helper_set_max_sectors_kb send EPIPE"); + return -1; + } + + if (rv == -1) { + log_error("helper_set_max_sectors_kb send errno %d", errno); + return rv; + } + + /* We don't try to wait for the helper process to do the write, + although we could probably do something with the status msg. + It shouldn't matter when the sysfs field is written wrt + reading/writing the device. Add a slight delay here which + should usually let the sysfs update happen first. */ + + usleep(2000); + + return 0; +} + static struct space *_search_space(const char *name, struct sync_disk *disk, uint64_t host_id, @@ -634,7 +711,10 @@ log_space(sp, "set_lockspace_max_sectors_kb small hw_kb %u using 1024", hw_kb); - rv = set_max_sectors_kb(&sp->host_id_disk, set_kb); + if (!com.uid) + rv = set_max_sectors_kb(&sp->host_id_disk, set_kb); + else + rv = helper_set_max_sectors_kb(&sp->host_id_disk, set_kb); if (rv < 0) { log_space(sp, "set_lockspace_max_sectors_kb small hw_kb %u set 1024 error %d", hw_kb, rv); return; @@ -646,12 +726,16 @@ log_space(sp, "set_lockspace_max_sectors_kb hw_kb %u setting %u", hw_kb, set_kb); - rv = set_max_sectors_kb(&sp->host_id_disk, set_kb); + if (!com.uid) + rv = set_max_sectors_kb(&sp->host_id_disk, set_kb); + else + rv = helper_set_max_sectors_kb(&sp->host_id_disk, set_kb); if (rv < 0) { log_space(sp, "set_lockspace_max_sectors_kb hw_kb %u set %u error %d", hw_kb, set_kb, rv); return; } } + sp->set_max_sectors_kb = set_kb; } /* @@ -939,6 +1023,8 @@ { if (sp->lease_status.renewal_read_buf) free(sp->lease_status.renewal_read_buf); + if (sp->renewal_history) + free(sp->renewal_history); free(sp); } @@ -1068,8 +1154,9 @@ (unsigned long long)sp->host_id_disk.offset); rv = pthread_create(&sp->thread, NULL, lockspace_thread, sp); - if (rv < 0) { - log_erros(sp, "add_lockspace create thread failed"); + if (rv) { + log_erros(sp, "add_lockspace create thread failed %d", rv); + rv = -1; goto fail_del; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sanlock-3.8.4/src/log.c new/sanlock-3.8.5/src/log.c --- old/sanlock-3.8.4/src/log.c 2021-06-01 23:04:27.000000000 +0200 +++ new/sanlock-3.8.5/src/log.c 2022-10-18 15:45:33.000000000 +0200 @@ -128,6 +128,9 @@ struct tm time_info; pid_t tid; + if (is_helper) + return; + memset(name, 0, sizeof(name)); if (level == LOG_CLIENT) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sanlock-3.8.4/src/main.c new/sanlock-3.8.5/src/main.c --- old/sanlock-3.8.4/src/main.c 2021-06-01 23:04:27.000000000 +0200 +++ new/sanlock-3.8.5/src/main.c 2022-10-18 15:45:33.000000000 +0200 @@ -946,9 +946,6 @@ while (1) { while (!pool.quit && list_empty(&pool.work_data)) { - if (pool.free_workers >= DEFAULT_MIN_WORKER_THREADS) - goto out; - pool.free_workers++; pthread_cond_wait(&pool.cond, &pool.mutex); pool.free_workers--; @@ -969,7 +966,6 @@ break; } -out: pool.num_workers--; if (!pool.num_workers) pthread_cond_signal(&pool.quit_wait); @@ -995,10 +991,11 @@ if (!pool.free_workers && pool.num_workers < pool.max_workers) { rv = pthread_create(&th, NULL, thread_pool_worker, (void *)(long)pool.num_workers); - if (rv < 0) { + if (rv) { log_error("thread_pool_add_work ci %d error %d", ca->ci_in, rv); list_del(&ca->list); pthread_mutex_unlock(&pool.mutex); + rv = -1; return rv; } pool.num_workers++; @@ -1023,7 +1020,7 @@ static int thread_pool_create(int min_workers, int max_workers) { pthread_t th; - int i, rv; + int i, rv = 0; memset(&pool, 0, sizeof(pool)); INIT_LIST_HEAD(&pool.work_data); @@ -1035,8 +1032,11 @@ for (i = 0; i < min_workers; i++) { rv = pthread_create(&th, NULL, thread_pool_worker, (void *)(long)i); - if (rv < 0) + if (rv) { + log_error("thread_pool_create failed %d", rv); + rv = -1; break; + } pool.num_workers++; } @@ -1649,6 +1649,7 @@ } else { close(pr_fd); close(pw_fd); + is_helper = 1; run_helper(cr_fd, cw_fd, (log_stderr_priority == LOG_DEBUG)); exit(0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sanlock-3.8.4/src/sanlock.h new/sanlock-3.8.5/src/sanlock.h --- old/sanlock-3.8.4/src/sanlock.h 2021-06-01 23:04:27.000000000 +0200 +++ new/sanlock-3.8.5/src/sanlock.h 2022-10-18 15:45:33.000000000 +0200 @@ -137,8 +137,8 @@ struct sanlk_options { char owner_name[SANLK_NAME_LEN]; /* optional user friendly name */ uint32_t flags; - uint32_t len; - /* followed by len bytes (migration input will use this) */ + uint32_t len; /* unused and ignored */ + /* followed by len bytes (unused and ignored) */ char str[0]; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sanlock-3.8.4/src/sanlock_internal.h new/sanlock-3.8.5/src/sanlock_internal.h --- old/sanlock-3.8.4/src/sanlock_internal.h 2021-06-01 23:04:27.000000000 +0200 +++ new/sanlock-3.8.5/src/sanlock_internal.h 2022-10-18 15:45:33.000000000 +0200 @@ -209,6 +209,7 @@ uint32_t used_retries; uint32_t renewal_read_extend_sec; /* defaults to io_timeout */ uint32_t rindex_op; + unsigned int set_max_sectors_kb; int sector_size; int align_size; int max_hosts; @@ -455,6 +456,7 @@ EXTERN int kill_count_max; EXTERN int kill_grace_seconds; +EXTERN int is_helper; EXTERN int helper_ci; EXTERN int helper_pid; EXTERN int helper_kill_fd; ++++++ suse-no-date-time.patch ++++++ --- /var/tmp/diff_new_pack.UCirHa/_old 2022-10-20 11:09:28.727748267 +0200 +++ /var/tmp/diff_new_pack.UCirHa/_new 2022-10-20 11:09:28.731748275 +0200 @@ -1,8 +1,8 @@ -Index: sanlock-3.8.4/src/main.c +Index: sanlock-3.8.5/src/main.c =================================================================== ---- sanlock-3.8.4.orig/src/main.c -+++ sanlock-3.8.4/src/main.c -@@ -2208,8 +2208,8 @@ static int read_command_line(int argc, c +--- sanlock-3.8.5.orig/src/main.c ++++ sanlock-3.8.5/src/main.c +@@ -2209,8 +2209,8 @@ static int read_command_line(int argc, c } if (!strcmp(arg1, "--version") || !strcmp(arg1, "-V")) { @@ -13,10 +13,10 @@ exit(EXIT_SUCCESS); } -Index: sanlock-3.8.4/fence_sanlock/fence_sanlockd.c +Index: sanlock-3.8.5/fence_sanlock/fence_sanlockd.c =================================================================== ---- sanlock-3.8.4.orig/fence_sanlock/fence_sanlockd.c -+++ sanlock-3.8.4/fence_sanlock/fence_sanlockd.c +--- sanlock-3.8.5.orig/fence_sanlock/fence_sanlockd.c ++++ sanlock-3.8.5/fence_sanlock/fence_sanlockd.c @@ -565,8 +565,7 @@ int main(int argc, char *argv[]) print_usage(); exit(0); ++++++ suse-systemd.patch ++++++ --- /var/tmp/diff_new_pack.UCirHa/_old 2022-10-20 11:09:28.743748300 +0200 +++ /var/tmp/diff_new_pack.UCirHa/_new 2022-10-20 11:09:28.747748308 +0200 @@ -1,7 +1,7 @@ -Index: sanlock-3.8.4/init.d/sanlock.service +Index: sanlock-3.8.5/init.d/sanlock.service =================================================================== ---- sanlock-3.8.4.orig/init.d/sanlock.service -+++ sanlock-3.8.4/init.d/sanlock.service +--- sanlock-3.8.5.orig/init.d/sanlock.service ++++ sanlock-3.8.5/init.d/sanlock.service @@ -5,8 +5,10 @@ Wants=wdmd.service [Service] @@ -15,10 +15,10 @@ [Install] WantedBy=multi-user.target -Index: sanlock-3.8.4/init.d/wdmd.service +Index: sanlock-3.8.5/init.d/wdmd.service =================================================================== ---- sanlock-3.8.4.orig/init.d/wdmd.service -+++ sanlock-3.8.4/init.d/wdmd.service +--- sanlock-3.8.5.orig/init.d/wdmd.service ++++ sanlock-3.8.5/init.d/wdmd.service @@ -4,8 +4,10 @@ After=syslog.target [Service] @@ -32,10 +32,10 @@ [Install] WantedBy=multi-user.target -Index: sanlock-3.8.4/init.d/fence_sanlockd.service +Index: sanlock-3.8.5/init.d/fence_sanlockd.service =================================================================== ---- sanlock-3.8.4.orig/init.d/fence_sanlockd.service -+++ sanlock-3.8.4/init.d/fence_sanlockd.service +--- sanlock-3.8.5.orig/init.d/fence_sanlockd.service ++++ sanlock-3.8.5/init.d/fence_sanlockd.service @@ -5,8 +5,8 @@ Before=corosync.service [Service]

1 0

commit libavif for openSUSE:Factory
by Source-Sync 20 Oct '22

20 Oct '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libavif for openSUSE:Factory checked in at 2022-10-20 11:09:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libavif (Old) and /work/SRC/openSUSE:Factory/.libavif.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libavif" Thu Oct 20 11:09:25 2022 rev:17 rq:1011224 version:0.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libavif/libavif.changes 2022-08-04 13:22:51.432395461 +0200 +++ /work/SRC/openSUSE:Factory/.libavif.new.2275/libavif.changes 2022-10-20 11:09:26.755744272 +0200 @@ -1,0 +2,98 @@ +Sat Oct 15 12:28:59 UTC 2022 - Bj��rn Lie <bjorn.lie(a)gmail.com> + +- Update to version 0.11.0: + * There are incompatible ABI changes in this release. The + alphaRange member was removed from the avifImage struct. The + chromaDownsampling and avoidLibYUV members were added to the + avifRGBImage struct. The imageDimensionLimit member was added + to the avifDecoder struct. avifImageCopy() and + avifImageAllocatePlanes() signatures changed. It is necessary + to recompile your code. Also check the return values of + avifImageCopy() and avifImageAllocatePlanes(). + * Added: + - Add man pages for avifenc and avifdec + - Add the avifChannelIndex type alias for enum avifChannelIndex + - Add avifChromaDownsampling enum + - Add chromaDownsampling field to avifRGBImage struct + - Add support for AVIF_RGB_FORMAT_RGB_565 + - Add imageDimensionLimit field to avifDecoder struct + - Add autoTiling field to avifEncoder struct + - Add new avifResult codes AVIF_RESULT_CANNOT_CHANGE_SETTING + and AVIF_RESULT_INCOMPATIBLE_IMAGE + - Add new enum constants AVIF_PIXEL_FORMAT_COUNT and + AVIF_RGB_FORMAT_COUNT + - avifdec: Add --dimension-limit, which specifies the image + dimension limit (width or height) that should be tolerated + - avifenc: Add --sharpyuv, which enables "sharp" RGB to YUV420 + conversion, which reduces artifacts caused by 420 chroma + downsampling. Needs libsharpyuv (part of the libwebp + repository) at compile time. + - avifenc: Add --ignore-exif and --ignore-xmp flags. + - avifenc: Add --autotiling, which sets --tilerowslog2 and + --tilecolslog2 automatically. + - avifenc: Input Exif orientation is converted to irot/imir by + default. + * Changed: + - Fix memory leaks of metadata on avifenc exit + - Update the handling of 'lsel' and progressive decoding to + AVIF spec v1.1.0 + - Treat an absent lsel and layer_id == 0xFFFF equivalently for + backward compatibility with earlier drafts of AVIF spec + v1.1.0 + - Set libavif's own default value of cfg.rc_end_usage for + libaom + - Set the libaom-specific option -a tune=ssim by default + - Bump cmake_minimum_required from 3.5 to 3.13 + - Fix https://crbug.com/oss-fuzz/48135 + - Use several new libyuv functions in reformat_libyuv.c + - Fix SVT-AV1's issue 1957 related to uninitialized variables + crashing the encoder + - Update aom.cmd: v3.5.0 + - Update rav1e.cmd: v0.5.1 + - Update svt.cmd/svt.sh: v1.2.1 + - Update libgav1.cmd: v0.18.0 + - Update libyuv.cmd: f9fda6e7 (version 1844) + - avifImageCopy() and avifImageAllocatePlanes() now return + avifResult instead of void to report invalid parameters or + memory allocation failures. + - avifImageRGBToYUV() now uses libyuv fast paths by default. It + may slightly change conversion results. The old behavior can + be restored by setting avifRGBImage::chromaDownsampling to + AVIF_CHROMA_DOWNSAMPLING_BEST_QUALITY and + avifRGBImage::avoidLibYUV to AVIF_TRUE. + - avifRGBImage::chromaUpsampling now only applies to + conversions that need upsampling chroma from 4:2:0 or 4:2:2 + and has no impact on the use of libyuv. + - Set avifRGBImage::avoidLibYUV accordingly to control the use + of libyuv. + - avifenc: Set the YUV format to 4:0:0 for grayscale PNGs + - Support updating encoder settings and codec-specific options + during encoding + - Disable AVIF_STRICT_CLAP_VALID and AVIF_STRICT_PIXI_REQUIRED + in the JNI wrapper + - avifdec: Return proper exit code in "info" mode + - In avifenc and avifdec, treat all arguments that start with + '-' as options + - Exif and XMP metadata is imported from PNG and JPEG files. + - avifImageSetMetadataExif() parses the Exif metadata and + converts any Exif orientation found into transformFlags, irot + and imir values. + - Write 'auxi' box for animated images with alpha channel + - Write 'auxv' as handler_type for alpha channel track + - Use PNG_COLOR_TYPE_GRAY for 8-bit grayscale output + - Replace repeated subtraction by modulo in calcGCD + - Change avifImageCreate to take uint32_t instead of int + parameters + - When writing an image sequence, check if it's safe to cast + width and height to uint16_t + - Allow clamped grid cells in avifEncoderAddImageGrid() + * Removed: + - alphaRange field was removed from the avifImage struct. It it + presumed that alpha plane is always full range. + - The avifCodecConfigurationBox struct becomes a private type + for libavif internal use +- Bump lib_soversion global (also in baselibs.conf) to 15 following + upstream change. +- Use ldconfig_scriptlets for post(un) handling. + +------------------------------------------------------------------- Old: ---- libavif-0.10.1.tar.gz New: ---- libavif-0.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libavif.spec ++++++ --- /var/tmp/diff_new_pack.Y7QoSa/_old 2022-10-20 11:09:27.239745253 +0200 +++ /var/tmp/diff_new_pack.Y7QoSa/_new 2022-10-20 11:09:27.243745261 +0200 @@ -25,11 +25,11 @@ %endif # Also update baselibs.conf if you bump the version -%global lib_soversion 14 +%global lib_soversion 15 %global lib_name libavif%{lib_soversion} Name: libavif -Version: 0.10.1 +Version: 0.11.0 Release: 0 Summary: Library for encoding and decoding .avif files License: BSD-2-Clause @@ -128,13 +128,11 @@ %install %cmake_install -%post -n %{lib_name} -p /sbin/ldconfig -%postun -n %{lib_name} -p /sbin/ldconfig +%ldconfig_scriptlets -n %{lib_name} %files -n %{lib_name} %license LICENSE -%{_libdir}/libavif.so.%{lib_soversion} -%{_libdir}/libavif.so.%{lib_soversion}.0.1 +%{_libdir}/libavif.so.%{lib_soversion}* %files devel %license LICENSE @@ -151,5 +149,7 @@ %files -n gdk-pixbuf-loader-libavif %{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-avif.so +%dir %{_datadir}/thumbnailers +%{_datadir}/thumbnailers/avif.thumbnailer %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.Y7QoSa/_old 2022-10-20 11:09:27.275745326 +0200 +++ /var/tmp/diff_new_pack.Y7QoSa/_new 2022-10-20 11:09:27.279745334 +0200 @@ -1,2 +1,2 @@ -libavif14 +libavif15 ++++++ libavif-0.10.1.tar.gz -> libavif-0.11.0.tar.gz ++++++ ++++ 16034 lines of diff (skipped)

1 0