linuxmint · mtwebster · Jan 8, 2026 · Feb 11, 2026 · Feb 11, 2026 · Feb 11, 2026
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,6 @@ jobs:
         linuxmint/cinnamon-control-center,
         linuxmint/cinnamon-desktop,
         linuxmint/cinnamon-menus,
-        linuxmint/cinnamon-screensaver,
         linuxmint/cinnamon-session,
         linuxmint/cinnamon-settings-daemon,
         linuxmint/cinnamon-translations,

diff --git a/cinnamon.session.in b/cinnamon.session.in
@@ -1,6 +1,6 @@
 [Cinnamon Session]
 Name=Cinnamon
-RequiredComponents=cinnamon;org.cinnamon.ScreenSaver;nemo-autostart;@REQUIRED@cinnamon-killer-daemon;
+RequiredComponents=cinnamon;nemo-autostart;@REQUIRED@cinnamon-killer-daemon;
 DesktopName=X-Cinnamon
 
 
diff --git a/cinnamon2d.session.in b/cinnamon2d.session.in
@@ -1,6 +1,6 @@
 [Cinnamon Session]
 Name=Cinnamon (Software Rendering)
-RequiredComponents=cinnamon2d;org.cinnamon.ScreenSaver;nemo-autostart;@REQUIRED@cinnamon-killer-daemon;
+RequiredComponents=cinnamon2d;nemo-autostart;@REQUIRED@cinnamon-killer-daemon;
 DesktopName=X-Cinnamon
 
 
diff --git a/data/meson.build b/data/meson.build
@@ -62,3 +62,5 @@ gnome.compile_resources(
     install: true,
     install_dir: pkgdatadir
 )
+
+subdir('pam')
diff --git a/data/org.cinnamon.gschema.xml b/data/org.cinnamon.gschema.xml
@@ -521,6 +521,24 @@
       <description>If true, the pointer will be set to the center of the new monitor when using pointer next/previous shortcuts.</description>
     </key>
 
+    <key type="b" name="internal-screensaver-enabled">
+      <default>true</default>
+      <summary>Use internal screensaver implementation. Requires cinnamon restart if changed.</summary>
+      <description>If true, use Cinnamon's internal screensaver for locking instead of the external cinnamon-screensaver daemon.</description>
+    </key>
+
+    <key type="b" name="session-locked-state">
+      <default>false</default>
+      <summary>Whether the session is currently locked</summary>
+      <description>Persists the screensaver locked state so it can be restored after a Cinnamon restart. This key is managed internally and should not be modified manually.</description>
+    </key>
+
+    <key type="b" name="debug-screensaver">
+      <default>false</default>
+      <summary>Enable screensaver debug logging</summary>
+      <description>If true, enables verbose debug logging for the screensaver, unlock dialog, and backup-locker.</description>
+    </key>
+
     <child name="theme" schema="org.cinnamon.theme"/>
     <child name="recorder" schema="org.cinnamon.recorder"/>
     <child name="keyboard" schema="org.cinnamon.keyboard"/>

diff --git a/data/pam/cinnamon.pam b/data/pam/cinnamon.pam
@@ -0,0 +1,16 @@
+#%PAM-1.0
+
+# Fedora & Arch
+-auth      sufficient   pam_selinux_permit.so
+auth       include      system-auth
+-auth       optional     pam_gnome_keyring.so
+account    include      system-auth
+password   include      system-auth
+session    include      system-auth
+
+# SuSE/Novell
+#auth       include      common-auth
+#auth       optional     pam_gnome_keyring.so
+#account    include      common-account
+#password   include      common-password
+#session    include      common-session
diff --git a/data/pam/cinnamon.pam.debian b/data/pam/cinnamon.pam.debian
@@ -0,0 +1,2 @@
+@include common-auth
+auth optional pam_gnome_keyring.so
diff --git a/data/pam/meson.build b/data/pam/meson.build
@@ -0,0 +1,18 @@
+pamdir = get_option('pam_prefix')
+if pamdir == ''
+  pamdir = sysconfdir
+endif
+
+if get_option('use_debian_pam')
+  install_data(
+    'cinnamon.pam.debian',
+    rename: 'cinnamon',
+    install_dir: join_paths(pamdir, 'pam.d')
+  )
+else
+  install_data(
+    'cinnamon.pam',
+    rename: 'cinnamon',
+    install_dir: join_paths(pamdir, 'pam.d')
+  )
+endif
diff --git a/data/services/meson.build b/data/services/meson.build
@@ -1,4 +1,5 @@
 service_files = [
+  'org.cinnamon.BackupLocker.service',
   'org.cinnamon.CalendarServer.service',
   'org.Cinnamon.HotplugSniffer.service',
   'org.Cinnamon.Melange.service',

diff --git a/data/services/org.cinnamon.BackupLocker.service.in b/data/services/org.cinnamon.BackupLocker.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.cinnamon.BackupLocker
+Exec=@libexecdir@/cinnamon-backup-locker
diff --git a/data/theme/cinnamon-sass/_widgets.scss b/data/theme/cinnamon-sass/_widgets.scss
@@ -6,6 +6,7 @@
 @import 'widgets/calendar';
 @import 'widgets/desklet';
 @import 'widgets/dialogs';
+@import 'widgets/screensaver';
 @import 'widgets/expo';
 @import 'widgets/ibus-popup';
 @import 'widgets/keyboard';

diff --git a/data/theme/cinnamon-sass/widgets/_screensaver.scss b/data/theme/cinnamon-sass/widgets/_screensaver.scss
@@ -0,0 +1,199 @@
+// Screensaver / Lock Screen
+
+.screen-shield {
+  background-color: black;
+
+  .screen-shield-background {
+    background-color: black;
+  }
+
+  // Clock widget
+
+  .clock-widget {
+    padding: 6px;
+    spacing: 6px;
+
+    .clock-time-label {
+      font-size: 50pt;
+      font-weight: bold;
+      color: white;
+      text-align: center;
+      text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.8);
+    }
+
+    .clock-date-label {
+      font-size: 24pt;
+      font-weight: bold;
+      color: white;
+      text-align: center;
+      text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.8);
+    }
+
+    .clock-message-label {
+      font-size: 14pt;
+      font-weight: bold;
+      color: #cccccc;
+      text-align: center;
+      text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.8);
+      margin-top: $base_margin;
+    }
+
+    .clock-message-author {
+      font-size: 12pt;
+      font-weight: bold;
+      color: #acacac;
+      text-align: center;
+      text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.8);
+    }
+  }
+
+  // Album art widget
+
+  .albumart-widget {
+    padding: 10px;
+    spacing: 8px;
+
+    .albumart-info-container {
+      background-color: $bg_color;
+      border-radius: 0;
+      border: 1px solid $borders_color;
+      spacing: $base_margin * 2;
+      min-width: 220px;
+
+      &:awake {
+        border-radius: 0 0 $modal_dialog_radius $modal_dialog_radius;
+      }
+
+      .albumart-cover-bin {
+        padding: 8px;
+        background-color: $bg_color;
+      }
+
+      .albumart-track-info-overlay {
+        spacing: 2px;
+        padding: 6px 6px;
+        background-gradient-direction: vertical;
+        background-gradient-start: transparentize($bg_color, 0.4);
+        background-gradient-end: $bg_color;
+
+        .albumart-title-overlay {
+          font-size: 11pt;
+          font-weight: bold;
+          text-align: center;
+          color: white;
+          text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.8);
+        }
+
+        .albumart-artist-overlay {
+          font-size: 10pt;
+          text-align: center;
+          color: rgba(255, 255, 255, 0.9);
+          text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.8);
+        }
+
+        .albumart-album-overlay {
+          font-size: 10pt;
+          text-align: center;
+          color: rgba(255, 255, 255, 0.8);
+          text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.8);
+        }
+      }
+
+      .albumart-controls {
+        spacing: 8px;
+
+        .albumart-control-button {
+          width: 36px;
+          height: 36px;
+          border-radius: 18px;
+          background-color: transparentize($fg_color, 0.9);
+
+          &:hover {
+            background-color: transparentize($fg_color, 0.8);
+          }
+
+          &:active {
+            background-color: transparentize($fg_color, 0.7);
+          }
+
+          &:insensitive {
+            color: transparentize($fg_color, 0.7);
+            background-color: transparentize($fg_color, 0.95);
+          }
+
+          StIcon {
+            icon-size: 20px;
+          }
+        }
+      }
+
+      .albumart-volume-box {
+        spacing: 8px;
+
+        .albumart-volume-icon {
+          icon-size: 16px;
+        }
+
+        .albumart-volume-slider {
+          height: 20px;
+          min-width: 150px;
+          -slider-height: 4px;
+          -slider-background-color: transparentize($fg_color, 0.8);
+          -slider-border-color: transparent;
+          -slider-active-background-color: $accent_bg_color;
+          -slider-active-border-color: transparent;
+          -slider-border-width: 0;
+          -slider-handle-radius: 8px;
+        }
+      }
+    }
+  }
+
+  // Info panel (notification count + battery indicator)
+
+  .info-panel {
+    padding: 8px;
+    spacing: 12px;
+
+    .notification-widget {
+      spacing: 4px;
+
+      .notification-widget-label {
+        color: white;
+        font-size: 12pt;
+        font-weight: bold;
+        text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.8);
+      }
+
+      .notification-widget-icon {
+        color: white;
+        text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.8);
+      }
+    }
+
+    .power-widget-icon {
+      color: white;
+      text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.8);
+
+      &-critical {
+        color: $error_color;
+      }
+    }
+  }
+
+  // On-screen keyboard toggle
+
+  .osk-activate-button {
+    @extend %button;
+
+    border-radius: 9999px;
+    padding: $base_padding;
+    min-height: 16px;
+
+    StIcon {
+      icon-size: 24px;
+    }
+
+    &.flat { @extend %flat_button; }
+  }
+}
diff --git a/debian/cinnamon.install b/debian/cinnamon.install
@@ -5,3 +5,4 @@ usr/share/applications
 usr/share/dbus-1
 usr/share/man
 usr/share/xdg-desktop-portal
+etc/pam.d
diff --git a/debian/control b/debian/control
@@ -24,12 +24,15 @@ Build-Depends:
  libmuffin-dev (>= 5.3),
  libnm-dev (>= 1.6) [linux-any],
  libnma-dev [linux-any],
+ libpam0g-dev,
  libpolkit-agent-1-dev (>= 0.100),
  libpulse-dev,
  librsvg2-dev,
  libsecret-1-dev,
  libstartup-notification0-dev (>= 0.11),
  libxapp-dev (>= 2.6.0),
+ libxcomposite-dev (>= 1:0.4),
+ libxdo-dev,
  meson,
  pysassc,
  python3:any,
@@ -45,7 +48,6 @@ Depends:
  cinnamon-control-center,
  cinnamon-desktop-data (>= 5.3),
  cinnamon-l10n,
- cinnamon-screensaver,
  cinnamon-session,
  cinnamon-settings-daemon (>= 5.3),
  cjs (>= 4.8),
@@ -118,8 +120,11 @@ Recommends:
  gnome-online-accounts-gtk,
  touchegg,
  ibus,
+ libpam-gnome-keyring,
 Suggests: cinnamon-doc
-Provides: notification-daemon, x-window-manager, polkit-1-auth-agent
+Breaks: cinnamon-screensaver (<< 6.7)
+Replaces: cinnamon-screensaver (<< 6.7)
+Provides: notification-daemon, x-window-manager, polkit-1-auth-agent, cinnamon-screensaver
 Description: Modern Linux desktop
  Cinnamon is a modern Linux desktop which provides advanced innovative
  features and a traditional user experience. It's easy to use, powerful

diff --git a/debian/rules b/debian/rules
@@ -20,7 +20,8 @@ override_dh_auto_configure:
 		-D deprecated_warnings=false \
 		-D exclude_info_settings=true \
 		-D exclude_users_settings=true \
-		-D py3modules_dir=/usr/lib/python3/dist-packages
+		-D py3modules_dir=/usr/lib/python3/dist-packages \
+		-D use_debian_pam=true
 
 # workaround for fix lmde4 build
 override_dh_dwz:

diff --git a/docs/reference/cinnamon/meson.build b/docs/reference/cinnamon/meson.build
@@ -5,6 +5,7 @@ ignore = [
     st_private_headers,
     tray_headers,
     sniffer_headers,
+    backup_locker_headers,
 ]
 
 if not internal_nm_agent
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		@include common-auth
		auth optional pam_gnome_keyring.so