Update Qubes version on the lock screen

.gitlab-ci.yml

@@ -3,3 +3,5 @@ include:
   project: QubesOS/qubes-continuous-integration
 - file: /r4.3/gitlab-host.yml
   project: QubesOS/qubes-continuous-integration
+- file: /r4.3/gitlab-vm.yml
+  project: QubesOS/qubes-continuous-integration

.qubesbuilder

@@ -2,6 +2,10 @@ host:
   rpm:
     build:
     - xscreensaver.spec
+vm:
+  rpm:
+    build:
+    - xscreensaver.spec
 source:
   files:
   - url: https://ftp.qubes-os.org/distfiles/xscreensaver-@VERSION@.tar.gz

Qubes-0007-utils.patch

@@ -13,7 +13,7 @@ index 28347f3..420919e 100644
 +++ b/utils/version.h
 @@ -1,4 +1,4 @@
  static const char screensaver_id[] =
--	"@(#)xscreensaver 6.08 (10-Oct-2023), by Jamie Zawinski (jwz@jwz.org)";
-+	"@(#)xscreensaver 6.08 (10-Oct-2023), by Jamie Zawinski";
- #define XSCREENSAVER_VERSION "6.08"
- #define XSCREENSAVER_RELEASED 1696964400
+-	"@(#)xscreensaver 6.10 (28-Apr-2025), by Jamie Zawinski (jwz@jwz.org)";
++	"@(#)xscreensaver 6.10 (28-Apr-2025), by Jamie Zawinski";
+ #define XSCREENSAVER_VERSION "6.10"
+ #define XSCREENSAVER_RELEASED 1745866800

Qubes-0009-Update-to-4-2-branding.patch → Qubes-0009-Update-to-4-3-branding.patch

@@ -1,7 +1,7 @@
 From c78d51772d9a7814a0d71a3d69fbd140766e6a46 Mon Sep 17 00:00:00 2001
 From: unman <unman@thirdeyesecurity.org>
 Date: Thu, 21 Oct 2021 17:51:42 +0000
-Subject: [PATCH] Update to 4.2 branding
+Subject: [PATCH] Update to 4.3 branding
 
 ---
  driver/dialog.c | 2 +-
@@ -16,7 +16,7 @@ index e5834b6..666fb5f 100644
      ws->heading_label = (char *) malloc (100);
      ws->version = strdup(version);
 -    sprintf (ws->heading_label, "Qubes OS 4.1");
-+    sprintf (ws->heading_label, "Qubes OS 4.2");
++    sprintf (ws->heading_label, "Qubes OS 4.3");
 
      if (splash_p)
        {

barcode-words-blacklist.txt

@@ -0,0 +1,10 @@
+boobies
+boobs
+cock
+flatulence
+hemorrhoid
+heroin
+pussy
+rectum
+viagra
+vibrator

rel

@@ -1 +1 @@
-5
+1

version

@@ -1 +1 @@
-6.08
+6.10.1

xscreensaver-5.45-0001-barcode-glsnake-sanitize-the-names-of-modes.patch

@@ -4,74 +4,9 @@ Date: Wed, 9 Dec 2020 22:12:09 +0900
 Subject: [PATCH] barcode / glsnake: sanitize the names of modes
 
 ---
- hacks/barcode.c     | 10 ----------
  hacks/glx/glsnake.c | 12 ++++++------
  2 files changed, 6 insertions(+), 16 deletions(-)
 
-diff --git a/hacks/barcode.c b/hacks/barcode.c
-index 20c2f38..ba3e2b2 100644
---- a/hacks/barcode.c
-+++ b/hacks/barcode.c
-@@ -122,8 +122,6 @@ static const char *words[] =
-   "bird flu",
-   "bliss",
-   "bogosity",
--  "boobies",
--  "boobs",
-   "booty",
-   "bread",
-   "brogrammers",
-@@ -139,7 +137,6 @@ static const char *words[] =
-   "chocolate",
-   "chupacabra",
-   "CLONE",
--  "cock",
-   "congress",
-   "constriction",
-   "contrition",
-@@ -184,7 +181,6 @@ static const char *words[] =
-   "fear",
-   "fever",
-   "filth",
--  "flatulence",
-   "fluff",
-   "fnord",
-   "followers",
-@@ -202,9 +198,7 @@ static const char *words[] =
-   "happiness",
-   "hate",
-   "helplessness",
--  "hemorrhoid",
-   "hermaphrodite",
--  "heroin",
-   "heroine",
-   "hope",
-   "hysteria",
-@@ -286,7 +280,6 @@ static const char *words[] =
-   "punishment",
-   "punk rock",
-   "punk",
--  "pussy",
-   "quagmire",
-   "quarantine",
-   "quartz",
-@@ -295,7 +288,6 @@ static const char *words[] =
-   "rage",
-   "readout",
-   "reality",
--  "rectum",
-   "reject",
-   "rejection",
-   "respect",
-@@ -365,8 +357,6 @@ static const char *words[] =
-   "venom",
-   "verifiability",
-   "very fine people",
--  "viagra",
--  "vibrator",
-   "victim",
-   "vignette",
-   "villainy",
 diff --git a/hacks/glx/glsnake.c b/hacks/glx/glsnake.c
 index 8efc681..125df90 100644
 --- a/hacks/glx/glsnake.c

xscreensaver-6.10.1.tar.gz.sha512

@@ -0,0 +1 @@
+25219f670cdd18db34fc514dc68c628ac8721f88a15d5df2cecbef92ebdfaa916be40ddd171b79166fc20469c199573827dbcbeb7bfa258d48b7f1a9ca7ea07a

xscreensaver.spec.in

@@ -1,6 +1,7 @@
 %define name          xscreensaver
 
-%define mainversion   @VERSION@
+%define mainversion   %(echo @VERSION@ | sed -e 's/\\([0-9]\\+\\.[0-9]\\+\\).*/\\1/')
+%define fullversion   @VERSION@
 #%%define beta_ver      b2
 %undefine beta_ver
 
@@ -69,12 +70,12 @@
 
 Summary:         X screen saver and locker
 Name:            %{name}
-Version:         %{mainversion}
+Version:         %{fullversion}
 Release:         %{?beta_ver:0.}%{fedora_rel}%{?beta_ver:.%beta_ver}%{?dist}%{flagrel}%{?extrarel}
 Epoch:           2
 License:         MIT
 URL:             http://www.jwz.org/xscreensaver/
-Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{mainversion}%{?beta_ver}.tar.gz
+Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{fullversion}%{?beta_ver}.tar.gz
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
@@ -84,6 +85,7 @@ Source12:        xscreensaver-autostart.desktop
 %endif
 # wrapper script for switching user (bug 1878730)
 Source13:        xscreensaver-newlogin-wrapper
+Source20:        barcode-words-blacklist.txt
 
 Source100:       ja.po
 
@@ -109,7 +111,7 @@ Patch6:          Qubes-0001-Brand-with-Qubes.patch
 Patch7:          Qubes-0002-Remove-Documentation-link-since-we-are-offline.patch
 Patch8:          Qubes-0007-utils.patch
 Patch9:          Qubes-0008-Remove-jwz-email-address-from-xscreensaver-help.patch
-Patch10:          Qubes-0009-Update-to-4-2-branding.patch
+Patch10:          Qubes-0009-Update-to-4-3-branding.patch
 
 ## Patches already sent to the upsteam
 ## Patches which must be discussed with upstream
@@ -119,10 +121,6 @@ Patch21:         xscreensaver-6.06-webcollage-default-nonet.patch
 Patch4701:       xscreensaver-6.07-0001-make_ximage-avoid-integer-overflow-on-left-shift.patch
 # convert_ximage_to_rgba32: avoid integer overflow on left shift
 Patch4702:       xscreensaver-6.07-0002-convert_ximage_to_rgba32-avoid-integer-overflow-on-l.patch
-# check header directory for ffmpeg related libraries and add to CFLAGS
-Patch4703:       xscreensaver-6.07-0003-check-header-directory-for-ffmpeg-related-libraries-.patch
-# ffmpeg-out.c: include additional header file
-Patch4704:       xscreensaver-6.07-0004-ffmpeg-out.c-include-additional-header-file.patch
 # Fedora specific
 # window_init: search parenthesis first for searching year
 Patch10001:     xscreensaver-6.00-0001-screensaver_id-search-parenthesis-first-for-searchin.patch
@@ -174,6 +172,7 @@ BuildRequires:   gettext
 BuildRequires:   libtool
 BuildRequires:   pam-devel > %{pam_ver}
 BuildRequires:   sed
+BuildRequires:   libxcrypt-devel
 # Use pseudo symlink
 # BuildRequires:   xdg-utils
 BuildRequires:   xorg-x11-proto-devel
@@ -429,12 +428,15 @@ find . -name \*.c -exec chmod ugo-x {} \;
 %__cat %PATCH9 | %__git am
 %__cat %PATCH10 | %__git am
 
+%__cat %SOURCE20 | while read f
+do
+    sed -i hacks/barcode.c -e "\@\"$f\"@s@^.*\$@/**/@"
+done
+%__git commit -m "barcode: sanitize the names of modes" -a
 %__cat %PATCH21 | %__git am
 
 %__cat %PATCH4701 | %__git am
 %__cat %PATCH4702 | %__git am
-%__cat %PATCH4703 | %__git am
-%__cat %PATCH4704 | %__git am
 %__cat %PATCH10001 | %__git am
 
 %__cat %PATCH14001 | %__git am
@@ -526,9 +528,13 @@ change_option driver/XScreenSaver.ad.in \
 # Disable the following hacks by default \
 # (disable, not remove)
 silence_hack driver/XScreenSaver.ad.in \
-   bsod flag \
-   peepers \
+   bsod \
+   covid19 \
+   flag \
    headroom \
+   peepers \
+   skulloop \
+   skytentacles \
    %{nil}
 %__git commit -m "%PATCH_desc" -a