Upgrade of GNOME and Poky

Poky: Yocto-5.2 GNOME: 48.1
Upgrade poky to Yocto-5.1.3 (Styhead)
2025-06-11 14:45:25 +00:00 · 2025-04-06 17:51:28 +00:00 · 2024-11-13 12:07:04 -05:00 · 2024-09-27 07:42:25 -04:00 · 2024-09-10 14:19:59 -04:00 · 2024-09-06 15:25:48 -04:00
201 changed files with 9624 additions and 7570 deletions
--- a/meta-citadel/classes/external-tree.bbclass
+++ b/meta-citadel/classes/external-tree.bbclass
@ -1,5 +1,8 @@

 S = "${WORKDIR}${@source_path(d)}"
+
+CURRENT_SRC_URI := "${SRC_URI}"
+
 SRC_URI = "${@source_uri(d)}"


@ -10,7 +13,7 @@ def source_path(d):
    if tree_path:
        return tree_path
    else:
-        return "/git"
+        return "/" + d.getVar("BP")

 def source_uri(d):
    var = d.getVar("EXTERNAL_TREE_VAR")
@ -19,7 +22,7 @@ def source_uri(d):
    if tree_path:
        return "file://" + tree_path
    else:
-        return d.getVar("GIT_URI")
+        return d.getVar("CURRENT_SRC_URI")

 # Set debug build if $EXTERNAL_TREE_VAR is set for faster builds
 DEBUG_BUILD = "${@debug_build(d)}"
--- a/meta-citadel/conf/layer.conf
+++ b/meta-citadel/conf/layer.conf
@ -14,7 +14,7 @@ BBFILE_COLLECTIONS += "citadel"
 BBFILE_PATTERN_citadel = "^${LAYERDIR}/"
 BBFILE_PRIORITY_citadel = "5"

-LAYERSERIES_COMPAT_citadel = "scarthgap"
+LAYERSERIES_COMPAT_citadel = "walnascar"

 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
--- a/meta-citadel/conf/templates/default/local.conf.sample
+++ b/meta-citadel/conf/templates/default/local.conf.sample
@ -143,8 +143,6 @@ PACKAGE_CLASSES ?= "package_deb"
 #                     e.g. ssh root access has a blank password
 # There are other application targets that can be used here too, see
 # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
-# We default to enabling the debugging tweaks.
-EXTRA_IMAGE_FEATURES ?= "debug-tweaks"

 #
 # Additional image features
--- a/meta-citadel/recipes-citadel/bbappends/base-files_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/base-files_%.bbappend
@ -13,7 +13,7 @@ do_install:append () {
    rm ${D}${sysconfdir}/fstab
    rm ${D}${sysconfdir}/skel/.bashrc
    rm ${D}${sysconfdir}/skel/.profile
-    install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile
+    install -m 0644 ${UNPACKDIR}/profile ${D}${sysconfdir}/profile
    sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}${sysconfdir}/profile
    sed -i 's#@BINDIR@#${bindir}#g' ${D}${sysconfdir}/profile
 }
--- a/meta-citadel/recipes-citadel/bbappends/bluez5_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/bluez5_%.bbappend
@ -1,11 +1 @@
-PACKAGECONFIG = "\
-    readline \
-    systemd \
-    a2dp-profiles \
-    avrcp-profiles \
-    hid-profiles \
-    hog-profiles \
-    tools \
-    deprecated \
-    udev \
-"
+PACKAGECONFIG:remove = "obex-profiles"
--- a/meta-citadel/recipes-citadel/bbappends/gdm_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/gdm_%.bbappend
@ -1,20 +1,14 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/gdm:"

+DEPENDS:remove = "audit"
+
 INSANE_SKIP:${PN}-src = "buildpaths"

 SRC_URI += "file://gdm.conf"
-DEPENDS += "plymouth"
+
+PACKAGECONFIG = "plymouth"

 do_install:append() {
-    install -d ${D}${sysconfdir}/default/volatiles
-    echo "d gdm gdm 755 ${localstatedir}/run/gdm/greeter none" > ${D}${sysconfdir}/default/volatiles/99_gdm
    rm ${D}${sysconfdir}/gdm/custom.conf
-    rm ${D}${libdir}/udev/rules.d/61-gdm.rules
-    install -m 644 ${WORKDIR}/gdm.conf ${D}${sysconfdir}/gdm/custom.conf
+    install -m 644 ${UNPACKDIR}/gdm.conf ${D}${sysconfdir}/gdm/custom.conf
 }
-
-EXTRA_OEMESON = " \
-    -Dplymouth=enabled \
-    -Ddefault-pam-config=openembedded \
-    -Dpam-mod-dir=${base_libdir}/security \
-"
--- a/meta-citadel/recipes-citadel/bbappends/gnome-control-center_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/gnome-control-center_%.bbappend
@ -1 +0,0 @@
-INSANE_SKIP:${PN}-src = "buildpaths"
--- a/meta-citadel/recipes-citadel/bbappends/gnome-terminal_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/gnome-terminal_%.bbappend
@ -10,10 +10,10 @@ SRC_URI += "\
 "

 do_install:append() {
-    install -m 644 ${WORKDIR}/50_gnome-terminal.gschema.override ${D}${datadir}/glib-2.0/schemas
-    install -m 644 ${WORKDIR}/org.gnome.TerminalCitadel.desktop ${D}${datadir}/applications
-    install -m 644 ${WORKDIR}/org.gnome.TerminalCitadel.service ${D}${datadir}/dbus-1/services
-    install -m 644 ${WORKDIR}/gnome-terminal-citadel.service ${D}${systemd_user_unitdir}
+    install -m 644 ${UNPACKDIR}/50_gnome-terminal.gschema.override ${D}${datadir}/glib-2.0/schemas
+    install -m 644 ${UNPACKDIR}/org.gnome.TerminalCitadel.desktop ${D}${datadir}/applications
+    install -m 644 ${UNPACKDIR}/org.gnome.TerminalCitadel.service ${D}${datadir}/dbus-1/services
+    install -m 644 ${UNPACKDIR}/gnome-terminal-citadel.service ${D}${systemd_user_unitdir}
    rm ${D}${datadir}/applications/org.gnome.Terminal.desktop
 }

--- a/meta-citadel/recipes-citadel/bbappends/gobject-introspection_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/gobject-introspection_%.bbappend
@ -1,5 +0,0 @@
-PACKAGES =+ "libgirepository"
-FILES:libgirepository = "\
-    ${libdir}/libgirepository-1.0${SOLIBS} \
-    ${libdir}/girepository-1.0 \
-"
--- a/meta-citadel/recipes-citadel/bbappends/libdevmapper_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/libdevmapper_%.bbappend
--- a/meta-citadel/recipes-citadel/bbappends/llvm_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/llvm_%.bbappend
@ -0,0 +1,3 @@
+
+PACKAGECONFIG="libllvm"
+
--- a/meta-citadel/recipes-citadel/bbappends/llvm_git.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/llvm_git.bbappend
@ -1 +0,0 @@
-EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=MinSizeRel "
--- a/meta-citadel/recipes-citadel/bbappends/lvm2_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/lvm2_%.bbappend
--- a/meta-citadel/recipes-citadel/bbappends/mozjs-115_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/mozjs-115_%.bbappend
@ -1 +0,0 @@
-INSANE_SKIP:${PN}-src = "buildpaths"
--- a/meta-citadel/recipes-citadel/bbappends/networkmanager_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/networkmanager_%.bbappend
@ -3,16 +3,12 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/networkmanager:"

 SRC_URI += "\
    file://NetworkManager.conf \
-    file://watch-resolvconf.path \
-    file://watch-resolvconf.service \
 "

 SYSTEMD_SERVICE:${PN} += "watch-resolvconf.path"

 do_install:append() {
-    install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager/
-    install -m 644 ${WORKDIR}/watch-resolvconf.path ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/watch-resolvconf.service ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager/
 }
 PACKAGECONFIG = "nss systemd polkit wifi iwd vala nmcli bluez5"
 NETWORKMANAGER_FIREWALL_DEFAULT = "iptables"
--- a/meta-citadel/recipes-citadel/bbappends/plymouth.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/plymouth.bbappend
@ -1,2 +0,0 @@
-PACKAGECONFIG = "pango drm gtk"
-
--- a/meta-citadel/recipes-citadel/bbappends/systemd/0001-Modify-systemd-to-use-localtime-in-storage-citadel-s.patch
+++ b/meta-citadel/recipes-citadel/bbappends/systemd/0001-Modify-systemd-to-use-localtime-in-storage-citadel-s.patch
@ -0,0 +1,244 @@
+From 14cd68b1fdd3a16a3aa2892f9216096bea02173d Mon Sep 17 00:00:00 2001
+From: isa <isa@subgraph.com>
+Date: Thu, 11 Jul 2024 18:58:40 +0000
+Subject: [PATCH] Modify systemd to use localtime in /storage/citadel-state
+Upstream-Status: Inappropriate [citadel specific]
+
+---
+ src/basic/time-util.c              |  4 ++--
+ src/core/manager.c                 | 18 +++++++++---------
+ src/core/manager.h                 |  2 +-
+ src/core/unit.h                    |  2 +-
+ src/firstboot/firstboot.c          | 20 ++++++++++----------
+ src/timedate/timedated.c           | 12 ++++++------
+ units/systemd-timedated.service.in |  2 +-
+ 7 files changed, 30 insertions(+), 30 deletions(-)
+
+diff --git a/src/basic/time-util.c b/src/basic/time-util.c
+index b94f37c31c..00ee790b60 100644
+--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
+@@ -1610,14 +1610,14 @@ int get_timezone(char **ret) {
+ 
+         assert(ret);
+ 
+-        r = readlink_malloc("/etc/localtime", &t);
+        r = readlink_malloc("/storage/citadel-state/localtime", &t);
+         if (r == -ENOENT)
+                 /* If the symlink does not exist, assume "UTC", like glibc does */
+                 return strdup_to(ret, "UTC");
+         if (r < 0)
+                 return r; /* Return EINVAL if not a symlink */
+ 
+-        const char *e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../usr/share/zoneinfo/");
+        const char *e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../../usr/share/zoneinfo/");
+         if (!e)
+                 return -EINVAL;
+         if (!timezone_is_valid(e, LOG_DEBUG))
+diff --git a/src/core/manager.c b/src/core/manager.c
+index 5997ef0cf1..21562cde8e 100644
+--- a/src/core/manager.c
+++ b/src/core/manager.c
+@@ -415,9 +415,9 @@ static int manager_read_timezone_stat(Manager *m) {
+ 
+         assert(m);
+ 
+-        /* Read the current stat() data of /etc/localtime so that we detect changes */
+-        if (lstat("/etc/localtime", &st) < 0) {
+-                log_debug_errno(errno, "Failed to stat /etc/localtime, ignoring: %m");
+        /* Read the current stat() data of /storage/citadel-state/localtime so that we detect changes */
+        if (lstat("/storage/citadel-state/localtime", &st) < 0) {
+                log_debug_errno(errno, "Failed to stat /storage/citadel-state/localtime, ignoring: %m");
+                 changed = m->etc_localtime_accessible;
+                 m->etc_localtime_accessible = false;
+         } else {
+@@ -442,7 +442,7 @@ static int manager_setup_timezone_change(Manager *m) {
+         if (MANAGER_IS_TEST_RUN(m))
+                 return 0;
+ 
+-        /* We watch /etc/localtime for three events: change of the link count (which might mean removal from /etc even
+        /* We watch /storage/citadel-state/localtime for three events: change of the link count (which might mean removal from /etc even
+          * though another link might be kept), renames, and file close operations after writing. Note we don't bother
+          * with IN_DELETE_SELF, as that would just report when the inode is removed entirely, i.e. after the link count
+          * went to zero and all fds to it are closed.
+@@ -453,14 +453,14 @@ static int manager_setup_timezone_change(Manager *m) {
+          * Note that we create the new event source first here, before releasing the old one. This should optimize
+          * behaviour as this way sd-event can reuse the old watch in case the inode didn't change. */
+ 
+-        r = sd_event_add_inotify(m->event, &new_event, "/etc/localtime",
+        r = sd_event_add_inotify(m->event, &new_event, "/storage/citadel-state/localtime",
+                                  IN_ATTRIB|IN_MOVE_SELF|IN_CLOSE_WRITE|IN_DONT_FOLLOW, manager_dispatch_timezone_change, m);
+         if (r == -ENOENT) {
+                 /* If the file doesn't exist yet, subscribe to /etc instead, and wait until it is created either by
+                  * O_CREATE or by rename() */
+ 
+-                log_debug_errno(r, "/etc/localtime doesn't exist yet, watching /etc instead.");
+-                r = sd_event_add_inotify(m->event, &new_event, "/etc",
+                log_debug_errno(r, "/storage/citadel-state/localtime doesn't exist yet, watching /storage/citadel-state instead.");
+                r = sd_event_add_inotify(m->event, &new_event, "/storage/citadel-state",
+                                          IN_CREATE|IN_MOVED_TO|IN_ONLYDIR, manager_dispatch_timezone_change, m);
+         }
+         if (r < 0)
+@@ -3258,13 +3258,13 @@ static int manager_dispatch_timezone_change(
+         int changed;
+         Unit *u;
+ 
+-        log_debug("inotify event for /etc/localtime");
+        log_debug("inotify event for /storage/citadel-state/localtime");
+ 
+         changed = manager_read_timezone_stat(m);
+         if (changed <= 0)
+                 return changed;
+ 
+-        /* Something changed, restart the watch, to ensure we watch the new /etc/localtime if it changed */
+        /* Something changed, restart the watch, to ensure we watch the new /storage/citadel-state/localtime if it changed */
+         (void) manager_setup_timezone_change(m);
+ 
+         /* Read the new timezone */
+diff --git a/src/core/manager.h b/src/core/manager.h
+index 0641b2726f..47a092868c 100644
+--- a/src/core/manager.h
+++ b/src/core/manager.h
+@@ -377,7 +377,7 @@ struct Manager {
+ 
+         unsigned gc_marker;
+ 
+-        /* The stat() data the last time we saw /etc/localtime */
+        /* The stat() data the last time we saw /storage/citadel-state/localtime */
+         usec_t etc_localtime_mtime;
+         bool etc_localtime_accessible;
+ 
+diff --git a/src/core/unit.h b/src/core/unit.h
+index b135fecc51..4654f976f6 100644
+--- a/src/core/unit.h
+++ b/src/core/unit.h
+@@ -657,7 +657,7 @@ typedef struct UnitVTable {
+         /* Called whenever CLOCK_REALTIME made a jump */
+         void (*time_change)(Unit *u);
+ 
+-        /* Called whenever /etc/localtime was modified */
+        /* Called whenever /storage/citadel-state/localtime was modified */
+         void (*timezone_change)(Unit *u);
+ 
+         /* Returns the next timeout of a unit */
+diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
+index 0dbdfc6638..04a292f4fb 100644
+--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
+@@ -608,15 +608,15 @@ static int process_timezone(int rfd) {
+ 
+         assert(rfd >= 0);
+ 
+-        pfd = chase_and_open_parent_at(rfd, "/etc/localtime",
+        pfd = chase_and_open_parent_at(rfd, "/storage/citadel-state/localtime",
+                                        CHASE_AT_RESOLVE_IN_ROOT|CHASE_MKDIR_0755|CHASE_WARN|CHASE_NOFOLLOW,
+                                        &f);
+         if (pfd < 0)
+-                return log_error_errno(pfd, "Failed to chase /etc/localtime: %m");
+                return log_error_errno(pfd, "Failed to chase /storage/citadel-state/localtime: %m");
+ 
+         r = should_configure(pfd, f);
+         if (r == 0)
+-                log_debug("Found /etc/localtime, assuming timezone has been configured.");
+                log_debug("Found /storage/citadel-state/localtime, assuming timezone has been configured.");
+         if (r <= 0)
+                 return r;
+ 
+@@ -627,16 +627,16 @@ static int process_timezone(int rfd) {
+         if (arg_copy_timezone && r == 0) {
+                 _cleanup_free_ char *s = NULL;
+ 
+-                r = readlink_malloc("/etc/localtime", &s);
+                r = readlink_malloc("/storage/citadel-state/localtime", &s);
+                 if (r != -ENOENT) {
+                         if (r < 0)
+-                                return log_error_errno(r, "Failed to read host's /etc/localtime: %m");
+                                return log_error_errno(r, "Failed to read host's /storage/citadel-state/localtime: %m");
+ 
+                         r = symlinkat_atomic_full(s, pfd, f, /* make_relative= */ false);
+                         if (r < 0)
+-                                return log_error_errno(r, "Failed to create /etc/localtime symlink: %m");
+                                return log_error_errno(r, "Failed to create /storage/citadel-state/localtime symlink: %m");
+ 
+-                        log_info("Copied host's /etc/localtime.");
+                        log_info("Copied host's /storage/citadel-state/localtime.");
+                         return 0;
+                 }
+         }
+@@ -652,9 +652,9 @@ static int process_timezone(int rfd) {
+ 
+         r = symlinkat_atomic_full(e, pfd, f, /* make_relative= */ false);
+         if (r < 0)
+-                return log_error_errno(r, "Failed to create /etc/localtime symlink: %m");
+                return log_error_errno(r, "Failed to create /storage/citadel-state/localtime symlink: %m");
+ 
+-        log_info("/etc/localtime written");
+        log_info("/storage/citadel-state/localtime written");
+         return 0;
+ }
+ 
+@@ -1240,7 +1240,7 @@ static int process_reset(int rfd) {
+                        "/etc/hostname",
+                        "/etc/machine-id",
+                        "/etc/kernel/cmdline",
+-                       "/etc/localtime") {
+                       "/storage/citadel-state/localtime") {
+                 r = reset_one(rfd, p);
+                 if (r < 0)
+                         return r;
+diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
+index e3b4367ec0..4693a0214e 100644
+--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
+@@ -280,9 +280,9 @@ static int context_read_data(Context *c) {
+ 
+         r = get_timezone(&t);
+         if (r == -EINVAL)
+-                log_warning_errno(r, "/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/.");
+                log_warning_errno(r, "/storage/citadel-state/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/.");
+         else if (r < 0)
+-                log_warning_errno(r, "Failed to get target of /etc/localtime: %m");
+                log_warning_errno(r, "Failed to get target of /storage/citadel-state/localtime: %m");
+ 
+         free_and_replace(c->zone, t);
+ 
+@@ -306,22 +306,22 @@ static int context_write_data_timezone(Context *c) {
+ 
+                 if (access("/usr/share/zoneinfo/UTC", F_OK) < 0) {
+ 
+-                        if (unlink("/etc/localtime") < 0 && errno != ENOENT)
+                        if (unlink("/storage/citadel-state/localtime") < 0 && errno != ENOENT)
+                                 return -errno;
+ 
+                         return 0;
+                 }
+ 
+-                source = "../usr/share/zoneinfo/UTC";
+                source = "../../usr/share/zoneinfo/UTC";
+         } else {
+-                p = path_join("../usr/share/zoneinfo", c->zone);
+                p = path_join("../../usr/share/zoneinfo", c->zone);
+                 if (!p)
+                         return -ENOMEM;
+ 
+                 source = p;
+         }
+ 
+-        return symlink_atomic(source, "/etc/localtime");
+        return symlink_atomic(source, "/storage/citadel-state/localtime");
+ }
+ 
+ static int context_write_data_local_rtc(Context *c) {
+diff --git a/units/systemd-timedated.service.in b/units/systemd-timedated.service.in
+index 06c3306a6e..5c3fe18ed0 100644
+--- a/units/systemd-timedated.service.in
+++ b/units/systemd-timedated.service.in
+@@ -32,7 +32,7 @@ ProtectKernelLogs=yes
+ ProtectKernelModules=yes
+ ProtectKernelTunables=yes
+ ProtectSystem=strict
+-ReadWritePaths=/etc
+ReadWritePaths=/storage/citadel-state
+ RestrictAddressFamilies=AF_UNIX
+ RestrictNamespaces=yes
+ RestrictRealtime=yes
--- a/meta-citadel/recipes-citadel/bbappends/systemd_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/systemd_%.bbappend
@ -8,11 +8,19 @@ ALTERNATIVE:${PN}:remove = "resolv-conf"

 GROUPADD_PARAM:${PN} += "-r wheel; -r kvm; -r render"
 PACKAGECONFIG = "\
-    efi acl ldconfig pam usrmerge rfkill backlight binfmt hostnamed localed logind machined myhostname \
-    nss polkit randomseed seccomp timedated utmp timesyncd kmod sysusers gshadow cryptsetup cgroupv2 \
+    efi acl ldconfig pam rfkill backlight binfmt hostnamed localed logind machined myhostname \
+    nss polkit randomseed seccomp timedated utmp timesyncd kmod sysusers gshadow cryptsetup \
 "

+# This is to avoid deletion of tmp.mount
+#   see do_install() in systemd recipe.
+FILESYSTEM_PERMS_TABLES += "files/fs-perms-volatile-tmp.txt"
+
 do_install:append() {
    rm -f ${D}${sysconfdir}/tmpfiles.d/00-create-volatile.conf
    ln -s rescue.target ${D}${systemd_unitdir}/system/kbrequest.target
 }
+
+SRC_URI += " \
+            file://0001-Modify-systemd-to-use-localtime-in-storage-citadel-s.patch \
+           "
--- a/meta-citadel/recipes-citadel/bbappends/tzdata%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/tzdata%.bbappend
@ -0,0 +1,5 @@
+pkg_postinst:${PN}() {
+	etc_lt="$D${sysconfdir}/localtime"
+
+    ln -sf ../storage/citadel-state/localtime $etc_lt
+}
--- a/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb
+++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb
@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384

 DEPENDS = "dconf-native"

-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"

 SRC_URI = "\
    file://gsettings/90_citadel.gschema.override \
--- a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
+++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 SECTION = ""
 DEPENDS = ""

-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"

 DEFAULT_REALM_UNITS = "\
    file://systemd/citadel-launch-default-realm.path \
@ -41,6 +42,7 @@ SRC_URI = "\
    file://share/dot.profile \
    file://share/dot.vimrc \
    file://polkit/citadel.rules \
+    file://polkit/gnome-control-center.rules \
    file://citadel-installer.session \
    file://citadel-installer.json \
    file://citadel-installer.desktop \
@ -50,6 +52,9 @@ SRC_URI = "\
    file://systemd/citadel-installer-backend.service \
    file://systemd/installer-session-switcher.service \
    file://systemd/user/gnome-session@citadel-installer.target.d/session.conf \
+    file://icons/citadel-installer.svg \
+    file://systemd/watch-resolvconf.service \
+    file://systemd/watch-resolvconf.path \
    file://skel/profile \
    file://skel/bashrc \
    file://skel/vimrc \
@ -66,7 +71,7 @@ SRC_URI = "\
 "

 USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "-m -u 1000 -s /bin/bash citadel"
+USERADD_PARAM:${PN} = "-m -u 1000 -G wheel -s /bin/bash citadel"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"

 # for citadel-ifconfig.sh
@ -74,7 +79,7 @@ RDEPENDS:${PN} = "bash"

 inherit allarch systemd useradd

-SYSTEMD_SERVICE:${PN} = "zram-swap.service citadel-launch-default-realm.path x11-session-switcher.service citadel-installer-backend.service installer-session-switcher.service citadel-setpassword.service"
+SYSTEMD_SERVICE:${PN} = "zram-swap.service citadel-launch-default-realm.path x11-session-switcher.service citadel-installer-backend.service installer-session-switcher.service citadel-setpassword.service watch-resolvconf.service watch-resolvconf.path"

 do_install() {
    install -m 0755 -d ${D}/storage
@ -103,55 +108,58 @@ do_install() {
    install -m 0755 -d ${D}${datadir}/applications
    install -m 0755 -d ${D}${datadir}/wayland-sessions

-    install -m 0644 ${WORKDIR}/locale.conf ${D}${sysconfdir}/locale.conf
-    install -m 0644 ${WORKDIR}/environment.sh ${D}${sysconfdir}/profile.d/environment.sh
-    install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
-    install -m 0440 ${WORKDIR}/sudo-citadel ${D}${sysconfdir}/sudoers.d/citadel
-    install -m 0644 ${WORKDIR}/00-storage-tmpfiles.conf ${D}${sysconfdir}/tmpfiles.d
-    #install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager
+    install -m 0644 ${UNPACKDIR}/locale.conf ${D}${sysconfdir}/locale.conf
+    install -m 0644 ${UNPACKDIR}/environment.sh ${D}${sysconfdir}/profile.d/environment.sh
+    install -m 0644 ${UNPACKDIR}/fstab ${D}${sysconfdir}/fstab
+    install -m 0440 ${UNPACKDIR}/sudo-citadel ${D}${sysconfdir}/sudoers.d/citadel
+    install -m 0644 ${UNPACKDIR}/00-storage-tmpfiles.conf ${D}${sysconfdir}/tmpfiles.d
+    #install -m 0644 ${UNPACKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager

    install -d ${D}${systemd_system_unitdir}

-    install -m 644 ${WORKDIR}/systemd/zram-swap.service ${D}${systemd_system_unitdir}
+    install -m 644 ${UNPACKDIR}/systemd/zram-swap.service ${D}${systemd_system_unitdir}

-    install -m 644 ${WORKDIR}/systemd/x11-session-switcher.service ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/systemd/citadel-installer-backend.service ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/systemd/installer-session-switcher.service ${D}${systemd_system_unitdir}
+    install -m 644 ${UNPACKDIR}/systemd/x11-session-switcher.service ${D}${systemd_system_unitdir}
+    install -m 644 ${UNPACKDIR}/systemd/citadel-installer-backend.service ${D}${systemd_system_unitdir}
+    install -m 644 ${UNPACKDIR}/systemd/installer-session-switcher.service ${D}${systemd_system_unitdir}

-    install -m 644 ${WORKDIR}/systemd/citadel-setpassword.service ${D}${systemd_system_unitdir}
-    install -m 0754 ${WORKDIR}/citadel-setpassword.sh ${D}${libexecdir}
+    install -m 644 ${UNPACKDIR}/systemd/watch-resolvconf.service ${D}${systemd_system_unitdir}
+    install -m 644 ${UNPACKDIR}/systemd/watch-resolvconf.path ${D}${systemd_system_unitdir}
+
+    install -m 644 ${UNPACKDIR}/systemd/citadel-setpassword.service ${D}${systemd_system_unitdir}
+    install -m 0754 ${UNPACKDIR}/citadel-setpassword.sh ${D}${libexecdir}
    install -d ${D}${systemd_user_unitdir}/gnome-session@citadel-installer.target.d
-    install -m 644 ${WORKDIR}/systemd/user/gnome-session@citadel-installer.target.d/session.conf ${D}${systemd_user_unitdir}/gnome-session@citadel-installer.target.d
+    install -m 644 ${UNPACKDIR}/systemd/user/gnome-session@citadel-installer.target.d/session.conf ${D}${systemd_user_unitdir}/gnome-session@citadel-installer.target.d

-    install -m 644 ${WORKDIR}/systemd/citadel-launch-default-realm.path ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/systemd/citadel-launch-default-realm.service ${D}${systemd_system_unitdir}
+    install -m 644 ${UNPACKDIR}/systemd/citadel-launch-default-realm.path ${D}${systemd_system_unitdir}
+    install -m 644 ${UNPACKDIR}/systemd/citadel-launch-default-realm.service ${D}${systemd_system_unitdir}

    # skel files for new realms
-    install -m 644 -T ${WORKDIR}/skel/profile ${D}${sysconfdir}/skel/.profile
-    install -m 644 -T ${WORKDIR}/skel/bashrc ${D}${sysconfdir}/skel/.bashrc
-    install -m 644 -T ${WORKDIR}/skel/vimrc ${D}${sysconfdir}/skel/.vimrc
-    install -m 644 -T ${WORKDIR}/skel/init.vim ${D}${sysconfdir}/skel/.config/nvim/init.vim
+    install -m 644 -T ${UNPACKDIR}/skel/profile ${D}${sysconfdir}/skel/.profile
+    install -m 644 -T ${UNPACKDIR}/skel/bashrc ${D}${sysconfdir}/skel/.bashrc
+    install -m 644 -T ${UNPACKDIR}/skel/vimrc ${D}${sysconfdir}/skel/.vimrc
+    install -m 644 -T ${UNPACKDIR}/skel/init.vim ${D}${sysconfdir}/skel/.config/nvim/init.vim

-    install -m 0644 ${WORKDIR}/sysctl/90-citadel-sysctl.conf ${D}${libdir}/sysctl.d/
+    install -m 0644 ${UNPACKDIR}/sysctl/90-citadel-sysctl.conf ${D}${libdir}/sysctl.d/

-    install -m 0644 ${WORKDIR}/udev/citadel-network.rules ${D}${sysconfdir}/udev/rules.d/
-    install -m 0755 ${WORKDIR}/citadel-ifconfig.sh ${D}${libexecdir}
+    install -m 0644 ${UNPACKDIR}/udev/citadel-network.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0755 ${UNPACKDIR}/citadel-ifconfig.sh ${D}${libexecdir}

-    install -m 0644 ${WORKDIR}/udev/pci-pm.rules ${D}${sysconfdir}/udev/rules.d/
-    install -m 0644 ${WORKDIR}/udev/udisks2-hide.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${UNPACKDIR}/udev/pci-pm.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${UNPACKDIR}/udev/udisks2-hide.rules ${D}${sysconfdir}/udev/rules.d/

-    install -m 0644 ${WORKDIR}/citadel-installer.session ${D}${datadir}/gnome-session/sessions/
-    install -m 0644 ${WORKDIR}/citadel-installer.json ${D}${datadir}/gnome-shell/modes/
-    install -m 0644 ${WORKDIR}/citadel-installer-ui.desktop ${D}${datadir}/applications/
-    install -m 0644 ${WORKDIR}/citadel-installer.desktop ${D}${datadir}/wayland-sessions/
+    install -m 0644 ${UNPACKDIR}/citadel-installer.session ${D}${datadir}/gnome-session/sessions/
+    install -m 0644 ${UNPACKDIR}/citadel-installer.json ${D}${datadir}/gnome-shell/modes/
+    install -m 0644 ${UNPACKDIR}/citadel-installer-ui.desktop ${D}${datadir}/applications/
+    install -m 0644 ${UNPACKDIR}/citadel-installer.desktop ${D}${datadir}/wayland-sessions/

-    install -m 0644 ${WORKDIR}/share/dot.bashrc ${D}${datadir}/factory/home/root/.bashrc
-    install -m 0644 ${WORKDIR}/share/dot.profile ${D}${datadir}/factory/home/root/.profile
-    install -m 0644 ${WORKDIR}/share/dot.vimrc ${D}${datadir}/factory/home/root/.vimrc
+    install -m 0644 ${UNPACKDIR}/share/dot.bashrc ${D}${datadir}/factory/home/root/.bashrc
+    install -m 0644 ${UNPACKDIR}/share/dot.profile ${D}${datadir}/factory/home/root/.profile
+    install -m 0644 ${UNPACKDIR}/share/dot.vimrc ${D}${datadir}/factory/home/root/.vimrc

-    install -m 0644 ${WORKDIR}/share/dot.bashrc ${D}${datadir}/factory/home/citadel/.bashrc
-    install -m 0644 ${WORKDIR}/share/dot.profile ${D}${datadir}/factory/home/citadel/.profile
-    install -m 0644 ${WORKDIR}/share/dot.vimrc ${D}${datadir}/factory/home/citadel/.vimrc
+    install -m 0644 ${UNPACKDIR}/share/dot.bashrc ${D}${datadir}/factory/home/citadel/.bashrc
+    install -m 0644 ${UNPACKDIR}/share/dot.profile ${D}${datadir}/factory/home/citadel/.profile
+    install -m 0644 ${UNPACKDIR}/share/dot.vimrc ${D}${datadir}/factory/home/citadel/.vimrc


    # To avoid these warnings:
@ -159,18 +167,23 @@ do_install() {
    #     [pulseaudio] authkey.c: Failed to open cookie file '/home/citadel/.config/pulse/cookie': No such file or directory
    #

-    install -m 0600 ${WORKDIR}/pulse/cookie ${D}${datadir}/factory/home/citadel/.config/pulse/cookie
+    install -m 0600 ${UNPACKDIR}/pulse/cookie ${D}${datadir}/factory/home/citadel/.config/pulse/cookie


-    install -m 0644 ${WORKDIR}/polkit/citadel.rules ${D}${sysconfdir}/polkit-1/rules.d/
+    install -m 0644 ${UNPACKDIR}/polkit/citadel.rules ${D}${sysconfdir}/polkit-1/rules.d/
+    install -m 0644 ${UNPACKDIR}/polkit/gnome-control-center.rules ${D}${sysconfdir}/polkit-1/rules.d/

-    install -m 0644 ${WORKDIR}/modprobe.d/audio_powersave.conf ${D}${sysconfdir}/modprobe.d/
+    install -m 0644 ${UNPACKDIR}/modprobe.d/audio_powersave.conf ${D}${sysconfdir}/modprobe.d/

-    install -m 0644 ${WORKDIR}/iwd/main.conf ${D}${sysconfdir}/iwd/
+    install -m 0644 ${UNPACKDIR}/iwd/main.conf ${D}${sysconfdir}/iwd/

    install -d ${D}${datadir}/apt-cacher-ng/conf
-    install -m 0644 ${WORKDIR}/apt-cacher-ng/acng.conf ${D}${datadir}/apt-cacher-ng/conf/
-    install -m 0644 ${WORKDIR}/apt-cacher-ng/security.conf ${D}${datadir}/apt-cacher-ng/conf/
+    install -m 0644 ${UNPACKDIR}/apt-cacher-ng/acng.conf ${D}${datadir}/apt-cacher-ng/conf/
+    install -m 0644 ${UNPACKDIR}/apt-cacher-ng/security.conf ${D}${datadir}/apt-cacher-ng/conf/
+
+    # icons
+    mkdir ${D}${datadir}/icons/
+    install -m 0644 ${UNPACKDIR}/icons/citadel-installer.svg ${D}${datadir}/icons/

    # This probably belongs in lvm2 recipe
    install -d ${D}${systemd_system_unitdir}/sysinit.target.wants
--- a/meta-citadel/recipes-citadel/citadel-config/files/citadel-installer-ui.desktop
+++ b/meta-citadel/recipes-citadel/citadel-config/files/citadel-installer-ui.desktop
@ -3,6 +3,6 @@ Name=Citadel Installer
 Comment=This session logs you into the Citadel Installer 
 Exec=/usr/libexec/citadel-installer-ui
 TryExec=/usr/libexec/citadel-installer-ui
-Icon=
+Icon=/usr/share/icons/citadel-installer.svg
 Type=Application

--- a/meta-citadel/recipes-citadel/citadel-config/files/icons/citadel-installer.svg
+++ b/meta-citadel/recipes-citadel/citadel-config/files/icons/citadel-installer.svg
@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="64"
+   height="64"
+   version="1.1"
+   id="svg13"
+   sodipodi:docname="citadel-installer.svg"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview13"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="15.0625"
+     inkscape:cx="31.966805"
+     inkscape:cy="31.966805"
+     inkscape:window-width="3840"
+     inkscape:window-height="2090"
+     inkscape:window-x="0"
+     inkscape:window-y="34"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg13" />
+  <rect
+     style="opacity:0.2;fill:#b6150c;fill-opacity:1"
+     width="56"
+     height="17"
+     x="4"
+     y="44"
+     rx="2.8"
+     ry="2.8"
+     id="rect1" />
+  <path
+     style="fill:#b60c12;fill-opacity:1;opacity:0.04"
+     d="m 18.25,4 h 27.5 C 50.3205,4 54,7.7045 54,12.275 V 46.65 c 0,4.5705 -3.6795,8.25 -8.25,8.25 H 18.25 C 13.6795,54.9 10,51.2205 10,46.65 V 12.275 C 10,7.7045 13.6795,4 18.25,4 Z"
+     id="path1" />
+  <path
+     style="opacity:0.1;fill:#b60c12;fill-opacity:1"
+     transform="matrix(2.2773394,0,0,1.2576563,-4.4374303,-4.805362)"
+     d="m 10.950248,26.084524 5.049752,0 5.049752,0 -2.524876,4.373214 L 16,34.830952 13.475124,30.457738 Z"
+     id="path2" />
+  <path
+     style="fill:#b6150c;fill-opacity:1"
+     transform="matrix(2.2773394,0,0,1.2576563,-4.4374303,-5.8053658)"
+     d="m 10.950248,26.084524 5.049752,0 5.049752,0 -2.524876,4.373214 L 16,34.830952 13.475124,30.457738 Z"
+     id="path3" />
+  <rect
+     style="opacity:0.8;fill:#b6150c;fill-opacity:1"
+     width="6"
+     height="6"
+     x="26"
+     y="9"
+     id="rect3" />
+  <rect
+     style="opacity:0.2;fill:#b6150c;fill-opacity:1"
+     width="6"
+     height="6"
+     x="32"
+     y="9"
+     id="rect4" />
+  <rect
+     style="opacity:0.4;fill:#b6150c;fill-opacity:1"
+     width="6"
+     height="6"
+     x="26"
+     y="15"
+     id="rect5" />
+  <rect
+     style="opacity:0.9;fill:#b6150c;fill-opacity:1"
+     width="6"
+     height="6"
+     x="32"
+     y="15"
+     id="rect6" />
+  <rect
+     style="fill:#b6150c;fill-opacity:1"
+     width="6"
+     height="6"
+     x="26"
+     y="21"
+     id="rect7" />
+  <rect
+     style="opacity:0.6;fill:#b6150c;fill-opacity:1"
+     width="6"
+     height="6"
+     x="32"
+     y="21"
+     id="rect8" />
+  <rect
+     style="fill:#b6150c;fill-opacity:1"
+     width="56"
+     height="17"
+     x="4"
+     y="43"
+     rx="2.8"
+     ry="2.8"
+     id="rect9" />
+  <rect
+     style="opacity:0.2"
+     width="22.4"
+     height="1"
+     x="12.4"
+     y="53"
+     id="rect10" />
+  <path
+     style="opacity:0.3"
+     d="M 51.5 47 A 4.5 4.5 0 0 0 47.267578 50 L 32.400391 50 L 32.400391 53 L 47.267578 53 A 4.5 4.5 0 0 0 51.5 56 A 4.5 4.5 0 0 0 56 51.5 A 4.5 4.5 0 0 0 51.5 47 z"
+     id="path10" />
+  <circle
+     style="opacity:0.2"
+     cx="12.5"
+     cy="52.5"
+     r="4.5"
+     id="circle10" />
+  <circle
+     style="fill:#ffffff"
+     cx="12.5"
+     cy="51.5"
+     r="4.5"
+     id="circle11" />
+  <rect
+     style="fill:#ffffff"
+     width="22.4"
+     height="3"
+     x="12.4"
+     y="50"
+     id="rect11" />
+  <circle
+     style="opacity:0.2"
+     cx="31.5"
+     cy="52.5"
+     r="4.5"
+     id="circle12" />
+  <circle
+     style="fill:#ffffff"
+     cx="31.5"
+     cy="51.5"
+     r="4.5"
+     id="circle13" />
+  <path
+     style="fill:#ffffff;opacity:0.2"
+     d="M 18.25 4 C 13.6795 4 10 7.7048906 10 12.275391 L 10 13.275391 C 10 8.7048906 13.6795 5 18.25 5 L 45.75 5 C 50.3205 5 54 8.7048906 54 13.275391 L 54 12.275391 C 54 7.7048906 50.3205 4 45.75 4 L 18.25 4 z"
+     id="path13" />
+</svg>
--- a/meta-citadel/recipes-citadel/citadel-config/files/polkit/gnome-control-center.rules
+++ b/meta-citadel/recipes-citadel/citadel-config/files/polkit/gnome-control-center.rules
@ -0,0 +1,13 @@
+polkit.addRule(function(action, subject) {
+	if ((action.id == "org.freedesktop.locale1.set-locale" ||
+	     action.id == "org.freedesktop.locale1.set-keyboard" ||
+	     action.id == "org.freedesktop.ModemManager1.Device.Control" ||
+	     action.id == "org.freedesktop.hostname1.set-static-hostname" ||
+	     action.id == "org.freedesktop.hostname1.set-hostname" ||
+	     action.id == "org.gnome.controlcenter.datetime.configure") &&
+	    subject.local &&
+	    subject.active &&
+	    subject.isInGroup ("citadel")) {
+		    return polkit.Result.YES;
+	    }
+});
--- a/meta-citadel/recipes-citadel/citadel-config/files/systemd/watch-resolvconf.path
+++ b/meta-citadel/recipes-citadel/citadel-config/files/systemd/watch-resolvconf.path
@ -6,4 +6,4 @@ PathChanged=/run/NetworkManager
 MakeDirectory=true

 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
--- a/meta-citadel/recipes-citadel/citadel-config/files/systemd/watch-resolvconf.service
+++ b/meta-citadel/recipes-citadel/citadel-config/files/systemd/watch-resolvconf.service
@ -4,4 +4,4 @@ ConditionPathExists=/run/NetworkManager/resolv.conf
 ConditionPathExists=/storage/citadel-state
 [Service]
 Type=oneshot
-ExecStart=/bin/cp /run/NetworkManager/resolv.conf /storage/citadel-state/resolv.conf
+ExecStart=/bin/cp /run/NetworkManager/resolv.conf /storage/citadel-state/resolv.conf
--- a/meta-citadel/recipes-citadel/citadel-documentation/citadel-documentation.bb
+++ b/meta-citadel/recipes-citadel/citadel-documentation/citadel-documentation.bb
@ -13,8 +13,8 @@ do_install() {
    install -m 0755 -d ${D}${datadir}/citadel-documentation
    install -m 0755 -d ${D}${datadir}/applications

-    install -m 0644 ${WORKDIR}/pages/*.page ${D}${datadir}/citadel-documentation
-    install -m 0644 ${WORKDIR}/citadel-documentation.desktop ${D}${datadir}/applications
+    install -m 0644 ${UNPACKDIR}/pages/*.page ${D}${datadir}/citadel-documentation
+    install -m 0644 ${UNPACKDIR}/citadel-documentation.desktop ${D}${datadir}/applications
 }

 FILES:${PN} = "/"
--- a/meta-citadel/recipes-citadel/citadel-realms/citadel-realms.bb
+++ b/meta-citadel/recipes-citadel/citadel-realms/citadel-realms.bb
@ -0,0 +1,21 @@
+LICENSE="CLOSED"
+
+SRC_URI = "gitsm://git.subgraph.com/brl/citadel-realms.git;protocol=https;branch=master"
+
+PV = "1.0"
+SRCREV = "048002a617d643b61774d69edee1526d4c7adbdf"
+
+S = "${WORKDIR}/git"
+
+APPNAME="com.subgraph.citadel.Realms"
+
+GTKIC_VERSION = "4"
+
+FILES:${PN} += "${datadir}/icons \
+                ${datadir}/${APPNAME} \
+"
+
+DEPENDS = "gjs gtk4 libadwaita"
+
+inherit meson gtk-icon-cache
+
--- a/meta-citadel/recipes-citadel/images/citadel-image.inc
+++ b/meta-citadel/recipes-citadel/images/citadel-image.inc
@ -5,7 +5,7 @@ CITADEL_IMAGE_VERSION_rootfs = "1"
 CITADEL_IMAGE_VERSION_extra = "1"
 CITADEL_IMAGE_VERSION_kernel = "1"

-CITADEL_KERNEL_VERSION = "6.9.1"
+CITADEL_KERNEL_VERSION = "6.14.0"

 CITADEL_KERNEL_CONFIG = "${COREBASE}/../meta-citadel/recipes-kernel/citadel-kernel/files/defconfig"

--- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb
+++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb
@ -49,4 +49,6 @@ RDEPENDS:${PN} = "\
    pipewire-tools \
    pipewire-spa-tools \
    alsa-utils \
+    gnome-software \
+    minijail \
 "
--- a/meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb
+++ b/meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb
@ -8,9 +8,21 @@ inherit cargo systemd gsettings pkgconfig
 #
 # Update this when changes are pushed to github
 #
-SRCREV = "421b0e27d777c418a26016bd8065715823504637"
+SRCREV = "11b3e8a0164c8b304efbeda5245f4ab6ec48d298"

-GIT_URI = "git://git.subgraph.com/brl/citadel-tools.git;protocol=https;branch=master"
+# get git repo owner from citadel to find the correct citadel-tools repo path
+python () {
+    import subprocess
+    git_url = subprocess.check_output(['git', 'remote', 'get-url', 'origin']).strip().decode('utf-8')
+    if git_url.startswith("git"):
+        git_owner = git_url.split('/')[0].split(':')[1]
+    else:
+        git_owner = git_url.split('/')[3]
+
+    d.setVar("GIT_REPO_OWNER", git_owner)
+}
+
+GIT_URI = "git://git.subgraph.com/${GIT_REPO_OWNER}/citadel-tools.git;protocol=https;branch=master"

 # If Cargo.lock changes in citadel-tools, this needs to be updated.
 # cargo bitbake does not support workspaces so as a workaround first
@ -24,78 +36,99 @@ SRC_URI += " \
    crate://crates.io/acl-sys/1.2.2 \
    crate://crates.io/addr2line/0.17.0 \
    crate://crates.io/adler/1.0.2 \
-    crate://crates.io/aho-corasick/0.7.18 \
-    crate://crates.io/ansi_term/0.12.1 \
+    crate://crates.io/anstream/0.6.15 \
+    crate://crates.io/anstyle-parse/0.2.5 \
+    crate://crates.io/anstyle-query/1.1.1 \
+    crate://crates.io/anstyle-wincon/3.0.4 \
+    crate://crates.io/anstyle/1.0.8 \
    crate://crates.io/anyhow/1.0.57 \
    crate://crates.io/array-macro/1.0.5 \
-    crate://crates.io/async-broadcast/0.3.4 \
-    crate://crates.io/async-channel/1.6.1 \
-    crate://crates.io/async-executor/1.4.1 \
-    crate://crates.io/async-io/1.6.0 \
-    crate://crates.io/async-lock/2.5.0 \
-    crate://crates.io/async-task/4.2.0 \
+    crate://crates.io/async-broadcast/0.7.1 \
+    crate://crates.io/async-channel/2.3.1 \
+    crate://crates.io/async-executor/1.13.1 \
+    crate://crates.io/async-fs/2.1.2 \
+    crate://crates.io/async-io/2.3.4 \
+    crate://crates.io/async-lock/3.4.0 \
+    crate://crates.io/async-process/2.2.4 \
+    crate://crates.io/async-recursion/1.1.1 \
+    crate://crates.io/async-signal/0.2.10 \
+    crate://crates.io/async-task/4.7.1 \
+    crate://crates.io/async-trait/0.1.82 \
    crate://crates.io/atk-sys/0.14.0 \
    crate://crates.io/atk/0.14.0 \
-    crate://crates.io/atty/0.2.14 \
+    crate://crates.io/atomic-waker/1.1.2 \
    crate://crates.io/autocfg/1.1.0 \
    crate://crates.io/backtrace/0.3.65 \
    crate://crates.io/bincode/1.3.3 \
    crate://crates.io/bitflags/1.2.1 \
+    crate://crates.io/bitflags/2.6.0 \
+    crate://crates.io/block-buffer/0.10.4 \
    crate://crates.io/block-buffer/0.9.0 \
-    crate://crates.io/block-cipher/0.7.1 \
-    crate://crates.io/blowfish/0.5.0 \
+    crate://crates.io/blocking/1.6.1 \
+    crate://crates.io/blowfish/0.7.0 \
    crate://crates.io/byteorder/1.4.3 \
-    crate://crates.io/cache-padded/1.2.0 \
    crate://crates.io/cairo-rs/0.14.9 \
    crate://crates.io/cairo-sys-rs/0.14.9 \
    crate://crates.io/cc/1.0.73 \
    crate://crates.io/cfg-expr/0.8.1 \
    crate://crates.io/cfg-if/0.1.10 \
    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/cfg_aliases/0.2.1 \
    crate://crates.io/chrono/0.4.19 \
-    crate://crates.io/clap/2.34.0 \
-    crate://crates.io/concurrent-queue/1.2.2 \
+    crate://crates.io/cipher/0.2.5 \
+    crate://crates.io/clap/4.5.17 \
+    crate://crates.io/clap_builder/4.5.17 \
+    crate://crates.io/clap_derive/4.5.13 \
+    crate://crates.io/clap_lex/0.7.2 \
+    crate://crates.io/colorchoice/1.0.2 \
+    crate://crates.io/concurrent-queue/2.5.0 \
    crate://crates.io/cpufeatures/0.2.2 \
    crate://crates.io/crc32fast/1.3.2 \
    crate://crates.io/crossbeam-channel/0.3.9 \
    crate://crates.io/crossbeam-utils/0.6.6 \
-    crate://crates.io/crypto-mac/0.8.0 \
+    crate://crates.io/crossbeam-utils/0.8.20 \
+    crate://crates.io/crypto-common/0.1.6 \
+    crate://crates.io/crypto-mac/0.10.1 \
    crate://crates.io/cursive/0.11.0 \
    crate://crates.io/dbus/0.6.5 \
    crate://crates.io/dbus/0.8.4 \
-    crate://crates.io/derivative/2.2.0 \
+    crate://crates.io/digest/0.10.7 \
    crate://crates.io/digest/0.9.0 \
-    crate://crates.io/easy-parallel/3.2.0 \
+    crate://crates.io/dtoa/0.4.8 \
    crate://crates.io/ed25519/1.5.2 \
    crate://crates.io/either/1.6.1 \
+    crate://crates.io/endi/1.1.0 \
    crate://crates.io/enum-map-derive/0.4.6 \
    crate://crates.io/enum-map-internals/0.1.2 \
    crate://crates.io/enum-map/0.5.0 \
-    crate://crates.io/enumflags2/0.6.4 \
-    crate://crates.io/enumflags2_derive/0.6.4 \
+    crate://crates.io/enumflags2/0.7.10 \
+    crate://crates.io/enumflags2_derive/0.7.10 \
    crate://crates.io/enumset/0.3.19 \
    crate://crates.io/enumset_derive/0.3.2 \
-    crate://crates.io/event-listener/2.5.2 \
+    crate://crates.io/equivalent/1.0.1 \
+    crate://crates.io/errno/0.3.9 \
+    crate://crates.io/event-listener-strategy/0.5.2 \
+    crate://crates.io/event-listener/5.3.1 \
    crate://crates.io/failure/0.1.8 \
    crate://crates.io/failure_derive/0.1.8 \
    crate://crates.io/fastrand/1.7.0 \
+    crate://crates.io/fastrand/2.1.1 \
    crate://crates.io/field-offset/0.3.4 \
    crate://crates.io/flate2/1.0.24 \
    crate://crates.io/futures-channel/0.3.21 \
-    crate://crates.io/futures-core/0.3.21 \
+    crate://crates.io/futures-core/0.3.30 \
    crate://crates.io/futures-executor/0.3.21 \
-    crate://crates.io/futures-io/0.3.21 \
-    crate://crates.io/futures-lite/1.12.0 \
-    crate://crates.io/futures-macro/0.3.21 \
-    crate://crates.io/futures-sink/0.3.21 \
-    crate://crates.io/futures-task/0.3.21 \
-    crate://crates.io/futures-util/0.3.21 \
+    crate://crates.io/futures-io/0.3.30 \
+    crate://crates.io/futures-lite/2.3.0 \
+    crate://crates.io/futures-macro/0.3.30 \
+    crate://crates.io/futures-sink/0.3.30 \
+    crate://crates.io/futures-task/0.3.30 \
+    crate://crates.io/futures-util/0.3.30 \
    crate://crates.io/gdk-pixbuf-sys/0.14.0 \
    crate://crates.io/gdk-pixbuf/0.14.0 \
    crate://crates.io/gdk-sys/0.14.0 \
    crate://crates.io/gdk/0.14.3 \
    crate://crates.io/generic-array/0.14.5 \
-    crate://crates.io/getrandom/0.1.16 \
    crate://crates.io/getrandom/0.2.6 \
    crate://crates.io/gimli/0.26.1 \
    crate://crates.io/gio-sys/0.14.0 \
@ -111,97 +144,101 @@ SRC_URI += " \
    crate://crates.io/gtk-sys/0.14.0 \
    crate://crates.io/gtk/0.14.3 \
    crate://crates.io/gtk3-macros/0.14.0 \
+    crate://crates.io/hashbrown/0.14.5 \
    crate://crates.io/heck/0.3.3 \
-    crate://crates.io/hermit-abi/0.1.19 \
+    crate://crates.io/heck/0.5.0 \
+    crate://crates.io/hermit-abi/0.4.0 \
    crate://crates.io/hex/0.4.3 \
-    crate://crates.io/hmac/0.8.1 \
+    crate://crates.io/hmac/0.10.1 \
+    crate://crates.io/indexmap/2.5.0 \
    crate://crates.io/inotify-sys/0.1.5 \
    crate://crates.io/inotify/0.8.3 \
    crate://crates.io/instant/0.1.12 \
+    crate://crates.io/is_terminal_polyfill/1.70.1 \
    crate://crates.io/itertools/0.10.3 \
    crate://crates.io/itertools/0.9.0 \
+    crate://crates.io/itoa/0.3.4 \
    crate://crates.io/lazy_static/1.4.0 \
-    crate://crates.io/libc/0.2.126 \
+    crate://crates.io/libc/0.2.158 \
    crate://crates.io/libdbus-sys/0.2.2 \
    crate://crates.io/libsodium-sys/0.2.7 \
+    crate://crates.io/linux-raw-sys/0.4.14 \
    crate://crates.io/log/0.4.17 \
    crate://crates.io/md-5/0.9.1 \
    crate://crates.io/memchr/2.5.0 \
    crate://crates.io/memoffset/0.6.5 \
+    crate://crates.io/memoffset/0.9.1 \
    crate://crates.io/miniz_oxide/0.5.1 \
    crate://crates.io/nix/0.17.0 \
-    crate://crates.io/nix/0.21.2 \
+    crate://crates.io/nix/0.29.0 \
    crate://crates.io/num-complex/0.2.4 \
    crate://crates.io/num-integer/0.1.45 \
    crate://crates.io/num-iter/0.1.43 \
    crate://crates.io/num-rational/0.2.4 \
+    crate://crates.io/num-traits/0.1.43 \
    crate://crates.io/num-traits/0.2.15 \
    crate://crates.io/num/0.2.1 \
    crate://crates.io/numtoa/0.1.0 \
    crate://crates.io/object/0.28.4 \
-    crate://crates.io/once_cell/1.10.0 \
-    crate://crates.io/opaque-debug/0.2.3 \
+    crate://crates.io/once_cell/1.19.0 \
    crate://crates.io/opaque-debug/0.3.0 \
+    crate://crates.io/ordered-stream/0.2.0 \
    crate://crates.io/owning_ref/0.4.1 \
    crate://crates.io/pango-sys/0.10.0 \
    crate://crates.io/pango-sys/0.14.0 \
    crate://crates.io/pango/0.14.8 \
    crate://crates.io/pango/0.9.1 \
-    crate://crates.io/parking/2.0.0 \
+    crate://crates.io/parking/2.2.1 \
    crate://crates.io/pest/2.1.3 \
-    crate://crates.io/pin-project-lite/0.2.9 \
+    crate://crates.io/pin-project-lite/0.2.14 \
    crate://crates.io/pin-utils/0.1.0 \
+    crate://crates.io/piper/0.2.4 \
    crate://crates.io/pkg-config/0.3.25 \
-    crate://crates.io/polling/2.2.0 \
+    crate://crates.io/polling/3.7.3 \
    crate://crates.io/posix-acl/1.0.0 \
    crate://crates.io/ppv-lite86/0.2.16 \
    crate://crates.io/proc-macro-crate/0.1.5 \
    crate://crates.io/proc-macro-crate/1.1.3 \
+    crate://crates.io/proc-macro-crate/3.2.0 \
    crate://crates.io/proc-macro-error-attr/1.0.4 \
    crate://crates.io/proc-macro-error/1.0.4 \
    crate://crates.io/proc-macro2/0.4.30 \
-    crate://crates.io/proc-macro2/1.0.39 \
+    crate://crates.io/proc-macro2/1.0.86 \
    crate://crates.io/procfs/0.12.0 \
-    crate://crates.io/pwhash/0.3.1 \
+    crate://crates.io/pwhash/1.0.0 \
    crate://crates.io/quote/0.6.13 \
-    crate://crates.io/quote/1.0.18 \
-    crate://crates.io/rand/0.7.3 \
+    crate://crates.io/quote/1.0.37 \
    crate://crates.io/rand/0.8.5 \
-    crate://crates.io/rand_chacha/0.2.2 \
    crate://crates.io/rand_chacha/0.3.1 \
-    crate://crates.io/rand_core/0.5.1 \
    crate://crates.io/rand_core/0.6.3 \
-    crate://crates.io/rand_hc/0.2.0 \
    crate://crates.io/redox_syscall/0.2.13 \
    crate://crates.io/redox_termios/0.1.2 \
-    crate://crates.io/regex-syntax/0.6.25 \
-    crate://crates.io/regex/1.5.5 \
    crate://crates.io/remove_dir_all/0.5.3 \
-    crate://crates.io/rpassword/4.0.5 \
+    crate://crates.io/rpassword/7.3.1 \
+    crate://crates.io/rtoolbox/0.0.2 \
    crate://crates.io/rustc-demangle/0.1.21 \
    crate://crates.io/rustc_version/0.3.3 \
+    crate://crates.io/rustix/0.38.37 \
    crate://crates.io/same-file/1.0.6 \
-    crate://crates.io/scoped-tls/1.0.0 \
    crate://crates.io/semver-parser/0.10.2 \
    crate://crates.io/semver/0.11.0 \
-    crate://crates.io/serde/1.0.137 \
-    crate://crates.io/serde_derive/1.0.137 \
-    crate://crates.io/serde_repr/0.1.8 \
+    crate://crates.io/serde/1.0.209 \
+    crate://crates.io/serde_derive/1.0.209 \
+    crate://crates.io/serde_json/1.0.1 \
+    crate://crates.io/serde_repr/0.1.19 \
+    crate://crates.io/serde_spanned/0.6.7 \
    crate://crates.io/sha-1/0.9.8 \
-    crate://crates.io/sha1/0.6.1 \
-    crate://crates.io/sha1_smol/1.0.0 \
+    crate://crates.io/sha1/0.10.6 \
    crate://crates.io/sha2/0.9.9 \
    crate://crates.io/signal-hook-registry/1.4.0 \
    crate://crates.io/signal-hook/0.1.17 \
    crate://crates.io/signature/1.5.0 \
-    crate://crates.io/slab/0.4.6 \
-    crate://crates.io/slotmap/1.0.6 \
+    crate://crates.io/slab/0.4.9 \
    crate://crates.io/smallvec/1.8.0 \
-    crate://crates.io/socket2/0.4.4 \
    crate://crates.io/sodiumoxide/0.2.7 \
    crate://crates.io/stable_deref_trait/1.2.0 \
    crate://crates.io/static_assertions/1.1.0 \
-    crate://crates.io/strsim/0.8.0 \
+    crate://crates.io/strsim/0.11.1 \
    crate://crates.io/strum/0.18.0 \
    crate://crates.io/strum/0.21.0 \
    crate://crates.io/strum_macros/0.18.0 \
@ -209,120 +246,169 @@ SRC_URI += " \
    crate://crates.io/subtle/2.4.1 \
    crate://crates.io/syn/0.15.44 \
    crate://crates.io/syn/1.0.95 \
+    crate://crates.io/syn/2.0.77 \
    crate://crates.io/synstructure/0.12.6 \
    crate://crates.io/system-deps/1.3.2 \
    crate://crates.io/system-deps/3.2.0 \
    crate://crates.io/tempfile/3.3.0 \
    crate://crates.io/termion/1.5.6 \
-    crate://crates.io/textwrap/0.11.0 \
    crate://crates.io/thiserror-impl/1.0.31 \
    crate://crates.io/thiserror/1.0.31 \
    crate://crates.io/time/0.1.43 \
    crate://crates.io/toml/0.4.10 \
    crate://crates.io/toml/0.5.9 \
+    crate://crates.io/toml/0.8.19 \
+    crate://crates.io/toml_datetime/0.6.8 \
+    crate://crates.io/toml_edit/0.22.20 \
+    crate://crates.io/tracing-attributes/0.1.27 \
+    crate://crates.io/tracing-core/0.1.32 \
+    crate://crates.io/tracing/0.1.40 \
    crate://crates.io/typenum/1.15.0 \
    crate://crates.io/ucd-trie/0.1.3 \
+    crate://crates.io/uds_windows/1.1.0 \
    crate://crates.io/unicode-ident/1.0.0 \
    crate://crates.io/unicode-segmentation/1.9.0 \
    crate://crates.io/unicode-width/0.1.9 \
    crate://crates.io/unicode-xid/0.1.0 \
    crate://crates.io/unicode-xid/0.2.3 \
-    crate://crates.io/vec_map/0.8.2 \
+    crate://crates.io/utf8parse/0.2.2 \
    crate://crates.io/version-compare/0.0.10 \
    crate://crates.io/version-compare/0.0.11 \
    crate://crates.io/version_check/0.9.4 \
    crate://crates.io/void/1.0.2 \
-    crate://crates.io/waker-fn/1.1.0 \
    crate://crates.io/walkdir/2.3.2 \
    crate://crates.io/wasi/0.10.2+wasi-snapshot-preview1 \
-    crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \
-    crate://crates.io/wepoll-ffi/0.1.2 \
    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
    crate://crates.io/winapi-util/0.1.5 \
    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/windows-sys/0.48.0 \
+    crate://crates.io/windows-sys/0.52.0 \
+    crate://crates.io/windows-sys/0.59.0 \
+    crate://crates.io/windows-targets/0.48.5 \
+    crate://crates.io/windows-targets/0.52.6 \
+    crate://crates.io/windows_aarch64_gnullvm/0.48.5 \
+    crate://crates.io/windows_aarch64_gnullvm/0.52.6 \
+    crate://crates.io/windows_aarch64_msvc/0.48.5 \
+    crate://crates.io/windows_aarch64_msvc/0.52.6 \
+    crate://crates.io/windows_i686_gnu/0.48.5 \
+    crate://crates.io/windows_i686_gnu/0.52.6 \
+    crate://crates.io/windows_i686_gnullvm/0.52.6 \
+    crate://crates.io/windows_i686_msvc/0.48.5 \
+    crate://crates.io/windows_i686_msvc/0.52.6 \
+    crate://crates.io/windows_x86_64_gnu/0.48.5 \
+    crate://crates.io/windows_x86_64_gnu/0.52.6 \
+    crate://crates.io/windows_x86_64_gnullvm/0.48.5 \
+    crate://crates.io/windows_x86_64_gnullvm/0.52.6 \
+    crate://crates.io/windows_x86_64_msvc/0.48.5 \
+    crate://crates.io/windows_x86_64_msvc/0.52.6 \
+    crate://crates.io/winnow/0.6.18 \
+    crate://crates.io/xdg-home/1.3.0 \
    crate://crates.io/xi-unicode/0.1.0 \
-    crate://crates.io/zbus/2.0.0-beta.5 \
-    crate://crates.io/zbus_macros/2.0.0-beta.5 \
-    crate://crates.io/zvariant/2.10.0 \
-    crate://crates.io/zvariant_derive/2.10.0 \
+    crate://crates.io/zbus/4.4.0 \
+    crate://crates.io/zbus_macros/4.4.0 \
+    crate://crates.io/zbus_names/3.0.0 \
+    crate://crates.io/zvariant/4.2.0 \
+    crate://crates.io/zvariant_derive/4.2.0 \
+    crate://crates.io/zvariant_utils/2.1.0 \
 "

 SRC_URI[acl-sys-1.2.2.sha256sum] = "bbc079f9bdd3124fd18df23c67f7e0f79d24751ae151dcffd095fcade07a3eb2"
 SRC_URI[addr2line-0.17.0.sha256sum] = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
 SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-SRC_URI[aho-corasick-0.7.18.sha256sum] = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
-SRC_URI[ansi_term-0.12.1.sha256sum] = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+SRC_URI[anstream-0.6.15.sha256sum] = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+SRC_URI[anstyle-parse-0.2.5.sha256sum] = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+SRC_URI[anstyle-query-1.1.1.sha256sum] = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+SRC_URI[anstyle-wincon-3.0.4.sha256sum] = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+SRC_URI[anstyle-1.0.8.sha256sum] = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 SRC_URI[anyhow-1.0.57.sha256sum] = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
 SRC_URI[array-macro-1.0.5.sha256sum] = "06e97b4e522f9e55523001238ac59d13a8603af57f69980de5d8de4bbbe8ada6"
-SRC_URI[async-broadcast-0.3.4.sha256sum] = "90622698a1218e0b2fb846c97b5f19a0831f6baddee73d9454156365ccfa473b"
-SRC_URI[async-channel-1.6.1.sha256sum] = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
-SRC_URI[async-executor-1.4.1.sha256sum] = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965"
-SRC_URI[async-io-1.6.0.sha256sum] = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b"
-SRC_URI[async-lock-2.5.0.sha256sum] = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6"
-SRC_URI[async-task-4.2.0.sha256sum] = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9"
+SRC_URI[async-broadcast-0.7.1.sha256sum] = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
+SRC_URI[async-channel-2.3.1.sha256sum] = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+SRC_URI[async-executor-1.13.1.sha256sum] = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
+SRC_URI[async-fs-2.1.2.sha256sum] = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+SRC_URI[async-io-2.3.4.sha256sum] = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
+SRC_URI[async-lock-3.4.0.sha256sum] = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+SRC_URI[async-process-2.2.4.sha256sum] = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374"
+SRC_URI[async-recursion-1.1.1.sha256sum] = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+SRC_URI[async-signal-0.2.10.sha256sum] = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
+SRC_URI[async-task-4.7.1.sha256sum] = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+SRC_URI[async-trait-0.1.82.sha256sum] = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
 SRC_URI[atk-sys-0.14.0.sha256sum] = "badcf670157c84bb8b1cf6b5f70b650fed78da2033c9eed84c4e49b11cbe83ea"
 SRC_URI[atk-0.14.0.sha256sum] = "a83b21d2aa75e464db56225e1bda2dd5993311ba1095acaa8fa03d1ae67026ba"
-SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+SRC_URI[atomic-waker-1.1.2.sha256sum] = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 SRC_URI[backtrace-0.3.65.sha256sum] = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
 SRC_URI[bincode-1.3.3.sha256sum] = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
 SRC_URI[bitflags-1.2.1.sha256sum] = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+SRC_URI[bitflags-2.6.0.sha256sum] = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 SRC_URI[block-buffer-0.9.0.sha256sum] = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-SRC_URI[block-cipher-0.7.1.sha256sum] = "fa136449e765dc7faa244561ccae839c394048667929af599b5d931ebe7b7f10"
-SRC_URI[blowfish-0.5.0.sha256sum] = "91d01392750dd899a2528948d6b856afe2df508d627fc7c339868c0bd0141b4b"
+SRC_URI[blocking-1.6.1.sha256sum] = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+SRC_URI[blowfish-0.7.0.sha256sum] = "32fa6a061124e37baba002e496d203e23ba3d7b73750be82dbfbc92913048a5b"
 SRC_URI[byteorder-1.4.3.sha256sum] = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-SRC_URI[cache-padded-1.2.0.sha256sum] = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
 SRC_URI[cairo-rs-0.14.9.sha256sum] = "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482"
 SRC_URI[cairo-sys-rs-0.14.9.sha256sum] = "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570"
 SRC_URI[cc-1.0.73.sha256sum] = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
 SRC_URI[cfg-expr-0.8.1.sha256sum] = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e"
 SRC_URI[cfg-if-0.1.10.sha256sum] = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 SRC_URI[chrono-0.4.19.sha256sum] = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
-SRC_URI[clap-2.34.0.sha256sum] = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-SRC_URI[concurrent-queue-1.2.2.sha256sum] = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
+SRC_URI[cipher-0.2.5.sha256sum] = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
+SRC_URI[clap-4.5.17.sha256sum] = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
+SRC_URI[clap_builder-4.5.17.sha256sum] = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
+SRC_URI[clap_derive-4.5.13.sha256sum] = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+SRC_URI[clap_lex-0.7.2.sha256sum] = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+SRC_URI[colorchoice-1.0.2.sha256sum] = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+SRC_URI[concurrent-queue-2.5.0.sha256sum] = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 SRC_URI[cpufeatures-0.2.2.sha256sum] = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
 SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 SRC_URI[crossbeam-channel-0.3.9.sha256sum] = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa"
 SRC_URI[crossbeam-utils-0.6.6.sha256sum] = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-SRC_URI[crypto-mac-0.8.0.sha256sum] = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
+SRC_URI[crossbeam-utils-0.8.20.sha256sum] = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+SRC_URI[crypto-mac-0.10.1.sha256sum] = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a"
 SRC_URI[cursive-0.11.0.sha256sum] = "e50c8961fb6728e44ea668e4133ca6f5bea681cb5e93aaee70a8f452412bbce5"
 SRC_URI[dbus-0.6.5.sha256sum] = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819"
 SRC_URI[dbus-0.8.4.sha256sum] = "5cd9e78c210146a1860f897db03412fd5091fd73100778e43ee255cca252cf32"
-SRC_URI[derivative-2.2.0.sha256sum] = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 SRC_URI[digest-0.9.0.sha256sum] = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-SRC_URI[easy-parallel-3.2.0.sha256sum] = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946"
+SRC_URI[dtoa-0.4.8.sha256sum] = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
 SRC_URI[ed25519-1.5.2.sha256sum] = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
 SRC_URI[either-1.6.1.sha256sum] = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+SRC_URI[endi-1.1.0.sha256sum] = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
 SRC_URI[enum-map-derive-0.4.6.sha256sum] = "e5c450cf304c9e18d45db562025a14fb1ca0f5c769b6f609309f81d4c31de455"
 SRC_URI[enum-map-internals-0.1.2.sha256sum] = "38b0bacf3ea7aba18ce84032efc3f0fa29f5c814048b742ab3e64d07d83ac3e8"
 SRC_URI[enum-map-0.5.0.sha256sum] = "ccd9b2d5e0eb5c2ff851791e2af90ab4531b1168cfc239d1c0bf467e60ba3c89"
-SRC_URI[enumflags2-0.6.4.sha256sum] = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0"
-SRC_URI[enumflags2_derive-0.6.4.sha256sum] = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
+SRC_URI[enumflags2-0.7.10.sha256sum] = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
+SRC_URI[enumflags2_derive-0.7.10.sha256sum] = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 SRC_URI[enumset-0.3.19.sha256sum] = "43bd5effaae6a671efa2032056110916a501bd24128cfb6f44e5a339b5cdb152"
 SRC_URI[enumset_derive-0.3.2.sha256sum] = "f73e5c77cf68e532b0e6fdd22c7f8f4d09f6f663692aecca0b3d8ec2e11af723"
-SRC_URI[event-listener-2.5.2.sha256sum] = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
+SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+SRC_URI[errno-0.3.9.sha256sum] = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+SRC_URI[event-listener-strategy-0.5.2.sha256sum] = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+SRC_URI[event-listener-5.3.1.sha256sum] = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
 SRC_URI[failure-0.1.8.sha256sum] = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
 SRC_URI[failure_derive-0.1.8.sha256sum] = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
 SRC_URI[fastrand-1.7.0.sha256sum] = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+SRC_URI[fastrand-2.1.1.sha256sum] = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 SRC_URI[field-offset-0.3.4.sha256sum] = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
 SRC_URI[flate2-1.0.24.sha256sum] = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
 SRC_URI[futures-channel-0.3.21.sha256sum] = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
-SRC_URI[futures-core-0.3.21.sha256sum] = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
+SRC_URI[futures-core-0.3.30.sha256sum] = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 SRC_URI[futures-executor-0.3.21.sha256sum] = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
-SRC_URI[futures-io-0.3.21.sha256sum] = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
-SRC_URI[futures-lite-1.12.0.sha256sum] = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
-SRC_URI[futures-macro-0.3.21.sha256sum] = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
-SRC_URI[futures-sink-0.3.21.sha256sum] = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
-SRC_URI[futures-task-0.3.21.sha256sum] = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
-SRC_URI[futures-util-0.3.21.sha256sum] = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
+SRC_URI[futures-io-0.3.30.sha256sum] = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+SRC_URI[futures-lite-2.3.0.sha256sum] = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+SRC_URI[futures-macro-0.3.30.sha256sum] = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+SRC_URI[futures-sink-0.3.30.sha256sum] = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+SRC_URI[futures-task-0.3.30.sha256sum] = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+SRC_URI[futures-util-0.3.30.sha256sum] = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 SRC_URI[gdk-pixbuf-sys-0.14.0.sha256sum] = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590"
 SRC_URI[gdk-pixbuf-0.14.0.sha256sum] = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f"
 SRC_URI[gdk-sys-0.14.0.sha256sum] = "0e091b3d3d6696949ac3b3fb3c62090e5bfd7bd6850bef5c3c5ea701de1b1f1e"
 SRC_URI[gdk-0.14.3.sha256sum] = "b9d749dcfc00d8de0d7c3a289e04a04293eb5ba3d8a4e64d64911d481fa9933b"
 SRC_URI[generic-array-0.14.5.sha256sum] = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
-SRC_URI[getrandom-0.1.16.sha256sum] = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 SRC_URI[getrandom-0.2.6.sha256sum] = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
 SRC_URI[gimli-0.26.1.sha256sum] = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
 SRC_URI[gio-sys-0.14.0.sha256sum] = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa"
@ -338,97 +424,101 @@ SRC_URI[gobject-sys-0.14.0.sha256sum] = "aa92cae29759dae34ab5921d73fff5ad54b3d79
 SRC_URI[gtk-sys-0.14.0.sha256sum] = "8c14c8d3da0545785a7c5a120345b3abb534010fb8ae0f2ef3f47c027fba303e"
 SRC_URI[gtk-0.14.3.sha256sum] = "2eb51122dd3317e9327ec1e4faa151d1fa0d95664cd8fb8dcfacf4d4d29ac70c"
 SRC_URI[gtk3-macros-0.14.0.sha256sum] = "21de1da96dc117443fb03c2e270b2d34b7de98d0a79a19bbb689476173745b79"
+SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 SRC_URI[heck-0.3.3.sha256sum] = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+SRC_URI[heck-0.5.0.sha256sum] = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+SRC_URI[hermit-abi-0.4.0.sha256sum] = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-SRC_URI[hmac-0.8.1.sha256sum] = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840"
+SRC_URI[hmac-0.10.1.sha256sum] = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
+SRC_URI[indexmap-2.5.0.sha256sum] = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 SRC_URI[inotify-sys-0.1.5.sha256sum] = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
 SRC_URI[inotify-0.8.3.sha256sum] = "46dd0a94b393c730779ccfd2a872b67b1eb67be3fc33082e733bdb38b5fde4d4"
 SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+SRC_URI[is_terminal_polyfill-1.70.1.sha256sum] = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 SRC_URI[itertools-0.10.3.sha256sum] = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
 SRC_URI[itertools-0.9.0.sha256sum] = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+SRC_URI[itoa-0.3.4.sha256sum] = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
 SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-SRC_URI[libc-0.2.126.sha256sum] = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+SRC_URI[libc-0.2.158.sha256sum] = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 SRC_URI[libdbus-sys-0.2.2.sha256sum] = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b"
 SRC_URI[libsodium-sys-0.2.7.sha256sum] = "6b779387cd56adfbc02ea4a668e704f729be8d6a6abd2c27ca5ee537849a92fd"
+SRC_URI[linux-raw-sys-0.4.14.sha256sum] = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 SRC_URI[md-5-0.9.1.sha256sum] = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15"
 SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 SRC_URI[memoffset-0.6.5.sha256sum] = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+SRC_URI[memoffset-0.9.1.sha256sum] = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
 SRC_URI[miniz_oxide-0.5.1.sha256sum] = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
 SRC_URI[nix-0.17.0.sha256sum] = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
-SRC_URI[nix-0.21.2.sha256sum] = "77d9f3521ea8e0641a153b3cddaf008dcbf26acd4ed739a2517295e0760d12c7"
+SRC_URI[nix-0.29.0.sha256sum] = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 SRC_URI[num-complex-0.2.4.sha256sum] = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
 SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
 SRC_URI[num-iter-0.1.43.sha256sum] = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
 SRC_URI[num-rational-0.2.4.sha256sum] = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
+SRC_URI[num-traits-0.1.43.sha256sum] = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 SRC_URI[num-traits-0.2.15.sha256sum] = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 SRC_URI[num-0.2.1.sha256sum] = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36"
 SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
 SRC_URI[object-0.28.4.sha256sum] = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
-SRC_URI[once_cell-1.10.0.sha256sum] = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
-SRC_URI[opaque-debug-0.2.3.sha256sum] = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
+SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 SRC_URI[opaque-debug-0.3.0.sha256sum] = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+SRC_URI[ordered-stream-0.2.0.sha256sum] = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
 SRC_URI[owning_ref-0.4.1.sha256sum] = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
 SRC_URI[pango-sys-0.10.0.sha256sum] = "24d2650c8b62d116c020abd0cea26a4ed96526afda89b1c4ea567131fdefc890"
 SRC_URI[pango-sys-0.14.0.sha256sum] = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe"
 SRC_URI[pango-0.14.8.sha256sum] = "546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581"
 SRC_URI[pango-0.9.1.sha256sum] = "9937068580bebd8ced19975938573803273ccbcbd598c58d4906efd4ac87c438"
-SRC_URI[parking-2.0.0.sha256sum] = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+SRC_URI[parking-2.2.1.sha256sum] = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 SRC_URI[pest-2.1.3.sha256sum] = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-SRC_URI[pin-project-lite-0.2.9.sha256sum] = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+SRC_URI[pin-project-lite-0.2.14.sha256sum] = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+SRC_URI[piper-0.2.4.sha256sum] = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
 SRC_URI[pkg-config-0.3.25.sha256sum] = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
-SRC_URI[polling-2.2.0.sha256sum] = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
+SRC_URI[polling-3.7.3.sha256sum] = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
 SRC_URI[posix-acl-1.0.0.sha256sum] = "2ea5dae99e4365fa738533b43f4c649c0450ba7fbb81a984a4fba6a42ce91812"
 SRC_URI[ppv-lite86-0.2.16.sha256sum] = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 SRC_URI[proc-macro-crate-0.1.5.sha256sum] = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
 SRC_URI[proc-macro-crate-1.1.3.sha256sum] = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
+SRC_URI[proc-macro-crate-3.2.0.sha256sum] = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 SRC_URI[proc-macro2-0.4.30.sha256sum] = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-SRC_URI[proc-macro2-1.0.39.sha256sum] = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
+SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 SRC_URI[procfs-0.12.0.sha256sum] = "0941606b9934e2d98a3677759a971756eb821f75764d0e0d26946d08e74d9104"
-SRC_URI[pwhash-0.3.1.sha256sum] = "1068eebd5d8aa4bbd6cbba05ff2647ad32f8ec86a3b73417b95522383c4bd18f"
+SRC_URI[pwhash-1.0.0.sha256sum] = "419a3ad8fa9f9d445e69d9b185a24878ae6e6f55c96e4512f4a0e28cd3bc5c56"
 SRC_URI[quote-0.6.13.sha256sum] = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-SRC_URI[quote-1.0.18.sha256sum] = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
-SRC_URI[rand-0.7.3.sha256sum] = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+SRC_URI[quote-1.0.37.sha256sum] = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-SRC_URI[rand_chacha-0.2.2.sha256sum] = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
 SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-SRC_URI[rand_core-0.5.1.sha256sum] = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 SRC_URI[rand_core-0.6.3.sha256sum] = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-SRC_URI[rand_hc-0.2.0.sha256sum] = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 SRC_URI[redox_syscall-0.2.13.sha256sum] = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
 SRC_URI[redox_termios-0.1.2.sha256sum] = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f"
-SRC_URI[regex-syntax-0.6.25.sha256sum] = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
-SRC_URI[regex-1.5.5.sha256sum] = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
 SRC_URI[remove_dir_all-0.5.3.sha256sum] = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-SRC_URI[rpassword-4.0.5.sha256sum] = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f"
+SRC_URI[rpassword-7.3.1.sha256sum] = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f"
+SRC_URI[rtoolbox-0.0.2.sha256sum] = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e"
 SRC_URI[rustc-demangle-0.1.21.sha256sum] = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
 SRC_URI[rustc_version-0.3.3.sha256sum] = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
+SRC_URI[rustix-0.38.37.sha256sum] = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-SRC_URI[scoped-tls-1.0.0.sha256sum] = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 SRC_URI[semver-parser-0.10.2.sha256sum] = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
 SRC_URI[semver-0.11.0.sha256sum] = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-SRC_URI[serde-1.0.137.sha256sum] = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
-SRC_URI[serde_derive-1.0.137.sha256sum] = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
-SRC_URI[serde_repr-0.1.8.sha256sum] = "a2ad84e47328a31223de7fed7a4f5087f2d6ddfe586cf3ca25b7a165bc0a5aed"
+SRC_URI[serde-1.0.209.sha256sum] = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+SRC_URI[serde_derive-1.0.209.sha256sum] = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+SRC_URI[serde_json-1.0.1.sha256sum] = "1c62115693d0a9ed8c32d1c760f0fdbe7d4b05cb13c135b9b54137ac0d59fccb"
+SRC_URI[serde_repr-0.1.19.sha256sum] = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+SRC_URI[serde_spanned-0.6.7.sha256sum] = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 SRC_URI[sha-1-0.9.8.sha256sum] = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
-SRC_URI[sha1-0.6.1.sha256sum] = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
-SRC_URI[sha1_smol-1.0.0.sha256sum] = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 SRC_URI[sha2-0.9.9.sha256sum] = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 SRC_URI[signal-hook-registry-1.4.0.sha256sum] = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
 SRC_URI[signal-hook-0.1.17.sha256sum] = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729"
 SRC_URI[signature-1.5.0.sha256sum] = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4"
-SRC_URI[slab-0.4.6.sha256sum] = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
-SRC_URI[slotmap-1.0.6.sha256sum] = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
+SRC_URI[slab-0.4.9.sha256sum] = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 SRC_URI[smallvec-1.8.0.sha256sum] = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
-SRC_URI[socket2-0.4.4.sha256sum] = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
 SRC_URI[sodiumoxide-0.2.7.sha256sum] = "e26be3acb6c2d9a7aac28482586a7856436af4cfe7100031d219de2d2ecb0028"
 SRC_URI[stable_deref_trait-1.2.0.sha256sum] = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-SRC_URI[strsim-0.8.0.sha256sum] = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 SRC_URI[strum-0.18.0.sha256sum] = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b"
 SRC_URI[strum-0.21.0.sha256sum] = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2"
 SRC_URI[strum_macros-0.18.0.sha256sum] = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c"
@ -436,43 +526,71 @@ SRC_URI[strum_macros-0.21.1.sha256sum] = "d06aaeeee809dbc59eb4556183dd927df67db1
 SRC_URI[subtle-2.4.1.sha256sum] = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 SRC_URI[syn-0.15.44.sha256sum] = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
 SRC_URI[syn-1.0.95.sha256sum] = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942"
+SRC_URI[syn-2.0.77.sha256sum] = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 SRC_URI[synstructure-0.12.6.sha256sum] = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 SRC_URI[system-deps-1.3.2.sha256sum] = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b"
 SRC_URI[system-deps-3.2.0.sha256sum] = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6"
 SRC_URI[tempfile-3.3.0.sha256sum] = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 SRC_URI[termion-1.5.6.sha256sum] = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e"
-SRC_URI[textwrap-0.11.0.sha256sum] = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 SRC_URI[thiserror-impl-1.0.31.sha256sum] = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
 SRC_URI[thiserror-1.0.31.sha256sum] = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
 SRC_URI[time-0.1.43.sha256sum] = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
 SRC_URI[toml-0.4.10.sha256sum] = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
 SRC_URI[toml-0.5.9.sha256sum] = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+SRC_URI[toml-0.8.19.sha256sum] = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+SRC_URI[toml_datetime-0.6.8.sha256sum] = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+SRC_URI[toml_edit-0.22.20.sha256sum] = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+SRC_URI[tracing-attributes-0.1.27.sha256sum] = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+SRC_URI[tracing-core-0.1.32.sha256sum] = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+SRC_URI[tracing-0.1.40.sha256sum] = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 SRC_URI[typenum-1.15.0.sha256sum] = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 SRC_URI[ucd-trie-0.1.3.sha256sum] = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+SRC_URI[uds_windows-1.1.0.sha256sum] = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
 SRC_URI[unicode-ident-1.0.0.sha256sum] = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
 SRC_URI[unicode-segmentation-1.9.0.sha256sum] = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
 SRC_URI[unicode-width-0.1.9.sha256sum] = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
 SRC_URI[unicode-xid-0.1.0.sha256sum] = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 SRC_URI[unicode-xid-0.2.3.sha256sum] = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
-SRC_URI[vec_map-0.8.2.sha256sum] = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 SRC_URI[version-compare-0.0.10.sha256sum] = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1"
 SRC_URI[version-compare-0.0.11.sha256sum] = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
 SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 SRC_URI[void-1.0.2.sha256sum] = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-SRC_URI[waker-fn-1.1.0.sha256sum] = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
 SRC_URI[walkdir-2.3.2.sha256sum] = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
 SRC_URI[wasi-0.10.2+wasi-snapshot-preview1.sha256sum] = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-SRC_URI[wasi-0.9.0+wasi-snapshot-preview1.sha256sum] = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-SRC_URI[wepoll-ffi-0.1.2.sha256sum] = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
 SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+SRC_URI[windows-sys-0.59.0.sha256sum] = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+SRC_URI[winnow-0.6.18.sha256sum] = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+SRC_URI[xdg-home-1.3.0.sha256sum] = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
 SRC_URI[xi-unicode-0.1.0.sha256sum] = "12ea8eda4b1eb72f02d148402e23832d56a33f55d8c1b2d5bcdde91d79d47cb1"
-SRC_URI[zbus-2.0.0-beta.5.sha256sum] = "d45f4720326304c291f96f66b6c1131f16964bba6bffe216ac85de2e48321a10"
-SRC_URI[zbus_macros-2.0.0-beta.5.sha256sum] = "cf0fa91321143695013cb3fa62a6395dbe14eafd97ab58c2ba73f61d5035b1d9"
-SRC_URI[zvariant-2.10.0.sha256sum] = "a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525"
-SRC_URI[zvariant_derive-2.10.0.sha256sum] = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9"
+SRC_URI[zbus-4.4.0.sha256sum] = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
+SRC_URI[zbus_macros-4.4.0.sha256sum] = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
+SRC_URI[zbus_names-3.0.0.sha256sum] = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+SRC_URI[zvariant-4.2.0.sha256sum] = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
+SRC_URI[zvariant_derive-4.2.0.sha256sum] = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
+SRC_URI[zvariant_utils-2.1.0.sha256sum] = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"

 export SODIUM_USE_PKG_CONFIG = "1"

@ -494,6 +612,7 @@ FILES:${PN} = "\
    ${libexecdir}/citadel-realmsd \
    ${libexecdir}/citadel-installer-ui \
    ${libexecdir}/realm-config-ui \
+    ${libexecdir}/launch-gnome-software \
    ${bindir}/citadel-image \
    ${bindir}/citadel-realmfs \
    ${bindir}/citadel-update \
@ -541,6 +660,9 @@ do_install() {
    # citadel-realms as /usr/bin/realms
    install -m 755 -T ${TARGET_BIN}/citadel-realms ${D}${bindir}/realms

+    # /usr/libexec/launch-gnome-software
+    install -m 4755 ${TARGET_BIN}/launch-gnome-software ${D}${libexecdir}
+
    ln ${D}${libexecdir}/citadel-tool ${D}${libexecdir}/citadel-boot
    ln ${D}${libexecdir}/citadel-tool ${D}${libexecdir}/citadel-install
    ln ${D}${libexecdir}/citadel-tool ${D}${libexecdir}/citadel-install-backend
--- a/meta-citadel/recipes-core/glib-2.0/glib-2.0/0001-Modify-glib-to-accommodate-citadel-timezone-symlink-.patch
+++ b/meta-citadel/recipes-core/glib-2.0/glib-2.0/0001-Modify-glib-to-accommodate-citadel-timezone-symlink-.patch
@ -0,0 +1,51 @@
+From a9ad6dd95f0aa2d413a5328edf3e3e4668e39415 Mon Sep 17 00:00:00 2001
+From: isa <isa@subgraph.com>
+Date: Thu, 22 Aug 2024 15:23:03 +0000
+Subject: [PATCH] Modify glib to use localtime in /storage/citadel-state
+Upstream-Status: Inappropriate [citadel specific]
+
+---
+ glib/gtimezone.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/glib/gtimezone.c b/glib/gtimezone.c
+index 4a4a2d0..ed1444a 100644
+--- a/glib/gtimezone.c
+++ b/glib/gtimezone.c
+@@ -538,14 +538,14 @@ zone_identifier_unix (void)
+   gboolean not_a_symlink_to_zoneinfo = FALSE;
+   struct stat file_status;
+ 
+-  /* Resolve the actual timezone pointed to by /etc/localtime. */
+-  resolved_identifier = g_file_read_link ("/etc/localtime", &read_link_err);
+  /* Resolve the actual timezone pointed to by /storage/citadel-state/localtime. */
+  resolved_identifier = g_file_read_link ("/storage/citadel-state/localtime", &read_link_err);
+ 
+   if (resolved_identifier != NULL)
+     {
+       if (!g_path_is_absolute (resolved_identifier))
+         {
+-          gchar *absolute_resolved_identifier = g_build_filename ("/etc", resolved_identifier, NULL);
+          gchar *absolute_resolved_identifier = g_build_filename ("/storage/citadel-state", resolved_identifier, NULL);
+           g_free (resolved_identifier);
+           resolved_identifier = g_steal_pointer (&absolute_resolved_identifier);
+         }
+@@ -604,7 +604,7 @@ zone_identifier_unix (void)
+   else
+     {
+       /* Resolve relative path */
+-      canonical_path = g_canonicalize_filename (resolved_identifier, "/etc");
+      canonical_path = g_canonicalize_filename (resolved_identifier, "/storage/citadel-state");
+       g_free (resolved_identifier);
+       resolved_identifier = g_steal_pointer (&canonical_path);
+     }
+   file = g_mapped_file_new (filename, FALSE, NULL);
+@@ -671,7 +671,7 @@ zone_info_unix (const gchar *identifier,
+       if (resolved_identifier == NULL)
+         goto out;
+ 
+-      filename = g_strdup ("/etc/localtime");
+      filename = g_strdup ("/storage/citadel-state/localtime");
+     }
+ 
+   file = g_mapped_file_new (filename, FALSE, NULL);
--- a/meta-citadel/recipes-core/glib-2.0/glib-2.0_%.bbappend
+++ b/meta-citadel/recipes-core/glib-2.0/glib-2.0_%.bbappend
@ -0,0 +1,4 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-Modify-glib-to-accommodate-citadel-timezone-symlink-.patch"
+
--- a/meta-citadel/recipes-desktop/paper-icon-theme/paper-icon-theme_1.5.bb
+++ b/meta-citadel/recipes-desktop/paper-icon-theme/paper-icon-theme_1.5.bb
@ -17,6 +17,6 @@ FILES:${PN} = "${datadir}/icons"
 # Add an index.theme to /usr/share/icons/default that inherits Paper cursors
 do_install:append() {
    mkdir -p ${D}${datadir}/icons/default
-    install -m 644 ${WORKDIR}/index.theme ${D}${datadir}/icons/default/index.theme
+    install -m 644 ${UNPACKDIR}/index.theme ${D}${datadir}/icons/default/index.theme
 }

--- a/meta-citadel/recipes-desktop/ttf-dejavu/ttf-dejavu_2.37.bb
+++ b/meta-citadel/recipes-desktop/ttf-dejavu/ttf-dejavu_2.37.bb
@ -22,7 +22,7 @@ S = "${WORKDIR}/dejavu-fonts-ttf-${PV}/ttf"

 do_install:append () {
    install -d ${D}${sysconfdir}/fonts/conf.d/
-    install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
+    install -m 0644 ${UNPACKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
 }

 PACKAGES = "\
--- a/meta-citadel/recipes-freedesktop/plymouth/files/plymouthd.conf
+++ b/meta-citadel/recipes-freedesktop/plymouth/files/plymouthd.conf
--- a/meta-citadel/recipes-freedesktop/plymouth/plymouth_%.bbappend
+++ b/meta-citadel/recipes-freedesktop/plymouth/plymouth_%.bbappend
@ -0,0 +1,17 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+PACKAGECONFIG = "pango systemd udev drm gtk spinfinity fade-in text details solar glow script spinner tribar bgrt"
+
+
+#
+# Install a custom plymouthd.conf file
+#
+SRC_URI += "file://plymouthd.conf" 
+
+do_install:append() {
+    rm -rf ${D}/etc/plymouth/plymouthd.conf
+    install -m 644 ${UNPACKDIR}/plymouthd.conf ${D}/etc/plymouth/plymouthd.conf
+}
+
+# No dracut pls
+RDEPENDS:${PN}:remove = "dracut"
--- a/meta-citadel/recipes-gnome/gnome-control-center/gnome-control-center/0001-Remove-panels-for-Citadel.patch
+++ b/meta-citadel/recipes-gnome/gnome-control-center/gnome-control-center/0001-Remove-panels-for-Citadel.patch
@ -1,34 +1,35 @@
-From a134a4b633953eed419b1f63ff2c5df9b19c5981 Mon Sep 17 00:00:00 2001
+From ccc362c085b87e05afcfbde86d1d146ceb29938b Mon Sep 17 00:00:00 2001
 From: Bruce Leidl <bruce@subgraph.com>
-Date: Wed, 3 Apr 2024 11:26:34 -0400
-Subject: [PATCH] Remove panels for citadel
+Date: Wed, 14 May 2025 16:19:40 +0000
+Subject: [PATCH] Remove panels for Citadel

+Upstream-Status: Inappropriate [Citadel]
 ---
 meson.build                      | 25 -----------
 panels/meson.build               |  4 --
 panels/system/cc-system-panel.c  | 72 --------------------------------
- panels/system/cc-system-panel.ui | 62 +--------------------------
- panels/system/meson.build        | 36 ----------------
+ panels/system/cc-system-panel.ui | 54 ------------------------
+ panels/system/meson.build        | 34 ---------------
 shell/cc-panel-list.c            |  4 --
 shell/cc-panel-loader.c          |  9 ----
- tests/meson.build                |  3 --
- 8 files changed, 1 insertion(+), 214 deletions(-)
+ tests/meson.build                |  2 -
+ 8 files changed, 204 deletions(-)

 diff --git a/meson.build b/meson.build
-index c1c1d4a..5134a63 100644
+index f3cca5b..a2d44b4 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -184,7 +184,6 @@ gnome_desktop_dep = dependency('gnome-desktop-4')
+@@ -191,7 +191,6 @@ gnome_desktop_dep = dependency('gnome-desktop-4')
 gnome_bg_dep = dependency('gnome-bg-4')
 gnome_rr_dep = dependency('gnome-rr-4')
- gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 41.0')
-goa_dep = dependency('goa-1.0', version: goa_req_version)
- gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 46.beta')
+ gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 48.rc', fallback: 'gsd')
+-goa_dep = dependency('goa-1.0', version: goa_req_version, fallback: 'goa')
+ gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 48.alpha')  # actually requires commit 9d55553, just after alpha
 libxml_dep = dependency('libxml-2.0')
 pulse_dep = dependency('libpulse', version: pulse_req_version)
-@@ -218,30 +217,6 @@ foreach polkit_file: polkit_files
-   assert(r.returncode() == 0, 'ITS support missing from polkit, please upgrade or contact your distribution')
- endforeach
+@@ -231,30 +230,6 @@ if cc.has_header_symbol('langinfo.h', '_NL_TIME_FIRST_WEEKDAY')
+                description: 'Define if langinfo.h supports _NL_TIME_FIRST_WEEKDAY')
+ endif
 
 -# Check for CUPS 1.4 or newer
 -cups_dep = dependency('cups', version : '>= 1.4', required: false)
@ -58,18 +59,17 @@ index c1c1d4a..5134a63 100644
 enable_ibus = get_option('ibus')
 if enable_ibus
 diff --git a/panels/meson.build b/panels/meson.build
-index 3067635..6c1d9d9 100644
+index 07c7733..21a56c2 100644
 --- a/panels/meson.build
 +++ b/panels/meson.build
-@@ -1,7 +1,6 @@
- subdir('common')
+@@ -5,19 +5,15 @@ dependent_panels = [
+ ]
 
 panels = [
 -  'applications',
   'background',
   'color',
   'display',
-@@ -9,12 +8,9 @@ panels = [
   'mouse',
   'multitasking',
   'notifications',
@ -83,28 +83,28 @@ index 3067635..6c1d9d9 100644
   'system',
   'universal-access',
 diff --git a/panels/system/cc-system-panel.c b/panels/system/cc-system-panel.c
-index 3574100..a509574 100644
+index a81e9a4..54f76b9 100644
 --- a/panels/system/cc-system-panel.c
 +++ b/panels/system/cc-system-panel.c
-@@ -30,9 +30,6 @@
+@@ -31,9 +31,6 @@
 #include "about/cc-about-page.h"
 #include "datetime/cc-datetime-page.h"
 #include "region/cc-region-page.h"
 -#include "remote-desktop/cc-remote-desktop-page.h"
-#include "remote-login/cc-remote-login-page.h"
+-#include "secure-shell/cc-secure-shell-page.h"
 -#include "users/cc-users-page.h"
 
 struct _CcSystemPanel
 {
-@@ -40,7 +37,6 @@ struct _CcSystemPanel
+@@ -45,7 +42,6 @@ struct _CcSystemPanel
+   AdwActionRow *remote_desktop_row;
+   AdwActionRow *users_row;
 
-   AdwNavigationView *navigation;
- 
-  GtkWidget *remote_login_dialog;
+-  CcSecureShellPage *secure_shell_dialog;
   AdwNavigationPage *software_updates_group;
 };
 
-@@ -68,65 +64,6 @@ gnome_software_allows_updates (void)
+@@ -73,64 +69,6 @@ gnome_software_allows_updates (void)
   return g_settings_get_boolean (settings, "allow-updates");
 }
 
@ -156,24 +156,23 @@ index 3574100..a509574 100644
 -static void
 -on_secure_shell_row_clicked (CcSystemPanel *self)
 -{
-  if (self->remote_login_dialog == NULL) {
-    GtkWidget *parent = cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (self)));
+-  if (self->secure_shell_dialog == NULL)
+-    {
+-      self->secure_shell_dialog = g_object_new (CC_TYPE_SECURE_SHELL_PAGE, NULL);
+-      g_object_add_weak_pointer (G_OBJECT (self->secure_shell_dialog),
+-                                 (gpointer *) &self->secure_shell_dialog);
+-    }
 -
-    self->remote_login_dialog = g_object_new (CC_TYPE_REMOTE_LOGIN_PAGE, NULL);
-
-    gtk_window_set_transient_for (GTK_WINDOW (self->remote_login_dialog),
-                                  GTK_WINDOW (parent));
-  }
-
-  gtk_window_present (GTK_WINDOW (self->remote_login_dialog));
+-  adw_dialog_present (ADW_DIALOG (self->secure_shell_dialog), GTK_WIDGET (self));
 -}
- 
+-
 static void
- on_subpage_set (CcSystemPanel *self)
-@@ -151,17 +88,10 @@ cc_system_panel_class_init (CcSystemPanelClass *klass)
-   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/system/cc-system-panel.ui");
- 
-   gtk_widget_class_bind_template_child (widget_class, CcSystemPanel, navigation);
+ cc_system_panel_class_init (CcSystemPanelClass *klass)
+ {
+@@ -143,18 +81,11 @@ cc_system_panel_class_init (CcSystemPanelClass *klass)
+   gtk_widget_class_bind_template_child (widget_class, CcSystemPanel, region_row);
+   gtk_widget_class_bind_template_child (widget_class, CcSystemPanel, remote_desktop_row);
+   gtk_widget_class_bind_template_child (widget_class, CcSystemPanel, users_row);
 -  gtk_widget_class_bind_template_child (widget_class, CcSystemPanel, software_updates_group);
 -
 -  gtk_widget_class_bind_template_callback (widget_class, cc_system_page_open_software_update);
@ -181,113 +180,103 @@ index 3574100..a509574 100644
 
   g_type_ensure (CC_TYPE_ABOUT_PAGE);
   g_type_ensure (CC_TYPE_DATE_TIME_PAGE);
+   g_type_ensure (CC_TYPE_LIST_ROW);
   g_type_ensure (CC_TYPE_REGION_PAGE);
 -  g_type_ensure (CC_TYPE_REMOTE_DESKTOP_PAGE);
-  g_type_ensure (CC_TYPE_REMOTE_LOGIN_PAGE);
+-  g_type_ensure (CC_TYPE_SECURE_SHELL_PAGE);
 -  g_type_ensure (CC_TYPE_USERS_PAGE);
 }
 
 static void
-@@ -170,7 +100,5 @@ cc_system_panel_init (CcSystemPanel *self)
-   g_resources_register (cc_system_get_resource ());
-   gtk_widget_init_template (GTK_WIDGET (self));
- 
+@@ -169,11 +100,8 @@ cc_system_panel_init (CcSystemPanel *self)
+   /* Hide the remote-desktop page if the g-r-d service is either "masked", "static", or "not-found". */
+   gtk_widget_set_visible (GTK_WIDGET (self->remote_desktop_row), service_state == CC_SERVICE_STATE_ENABLED ||
+                                                                  service_state == CC_SERVICE_STATE_DISABLED);
 -  gtk_widget_set_visible (GTK_WIDGET (self->software_updates_group), show_software_updates_group (self));
-
-   g_signal_connect_object (self, "notify::subpage", G_CALLBACK (on_subpage_set), self, G_CONNECT_SWAPPED);
+ 
+   cc_panel_add_static_subpage (CC_PANEL (self), "about", CC_TYPE_ABOUT_PAGE);
+   cc_panel_add_static_subpage (CC_PANEL (self), "datetime", CC_TYPE_DATE_TIME_PAGE);
+   cc_panel_add_static_subpage (CC_PANEL (self), "region", CC_TYPE_REGION_PAGE);
+-  cc_panel_add_static_subpage (CC_PANEL (self), "remote-desktop", CC_TYPE_REMOTE_DESKTOP_PAGE);
+-  cc_panel_add_static_subpage (CC_PANEL (self), "users", CC_TYPE_USERS_PAGE);
 }
 diff --git a/panels/system/cc-system-panel.ui b/panels/system/cc-system-panel.ui
-index 5c05149..e13de91 100644
+index 6de8b22..12c88d9 100644
 --- a/panels/system/cc-system-panel.ui
 +++ b/panels/system/cc-system-panel.ui
-@@ -40,40 +40,6 @@
-                           </object>
-                         </child>
- 
-                        <child>
-                          <object class="CcListRow">
-                            <property name="title" translatable="yes">_Users</property>
-                            <property name="subtitle" translatable="yes">Add and remove accounts, change password</property>
-                            <property name="icon-name">org.gnome.Settings-users-symbolic</property>
-                            <property name="use-underline">True</property>
-                            <property name="show-arrow">True</property>
-                            <property name="action-name">navigation.push</property>
-                            <property name="action-target">'users'</property>
-                          </object>
-                        </child>
-
-                        <child>
-                          <object class="CcListRow">
-                            <property name="visible" bind-source="remote_desktop_page" bind-property="visible" bind-flags="sync-create"/>
-                            <property name="title" translatable="yes">R_emote Desktop</property>
-                            <property name="subtitle" translatable="yes">Allow this device to be used remotely</property>
-                            <property name="icon-name">org.gnome.Settings-remote-desktop-symbolic</property>
-                            <property name="show-arrow">True</property>
-                            <property name="action-name">navigation.push</property>
-                            <property name="action-target">'remote-desktop'</property>
-                          </object>
-                        </child>
-
-                        <child>
-                          <object class="CcListRow">
-                            <property name="title" translatable="yes">Secu_re Shell</property>
-                            <property name="subtitle" translatable="yes">SSH network access</property>
-                            <property name="icon-name">utilities-terminal-symbolic</property>
-                            <property name="show-arrow">True</property>
-                            <signal name="activated" handler="on_secure_shell_row_clicked" object="CcSystemPanel" swapped="yes"/>
-                          </object>
-                        </child>
-
-                         <child>
-                           <object class="CcListRow">
-                             <property name="title" translatable="yes">_About</property>
-@@ -87,27 +53,7 @@
- 
+@@ -37,39 +37,6 @@
                       </object>
                     </child>
+ 
 -                    <child>
-                      <!-- Software Updates -->
-                      <object class="AdwPreferencesGroup" id="software_updates_group">
-                        <property name="visible">False</property>
-                        <child>
-                          <object class="AdwActionRow">
-                            <property name="activatable">True</property>
-                            <property name="title" translatable="yes">Software _Updates</property>
-                            <property name="icon-name">update-symbolic</property>
-                            <property name="use-underline">True</property>
-                            <signal name="activated" handler="cc_system_page_open_software_update" swapped="yes"/>
-                            <child type="suffix">
-                              <object class="GtkImage">
-                                <property name="valign">center</property>
-                                <property name="icon-name">adw-external-link-symbolic</property>
-                              </object>
-                            </child>
+-                      <object class="CcListRow" id="users_row">
+-                        <property name="title" translatable="yes">_Users</property>
+-                        <property name="subtitle" translatable="yes">Add and remove accounts, change password</property>
+-                        <property name="icon-name">org.gnome.Settings-users-symbolic</property>
+-                        <property name="use-underline">True</property>
+-                        <property name="show-arrow">True</property>
+-                        <property name="action-name">navigation.push</property>
+-                        <property name="action-target">'users'</property>
+-                      </object>
+-                    </child>
+-
+-                    <child>
+-                      <object class="CcListRow" id="remote_desktop_row">
+-                        <property name="title" translatable="yes">R_emote Desktop</property>
+-                        <property name="subtitle" translatable="yes">Allow this device to be used remotely</property>
+-                        <property name="icon-name">org.gnome.Settings-remote-desktop-symbolic</property>
+-                        <property name="show-arrow">True</property>
+-                        <property name="action-name">navigation.push</property>
+-                        <property name="action-target">'remote-desktop'</property>
+-                      </object>
+-                    </child>
+-
+-                    <child>
+-                      <object class="CcListRow">
+-                        <property name="title" translatable="yes">Se_cure Shell</property>
+-                        <property name="subtitle" translatable="yes">SSH network access</property>
+-                        <property name="icon-name">utilities-terminal-symbolic</property>
+-                        <property name="show-arrow">True</property>
+-                        <signal name="activated" handler="on_secure_shell_row_clicked" object="CcSystemPanel" swapped="yes"/>
+-                      </object>
+-                    </child>
+-
+                     <child>
+                       <object class="CcListRow" id="about_row">
+                         <property name="title" translatable="yes">_About</property>
+@@ -83,27 +50,6 @@
+ 
+                   </object>
+                 </child>
+-                <child>
+-                  <!-- Software Updates -->
+-                  <object class="AdwPreferencesGroup" id="software_updates_group">
+-                    <property name="visible">False</property>
+-                    <child>
+-                      <object class="AdwActionRow">
+-                        <property name="activatable">True</property>
+-                        <property name="title" translatable="yes">S_oftware Updates</property>
+-                        <property name="icon-name">system-update-symbolic</property>
+-                        <property name="use-underline">True</property>
+-                        <signal name="activated" handler="cc_system_page_open_software_update" swapped="yes"/>
+-                        <child type="suffix">
+-                          <object class="GtkImage">
+-                            <property name="valign">center</property>
+-                            <property name="icon-name">adw-external-link-symbolic</property>
 -                          </object>
 -                        </child>
 -                      </object>
 -                    </child>
-+
-                   </object>
-                 </property>
+-                  </object>
+-                </child>
+               </object>
+             </property>
 
-@@ -122,12 +68,6 @@
-         <child>
-           <object class="CcDateTimePage" id="datetime_page"/>
-         </child>
-        <child>
-          <object class="CcUsersPage" id="users_page"/>
-        </child>
-        <child>
-          <object class="CcRemoteDesktopPage" id="remote_desktop_page"/>
-        </child>
-         <child>
-           <object class="CcAboutPage" id="about_page"/>
-         </child>
 diff --git a/panels/system/meson.build b/panels/system/meson.build
-index 979332a..530273d 100644
+index 2525bde..fe3663c 100644
 --- a/panels/system/meson.build
 +++ b/panels/system/meson.build
-@@ -39,30 +39,6 @@ sources = files(
+@@ -35,28 +35,6 @@ sources = files(
   'region/cc-region-page.c',
   'region/cc-format-chooser.c',
   'region/cc-format-preview.c',
@ -295,12 +284,10 @@ index 979332a..530273d 100644
 -  'remote-desktop/cc-encryption-fingerprint-dialog.c',
 -  'remote-desktop/cc-gnome-remote-desktop.c',
 -  'remote-desktop/cc-remote-desktop-page.c',
-  'remote-desktop/cc-remote-session-page.c',
+-  'remote-desktop/cc-remote-login-page.c',
 -  'remote-desktop/cc-tls-certificate.c',
-  'remote-desktop/cc-systemd-service.c',
-  'remote-login/cc-remote-login.c',
-  'remote-login/cc-remote-login-page.c',
-  'remote-login/cc-systemd-service.c',
+-  'secure-shell/cc-secure-shell.c',
+-  'secure-shell/cc-secure-shell-page.c',
 -  'users/cc-add-user-dialog.c',
 -  'users/cc-avatar-chooser.c',
 -  'users/cc-crop-area.c',
@ -318,8 +305,8 @@ index 979332a..530273d 100644
 )
 
 sources += gnome.compile_resources(
-@@ -97,26 +73,17 @@ sources += gnome.mkenums(
-   vtail: '      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static ("@EnumName@", values);\n  }\n  return etype;\n}\n'
+@@ -77,26 +55,17 @@ sources += gnome.mkenums_simple(
+   symbol_prefix: 'g_desktop'
 )
 
 -libsecret_dep = dependency('libsecret-1')
@ -345,21 +332,21 @@ index 979332a..530273d 100644
   polkit_gobject_dep,
   pwquality_dep,
   udisks2,
-@@ -150,9 +117,6 @@ cflags += [
- subdir('about')
+@@ -131,9 +100,6 @@ subdir('about')
 subdir('datetime')
+ subdir('icons')
 subdir('region')
 -subdir('remote-desktop')
-subdir('remote-login')
+-subdir('secure-shell')
 -subdir('users')
 
 panels_libs += static_library(
   cappletname,
 diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c
-index 14ae7d0..a34c137 100644
+index c339054..09a0728 100644
 --- a/shell/cc-panel-list.c
 +++ b/shell/cc-panel-list.c
-@@ -376,18 +376,14 @@ static const gchar * const panel_order[] = {
+@@ -380,11 +380,8 @@ static const gchar * const panel_order[] = {
 
   "separator",
 
@ -368,9 +355,10 @@ index 14ae7d0..a34c137 100644
   "search",
 -  "online-accounts",
 -  "sharing",
+   "wellbeing",
 
   "separator",
- 
+@@ -392,7 +389,6 @@ static const gchar * const panel_order[] = {
   "mouse",
   "keyboard",
   "color",
@ -379,7 +367,7 @@ index 14ae7d0..a34c137 100644
 
   "separator",
 diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
-index 71b7686..c322944 100644
+index 28a1671..45eeb4e 100644
 --- a/shell/cc-panel-loader.c
 +++ b/shell/cc-panel-loader.c
@@ -31,7 +31,6 @@
@ -403,7 +391,7 @@ index 71b7686..c322944 100644
 extern GType cc_sound_panel_get_type (void);
 extern GType cc_system_panel_get_type (void);
 extern GType cc_ua_panel_get_type (void);
-@@ -84,7 +80,6 @@ extern void cc_wwan_panel_static_init_func (void);
+@@ -86,7 +82,6 @@ extern void cc_wwan_panel_static_init_func (void);
 
 static CcPanelLoaderVtable default_panels[] =
 {
@ -411,7 +399,7 @@ index 71b7686..c322944 100644
   PANEL_TYPE("background",       cc_background_panel_get_type,           NULL),
 #ifdef BUILD_BLUETOOTH
   PANEL_TYPE("bluetooth",        cc_bluetooth_panel_get_type,            NULL),
-@@ -99,12 +94,9 @@ static CcPanelLoaderVtable default_panels[] =
+@@ -101,12 +96,9 @@ static CcPanelLoaderVtable default_panels[] =
   PANEL_TYPE("wifi",             cc_wifi_panel_get_type,                 cc_wifi_panel_static_init_func),
 #endif
   PANEL_TYPE("notifications",    cc_notifications_panel_get_type,        NULL),
@ -420,11 +408,11 @@ index 71b7686..c322944 100644
 -  PANEL_TYPE("printers",         cc_printers_panel_get_type,             NULL),
   PANEL_TYPE("privacy",          cc_privacy_panel_get_type,              NULL),
   PANEL_TYPE("search",           cc_search_panel_get_type,               NULL),
-  PANEL_TYPE("sharing",          cc_sharing_panel_get_type,              NULL),
+-  PANEL_TYPE("sharing",          cc_sharing_panel_get_type,              cc_sharing_panel_static_init_func),
   PANEL_TYPE("sound",            cc_sound_panel_get_type,                NULL),
   PANEL_TYPE("system",           cc_system_panel_get_type,               NULL),
   PANEL_TYPE("universal-access", cc_ua_panel_get_type,                   NULL),
-@@ -133,7 +125,6 @@ static CcSubpageLoaderVtable default_subpages[] =
+@@ -136,7 +128,6 @@ static CcSubpageLoaderVtable default_subpages[] =
   {CC_CATEGORY_SYSTEM, "about"},
   {CC_CATEGORY_SYSTEM, "datetime"},
   {CC_CATEGORY_SYSTEM, "region"},
@ -433,13 +421,12 @@ index 71b7686..c322944 100644
 static CcSubpageLoaderVtable *subpages_vtable = default_subpages;
 static gsize supages_vtable_len = G_N_ELEMENTS (default_subpages);
 diff --git a/tests/meson.build b/tests/meson.build
-index ad645c2..c10ce2f 100644
+index a8c37c5..5e8645e 100644
 --- a/tests/meson.build
 +++ b/tests/meson.build
-@@ -8,6 +8,3 @@ endif
- if not libadwaita_is_subproject
+@@ -12,5 +12,3 @@ if not libadwaita_is_subproject
   subdir('interactive-panels')
 endif
-
+ 
 -subdir('printers')
 -subdir('keyboard')
--- a/meta-citadel/recipes-gnome/gnome-control-center/gnome-control-center_%.bbappend
+++ b/meta-citadel/recipes-gnome/gnome-control-center/gnome-control-center_%.bbappend
@ -0,0 +1,7 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-Remove-panels-for-Citadel.patch"
+
+DEPENDS:remove = "samba gnome-online-accounts"
+RDEPENDS:${PN} += "gstreamer1.0-plugins-base gstreamer1.0-plugins-good"
+
--- a/meta-citadel/recipes-gnome/gnome-desktop/gnome-desktop/0001-Modify-gnome-desktop-to-use-localtime-in-storage-cit.patch
+++ b/meta-citadel/recipes-gnome/gnome-desktop/gnome-desktop/0001-Modify-gnome-desktop-to-use-localtime-in-storage-cit.patch
@ -0,0 +1,23 @@
+From f96b772948fa78cbb6b2e58f6fe41e53501cc629 Mon Sep 17 00:00:00 2001
+From: isa <isa@subgraph.com>
+Date: Fri, 23 Aug 2024 16:00:25 +0000
+Subject: [PATCH] Modify gnome-desktop to use localtime in /storage/citadel-state
+Upstream-Status: Inappropriate [citadel specific]
+
+---
+ libgnome-desktop/gnome-wall-clock.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgnome-desktop/gnome-wall-clock.c b/libgnome-desktop/gnome-wall-clock.c
+index 4646220..1bb8269 100644
+--- a/libgnome-desktop/gnome-wall-clock.c
+++ b/libgnome-desktop/gnome-wall-clock.c
+@@ -78,7 +78,7 @@ gnome_wall_clock_init (GnomeWallClock *self)
+ 
+ 	self->priv->clock_string = NULL;
+ 	
+-	tz = g_file_new_for_path ("/etc/localtime");
+	tz = g_file_new_for_path ("/storage/citadel-state/localtime");
+ 	self->priv->tz_monitor = g_file_monitor_file (tz, 0, NULL, NULL);
+ 	g_object_unref (tz);
+ 	
--- a/meta-citadel/recipes-gnome/gnome-desktop/gnome-desktop_%.bbappend
+++ b/meta-citadel/recipes-gnome/gnome-desktop/gnome-desktop_%.bbappend
@ -0,0 +1,4 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-Modify-gnome-desktop-to-use-localtime-in-storage-cit.patch"
+
--- a/meta-citadel/recipes-gnome/gnome-shell/gnome-shell/0001-Changes-to-compiled-theme-files.patch
+++ b/meta-citadel/recipes-gnome/gnome-shell/gnome-shell/0001-Changes-to-compiled-theme-files.patch
@ -0,0 +1,118 @@
+From 5ac3cdf3cfdafa39c709c6ea732bc99031f5f8bb Mon Sep 17 00:00:00 2001
+From: Bruce Leidl <bruce@subgraph.com>
+Date: Wed, 11 Jun 2025 14:12:04 +0000
+Subject: [PATCH] Changes to compiled theme files.
+
+Upstream-Status: Inappropriate [Citadel]
+
+---
+ data/theme/gnome-shell-dark.css          | 27 ++++++++++++++++++++++++
+ data/theme/gnome-shell-high-contrast.css | 27 ++++++++++++++++++++++++
+ data/theme/gnome-shell-light.css         | 27 ++++++++++++++++++++++++
+ 3 files changed, 81 insertions(+)
+
+diff --git a/data/theme/gnome-shell-dark.css b/data/theme/gnome-shell-dark.css
+index 8dadc8c..f0c81e3 100644
+--- a/data/theme/gnome-shell-dark.css
+++ b/data/theme/gnome-shell-dark.css
+@@ -3269,3 +3269,30 @@ StScrollBar {
+     .login-dialog .user-widget.vertical .user-icon StIcon,
+     .unlock-dialog .user-widget.vertical .user-icon StIcon {
+       padding: 30px; }
+
+.realm-switch-label {
+  font-size: 36px;
+  font-weight: bold;
+  color: #ffffff;
+  background-color: rgba(10, 10, 10, 0.7);
+  border-radius: 5px;
+  padding: .5em; }
+
+.realm-window-label {
+  color: #282828;
+  padding: 6px 1em;
+  border-radius: 999px;
+  text-align: center;
+  font-size: 12pt;
+  font-weight: bold; }
+
+.realm-app-icon-label {
+  border-width: 3px;
+  border-style: solid;
+  border-color: #282828;
+  border-radius: 8px;
+  padding: 2px 1em;
+  margin-bottom: 8px; }
+
+.realm-config-icon {
+  color: #8e8e80; }
+diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
+index d2041ff..2a9581d 100644
+--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
+@@ -3616,3 +3616,30 @@ StScrollBar {
+     .login-dialog .user-widget.vertical .user-icon StIcon,
+     .unlock-dialog .user-widget.vertical .user-icon StIcon {
+       padding: 30px; }
+
+.realm-switch-label {
+  font-size: 36px;
+  font-weight: bold;
+  color: #ffffff;
+  background-color: rgba(10, 10, 10, 0.7);
+  border-radius: 5px;
+  padding: .5em; }
+
+.realm-window-label {
+  color: #282828;
+  padding: 6px 1em;
+  border-radius: 999px;
+  text-align: center;
+  font-size: 12pt;
+  font-weight: bold; }
+
+.realm-app-icon-label {
+  border-width: 3px;
+  border-style: solid;
+  border-color: #282828;
+  border-radius: 8px;
+  padding: 2px 1em;
+  margin-bottom: 8px; }
+
+.realm-config-icon {
+  color: #8e8e80; }
+diff --git a/data/theme/gnome-shell-light.css b/data/theme/gnome-shell-light.css
+index 266768a..12f1bf7 100644
+--- a/data/theme/gnome-shell-light.css
+++ b/data/theme/gnome-shell-light.css
+@@ -3269,3 +3269,30 @@ StScrollBar {
+     .login-dialog .user-widget.vertical .user-icon StIcon,
+     .unlock-dialog .user-widget.vertical .user-icon StIcon {
+       padding: 30px; }
+
+.realm-switch-label {
+  font-size: 36px;
+  font-weight: bold;
+  color: #ffffff;
+  background-color: rgba(10, 10, 10, 0.7);
+  border-radius: 5px;
+  padding: .5em; }
+
+.realm-window-label {
+  color: #282828;
+  padding: 6px 1em;
+  border-radius: 999px;
+  text-align: center;
+  font-size: 12pt;
+  font-weight: bold; }
+
+.realm-app-icon-label {
+  border-width: 3px;
+  border-style: solid;
+  border-color: #282828;
+  border-radius: 8px;
+  padding: 2px 1em;
+  margin-bottom: 8px; }
+
+.realm-config-icon {
+  color: #8e8e80; }
--- a/meta-citadel/recipes-gnome/gnome-shell/gnome-shell/citadel-gnome-shell.patch
+++ b/meta-citadel/recipes-gnome/gnome-shell/gnome-shell/citadel-gnome-shell.patch
--- a/meta-citadel/recipes-gnome/gnome-shell/gnome-shell_48.1.bb
+++ b/meta-citadel/recipes-gnome/gnome-shell/gnome-shell_48.1.bb
@ -6,10 +6,7 @@ REQUIRED_DISTRO_FEATURES = "x11 systemd pam"
 GIR_MESON_OPTION = ""
 GTKIC_VERSION = "4"

-SRCREV = "fdacdf5cc80a94e04549d864f2d4dbac5f15f4bc"
-
 EXTERNAL_TREE_VAR="CITADEL_GNOME_SHELL_PATH"
-GIT_URI = "gitsm://git.subgraph.com/brl/gnome-shell.git;branch=citadel-46.0;protocol=https"

 DEPENDS = " \
    libxml2-native \
@ -30,6 +27,13 @@ DEPENDS = " \

 inherit gnomebase gsettings gettext gobject-introspection gtk-icon-cache features_check external-tree

+SRC_URI[archive.sha256sum] = "ba4f455afd6213f387545946e3cd9daa39c904f7ab16dd830ac77a73ff1002ca"
+
+SRC_URI += " \
+    file://citadel-gnome-shell.patch \
+    file://0001-Changes-to-compiled-theme-files.patch \
+"
+
 RDEPENDS:${PN} = "gsettings-desktop-schemas librsvg-gtk tecla libjxl pipewire"

 FILES:${PN} += "\
@ -37,6 +41,7 @@ FILES:${PN} += "\
    ${datadir}/xdg-desktop-portal \
    ${datadir}/gnome-control-center  \
    ${datadir}/bash-completion/completions/gnome-extensions \
+    ${datadir}/desktop-directories \
    ${systemd_user_unitdir} \
 "

--- a/meta-citadel/recipes-gnome/mutter/mutter/citadel-mutter.patch
+++ b/meta-citadel/recipes-gnome/mutter/mutter/citadel-mutter.patch
--- a/meta-citadel/recipes-gnome/mutter/mutter_48.1.bb
+++ b/meta-citadel/recipes-gnome/mutter/mutter_48.1.bb
@ -1,7 +1,6 @@
 SUMMARY = "Window and compositing manager based on Clutter"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
 DEPENDS = " \
    xserver-xorg-cvt-native \
    libsm \
@ -12,6 +11,7 @@ DEPENDS = " \
    xcomposite \
    libinput \
    libei \
+    libdisplay-info \
    libcanberra \
    mesa \
    upower \
@ -38,13 +38,15 @@ DEPENDS = " \

 RDEPENDS:${PN} += " xwayland zenity"

-SRCREV = "ab32580b4c916914aec8429b3d4d68fef1dd583e"

 EXTERNAL_TREE_VAR="CITADEL_MUTTER_PATH"
-GIT_URI = "git://git.subgraph.com/brl/mutter.git;branch=citadel-46.0;protocol=https"

 inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even features_check external-tree

+
+SRC_URI[archive.sha256sum] = "e9970b3d81c76aed1e91f3436a82e7b14c5e32cf55949b1c9a18d0f157bacafc"
+SRC_URI += "file://citadel-mutter.patch"
+
 # x11 is still mandatory - see meson.build
 REQUIRED_DISTRO_FEATURES = "x11 systemd"

@ -55,7 +57,7 @@ LOGIND ?= "systemd"

 EXTRA_OEMESON += " \
    -Dremote_desktop=false \
-    -Dtests=false \
+    -Dtests=disabled\
    -Dprofiler=false \
    -Dcogl_tests=false \
    -Dlibwacom=true \
@ -64,7 +66,7 @@ EXTRA_OEMESON += " \
    -Dgles2_libname=libGLESv2.so.2 \
 "

-MUTTER_API_NAME = "mutter-14"
+MUTTER_API_NAME = "mutter-16"

 do_install:append() {
    # Add gir links in standard paths. That makes dependents life much easier
--- a/meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb
+++ b/meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb
@ -15,7 +15,8 @@ SRC_URI = "\
    file://citadel-install-rootfs-mount.service \
 "

-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"

 dirs755="/boot /dev /usr /usr/bin /usr/sbin /usr/lib /usr/share /etc /proc /run /var /sys /tmp"

@ -26,11 +27,11 @@ do_install() {
    done

    install -d ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/citadel-lvm-activate.service ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/citadel-rootfs-mount.path ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/citadel-rootfs-mount.service ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/citadel-rootfs-setup.service ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/citadel-install-rootfs-mount.service ${D}${systemd_system_unitdir}
+    install -m 644 ${UNPACKDIR}/citadel-lvm-activate.service ${D}${systemd_system_unitdir}
+    install -m 644 ${UNPACKDIR}/citadel-rootfs-mount.path ${D}${systemd_system_unitdir}
+    install -m 644 ${UNPACKDIR}/citadel-rootfs-mount.service ${D}${systemd_system_unitdir}
+    install -m 644 ${UNPACKDIR}/citadel-rootfs-setup.service ${D}${systemd_system_unitdir}
+    install -m 644 ${UNPACKDIR}/citadel-install-rootfs-mount.service ${D}${systemd_system_unitdir}

    install -d ${D}${systemd_system_unitdir}/sysinit.target.wants
    ln -s ../citadel-rootfs-mount.path ${D}${systemd_system_unitdir}/sysinit.target.wants/citadel-rootfs-mount.path
@ -38,10 +39,10 @@ do_install() {
    ln -s ../citadel-install-rootfs-mount.service ${D}${systemd_system_unitdir}/sysinit.target.wants/citadel-install-rootfs-mount.service

    install -d ${D}${sysconfdir}
-    install -m 644 ${WORKDIR}/initrd-release ${D}${sysconfdir}
-    install -m 644 ${WORKDIR}/crypttab ${D}${sysconfdir}
+    install -m 644 ${UNPACKDIR}/initrd-release ${D}${sysconfdir}
+    install -m 644 ${UNPACKDIR}/crypttab ${D}${sysconfdir}
    install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 644 ${WORKDIR}/11-dm.rules ${D}${sysconfdir}/udev/rules.d
+    install -m 644 ${UNPACKDIR}/11-dm.rules ${D}${sysconfdir}/udev/rules.d

    install -d ${D}/dev
    mknod -m 622 ${D}/dev/console c 5 1
--- a/meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb
+++ b/meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb
@ -7,7 +7,6 @@ PACKAGE_INSTALL = "\
    citadel-tools-boot \
    cryptsetup \
    lvm2 \
-    lvm2-udevrules \
    xz \
    tar \
    dconf \
@ -26,9 +25,6 @@ PACKAGE_INSTALL = "\
    kernel-module-appletouch \
    kernel-module-bcm5974 \
    kernel-module-ccm \
-    kernel-module-crc32-pclmul \
-    kernel-module-crc32c-intel \
-    kernel-module-crct10dif-pclmul \
    kernel-module-ecdh-generic \
    kernel-module-ehci-platform \
    kernel-module-ghash-clmulni-intel \
--- a/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_6.9.1.bb
+++ b/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_6.9.1.bb
@ -10,7 +10,7 @@ SRC_URI = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${PV}.tar.xz\
    file://bootconfig \
 "

-SRC_URI[sha256sum] = "01b414ba98fd189ecd544435caf3860ae2a790e3ec48f5aa70fdf42dc4c5c04a"
+SRC_URI[sha256sum] = "a294b683e7b161bb0517bb32ec7ed1d2ea7603dfbabad135170ed12d00c47670"

 LINUX_VERSION ?= "${PV}"
 S = "${WORKDIR}/linux-${LINUX_VERSION}"
--- a/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig
+++ b/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig
--- a/meta-citadel/recipes-kernel/linux-firmware/linux-firmware_20230804.bb
+++ b/meta-citadel/recipes-kernel/linux-firmware/linux-firmware_20230804.bb
--- a/meta-citadel/recipes-kernel/sof-firmware/sof-firmware_2.2.6.bb
+++ b/meta-citadel/recipes-kernel/sof-firmware/sof-firmware_2.2.6.bb
@ -1,22 +0,0 @@
-DESCRIPTION = "SOF firmware files for use with Linux kernel"
-HOMEPAGE = "https://github.com/thesofproject"
-SECTION = "kernel"
-
-SRC_URI = "https://github.com/thesofproject/sof-bin/releases/download/v${PV}/sof-bin-v${PV}.tar.gz"
-SRC_URI[sha256sum] = "9322c2a7636d02845c3b26984d58ab8f78d63ff4c766d084c3196a585e000905"
-
-S = "${WORKDIR}"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://sof-bin-v${PV}/LICENCE.Intel;md5=54b4f1a2dd35fd85bc7a1d4afa731b78"
-
-FILES:${PN} += "/usr/lib/firmware/intel/*"
-
-inherit allarch update-alternatives
-
-do_install() {
-        install -v -d  ${D}/usr/lib/firmware/intel/sof
-        install -v -d  ${D}/usr/lib/firmware/intel/sof-tplg
-        cp -R ${S}/sof-bin-v${PV}/sof-v${PV}/* ${D}/usr/lib/firmware/intel/sof
-        cp -R ${S}/sof-bin-v${PV}/sof-tplg-v${PV}/* ${D}/usr/lib/firmware/intel/sof-tplg
-}
--- a/meta-citadel/recipes-kernel/sof-firmware/sof-firmware_2025.01.bb
+++ b/meta-citadel/recipes-kernel/sof-firmware/sof-firmware_2025.01.bb
@ -0,0 +1,72 @@
+DESCRIPTION = "SOF firmware files for use with Linux kernel"
+HOMEPAGE = "https://github.com/thesofproject"
+SECTION = "kernel"
+
+#https://github.com/thesofproject/sof-bin/releases/download/v2025.01/sof-bin-2025.01.tar.gz
+SRC_URI = "https://github.com/thesofproject/sof-bin/releases/download/v${PV}/sof-bin-${PV}.tar.gz"
+SRC_URI[sha256sum] = "34d565db757a32450106317cc51f38bf67962e0fc8b7f7c72e6e39fd89e99263"
+
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://sof-bin-${PV}/LICENCE.Intel;md5=54b4f1a2dd35fd85bc7a1d4afa731b78"
+
+FILES:${PN} += "/usr/lib/firmware/intel/*"
+
+FIRMWARE_DEST = "${D}/usr/lib/firmware/intel"
+
+XZ_OPTS = "-9 --check=crc32"
+
+inherit allarch update-alternatives
+
+do_install() {
+
+        install -v -d  ${FIRMWARE_DEST}
+        for d in sof sof-ipc4 sof-ipc4-lib sof-ipc4-tplg sof-tplg; do \
+            cp -R ${S}/sof-bin-${PV}/${d} ${FIRMWARE_DEST}
+        done
+        ln -s sof-ipc4-tplg ${FIRMWARE_DEST}/sof-ace-tplg
+
+        # remove NXP firmware files
+        rm -rf ${FIRMWARE_DEST}/sof-tplg/sof-imx8*
+
+        # remove Mediatek firmware files
+        rm -rf ${FIRMWARE_DEST}/sof-tplg/sof-mt8*
+
+        # remove debug files
+        rm -rf ${FIRMWARE_DEST}/sof/*.ldc
+
+        for d in sof sof-ipc4; do \
+          find -P "${FIRMWARE_DEST}/${d}" -type f -name "*.ri" -exec xz -z ${XZ_OPTS} {} \;
+          for f in $(find -P "${FIRMWARE_DEST}/${d}" -type l -name "*.ri"); do \
+            l=$(readlink "${f}"); \
+            n=$(dirname "${f}"); \
+            b=$(basename "${f}"); \
+            rm "${f}"; \
+            oldpath=`pwd`; \
+            cd "${n}"; \
+            ln -svf "${l}.xz" "${b}.xz"; \
+            cd "${oldpath}"; \
+          done; \
+        done
+        for d in sof-ipc4-lib; do \
+          for e in bin llext; do \
+            find -P "${FIRMWARE_DEST}/${d}"  -type f -name "*.${e}" -exec xz -z ${XZ_OPTS} {} \;
+            for f in $(find -P "${FIRMWARE_DEST}/${d}" -type l -name "*.${e}"); do \
+              l=$(readlink "${f}"); \
+              n=$(dirname "${f}"); \
+              b=$(basename "${f}"); \
+              rm "${f}"; \
+              oldpath=`pwd`; \
+              cd "${n}"; \
+              ln -svf "${l}.xz" "${b}.xz"; \
+              cd "${oldpath}"; \
+            done; \
+          done; \
+        done
+        for d in sof-tplg sof-ipc4-tplg; do \
+          find -P "${FIRMWARE_DEST}/${d}"  -type f -name "*.tplg" -exec xz -z ${XZ_OPTS} {} \;
+        done
+}
--- a/meta-citadel/recipes-support/bubblewrap/bubblewrap_0.8.0.bb
+++ b/meta-citadel/recipes-support/bubblewrap/bubblewrap_0.8.0.bb
@ -0,0 +1,24 @@
+DESCRIPTION = "Unprivileged sandboxing tool"
+HOMEPAGE = "https://github.com/containers/bubblewrap"
+LICENSE = "LGPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+DEPENDS = "libcap"
+
+SRC_URI = "https://github.com/containers/${BPN}/releases/download/v${PV}/${BP}.tar.xz"
+SRC_URI[sha256sum] = "957ad1149db9033db88e988b12bcebe349a445e1efc8a9b59ad2939a113d333a"
+
+inherit autotools bash-completion github-releases manpages pkgconfig
+
+GITHUB_BASE_URI = "https://github.com/containers/${BPN}/releases/"
+
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
+PACKAGECONFIG[manpages] = "--enable-man,--disable-man,libxslt-native docbook-xsl-stylesheets-native xmlto-native"
+PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
+PACKAGECONFIG[setuid] = "--with-priv-mode=setuid,--with-priv-mode=none"
+
+PACKAGES += "${PN}-zsh-completion"
+
+FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions"
+
+BBCLASSEXTEND = "native"
--- a/meta-citadel/recipes-support/cryptsetup/cryptsetup_2.7.5.bb
+++ b/meta-citadel/recipes-support/cryptsetup/cryptsetup_2.7.5.bb
@ -16,9 +16,11 @@ DEPENDS = " \
    util-linux-libuuid \
 "

+DEPENDS:append:libc-musl = " argp-standalone"
+LDFLAGS:append:libc-musl = " -largp"
+
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz"
-SRC_URI[md5sum] = "504d1ab22cbc4d1a59a8d8c7ee5ed3bf"
-SRC_URI[sha256sum] = "b296b7a21ea576c2b180611ccb19d06aec8dddaedf7c704b0c6a81210c25635f"
+SRC_URI[sha256sum] = "d2be4395b8f503b0ebf4b2d81db90c35a97050a358ee21fe62a0dfb66e5d5522"

 inherit autotools gettext pkgconfig

@ -28,7 +30,7 @@ PACKAGECONFIG ??= " \
    keyring \
    cryptsetup \
    veritysetup \
-    cryptsetup-reencrypt \
+    luks2-reencryption \
    integritysetup \
    ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
    kernel_crypto \
@ -47,10 +49,10 @@ PACKAGECONFIG[pwquality] = "--enable-pwquality,--disable-pwquality,libpwquality"
 PACKAGECONFIG[passwdqc] = "--enable-passwdqc,--disable-passwdqc,passwdqc"
 PACKAGECONFIG[cryptsetup] = "--enable-cryptsetup,--disable-cryptsetup"
 PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup"
-PACKAGECONFIG[cryptsetup-reencrypt] = "--enable-cryptsetup-reencrypt,--disable-cryptsetup-reencrypt"
+PACKAGECONFIG[luks2-reencryption] = "--enable-luks2-reencryption,--disable-luks2-reencryption"
 PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux"
-PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev lvm2-udevrules"
+PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,,udev lvm2"
 PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto"
 # gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't
 # recognized.
@ -66,6 +68,7 @@ PACKAGECONFIG[nss] = "--with-crypto_backend=nss,,nss"
 PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel"
 PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle"
 PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1"
+PACKAGECONFIG[ssh-token] = "--enable-ssh-token,--disable-ssh-token,libssh"

 EXTRA_OECONF = "--enable-static"
 # Building without largefile is not supported by upstream
@ -74,6 +77,26 @@ EXTRA_OECONF += "--enable-largefile"
 EXTRA_OECONF += "--disable-static-cryptsetup"
 # There's no recipe for libargon2 yet
 EXTRA_OECONF += "--disable-libargon2"
+# Disable documentation, there is no asciidoctor-native available in OE
+EXTRA_OECONF += "--disable-asciidoc"
+# libcryptsetup default PBKDF algorithm, Argon2 memory cost (KB), parallel threads and iteration time (ms)
+LUKS2_PBKDF ?= "argon2i"
+LUKS2_MEMORYKB ?= "1048576"
+LUKS2_PARALLEL_THREADS ?= "4"
+LUKS2_ITERTIME ?= "2000"
+
+EXTRA_OECONF += "--with-luks2-pbkdf=${LUKS2_PBKDF} \
+    --with-luks2-memory-kb=${LUKS2_MEMORYKB} \
+    --with-luks2-parallel-threads=${LUKS2_PARALLEL_THREADS} \
+    --with-luks2-iter-time=${LUKS2_ITERTIME}"
+
+do_install:append() {
+    # The /usr/lib/cryptsetup directory is always created, even when ssh-token
+    # is disabled. In that case it is empty and causes a packaging error. Since
+    # there is no reason to distribute the empty directory, the easiest solution
+    # is to remove it if it is empty.
+    rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/${BPN}
+}

 FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}"

--- a/meta-citadel/recipes-support/fuse/fuse3/fuse3.conf
+++ b/meta-citadel/recipes-support/fuse/fuse3/fuse3.conf
@ -0,0 +1 @@
+fuse
--- a/meta-citadel/recipes-support/fuse/fuse3/run-ptest
+++ b/meta-citadel/recipes-support/fuse/fuse3/run-ptest
@ -0,0 +1,3 @@
+#!/bin/sh
+
+pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
--- a/meta-citadel/recipes-support/fuse/fuse3_3.16.2.bb
+++ b/meta-citadel/recipes-support/fuse/fuse3_3.16.2.bb
@ -0,0 +1,99 @@
+SUMMARY = "Implementation of a fully functional filesystem in a userspace program"
+DESCRIPTION = "FUSE (Filesystem in Userspace) is a simple interface for userspace \
+               programs to export a virtual filesystem to the Linux kernel. FUSE \
+               also aims to provide a secure method for non privileged users to \
+               create and mount their own filesystem implementations. \
+              "
+HOMEPAGE = "https://github.com/libfuse/libfuse"
+SECTION = "libs"
+LICENSE = "GPL-2.0-only & LGPL-2.0-only"
+LIC_FILES_CHKSUM = " \
+    file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LGPL2.txt;md5=4fbd65380cdd255951079008b364516c \
+    file://LICENSE;md5=a55c12a2d7d742ecb41ca9ae0a6ddc66 \
+"
+
+SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.gz"
+SRC_URI[sha256sum] = "f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87"
+
+S = "${WORKDIR}/fuse-${PV}"
+
+UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases"
+UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>3(\.\d+)+).tar.xz"
+
+CVE_PRODUCT = "fuse_project:fuse"
+
+inherit meson pkgconfig ptest
+
+SRC_URI += " \
+    file://run-ptest \
+    file://fuse3.conf \
+"
+#python3-compile for filecmp module
+RDEPENDS:${PN}-ptest += " \
+    python3-compile \
+    python3-pytest \
+    python3-looseversion \
+    bash \
+"
+RRECOMMENDS:${PN}-ptest += " kernel-module-cuse"
+
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/test
+    install -d ${D}${PTEST_PATH}/example
+    install -d ${D}${PTEST_PATH}/util
+    cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/
+
+    example_excutables=`find ${B}/example -type f -executable`
+    util_excutables=`find ${B}/util -type f -executable`
+    test_excutables=`find ${B}/test -type f -executable`
+
+    for e in $example_excutables
+    do
+        cp -rf $e  ${D}${PTEST_PATH}/example/
+    done
+
+    for e in $util_excutables
+    do
+        cp -rf $e  ${D}${PTEST_PATH}/util/
+    done
+
+    for e in $test_excutables
+    do
+        cp -rf $e  ${D}${PTEST_PATH}/test
+    done
+}
+
+DEPENDS = "udev"
+
+PACKAGES =+ "fuse3-utils"
+
+RPROVIDES:${PN}-dbg += "fuse3-utils-dbg"
+
+RRECOMMENDS:${PN}:class-target = "kernel-module-fuse fuse3-utils"
+
+FILES:${PN} += "${libdir}/libfuse3.so.*"
+FILES:${PN}-dev += "${libdir}/libfuse3*.la"
+
+# Forbid auto-renaming to libfuse3-utils
+FILES:fuse3-utils = "${bindir} ${base_sbindir}"
+DEBIAN_NOAUTONAME:fuse3-utils = "1"
+DEBIAN_NOAUTONAME:${PN}-dbg = "1"
+
+SYSTEMD_SERVICE:${PN} = ""
+
+do_install:append() {
+    rm -rf ${D}${base_prefix}/dev
+
+    # systemd class remove the sysv_initddir only if systemd_system_unitdir
+    # contains anything, but it's not needed if sysvinit is not in DISTRO_FEATURES
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then
+        rm -rf ${D}${sysconfdir}/init.d/
+    fi
+
+    # Install systemd related configuration file
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/modules-load.d
+        install -m 0644 ${UNPACKDIR}/fuse3.conf ${D}${sysconfdir}/modules-load.d
+    fi
+}
--- a/meta-citadel/recipes-support/keyutils/keyutils_1.6.3.bb
+++ b/meta-citadel/recipes-support/keyutils/keyutils_1.6.3.bb
@ -12,17 +12,24 @@ LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \
                    file://LICENCE.LGPL;md5=7d1cacaa3ea752b72ea5e525df54a21f"

-inherit siteinfo autotools-brokensep ptest
+inherit manpages ptest

-SRC_URI = "http://people.redhat.com/dhowells/keyutils/${BP}.tar.bz2 \
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git;protocol=https;branch=master \
           file://keyutils-test-fix-output-format.patch \
           file://keyutils-fix-error-report-by-adding-default-message.patch \
           file://run-ptest \
           file://fix_library_install_path.patch \
+           file://0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch \
+           file://0001-Adhere-to-the-SOURCE_DATE_EPOCH-standard.patch \
+           file://0001-tests-builtin_trusted-Failure-command-is-failed.patch \
+           file://0002-tests-Use-head-n1-for-busybox-compatibility.patch \
           "
+SRCREV = "cb3bb194cca88211cbfcdde2f10c0f43c3fb8ec3"

-SRC_URI[md5sum] = "919af7f33576816b423d537f8a8692e8"
-SRC_URI[sha256sum] = "c8b15722ae51d95b9ad76cc6d49a4c2cc19b0c60f72f61fb9bf43eea7cbd64ce"
+S = "${WORKDIR}/git"
+
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[manpages] = ""

 EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall' \
    NO_ARLIB=1 \
@ -31,34 +38,24 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall' \
    LIBDIR=${libdir} \
    USRLIBDIR=${libdir} \
    INCLUDEDIR=${includedir} \
+    ETCDIR=${sysconfdir} \
+    SHAREDIR=${datadir}/keyutils \
+    MANDIR=${datadir}/man \
    BUILDFOR=${SITEINFO_BITS}-bit \
    NO_GLIBC_KEYERR=1 \
    "

 do_install () {
-    install -d ${D}/${libdir}/pkgconfig
    oe_runmake DESTDIR=${D} install
 }

-do_install:append:class-nativesdk() {
-    install -d ${D}${datadir}
-    src_dir="${D}${target_datadir}"
-    mv $src_dir/* ${D}${datadir}
-    par_dir=`dirname $src_dir`
-    rmdir $src_dir $par_dir
-
-    install -d ${D}${sysconfdir}
-    mv ${D}/etc/* ${D}${sysconfdir}/
-    rmdir ${D}/etc
-}
-
 do_install_ptest () {
    cp -r ${S}/tests ${D}${PTEST_PATH}/
    sed -i -e 's/OSDIST=Unknown/OSDIST=${DISTRO}/' ${D}${PTEST_PATH}/tests/prepare.inc.sh
 }


-RDEPENDS:${PN}-ptest += "lsb-release"
+RDEPENDS:${PN}-ptest += "bash file lsb-release make"
 RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils"
 RDEPENDS:${PN}-ptest:append:libc-musl = " musl-utils"

--- a/meta-citadel/recipes-support/libblockdev/libblockdev_2.28.bb
+++ b/meta-citadel/recipes-support/libblockdev/libblockdev_2.28.bb
@ -1,43 +0,0 @@
-DESCRIPTION = "libblockdev is a C library supporting GObject introspection for manipulation of \
-block devices. It has a plugin-based architecture where each technology (like \
-LVM, Btrfs, MD RAID, Swap,...) is implemented in a separate plugin, possibly \
-with multiple implementations (e.g. using LVM CLI or the new LVM DBus API)."
-HOMEPAGE = "http://rhinstaller.github.io/libblockdev/"
-LICENSE = "LGPL-2.0-or-later"
-SECTION = "devel/lib"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c"
-
-inherit autotools gobject-introspection pkgconfig lib_package
-
-DEPENDS = "autoconf-archive-native glib-2.0 kmod udev"
-
-SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch;protocol=https \
-"
-SRCREV = "1412dc51c8f76bf8d9a6008228737db4a9a26d69"
-S = "${WORKDIR}/git"
-
-FILES:${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages"
-
-PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath nvdimm tools"
-PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3"
-PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python"
-PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2"
-PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2"
-PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2"
-PACKAGECONFIG[dmraid] = "--with-dmraid, --without-dmraid"
-PACKAGECONFIG[kmod] = "--with-kbd, --without-kbd,libbytesize"
-PACKAGECONFIG[parted] = "--with-part, --without-part, parted"
-PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux"
-PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native"
-PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm, ndctl util-linux"
-PACKAGECONFIG[vdo] = "--with-vdo, --without-vdo,libbytesize"
-PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key"
-PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools"
-PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup nss volume-key"
-PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize"
-PACKAGECONFIG[kbd] = "--with-kbd,--without-kbd,libbytesize"
-PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2"
-PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper"
-
-export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs"
--- a/meta-citadel/recipes-support/libblockdev/libblockdev_3.2.1.bb
+++ b/meta-citadel/recipes-support/libblockdev/libblockdev_3.2.1.bb
@ -12,28 +12,30 @@ inherit autotools gobject-introspection pkgconfig lib_package

 DEPENDS = "autoconf-archive-native glib-2.0 kmod udev libnvme"

-SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.1.x-devel;protocol=https \
+SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.2.x-branch;protocol=https \
           file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \
           "
-SRCREV = "68aaff5556afe26be749c29a2b7cbd714dce3050"
+SRCREV = "b829b60d9ff049abb190f09a3b9a5fac648cd5a3"
 S = "${WORKDIR}/git"

 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}"

-PACKAGECONFIG ??= "python3 lvm lvm-dbus dm parted fs escrow btrfs crypto mdraid mpath nvdimm tools"
+PACKAGECONFIG ??= "python3 lvm lvm-dbus dm parted fs escrow btrfs crypto mdraid mpath nvdimm tools smart smartmontools"
 PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3"
-PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2"
-PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2"
+PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools libyaml, lvm2"
+PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools libyaml, lvm2"
 PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2"
 PACKAGECONFIG[parted] = "--with-part, --without-part, parted"
-PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux e2fsprogs"
+PACKAGECONFIG[fs] = "--with-fs, --without-fs, e2fsprogs util-linux"
 PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native"
 PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm, ndctl util-linux"
 PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key"
 PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools"
-PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup nss volume-key keyutils"
+PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup keyutils nss volume-key"
 PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize"
 PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2"
 PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper"
+PACKAGECONFIG[smart] = "--with-smart,--without-smart,libatasmart"
+PACKAGECONFIG[smartmontools] = "--with-smartmontools,--without-smartmontools,json-glib,smartmontools"

-export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs"
+export GIR_EXTRA_LIBS_PATH = "${B}/src/utils/.libs"
--- a/meta-citadel/recipes-support/libbytesize/libbytesize_2.11.bb
+++ b/meta-citadel/recipes-support/libbytesize/libbytesize_2.11.bb
@ -7,10 +7,9 @@ SECTION = "devel/lib"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c"

 S = "${WORKDIR}/git"
-B = "${S}"

-SRCREV = "c9864f4dd03736839f40d225da494cb1eb64e654"
-SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master;protocol=https"
+SRCREV = "9da72b2732508b0ba0ceed27f5e50bc276ef31f2"
+SRC_URI = "git://github.com/storaged-project/libbytesize;branch=main;protocol=https"

 inherit gettext autotools pkgconfig python3native

--- a/meta-citadel/recipes-support/libpam-pwdfile/libpam-pwdfile_2.0.bb
+++ b/meta-citadel/recipes-support/libpam-pwdfile/libpam-pwdfile_2.0.bb
@ -4,8 +4,8 @@ SECTION = "libs"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://pam_pwdfile.c;beginline=1;endline=39;md5=02765d16df913d327ffd4a2ef499baf4"

-SRC_URI = "git://github.com/tiwe-de/libpam-pwdfile.git;protocol=https;branch=master"
-SRCREV = "8f0e412b48178c00abd023917dd2c9050ee89c18"
+SRC_URI = "git://git.tiwe.de/libpam-pwdfile.git;protocol=https;branch=master"
+SRCREV = "2347ef0edd7054d3df9838612aa78ac6bd077dfd"

 S = "${WORKDIR}/git"

--- a/meta-citadel/recipes-support/libsass/libsass_3.5.5.bb
+++ b/meta-citadel/recipes-support/libsass/libsass_3.5.5.bb
@ -1,15 +0,0 @@
-SUMMARY = "A C/C++ implementation of a Sass compiler"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d \
-                    file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744"
-
-SRC_URI = "git://github.com/sass/libsass.git;protocol=https;branch=3.5-stable"
-SRCREV = "39e30874b9a5dd6a802c20e8b0470ba44eeba929"
-
-S = "${WORKDIR}/git"
-
-inherit autotools
-
-EXTRA_OECONF = ""
-BBCLASSEXTEND = "native"
-
--- a/meta-citadel/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
+++ b/meta-citadel/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
@ -1,7 +1,7 @@
-From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001
+From 44695f332e206e1db43d50163e1bce0bedf75fb7 Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
 Date: Mon, 26 Nov 2018 14:53:09 +0800
-Subject: [PATCH 1/3] Avoid bashisms in init scripts
+Subject: [PATCH] Avoid bashisms in init scripts

 Upstream-Status: Inappropriate

@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 5 files changed, 10 insertions(+), 10 deletions(-)

 diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in
-index 347c395..b2e9cf9 100644
+index 347c39574..b2e9cf932 100644
 --- a/scripts/blk_availability_init_red_hat.in
 +++ b/scripts/blk_availability_init_red_hat.in
@@ -1,4 +1,4 @@
@ -37,7 +37,7 @@ index 347c395..b2e9cf9 100644
 	;;
 esac
 diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in
-index c82f8f5..a3a321d 100755
+index c82f8f547..a3a321d9c 100755
 --- a/scripts/cmirrord_init_red_hat.in
 +++ b/scripts/cmirrord_init_red_hat.in
@@ -1,4 +1,4 @@
@ -56,7 +56,7 @@ index c82f8f5..a3a321d 100755
 esac
 
 diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in
-index 176ff5d..825f6ad 100644
+index 176ff5dcb..825f6ad84 100644
 --- a/scripts/lvm2_lvmpolld_init_red_hat.in
 +++ b/scripts/lvm2_lvmpolld_init_red_hat.in
@@ -1,4 +1,4 @@
@ -75,7 +75,7 @@ index 176ff5d..825f6ad 100644
 esac
 
 diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in
-index 95e4125..dff89cd 100644
+index 95e4125a0..dff89cd38 100644
 --- a/scripts/lvm2_monitoring_init_red_hat.in
 +++ b/scripts/lvm2_monitoring_init_red_hat.in
@@ -1,4 +1,4 @@
@ -94,7 +94,7 @@ index 95e4125..dff89cd 100644
 esac
 
 diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4
-index 8eb06c5..2e8d0f7 100644
+index 8eb06c509..2e8d0f71e 100644
 --- a/scripts/lvm2_monitoring_init_rhel4
 +++ b/scripts/lvm2_monitoring_init_rhel4
@@ -1,4 +1,4 @@
@ -112,6 +112,3 @@ index 8eb06c5..2e8d0f7 100644
 	;;
 esac
 
-- 
-2.7.4
-
--- a/meta-citadel/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
+++ b/meta-citadel/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
@ -1,4 +1,4 @@
-From e3103459416616d3b8508e7176e897b0ae6c90f2 Mon Sep 17 00:00:00 2001
+From cfa37411fa2ebe8ade94742ee00f86d0e386a651 Mon Sep 17 00:00:00 2001
 From: Dengke Du <dengke.du@windriver.com>
 Date: Tue, 25 Oct 2016 11:49:40 +0000
 Subject: [PATCH] implement libc specific reopen_stream
@ -14,16 +14,17 @@ http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Dengke Du <dengke.du@windriver.com>

+Upstream-Status: Pending
 ---
 lib/log/log.c      | 6 ++++++
 tools/lvmcmdline.c | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

-Index: LVM2.2.02.177/lib/log/log.c
-===================================================================
--- LVM2.2.02.177.orig/lib/log/log.c
-+++ LVM2.2.02.177/lib/log/log.c
-@@ -161,6 +161,7 @@ static void _check_and_replace_standard_
+diff --git a/lib/log/log.c b/lib/log/log.c
+index 90905e629..ed69662d0 100644
+--- a/lib/log/log.c
+++ b/lib/log/log.c
+@@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_
  * Close and reopen standard stream on file descriptor fd.
  */
 int reopen_standard_stream(FILE **stream, const char *mode)
@ -31,7 +32,7 @@ Index: LVM2.2.02.177/lib/log/log.c
 {
 	int fd, fd_copy, new_fd;
 	const char *name;
-@@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream
+@@ -211,6 +212,11 @@ int reopen_standard_stream(FILE **stream, const char *mode)
 	*stream = new_stream;
 	return 1;
 }
@ -43,11 +44,11 @@ Index: LVM2.2.02.177/lib/log/log.c
 
 void init_log_fn(lvm2_log_fn_t log_fn)
 {
-Index: LVM2.2.02.177/tools/lvmcmdline.c
-===================================================================
--- LVM2.2.02.177.orig/tools/lvmcmdline.c
-+++ LVM2.2.02.177/tools/lvmcmdline.c
-@@ -3095,7 +3095,7 @@ static int _check_standard_fds(void)
+diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
+index 4af6adc83..fbab70988 100644
+--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
+@@ -3395,7 +3395,7 @@ static int _check_standard_fds(void)
 	int err = is_valid_fd(STDERR_FILENO);
 
 	if (!is_valid_fd(STDIN_FILENO) &&
@ -56,7 +57,7 @@ Index: LVM2.2.02.177/tools/lvmcmdline.c
 		if (err)
 			perror("stdin stream open");
 		else
-@@ -3105,7 +3105,7 @@ static int _check_standard_fds(void)
+@@ -3405,7 +3405,7 @@ static int _check_standard_fds(void)
 	}
 
 	if (!is_valid_fd(STDOUT_FILENO) &&
@ -65,7 +66,7 @@ Index: LVM2.2.02.177/tools/lvmcmdline.c
 		if (err)
 			perror("stdout stream open");
 		/* else no stdout */
-@@ -3113,7 +3113,7 @@ static int _check_standard_fds(void)
+@@ -3413,7 +3413,7 @@ static int _check_standard_fds(void)
 	}
 
 	if (!is_valid_fd(STDERR_FILENO) &&
--- a/meta-citadel/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch
+++ b/meta-citadel/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch
@ -0,0 +1,29 @@
+From c7a63e17fc841eab5874aa5dc4e848e2bf300bf0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 25 Mar 2024 13:07:28 -0700
+Subject: [PATCH] include libgen.h for basename
+
+basename prototype has been removed from string.h from latest musl [1]
+compilers e.g. clang-18 flags the absense of prototype as error. therefore
+include libgen.h for providing it.
+
+[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
+
+Upstream-Status: Submitted [ Sent to maintainer and lvm-devel@redhat.com ]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/device/device_id.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/device/device_id.c b/lib/device/device_id.c
+index a3f341bfc..0c05eb151 100644
+--- a/lib/device/device_id.c
+++ b/lib/device/device_id.c
+@@ -27,6 +27,7 @@
+ #include "lib/display/display.h"
+ #include "device_mapper/misc/dm-ioctl.h"
+ 
+#include <libgen.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
--- a/meta-citadel/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-GLIBC.patch
+++ b/meta-citadel/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-GLIBC.patch
@ -1,27 +0,0 @@
-From 3ae9c0b607ec33fb07f32a41e9d28cc9068dd39a Mon Sep 17 00:00:00 2001
-From: Dengke Du <dengke.du@windriver.com>
-Date: Tue, 25 Oct 2016 11:52:44 +0000
-Subject: [PATCH] Guard use of mallinfo() with __GLIBC__
-
-This API is glibc-only
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Dengke Du <dengke.du@windriver.com>
-
---
- lib/mm/memlock.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: LVM2.2.02.177/lib/mm/memlock.c
-===================================================================
--- LVM2.2.02.177.orig/lib/mm/memlock.c
-+++ LVM2.2.02.177/lib/mm/memlock.c
-@@ -151,7 +151,7 @@ static void _touch_memory(void *mem, siz
- 
- static void _allocate_memory(void)
- {
-#ifndef VALGRIND_POOL
-+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
- 	void *stack_mem;
- 	struct rlimit limit;
- 	int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks;
--- a/meta-citadel/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch
+++ b/meta-citadel/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch
@ -1,7 +1,7 @@
-From 3bba45890985b877b823836e78a1c8ac3c878856 Mon Sep 17 00:00:00 2001
+From 53a879b5a285722f0cb0ee42607c1cd1102b79be Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Tue, 31 Jul 2018 15:04:29 +0800
-Subject: [PATCH 4/4] tweak MODPROBE_CMD for cross compile
+Subject: [PATCH] tweak MODPROBE_CMD for cross compile

 Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe
 is incorrect.
@ -21,18 +21,15 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 1 file changed, 2 deletions(-)

 diff --git a/configure.ac b/configure.ac
-index e427708..aa374ea 100644
+index e5e5e71ce..3af73c781 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1791,8 +1791,6 @@ if test "$BUILD_DMFILEMAPD" = yes; then
- fi
+@@ -1742,8 +1742,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
+ ])
 
 ################################################################################
 -AC_PATH_TOOL(MODPROBE_CMD, modprobe, [], [$PATH_SBIN])
 -
- if test -n "$MODPROBE_CMD"; then
+ AS_IF([test -n "$MODPROBE_CMD"], [
 	AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.])
- fi
-- 
-2.7.4
-
+ ])
--- a/meta-citadel/recipes-support/lvm2/files/0005-do-not-build-manual.patch
+++ b/meta-citadel/recipes-support/lvm2/files/0005-do-not-build-manual.patch
@ -1,7 +1,7 @@
-From 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001
+From 8657541b91b4f2bd05ce14ec9899ff5f9f3b7d4c Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Mon, 26 Nov 2018 14:59:55 +0800
-Subject: [PATCH 2/3] do not build manual
+Subject: [PATCH] do not build manual

 On some host (ubuntu 1404), build manual failed.
 ...
@ -15,25 +15,26 @@ Upstream-Status: Pending

 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>

-
 Update context for lvm2 2.03.02.
-
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+Update context for lvm2 2.03.16.
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
 ---
 Makefile.in  | 6 +++---
 configure.ac | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

 diff --git a/Makefile.in b/Makefile.in
-index 6a1a990..80cba91 100644
+index 06c4b1823..90df7b09c 100644
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -18,7 +18,7 @@ top_builddir = @top_builddir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 
-SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools
-+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools
+-SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools
+SUBDIRS = libdm conf daemons include lib libdaemon scripts tools
 
 ifeq ("@UDEV_RULES@", "yes")
   SUBDIRS += udev
@ -46,20 +47,20 @@ index 6a1a990..80cba91 100644
     libdaemon lib tools daemons libdm \
     udev po
 tools.distclean: test.distclean
-@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper
+@@ -59,7 +59,7 @@ unit-test  run-unit-test: test libdm
+ 
 daemons.device-mapper: libdm.device-mapper
 tools.device-mapper: libdm.device-mapper
- scripts.device-mapper: include.device-mapper
 -device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
 +device-mapper: tools.device-mapper daemons.device-mapper
+ device_mapper: device-mapper
 
 ifeq ("@INTL@", "yes")
- lib.pofile: include.pofile
 diff --git a/configure.ac b/configure.ac
-index 7fd0561..4154dc0 100644
+index 3af73c781..f32d1f376 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile
+@@ -2076,7 +2076,6 @@ libdaemon/server/Makefile
 libdm/Makefile
 libdm/dm-tools/Makefile
 libdm/libdevmapper.pc
@ -67,6 +68,3 @@ index 7fd0561..4154dc0 100644
 po/Makefile
 scripts/lvm2-pvscan.service
 scripts/blkdeactivate.sh
-- 
-2.7.4
-
--- a/meta-citadel/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
+++ b/meta-citadel/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
@ -1,4 +1,4 @@
-From e213ed33a28704f6f538df41a91b7ce95594a4f8 Mon Sep 17 00:00:00 2001
+From 20a110ade91c73f4cb3883a3a9676708a93ca786 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Tue, 15 Oct 2019 18:12:54 +0800
 Subject: [PATCH] start lvm2-monitor.service after tmp.mount
@ -11,23 +11,23 @@ Upstream-Status: Inappropriate [oe specific]

 Rebase to v2_03_05
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
+Rebase to v2_03_16
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
 ---
 scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in
-index 4bf744a..46766cb 100644
+index c0c96e316..2a99a379d 100644
 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
 +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
@@ -2,7 +2,7 @@
 Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling
 Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8)
 Requires=dm-event.socket
-After=dm-event.socket dm-event.service lvm2-activation.service
-+After=dm-event.socket dm-event.service lvm2-activation.service tmp.mount
+-After=dm-event.socket dm-event.service
+After=dm-event.socket dm-event.service tmp.mount
 Before=local-fs-pre.target shutdown.target
 DefaultDependencies=no
 Conflicts=shutdown.target
-- 
-2.7.4
-
--- a/meta-citadel/recipes-support/lvm2/files/reproducible-build.patch
+++ b/meta-citadel/recipes-support/lvm2/files/reproducible-build.patch
@ -1,14 +1,21 @@
-configure.ac:  override CONFIGURE_LINE
+From f5c6fabbdf2e7bfa105658b9dfe45d2ab86f34bb Mon Sep 17 00:00:00 2001
+From: Joe Slater <joe.slater@windriver.com>
+Date: Fri, 17 Jul 2020 13:59:56 -0700
+Subject: [PATCH] configure.ac:  override CONFIGURE_LINE

 For reproducible binaries, we need to report a constant CONFIGURE_LINE.

 Upstream-Status: Pending

 Signed-off-by: Joe Slater <joe.slater@windriver.com>
+---
+ configure.ac | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)

-
--- git.orig/configure.ac
-+++ git/configure.ac
+diff --git a/configure.ac b/configure.ac
+index 5364dd68e..c2dbf3c9f 100644
+--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,15 @@ AC_PREREQ(2.69)
 ################################################################################
 dnl -- Process this file with autoconf to produce a configure script.
--- a/meta-citadel/recipes-support/lvm2/libdevmapper_2.03.11.bb
+++ b/meta-citadel/recipes-support/lvm2/libdevmapper_2.03.11.bb
@ -5,6 +5,8 @@ require lvm2.inc

 DEPENDS += "autoconf-archive-native"

+inherit nopackages
+
 TARGET_CC_ARCH += "${LDFLAGS}"

 do_install() {
--- a/meta-citadel/recipes-support/lvm2/lvm2_2.03.11.bb
+++ b/meta-citadel/recipes-support/lvm2/lvm2_2.03.11.bb
@ -1,12 +1,12 @@
 require lvm2.inc

 SRC_URI += " \
-            file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \
+            file://tweak-for-lvmdbusd.patch \
           "

 DEPENDS += "autoconf-archive-native"

-inherit multilib_script
+inherit multilib_script python3native

 MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf"

@ -15,23 +15,35 @@ CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe"
 do_install:append() {
    # Install machine specific configuration file
    install -d ${D}${sysconfdir}/lvm
-    install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf
+    install -m 0644 ${UNPACKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf
    sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf
-    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-        oe_runmake 'DESTDIR=${D}' install install_systemd_units
-        sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service
-    else
-        oe_runmake 'DESTDIR=${D}' install install_initscripts
-        mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d
-        rm -rf ${D}${sysconfdir}/rc.d
+    # We don't want init scripts/systemd units for native SDK utilities
+    if [ "${PN}" != "nativesdk-lvm2" ]; then
+        if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+            oe_runmake 'DESTDIR=${D}' install install_systemd_units
+            sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service
+        else
+            oe_runmake 'DESTDIR=${D}' install install_initscripts
+            mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d
+            rm -rf ${D}${sysconfdir}/rc.d
+        fi
    fi
+
+    # following files only exist when package config `dbus` enabled
+    sed -i -e '1s,#!.*python.*,#!${USRBINPATH}/env python3,' \
+        ${D}${sbindir}/lvmdbusd \
+        ${D}${PYTHON_SITEPACKAGES_DIR}/lvmdbusd/lvmdb.py \
+        ${D}${PYTHON_SITEPACKAGES_DIR}/lvmdbusd/lvm_shell_proxy.py \
+    || true
 }

-PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules"
+PACKAGE_BEFORE_PN = "${PN}-scripts"

 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \
-                         blk-availability.service"
+                         ${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'lvm2-lvmdbusd.service', '', d)} \
+                         blk-availability.service \
+                         "
 SYSTEMD_AUTO_ENABLE = "disable"

 TARGET_CC_ARCH += "${LDFLAGS}"
@ -42,19 +54,32 @@ DEPENDS += "util-linux"
 LVM2_PACKAGECONFIG:append:class-target = " \
    udev \
 "
-PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules"
+
+PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev"
+PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,"

 PACKAGES =+ "libdevmapper"
 FILES:libdevmapper = " \
    ${libdir}/libdevmapper.so.* \
    ${sbindir}/dmsetup \
    ${sbindir}/dmstats \
+    ${nonarch_base_libdir}/udev/rules.d/10-dm.rules \
+    ${nonarch_base_libdir}/udev/rules.d/13-dm-disk.rules \
+    ${nonarch_base_libdir}/udev/rules.d/95-dm-notify.rules \
 "

 FILES:${PN} += " \
    ${libdir}/device-mapper/*.so \
-    ${systemd_system_unitdir}/lvm2-pvscan@.service \
+    ${systemd_system_unitdir} \
+    ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \
+    ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \
+    ${nonarch_base_libdir}/udev/rules.d/11-dm-lvm.rules \
+    ${nonarch_base_libdir}/udev/rules.d/69-dm-lvm.rules \
 "
+# Remove /lib/udev from FILES:${PN} so that any new rules files that are added
+# upstream will have to be explicitly added to either FILES:${PN} or
+# FILES:libdevmapper.
+FILES:${PN}:remove = "${nonarch_base_libdir}/udev"

 FILES:${PN}-scripts = " \
    ${sbindir}/blkdeactivate \
@ -62,10 +87,8 @@ FILES:${PN}-scripts = " \
    ${sbindir}/lvmconf \
    ${sbindir}/lvmdump \
 "
-# Specified explicitly for the udev rules, just in case that it does not get picked
-# up automatically:
-FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
-RDEPENDS:${PN}-udevrules = "libdevmapper"
+
+RDEPENDS:${PN} = "bash"
 RDEPENDS:${PN}:append:class-target = " libdevmapper"
 RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"

--- a/meta-citadel/recipes-support/lvm2/lvm2.inc
+++ b/meta-citadel/recipes-support/lvm2/lvm2.inc
@ -10,16 +10,19 @@ DEPENDS += "libaio"
 SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
           file://lvm.conf \
           file://0001-implement-libc-specific-reopen_stream.patch \
-           file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \
           file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \
           file://0001-Avoid-bashisms-in-init-scripts.patch \
           file://0005-do-not-build-manual.patch \
           file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \
           file://reproducible-build.patch \
+           file://0001-include-libgen.h-for-basename.patch \
           "

-SRCREV = "3e8bd8d1bd70691f09a170785836aeb4f83154e6"
+SRCREV = "3a6e221c569eb253fa38a772b15e53b5de65b5d1"
 S = "${WORKDIR}/git"
+PV = "2.03.31"
+
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"

 inherit autotools-brokensep pkgconfig systemd

--- a/meta-citadel/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch
+++ b/meta-citadel/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch
@ -1,73 +0,0 @@
-From ddf36613f3408ce42f15b03b4e9c6ad8478b97f8 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Tue, 2 Mar 2021 01:33:05 -0800
-Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found
-
-In oe-core (util-linux and coreutils), the commands locates in
-${bindir} rather than /bin, add BINDIR to configure it
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- configure.ac                | 3 +++
- scripts/blkdeactivate.sh.in | 7 ++++---
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4811d4a3d..137b31a82 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -1611,6 +1611,8 @@ fi
- 
- SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))"
- 
-+BINDIR="$(eval echo $(eval echo $bindir))"
-+
- SBINDIR="$(eval echo $(eval echo $sbindir))"
- LVM_PATH="$SBINDIR/lvm"
- AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.])
-@@ -1829,6 +1831,7 @@ AC_SUBST(SACKPT_CFLAGS)
- AC_SUBST(SACKPT_LIBS)
- AC_SUBST(SALCK_CFLAGS)
- AC_SUBST(SALCK_LIBS)
-+AC_SUBST(BINDIR)
- AC_SUBST(SBINDIR)
- AC_SUBST(SELINUX_LIBS)
- AC_SUBST(SELINUX_PC)
-diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
-index 7c517b87b..7ef1bb766 100644
--- a/scripts/blkdeactivate.sh.in
-+++ b/scripts/blkdeactivate.sh.in
-@@ -42,13 +42,14 @@ VDO="/bin/vdo"
- 
- sbindir="@SBINDIR@"
- DMSETUP="$sbindir/dmsetup"
-+bindir="@BINDIR@"
- LVM="$sbindir/lvm"
- 
- if "$UMOUNT" --help | grep -- "--all-targets" >"$DEV_DIR/null"; then
- 	UMOUNT_OPTS="--all-targets "
- else
- 	UMOUNT_OPTS=""
-	FINDMNT="/bin/findmnt -r --noheadings -u -o TARGET"
-+	FINDMNT="$bindir/findmnt -r --noheadings -u -o TARGET"
- 	FINDMNT_READ="read -r mnt"
- fi
- DMSETUP_OPTS=""
-@@ -57,10 +58,10 @@ MDADM_OPTS=""
- MPATHD_OPTS=""
- VDO_OPTS=""
- 
-LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
-+LSBLK="$bindir/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
- LSBLK_VARS="local devtype local kname local name local mnt"
- LSBLK_READ="read -r devtype kname name mnt"
-SORT_MNT="/bin/sort -r -u -k 4"
-+SORT_MNT="$bindir/sort -r -u -k 4"
- 
- # Do not show tool errors by default (only done/skipping summary
- # message provided by this script) and no verbose mode by default.
-- 
-2.29.2
-
--- a/meta-citadel/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch
+++ b/meta-citadel/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch
@ -0,0 +1,60 @@
+From 34f5a21afae759d48fa11e77b622ca35a4feabaa Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Wed, 6 Dec 2023 10:24:46 +0800
+Subject: [PATCH] lvm2: 2.03.16 -> 2.03.22
+
+Not check python modules pyudev and dbus during configure that they are runtime
+dependencies. Deal with them in the package config setting in the recipe.
+
+Remove $(DESTDIR) from install destination that it is not suitable for oe. And
+no generate python cache files too.
+
+Upstream-Status: Pending [oe specific]
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+ configure.ac                 | 4 ++--
+ daemons/lvmdbusd/Makefile.in | 6 ++----
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9dfdcfe01..fcf5c8b78 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -1282,8 +1282,8 @@ AS_IF([test "$BUILD_LVMDBUSD" = "yes"], [
+ 	AS_IF([test "$PYTHON3_BINDINGS" = "yes"], [PYTHON_BINDINGS="yes"])
+ 
+ 	# To get this macro, install autoconf-archive package then run autoreconf
+-	AX_PYTHON_MODULE([pyudev], [Required], python3)
+-	AX_PYTHON_MODULE([dbus], [Required], python3)
+	# AX_PYTHON_MODULE([pyudev], [Required], python3)
+	# AX_PYTHON_MODULE([dbus], [Required], python3)
+ ])
+ 
+ ################################################################################
+diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in
+index 08b061fb2..e2b1c3209 100644
+--- a/daemons/lvmdbusd/Makefile.in
+++ b/daemons/lvmdbusd/Makefile.in
+@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@
+ top_builddir = @top_builddir@
+ 
+ lvmdbuspydir = $(python3dir)/lvmdbusd
+-lvmdbusdir = $(DESTDIR)$(lvmdbuspydir)
+lvmdbusdir = $(lvmdbuspydir)
+ 
+ LVMDBUS_SRCDIR_FILES = \
+ 	automatedproperties.py \
+@@ -55,11 +55,9 @@ install_lvmdbusd: $(LVMDBUSD)
+ 	$(SHOW) "    [INSTALL] $<"
+ 	$(Q) $(INSTALL_DIR) $(sbindir)
+ 	$(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir)
+-	$(Q) $(INSTALL_DIR) $(lvmdbusdir) $(lvmdbusdir)/__pycache__
+	$(Q) $(INSTALL_DIR) $(lvmdbusdir)
+ 	$(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(lvmdbusdir))
+ 	$(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(lvmdbusdir)
+-	$(Q) PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbuspydir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES)
+-	$(Q) $(CHMOD) 444 $(lvmdbusdir)/__pycache__/*.py[co]
+ 
+ install_lvm2: install_lvmdbusd
+ 
--- a/meta-citadel/recipes-support/minijail/minijail_git.bb
+++ b/meta-citadel/recipes-support/minijail/minijail_git.bb
@ -0,0 +1,54 @@
+# Recipe created by recipetool
+# This is the basis of a recipe and may need further editing in order to be fully functional.
+# (Feel free to remove these comments when editing.)
+
+SUMMARY = "A set of tools for Minijail"
+HOMEPAGE = "https://google.github.io/minijail/"
+# NOTE: License in setup.py/PKGINFO is: Apache License 2.0
+# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is
+# your responsibility to verify that the values are complete and correct.
+#
+# The following license files were not able to be identified and are
+# represented as "Unknown" below, you will need to check them yourself:
+#   LICENSE
+# NOTE: Original package / source metadata indicates license is: Apache-2.0
+#
+# NOTE: multiple licenses have been detected; they have been separated with &
+# in the LICENSE value for now since it is a reasonable assumption that all
+# of the licenses apply. If instead there is a choice between the multiple
+# licenses then you should change the value to separate the licenses with |
+# instead of &. If there is any doubt, check the accompanying documentation
+# to determine which situation is applicable.
+LICENSE = "Apache-2.0 & Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2089bcf649ce83dde9493f497237833a \
+                    file://MODULE_LICENSE_BSD;md5=d41d8cd98f00b204e9800998ecf8427e"
+
+SRC_URI = "git://github.com/google/minijail.git;protocol=https;branch=main"
+
+# Modify these as desired
+PV = "0.12+git"
+SRCREV = "3ce72e092f1ea94edc74545cd29df297e503d4fa"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "libcap"
+
+do_configure () {
+        :
+}
+ 
+do_compile () {
+        oe_runmake LIBDIR=${libdir}
+}
+ 
+do_install () {
+    install -d ${D}${libdir}
+    install -d ${D}${libexecdir}
+
+    install -m 0755 ${S}/libminijail.so ${D}${libdir}
+    install -m 0755 ${S}/libminijailpreload.so ${D}${libdir}
+    install -m 0755 ${S}/minijail0 ${D}${libexecdir}
+}
+
+FILES:${PN}-dev = ""
+FILES:${PN} = "/"
--- a/meta-citadel/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch
+++ b/meta-citadel/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch
@ -1,39 +0,0 @@
-From d24dc9bebaefbd8abf32707bad5efc0c811c0cd4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 18 Jan 2023 13:04:56 -0800
-Subject: [PATCH] Fix -Wincompatible-function-pointer-types
-
-Fixes warnings with clang16
-testfile.c:576:31: error: incompatible function pointer types passing 'PRInt32 (void *)' (aka 'int (void *)') to parameter of type 'void (*)(void *)' [-Wincompatible-function-pointe r-types]
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- pr/tests/testfile.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pr/tests/testfile.c b/pr/tests/testfile.c
-index 79d8a05..42aa6a7 100644
--- a/pr/tests/testfile.c
-+++ b/pr/tests/testfile.c
-@@ -123,7 +123,7 @@ PRThread* create_new_thread(PRThreadType type,
-     if (native_thread) {
- #if defined(_PR_PTHREADS)
-         pthread_t tid;
-        if (!pthread_create(&tid, NULL, start, arg)) {
-+        if (!pthread_create(&tid, NULL, (void*(*)(void*))start, arg)) {
-             return((PRThread *) tid);
-         }
-         else {
-@@ -573,7 +573,7 @@ static PRInt32 RunDirTest(void)
- 
-         thrarg.done= 0;
-         t = create_new_thread(PR_USER_THREAD,
-                              DirTest, &thrarg,
-+                              (void (*)(void *))DirTest, &thrarg,
-                               PR_PRIORITY_NORMAL,
-                               PR_LOCAL_THREAD,
-                               PR_UNJOINABLE_THREAD,
-- 
-2.39.1
-
--- a/meta-citadel/recipes-support/nspr/nspr/0001-remove-rpath-from-tests.patch
+++ b/meta-citadel/recipes-support/nspr/nspr/0001-remove-rpath-from-tests.patch
@ -1,5 +1,7 @@
-Author: Andrei Gherzan <andrei@gherzan.ro>
-Date:   Thu Feb 9 00:03:38 2012 +0200
+From 63eb483f7feb05917402731d8f21b396630ef202 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@gherzan.ro>
+Date: Thu, 9 Feb 2012 00:03:38 +0200
+Subject: [PATCH] remove rpath from tests

 Avoid QA warnings by removing hardcoded rpath from binaries.

@ -8,14 +10,18 @@ WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-p
 in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait
 [...]

-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
 Upstream-Status: Pending

-Index: nspr/pr/tests/Makefile.in
-===================================================================
--- nspr.orig/pr/tests/Makefile.in
-+++ nspr/pr/tests/Makefile.in
-@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS)
+Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+---
+ pr/tests/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in
+index 20e2f99..56c73e1 100644
+--- a/pr/tests/Makefile.in
+++ b/pr/tests/Makefile.in
+@@ -260,7 +260,7 @@ ifeq ($(OS_ARCH), SunOS)
 endif # SunOS
 
 ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
@ -24,3 +30,6 @@ Index: nspr/pr/tests/Makefile.in
     ifeq ($(USE_PTHREADS),1)
         EXTRA_LIBS = -lpthread
     endif
+-- 
+2.25.1
+
--- a/meta-citadel/recipes-support/nspr/nspr/0002-Fix-build-failure-on-x86_64.patch
+++ b/meta-citadel/recipes-support/nspr/nspr/0002-Fix-build-failure-on-x86_64.patch
@ -1,21 +1,24 @@
-Fix build failure on x86_64
+From f68f2535e98231ab362b6bbbe7cc4718b2c72aa9 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Tue, 31 Dec 2024 10:25:15 +0800
+Subject: [PATCH] Fix build failure on x86_64

 When the target_cpu is x86_64, we should assume that the pkg uses 64bit,
 only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a
 opposite logic before.

-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-
 Upstream-Status: Pending
---
- configure.in |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)

-Index: nspr/configure.in
-===================================================================
--- nspr.orig/configure.in
-+++ nspr/configure.in
-@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ configure.in | 16 ++++++----------
+ 1 file changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 1a3e489..04419d9 100644
+--- a/configure.in
+++ b/configure.in
+@@ -1590,28 +1590,24 @@ tools are selected during the Xcode/Developer Tools installation.])
         PR_MD_ASFILES=os_Linux_ia64.s
         ;;
     x86_64)
@ -49,4 +52,7 @@ Index: nspr/configure.in
 -            PR_MD_ASFILES=os_Linux_ppc.s
         fi
         ;;
-     esac    
+     esac
+-- 
+2.25.1
+
--- a/meta-citadel/recipes-support/nspr/nspr/0003-Add-nios2-support.patch
+++ b/meta-citadel/recipes-support/nspr/nspr/0003-Add-nios2-support.patch
@ -1,21 +1,23 @@
-From 4760065a58153e4dae24e4e437a5136592c624bc Mon Sep 17 00:00:00 2001
+From 09a67d3945f1fde8372532ef2e19af20db2112cd Mon Sep 17 00:00:00 2001
 From: Marek Vasut <marex@denx.de>
 Date: Sat, 30 Jan 2016 07:18:02 +0100
 Subject: [PATCH] Add nios2 support

 Add support for the nios2 CPU.

-Signed-off-by: Marek Vasut <marex@denx.de>
 Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ]

+Signed-off-by: Marek Vasut <marex@denx.de>
 ---
- pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++
+ pr/include/md/_linux.cfg | 45 ++++++++++++++++++++++++++++++++++++++++
 pr/include/md/_linux.h   |  4 +++-
 2 files changed, 48 insertions(+), 1 deletion(-)

+diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
+index 009d5e5..77c13df 100644
 --- a/pr/include/md/_linux.cfg
 +++ b/pr/include/md/_linux.cfg
-@@ -975,6 +975,51 @@
+@@ -979,6 +979,51 @@
 #define PR_BYTES_PER_WORD_LOG2   2
 #define PR_BYTES_PER_DWORD_LOG2  3
 
@ -67,6 +69,8 @@ Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=124442
 #elif defined(__or1k__)
 
 #undef  IS_LITTLE_ENDIAN
+diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
+index ad57d08..45a2231 100644
 --- a/pr/include/md/_linux.h
 +++ b/pr/include/md/_linux.h
@@ -55,6 +55,8 @@
@ -78,7 +82,7 @@ Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=124442
 #elif defined(__or1k__)
 #define _PR_SI_ARCHITECTURE "or1k"
 #elif defined(__riscv) && (__riscv_xlen == 32)
-@@ -143,7 +145,7 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn
+@@ -143,7 +145,7 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
 #define _MD_ATOMIC_SET                _PR_x86_64_AtomicSet
 #endif
 
@ -87,3 +91,6 @@ Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=124442
 #if defined(__GNUC__)
 /* Use GCC built-in functions */
 #define _PR_HAVE_ATOMIC_OPS
+-- 
+2.25.1
+
--- a/meta-citadel/recipes-support/nspr/nspr/0004-md-Fix-build-with-musl.patch
+++ b/meta-citadel/recipes-support/nspr/nspr/0004-md-Fix-build-with-musl.patch
@ -1,4 +1,4 @@
-From 5f6fcaeb0b7a319c8afd32ddb48b3515b63a6c0c Mon Sep 17 00:00:00 2001
+From e8cab35851949cd4b7498d56978c5e7907841f32 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 18 Sep 2017 17:22:43 -0700
 Subject: [PATCH] md: Fix build with musl
@ -7,17 +7,17 @@ The MIPS specific header <sgidefs.h> is not provided by musl
 linux kernel headers provide <asm/sgidefs.h> which has same definitions

 Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>

+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 pr/include/md/_linux.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
-index aa3af78..899826f 100644
+index 77c13df..3eb2faf 100644
 --- a/pr/include/md/_linux.cfg
 +++ b/pr/include/md/_linux.cfg
-@@ -511,7 +511,7 @@
+@@ -515,7 +515,7 @@
 #error "Unknown MIPS endianness."
 #endif
 
@ -26,3 +26,6 @@ index aa3af78..899826f 100644
 
 #define IS_64
 
+-- 
+2.25.1
+
--- a/meta-citadel/recipes-support/nspr/nspr/0005-Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
+++ b/meta-citadel/recipes-support/nspr/nspr/0005-Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
@ -1,4 +1,4 @@
-From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001
+From 161c955f32dd350413de076b7cad588fa4bdc4de Mon Sep 17 00:00:00 2001
 From: Mingli Yu <Mingli.Yu@windriver.com>
 Date: Fri, 16 Nov 2018 13:52:49 +0800
 Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME
@ -23,10 +23,10 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
 4 files changed, 4 insertions(+), 28 deletions(-)

 diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in
-index e737791..b578476 100644
+index fa8c783..74b4bdd 100644
 --- a/lib/ds/Makefile.in
 +++ b/lib/ds/Makefile.in
-@@ -114,13 +114,7 @@ GARBAGE += $(TINC)
+@@ -104,13 +104,7 @@ GARBAGE += $(TINC)
 
 $(TINC):
 	@$(MAKE_OBJDIR)
@ -42,10 +42,10 @@ index e737791..b578476 100644
 
 $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
 diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in
-index e8a6d9f..978ed28 100644
+index 9ef2007..21abd6f 100644
 --- a/lib/libc/src/Makefile.in
 +++ b/lib/libc/src/Makefile.in
-@@ -116,13 +116,7 @@ GARBAGE += $(TINC)
+@@ -106,13 +106,7 @@ GARBAGE += $(TINC)
 
 $(TINC):
 	@$(MAKE_OBJDIR)
@ -61,10 +61,10 @@ index e8a6d9f..978ed28 100644
 
 $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
 diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in
-index aeb2944..f318097 100644
+index 5865ab8..a00d20c 100644
 --- a/lib/prstreams/Makefile.in
 +++ b/lib/prstreams/Makefile.in
-@@ -116,13 +116,7 @@ endif
+@@ -102,13 +102,7 @@ endif
 
 $(TINC):
 	@$(MAKE_OBJDIR)
@ -80,10 +80,10 @@ index aeb2944..f318097 100644
 
 $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
 diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
-index 19c5a69..b4ac31c 100644
+index a9e86f5..bbcbb67 100644
 --- a/pr/src/Makefile.in
 +++ b/pr/src/Makefile.in
-@@ -326,13 +326,7 @@ GARBAGE += $(TINC)
+@@ -291,13 +291,7 @@ GARBAGE += $(TINC)
 
 $(TINC):
 	@$(MAKE_OBJDIR)
@ -99,5 +99,5 @@ index 19c5a69..b4ac31c 100644
 
 $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC)
 -- 
-2.7.4
+2.25.1

--- a/meta-citadel/recipes-support/nspr/nspr/0006-config-nspr-config.in-don-t-pass-LDFLAGS.patch
+++ b/meta-citadel/recipes-support/nspr/nspr/0006-config-nspr-config.in-don-t-pass-LDFLAGS.patch
@ -1,4 +1,4 @@
-From 13e9d66c24d1dce5179805ae5e1bf940409b4914 Mon Sep 17 00:00:00 2001
+From 88bf2abc07ae56ed1bcc9e915add0b3d9ed66c7b Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Wed, 10 Aug 2022 15:21:07 +0800
 Subject: [PATCH] config/nspr-config.in: don't pass LDFLAGS
--- a/meta-citadel/recipes-support/nspr/nspr_4.36.bb
+++ b/meta-citadel/recipes-support/nspr/nspr_4.36.bb
@ -6,13 +6,12 @@ LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d
 SECTION = "libs/network"

 SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
-           file://remove-rpath-from-tests.patch \
-           file://fix-build-on-x86_64.patch \
-           file://0002-Add-nios2-support.patch \
-           file://0001-md-Fix-build-with-musl.patch \
-           file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \
-           file://0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch \
-           file://0001-Fix-Wincompatible-function-pointer-types.patch \
+           file://0001-remove-rpath-from-tests.patch \
+           file://0002-Fix-build-failure-on-x86_64.patch \
+           file://0003-Add-nios2-support.patch \
+           file://0004-md-Fix-build-with-musl.patch  \
+           file://0005-Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \
+           file://0006-config-nspr-config.in-don-t-pass-LDFLAGS.patch \
           file://nspr.pc.in \
           "

@ -24,7 +23,7 @@ CACHED_CONFIGUREVARS:append:libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE
 UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/"
 UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"

-SRC_URI[sha256sum] = "7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f"
+SRC_URI[sha256sum] = "55dec317f1401cd2e5dba844d340b930ab7547f818179a4002bce62e6f1c6895"

 CVE_PRODUCT = "netscape_portable_runtime"

@ -171,7 +170,7 @@ do_compile:append() {
 }

 do_install:append() {
-    install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc
+    install -D ${UNPACKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc
    sed -i  \
    -e 's:NSPRVERSION:${PV}:g' \
    -e 's:OEPREFIX:${prefix}:g' \
--- a/meta-citadel/recipes-support/nss/nss/0001-Bug-1750624-Pin-validation-date-for-PayPalEE-test-ce.patch
+++ b/meta-citadel/recipes-support/nss/nss/0001-Bug-1750624-Pin-validation-date-for-PayPalEE-test-ce.patch
@ -1,64 +0,0 @@
-From 1109c1b8259ad840ac1688d533f76ca268c67b6b Mon Sep 17 00:00:00 2001
-From: "John M. Schanck" <jschanck@mozilla.com>
-Date: Sat, 5 Feb 2022 11:12:43 +0000
-Subject: [PATCH] Bug 1750624 - Pin validation date for PayPalEE test cert.
- r=nss-reviewers,bbeurdouche,rrelyea
-
-Differential Revision: https://phabricator.services.mozilla.com/D136289
-
--HG--
-extra : moz-landing-system : lando
-
-Upstream-Status: Backport
-
---
- tests/chains/chains.sh               | 6 +++++-
- tests/chains/scenarios/realcerts.cfg | 1 +
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/chains/chains.sh b/tests/chains/chains.sh
-index 32c7ef54c..e13ae52f9 100755
--- a/nss/tests/chains/chains.sh
-+++ b/nss/tests/chains/chains.sh
-@@ -917,7 +917,7 @@ verify_cert()
-     done
- 
-     VFY_OPTS_TNAME="${DB_OPT} ${ENGINE} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${TRUST_OPT}"
-    VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}"
-+    VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${VFY_TIME_OPT} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}"
- 
-     TESTNAME="Verifying certificate(s) ${VFY_LIST} with flags ${VFY_OPTS_TNAME}"
-     echo "${SCRIPTNAME}: ${TESTNAME}"
-@@ -1118,6 +1118,7 @@ parse_config()
-             ;;
-         "verify")
-             VERIFY="${VALUE}"
-+            VFY_TIME_OPT=
-             TRUST=
-             TRUST_AND_DB=
-             POLICY=
-@@ -1126,6 +1127,9 @@ parse_config()
-             REV_OPTS=
-             USAGE_OPT=
-             ;;
-+        "at_time")
-+            VFY_TIME_OPT="-b ${VALUE}"
-+            ;;
-         "cert")
-             VERIFY="${VERIFY} ${VALUE}"
-             ;;
-diff --git a/tests/chains/scenarios/realcerts.cfg b/tests/chains/scenarios/realcerts.cfg
-index 305443fc3..f8b0fc452 100644
--- a/nss/tests/chains/scenarios/realcerts.cfg
-+++ b/nss/tests/chains/scenarios/realcerts.cfg
-@@ -22,6 +22,7 @@ verify TestUser51:x
- 
- verify PayPalEE:x
-   policy OID.2.16.840.1.114412.2.1 
-+  at_time 2201010000Z
-   result pass
- 
- verify BrAirWaysBadSig:x
-- 
-2.25.1
-
--- a/meta-citadel/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
+++ b/meta-citadel/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
@ -1,24 +1,24 @@
-From 919fc5d674fae99fe21ba1351d98b75e466f425f Mon Sep 17 00:00:00 2001
+From c15470d6b52986a8e41f9be4579c88ed80413b44 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 22 Feb 2017 11:36:11 +0200
 Subject: [PATCH] nss: fix support cross compiling

 Let some make variables be assigned from outside makefile.

-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [oe specific]
+
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
 ---
- nss/coreconf/arch.mk    | 2 +-
+ nss/coreconf/arch.mk    | 4 ++--
 nss/lib/freebl/Makefile | 6 ++++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
+ 2 files changed, 8 insertions(+), 2 deletions(-)

 diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
-index 2012d18..78fca62 100644
+index 711d19d..a163d24 100644
 --- a/nss/coreconf/arch.mk
 +++ b/nss/coreconf/arch.mk
-@@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s)
+@@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s))
 # Attempt to differentiate between sparc and x86 Solaris
 #
 
@ -31,9 +31,9 @@ index 2012d18..78fca62 100644
 +    OS_RELEASE ?= $(shell uname -r)
 endif
 
- #
+ 
 diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
-index 0b8c6f4..b38889f 100644
+index e744314..0ebfc92 100644
 --- a/nss/lib/freebl/Makefile
 +++ b/nss/lib/freebl/Makefile
@@ -36,6 +36,12 @@ ifdef USE_64
@ -49,3 +49,6 @@ index 0b8c6f4..b38889f 100644
 ifdef USE_ABI32_FPU
 	DEFINES += -DNSS_USE_ABI32_FPU
 endif
+-- 
+2.25.1
+
--- a/meta-citadel/recipes-support/nss/nss/0002-nss-no-rpath-for-cross-compiling.patch
+++ b/meta-citadel/recipes-support/nss/nss/0002-nss-no-rpath-for-cross-compiling.patch
@ -1,11 +1,11 @@
-From 73edfbdf33fe4e41724e7e947033d8caeec8f3d0 Mon Sep 17 00:00:00 2001
+From 621023bc696d3d26a4179dbbafb42d79bef1faf9 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Sat, 7 Mar 2020 08:34:02 -0800
 Subject: [PATCH] nss:no rpath for cross compiling

-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [oe specific]

+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
 nss/cmd/platlibs.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
@ -26,3 +26,6 @@ index 6401778..e5c4e16 100644
 endif
 endif
 
+-- 
+2.25.1
+
--- a/meta-citadel/recipes-support/nss/nss/0003-nss-fix-incorrect-shebang-of-perl.patch
+++ b/meta-citadel/recipes-support/nss/nss/0003-nss-fix-incorrect-shebang-of-perl.patch
@ -1,14 +1,14 @@
-From 2ce67b1f4b1f582d556ae058da10698bbaa0edc1 Mon Sep 17 00:00:00 2001
+From 6aec640342088498cb1b0a2e395eb3da297a48b4 Mon Sep 17 00:00:00 2001
 From: Ovidiu Panait <ovidiu.panait@windriver.com>
 Date: Mon, 13 Jul 2020 12:12:31 +0300
 Subject: [PATCH] nss: fix incorrect shebang of perl

 Replace incorrect shebang of perl with `#!/usr/bin/env perl'.

-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 Upstream-Status: Pending
-Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>

+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
 ---
 nss/cmd/signver/examples/1/form.pl       | 2 +-
 nss/cmd/signver/examples/1/signedForm.pl | 2 +-
@ -89,3 +89,6 @@ index f29f60a..850332a 100755
 
 ########################################################################
 #
+-- 
+2.25.1
+
--- a/meta-citadel/recipes-support/nss/nss/0004-nss-disable-Wvarargs-with-clang.patch
+++ b/meta-citadel/recipes-support/nss/nss/0004-nss-disable-Wvarargs-with-clang.patch
@ -1,7 +1,7 @@
-From f613c9a9107435a40d91329f33f12cfb16927f07 Mon Sep 17 00:00:00 2001
+From 72c3150300975524bb0001b5a731f077852c95ab Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 7 Mar 2020 08:34:02 -0800
-Subject: [PATCH] nss,nspr: Add recipes
+Subject: [PATCH] nss: disable Wvarargs with clang

 clang 3.9 add this warning to rightly flag undefined
 behavior, we relegate this to be just a warning instead
@ -20,9 +20,9 @@ see
 https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start
 for more details

-Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Upstream-Status: Pending

+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 nss/coreconf/Werror.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
@ -40,3 +40,6 @@ index a569a49..687fe58 100644
       # -Wno-parentheses-equality : because clang warns about macro expansions
       WARNING_CFLAGS += $(call disable_warning,parentheses-equality)
       ifdef BUILD_OPT
+-- 
+2.25.1
+
--- a/meta-citadel/recipes-support/nss/nss/0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch
+++ b/meta-citadel/recipes-support/nss/nss/0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch
@ -1,22 +1,22 @@
-From cbd367160338847b28fc801a12c74f1c8b5b03ee Mon Sep 17 00:00:00 2001
+From 5935755eef43ac7cb8f4567e7bed5892180f954c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 7 Mar 2020 08:34:02 -0800
-Subject: [PATCH] nss does not build on mips with clang because wrong types are
- used?
+Subject: [PATCH] nss: does not build on mips with clang because wrong types
+ are used

 pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare]
     if (addend < MP_DIGIT_MAX) {
       ~~~~~~ ^ ~~~~~~~~~~~~

-Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Upstream-Status: Pending

+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 nss/lib/freebl/pqg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c
-index 1b03278..ad895b7 100644
+index 62d46b5..8c8665d 100644
 --- a/nss/lib/freebl/pqg.c
 +++ b/nss/lib/freebl/pqg.c
@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H)
@ -30,3 +30,6 @@ index 1b03278..ad895b7 100644
           SECItem *seedout)
 {
     mp_int s, sum, modulus, tmp;
+-- 
+2.25.1
+
--- a/meta-citadel/recipes-support/nss/nss/0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch
+++ b/meta-citadel/recipes-support/nss/nss/0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch
@ -1,4 +1,4 @@
-From f9b2b1c738576a17460aebd005f511f427aa1974 Mon Sep 17 00:00:00 2001
+From 895e76e75dbb993a8f445072c190a9db4ee50d15 Mon Sep 17 00:00:00 2001
 From: Wenzong Fan <wenzong.fan@windriver.com>
 Date: Sat, 7 Mar 2020 08:34:02 -0800
 Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit
@ -15,17 +15,15 @@ on host to install built files, it doesn't need any cross-compling or
 multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this
 error.

-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [oe specific]

 Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
-===================================================
-
 ---
 nss/coreconf/nsinstall/Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

 diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile
-index 08dfbc2..e97fb5f 100644
+index 337cbeb..dd77fbe 100644
 --- a/nss/coreconf/nsinstall/Makefile
 +++ b/nss/coreconf/nsinstall/Makefile
@@ -18,6 +18,13 @@ INTERNAL_TOOLS  = 1
@ -39,6 +37,9 @@ index 08dfbc2..e97fb5f 100644
 +LDFLAGS =
 +# CFLAGS =
 +
- ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
+ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 PROGRAM		=
 TARGETS		=
+-- 
+2.25.1
+
--- a/meta-citadel/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
+++ b/meta-citadel/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
@ -1,4 +1,4 @@
-From 9937e89c22eb2f2db9a936e7bc4442857b4192f5 Mon Sep 17 00:00:00 2001
+From 459ee39104228a958a0999e1a7d4c43e4e6fe4f0 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 18 Dec 2019 12:29:50 +0100
 Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto
@ -7,18 +7,18 @@ Not all current hardware supports it, particularly anything
 prior to armv8 does not.

 Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>

+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
 nss/lib/freebl/Makefile | 3 +++
 nss/lib/freebl/gcm.c    | 2 ++
 2 files changed, 5 insertions(+)

 diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
-index b38889f..4616aac 100644
+index 0ebfc92..3ee7623 100644
 --- a/nss/lib/freebl/Makefile
 +++ b/nss/lib/freebl/Makefile
-@@ -139,6 +139,8 @@ endif
+@@ -142,6 +142,8 @@ endif
         endif
     endif
 endif
@ -27,16 +27,16 @@ index b38889f..4616aac 100644
 ifeq ($(CPU_ARCH),aarch64)
     ifdef CC_IS_CLANG
         DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2
-@@ -180,6 +182,7 @@ endif
+@@ -183,6 +185,7 @@ endif
         endif
     endif
 endif
 +endif
 
- ifeq ($(OS_TARGET),OSF1)
-     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
+ ifeq (,$(filter-out WINNT,$(OS_TARGET)))
+ ifndef USE_64
 diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c
-index ac461b4..04cb180 100644
+index a2f63a6..743158e 100644
 --- a/nss/lib/freebl/gcm.c
 +++ b/nss/lib/freebl/gcm.c
@@ -18,6 +18,7 @@
@ -53,5 +53,5 @@ index ac461b4..04cb180 100644
 #endif
 +#endif
 
- /* Forward declarations */
- SECStatus gcm_HashInit_hw(gcmHashContext *ghash);
+ #if defined(__ARM_NEON) || defined(__ARM_NEON__)
+ #include <arm_neon.h>
--- a/meta-citadel/recipes-support/nss/nss_3.109.bb
+++ b/meta-citadel/recipes-support/nss/nss_3.109.bb
@ -16,28 +16,27 @@ LICENSE = "(MPL-2.0 & MIT) | (MPL-2.0 & GPL-2.0-or-later & MIT) | (MPL-2.0 & LGP
 LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
                    file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \
                    file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132 \
-                    file://nss/lib/freebl/verified/Hacl_Poly1305_256.c;beginline=1;endline=22;md5=d4096c1e4421ee56e9e0f441a8161f78"
+                    file://nss/lib/freebl/verified/Hacl_Poly1305_256.c;beginline=1;endline=22;md5=cc22f07b95d28d56baeb757df46ee7c8"

 VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}"

 SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \
           file://nss.pc.in \
-           file://0001-nss-fix-support-cross-compiling.patch \
-           file://nss-no-rpath-for-cross-compiling.patch \
-           file://nss-fix-incorrect-shebang-of-perl.patch \
-           file://disable-Wvarargs-with-clang.patch \
-           file://pqg.c-ULL_addend.patch \
           file://blank-cert9.db \
           file://blank-key4.db \
           file://system-pkcs11.txt \
-           file://nss-fix-nsinstall-build.patch \
-           file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
-           file://0001-Bug-1750624-Pin-validation-date-for-PayPalEE-test-ce.patch \
+           file://0001-nss-fix-support-cross-compiling.patch \
+           file://0002-nss-no-rpath-for-cross-compiling.patch \
+           file://0003-nss-fix-incorrect-shebang-of-perl.patch \
+           file://0004-nss-disable-Wvarargs-with-clang.patch \
+           file://0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch  \
+           file://0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch \
+           file://0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
           "
-SRC_URI[sha256sum] = "88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056"
+SRC_URI[sha256sum] = "bea46c256118cd8910202f05339627d75291f13b80054527df58419b9d29c18b"

-UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
-UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
+UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/"
+UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)"

 inherit siteinfo

@ -225,7 +224,7 @@ do_install:append() {
    done

    install -d ${D}${libdir}/pkgconfig/
-    sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc
+    sed 's/%NSS_VERSION%/${PV}/' ${UNPACKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc
    sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc
    sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc
    sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc
@ -240,9 +239,9 @@ do_install:append:class-target() {
    # databases by:
    # certutil -N -d sql:/database/path/ --empty-password
    install -d ${D}${sysconfdir}/pki/nssdb/
-    install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db
-    install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db
-    install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt
+    install -m 0644 ${UNPACKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db
+    install -m 0644 ${UNPACKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db
+    install -m 0644 ${UNPACKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt
 }

 PACKAGE_WRITE_DEPS += "nss-native"
--- a/meta-citadel/recipes-support/sassc/sassc_3.5.0.bb
+++ b/meta-citadel/recipes-support/sassc/sassc_3.5.0.bb
@ -1,15 +0,0 @@
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744"
-
-SRC_URI = "git://github.com/sass/sassc.git;protocol=https;branch=master"
-SRCREV = "aa6d5c635ea8faf44d542a23aaf85d27e5777d48"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "libsass"
-
-inherit autotools
-
-EXTRA_OECONF = ""
-
-BBCLASSEXTEND = "native"
--- a/meta-gnome/conf/layer.conf
+++ b/meta-gnome/conf/layer.conf
@ -1,7 +1,7 @@
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"

-LAYERSERIES_COMPAT_meta-gnome = "scarthgap"
+LAYERSERIES_COMPAT_meta-gnome = "walnascar"

 # We have recipes-* directories, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
--- a/meta-gnome/recipes-connectivity/iwd/iwd/iwd
+++ b/meta-gnome/recipes-connectivity/iwd/iwd/iwd
@ -0,0 +1,42 @@
+#!/bin/sh
+
+DAEMON=/usr/libexec/iwd
+PIDFILE=/var/run/iwd.pid
+DESC="iNet wireless daemon"
+
+if [ -f /etc/default/iwd ] ; then
+	. /etc/default/iwd
+fi
+
+set -e
+
+do_start() {
+	start-stop-daemon --start --background --name iwd --quiet --exec $DAEMON
+}
+
+do_stop() {
+	start-stop-daemon --stop --oknodo --name iwd --quiet
+}
+
+case "$1" in
+  start)
+	echo "Starting $DESC"
+	do_start
+	;;
+  stop)
+	echo "Stopping $DESC"
+	do_stop
+	;;
+  restart|force-reload)
+	echo "Restarting $DESC"
+	do_stop
+	sleep 1
+	do_start
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- a/meta-gnome/recipes-connectivity/iwd/iwd_1.30.bb
+++ b/meta-gnome/recipes-connectivity/iwd/iwd_1.30.bb
@ -3,14 +3,15 @@ HOMEPAGE = "https://iwd.wiki.kernel.org/"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"

-DEPENDS = "ell"
+DEPENDS = "dbus"

 SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \
           file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \
+           file://iwd \ 
           "
-SRC_URI[sha256sum] = "9fd13512dc27d83efb8d341f7df98f5488f70131686021fcd0d93fc97af013b8"
+SRC_URI[sha256sum] = "8189e15e701112f871fb5f5e9351f007c9098754b4168ed43cc5422a3adc0255"

-inherit autotools manpages pkgconfig python3native systemd
+inherit autotools manpages pkgconfig python3native systemd update-rc.d

 PACKAGECONFIG ??= " \
    client \
@ -24,7 +25,8 @@ PACKAGECONFIG[wired] = "--enable-wired,--disable-wired"
 PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono"
 PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd"

-EXTRA_OECONF = "--enable-external-ell"
+INITSCRIPT_NAME = "iwd"
+INITSCRIPT_PARAMS = "start 04 5 2 3 . stop 23 0 1 6 ."

 SYSTEMD_SERVICE:${PN} = " \
    iwd.service \
@ -38,6 +40,11 @@ do_configure:prepend() {
 do_install:append() {
    # If client and monitor are disabled, bindir is empty, causing a QA error
    rmdir --ignore-fail-on-non-empty ${D}/${bindir}
+
+    if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${UNPACKDIR}/iwd ${D}${sysconfdir}/init.d/iwd
+    fi
 }

 FILES:${PN} += " \
--- a/meta-gnome/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch
+++ b/meta-gnome/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch
@ -1,70 +0,0 @@
-From 35173fa04d0116ba30a86dc1a19f859f2be14a24 Mon Sep 17 00:00:00 2001
-From: "Bruce A. Johnson" <waterfordtrack@gmail.com>
-Date: Wed, 22 Dec 2021 14:24:02 -0500
-Subject: [PATCH] core: switch bash shell scripts to use /bin/sh for use
- w/Busybox.
-
-Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/483
-
-%% original patch: 0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch
---
- data/dispatcher-fcc-unlock/105b | 2 +-
- data/dispatcher-fcc-unlock/1199 | 2 +-
- data/dispatcher-fcc-unlock/1eac | 2 +-
- test/mmcli-test-sms             | 2 +-
- tools/tests/test-wrapper.sh.in  | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/data/dispatcher-fcc-unlock/105b b/data/dispatcher-fcc-unlock/105b
-index 444bd51f..772c90f4 100644
--- a/data/dispatcher-fcc-unlock/105b
-+++ b/data/dispatcher-fcc-unlock/105b
-@@ -1,4 +1,4 @@
-#!/bin/bash
-+#!/bin/sh
- 
- # SPDX-License-Identifier: CC0-1.0
- # 2021 Aleksander Morgado <aleksander@aleksander.es>
-diff --git a/data/dispatcher-fcc-unlock/1199 b/data/dispatcher-fcc-unlock/1199
-index 83ab2c9e..6dbf8d1b 100644
--- a/data/dispatcher-fcc-unlock/1199
-+++ b/data/dispatcher-fcc-unlock/1199
-@@ -1,4 +1,4 @@
-#!/bin/bash
-+#!/bin/sh
- 
- # SPDX-License-Identifier: CC0-1.0
- # 2021 Aleksander Morgado <aleksander@aleksander.es>
-diff --git a/data/dispatcher-fcc-unlock/1eac b/data/dispatcher-fcc-unlock/1eac
-index 1a048dc8..44ce46d7 100644
--- a/data/dispatcher-fcc-unlock/1eac
-+++ b/data/dispatcher-fcc-unlock/1eac
-@@ -1,4 +1,4 @@
-#!/bin/bash
-+#!/bin/sh
- 
- # SPDX-License-Identifier: CC0-1.0
- # 2021 Aleksander Morgado <aleksander@aleksander.es>
-diff --git a/test/mmcli-test-sms b/test/mmcli-test-sms
-index 18e0a7b4..7136ee0d 100755
--- a/test/mmcli-test-sms
-+++ b/test/mmcli-test-sms
-@@ -1,4 +1,4 @@
-#!/bin/bash
-+#!/bin/sh
- 
- print_usage () {
-     echo "usage: $0 [MODEM INDEX] [all|ucs2|gsm7|data] [NUMBER]"
-diff --git a/tools/tests/test-wrapper.sh.in b/tools/tests/test-wrapper.sh.in
-index d64ea4cb..fcdb56de 100644
--- a/tools/tests/test-wrapper.sh.in
-+++ b/tools/tests/test-wrapper.sh.in
-@@ -1,4 +1,4 @@
-#!/bin/bash
-+#!/bin/sh
- 
- # For debugging behavior of test-modemmanager-service.py, you can modify
- # this line to add --log-file option
-- 
-2.35.3
-
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bruce Leidl	86ac69427f	Upgrade of GNOME and Poky Poky: Yocto-5.2 GNOME: 48.1	2025-06-11 14:45:25 +00:00
Bruce Leidl	439f3c8326	Upgrade poky to Yocto-5.1.3 (Styhead)	2025-04-06 17:51:28 +00:00
Bruce Leidl	93d2acdb9d	Integrated citadel-realms into citadel	2024-11-13 12:07:04 -05:00
Bruce Leidl	9599d3da9d	Add patch for GNOME Software to facilitate sandboxing	2024-09-27 07:42:25 -04:00
isa	4c6f4f4a3d	Add missing files to correct dns fix commit (`0d13ca38df`)	2024-09-10 14:19:59 -04:00
isa	0d13ca38df	Fix failure of dns resolution in realms	2024-09-06 15:25:48 -04:00
Bruce Leidl	bc87a2c629	Added packages needed for flatpak/gnome-software support also: citadel-tools updated	2024-09-06 10:43:31 -04:00
isa	e51faa3266	Fix missing svg file in bitbake build process	2024-09-03 15:30:27 -04:00
isa	88b412a18f	Add citadel-installer-ui icon	2024-08-30 09:38:50 -04:00
isa	277cac8eea	Fix x1 touchpad not working	2024-08-30 09:38:20 -04:00
isa	4b73960043	Fix installer fails because missing kernel module	2024-08-30 09:36:32 -04:00
isa	8eacade6bf	Fix not able to change timezones	2024-08-30 09:35:47 -04:00
isa	5dfd3e31db	Add features to qemu script and support for other linux distros	2024-07-18 16:03:29 -04:00
isa	1dc36e94fc	Build citadel-tools from the same git repo owner as citadel	2024-07-17 07:01:43 -04:00
				`@ -1 +0,0 @@`
				`EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=MinSizeRel "`