Merge branch 'main' into main-next

spec_files/jupiter-fan-control/fan_fix.patch

@@ -0,0 +1,20 @@
+diff --git usr/share/jupiter-fan-control/jupiter-config.yaml usr/share/jupiter-fan-control/jupiter-config.yaml
+index c907f3f..b036518 100644
+--- usr/share/jupiter-fan-control/jupiter-config.yaml
++++ usr/share/jupiter-fan-control/jupiter-config.yaml
+@@ -17,6 +17,8 @@ fan_min_time_on: 120
+ fan_gain: 10
+ ec_ramp_rate: 10
+ 
++dry_run: False
++
+ sensors:
+   - hwmon_name: amdgpu
+     nice_name: P_APU
+@@ -62,4 +64,4 @@ devices:
+     B: -531
+     C: 17394
+     T_threshold: 55
+-    # quadratic fit {{60, 2000}, {78, 3800}, {85, 5300}}
+\ No newline at end of file
++    # quadratic fit {{60, 2000}, {78, 3800}, {85, 5300}}

spec_files/jupiter-fan-control/jupiter-fan-control.spec

@@ -9,6 +9,8 @@ Source:         https://gitlab.com/evlaV/%{name}/-/archive/main/%{name}-main.tar
 BuildArch:      noarch
 
 Patch0:         fedora.patch
+# Valve does the funny (Thanks RodoMa92)
+Patch1:         fan_fix.patch
 
 Requires:       python3
 
@@ -21,8 +23,7 @@ SteamOS 3.0 Steam Deck Fan Controller
 %define debug_package %{nil}
 
 %prep
-%setup -n %{name}-main
-%patch 0 -p0
+%autosetup -n %{name}-main -p0
 
 %build
 

spec_files/xorg-x11-server-Xwayland/xorg-x11-server-Xwayland.spec

@@ -8,7 +8,7 @@
 
 Summary:   Xwayland
 Name:      xorg-x11-server-Xwayland
-%global    xwayland_version 23.2.2
+%global    xwayland_version 23.2.4
 Version:   %{xwayland_version}.bazzite.{{{ git_dir_version }}}
 Release:   1%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
 
@@ -24,7 +24,8 @@ Patch1:    0001-Valve.patch
 
 License:   MIT
 
-Requires: xorg-x11-server-common
+Requires: xkeyboard-config
+Requires: xkbcomp
 Requires: libEGL
 Requires: libepoxy >= 1.5.5
 
@@ -111,6 +112,7 @@ necessary for developing Wayland compositors using Xwayland.
         -Ddefault_font_path=%{default_font_path} \
         -Dbuilder_string="Build ID: %{name} %{xwayland_version}-%{release}" \
         -Dxkb_output_dir=%{_localstatedir}/lib/xkb \
+        -Dserverconfigdir=%{_datadir}/xwayland \
         -Dxcsecurity=true \
         -Dglamor=true \
         -Ddri3=true
@@ -122,23 +124,35 @@ necessary for developing Wayland compositors using Xwayland.
 
 # Remove unwanted files/dirs
 rm $RPM_BUILD_ROOT%{_mandir}/man1/Xserver.1*
-rm -Rf $RPM_BUILD_ROOT%{_libdir}/xorg
 rm -Rf $RPM_BUILD_ROOT%{_includedir}/xorg
 rm -Rf $RPM_BUILD_ROOT%{_datadir}/aclocal
-rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb
 
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
 %files
+%dir %{_datadir}/xwayland
 %{_bindir}/Xwayland
 %{_mandir}/man1/Xwayland.1*
 %{_datadir}/applications/org.freedesktop.Xwayland.desktop
+%{_datadir}/xwayland/protocol.txt
 
 %files devel
 %{_libdir}/pkgconfig/xwayland.pc
 
 %changelog
+* Tue Jan 16 2024 Olivier Fourdan <ofourdan@redhat.com> - 23.2.4-1
+- xwayland 23.2.4 - (#2254280)
+  CVE fix for: CVE-2023-6816, CVE-2024-0229, CVE-2024-21885, CVE-2024-21886,
+  CVE-2024-0408, CVE-2024-0409
+
+* Wed Dec 13 2023 Peter Hutterer <peter.hutterer@redhat.com> - 23.2.3-1
+- xwayland 23.2.3 
+  CVE fix for: CVE-2023-6377, CVE-2023-6478
+
+* Fri Nov 24 2023 Olivier Fourdan <ofourdan@redhat.com> - 23.2.2-2
+- Drop dependency on xorg-x11-server-common
+
 * Thu Oct 26 2023 Olivier Fourdan <ofourdan@redhat.com> - 23.2.2-1
 - xwayland 23.2.2 - (#2246029)