Merge branch 'main' into testing

Containerfile

@@ -184,14 +184,7 @@ RUN rpm-ostree override remove \
         ublue-os-update-services \
         firefox \
         firefox-langpacks \
-        htop && \
-    rpm-ostree override remove \
-        power-profiles-daemon \
-        || true && \
-    rpm-ostree override remove \
-        tlp \
-        tlp-rdw \
-        || true
+        htop
 
 # Install new packages
 RUN rpm-ostree install \
@@ -206,13 +199,6 @@ RUN rpm-ostree install \
         compsize \
         input-remapper \
         system76-scheduler \
-        tuned \
-        tuned-ppd \
-        tuned-utils \
-        tuned-utils-systemtap \
-        tuned-gtk \
-        tuned-profiles-atomic \
-        tuned-profiles-cpu-partitioning \
         powertop \
         hl2linux-selinux \
         joycond \
@@ -248,7 +234,6 @@ RUN rpm-ostree install \
         gum \
         setools \
         redhat-lsb-core && \
-    sed -i 's@Name=tuned-gui@Name=TuneD Manager@g' /usr/share/applications/tuned-gui.desktop && \
     ln -s /usr/share/fonts/google-noto-sans-cjk-fonts /usr/share/fonts/noto-cjk && \
     wget https://raw.githubusercontent.com/KyleGospo/steam-proton-mf-wmv/master/installcab.py -O /usr/bin/installcab && \
     wget https://github.com/KyleGospo/steam-proton-mf-wmv/blob/master/install-mf-wmv.sh -O /usr/bin/install-mf-wmv && \
@@ -461,7 +446,6 @@ RUN /tmp/image-info.sh && \
     mkdir -p /usr/etc/flatpak/remotes.d && \
     wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remotes.d && \
     systemctl enable com.system76.Scheduler.service && \
-    systemctl enable tuned.service && \
     systemctl enable btrfs-dedup@var-home.timer && \
     systemctl enable displaylink.service && \
     systemctl enable input-remapper.service && \

README.md

@@ -42,7 +42,6 @@ Bazzite is built from [ublue-os/main](https://github.com/ublue-os/main) and [ubl
 - Includes Valve's KDE themes from SteamOS.
 - Features optional Valve-inspired GTK3/4 themes matching Vapor and VGUI2 from SteamOS. Install [Gradience](https://flathub.org/apps/com.github.GradienceTeam.Gradience) to make use of them.
 - [LatencyFleX](https://github.com/ishitatsuyuki/LatencyFleX), [vkBasalt](https://github.com/DadSchoorse/vkBasalt), [MangoHud](https://github.com/flightlessmango/Mangohud), and [OBS VkCapture](https://github.com/nowrep/obs-vkcapture) installed and available by default
-- Uses [TuneD](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/monitoring_and_managing_system_status_and_performance/getting-started-with-tuned_monitoring-and-managing-system-status-and-performance) in place of PPD, with full integration into GNOME, KDE, and Game mode. This is an incredibly powerful tool that Red Hat offers [entire classes on](https://www.redhat.com/en/services/training/rh442-red-hat-enterprise-performance-tuning).
 - Support for [Wallpaper Engine](https://www.wallpaperengine.io/en). <sub><sup>(Only on KDE)</sup></sub>
 - [ROM Properties Page shell extension](https://github.com/GerbilSoft/rom-properties) included.
 - Full support for [Winesync/Fastsync/NTsync](https://github.com/Frogging-Family/wine-tkg-git/issues/936).
@@ -265,7 +264,6 @@ Ported SteamOS and ChimeraOS packages, among others used by Bazzite, are built o
 | steamdeck-kde-presets                                                                               | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/steamdeck-kde-presets/status_image/last_build.png?)                       |
 | steamdeck-kde-presets-desktop                                                                       | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/steamdeck-kde-presets-desktop/status_image/last_build.png?)               |
 | steam_notif_daemon                                                                                  | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/steam_notif_daemon/status_image/last_build.png?)                          |
-| [tuned](https://github.com/redhat-performance/tuned)-ppd                                            | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/tuned/status_image/last_build.png?)     
 | udisks2                                                                                             | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/udisks2/status_image/last_build.png?)                                     |
 | upower                                                                                              | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/upower/status_image/last_build.png?)                                      |
 | vpower                                                                                              | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/vpower/status_image/last_build.png?)                                      |

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)
 

system_files/desktop/shared/usr/etc/profile.d/secure-boot-warning.sh

@@ -1 +0,0 @@
-echo -e 'Warning: The next major update for Bazzite will introduce new requirements for secure boot to work.\nPlease make sure to run "ujust enroll-secure-boot-key" at least once.\nThis message will automatically disappear after the update has been deployed.\nFor more information, see our thread at: https://universal-blue.discourse.group/t/secure-boot-notice/405\n'

system_files/nvidia/silverblue/usr/etc/dconf/db/local.d/05-bazzite-extensions

@@ -1,3 +0,0 @@
-[org/gnome/shell] 
-enabled-extensions=['s76-scheduler@mattjakeman.com', 'logomenu@aryan_k', 'appindicatorsupport@rgcjonas.gmail.com', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'gsconnect@andyholmes.github.io', 'just-perfection-desktop@just-perfection', 'blur-my-shell@aunetx', 'supergfxctl-gex@asus-linux.org']
-disabled-extensions=['background-logo@fedorahosted.org']