From bc2f81d951e8cd06ed348f14430eaefffba6d602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= Date: Fri, 26 Sep 2025 15:54:53 +0200 Subject: [PATCH] Fix RPM package --- resources-linux/postinst | 4 ++-- resources-linux/postrm | 6 +++--- resources-linux/prerm | 2 +- src-tauri/Cargo.lock | 8 +++++++- .../components/LocationsList/modals/MFAModal/MFAModal.tsx | 1 - 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/resources-linux/postinst b/resources-linux/postinst index 580264af..64779ffd 100644 --- a/resources-linux/postinst +++ b/resources-linux/postinst @@ -5,10 +5,10 @@ GROUP_NAME="defguard" SERVICE_NAME="defguard-service" case "$1" in - configure) + 1|configure) # Create the group if it doesn't exist if ! getent group "$GROUP_NAME" >/dev/null; then - addgroup --system "$GROUP_NAME" + groupadd --system "$GROUP_NAME" echo "Created group $GROUP_NAME" fi diff --git a/resources-linux/postrm b/resources-linux/postrm index 645f3f87..924e6eb0 100644 --- a/resources-linux/postrm +++ b/resources-linux/postrm @@ -5,7 +5,7 @@ GROUP_NAME="defguard" SERVICE_NAME="defguard-service" case "$1" in - remove) + 0|1|remove) # Service file still exists, just disable it if [ -d /run/systemd/system ]; then systemctl disable "$SERVICE_NAME" || true @@ -13,10 +13,10 @@ case "$1" in fi ;; - purge) + 0|purge) # Complete removal - clean up group too if getent group "$GROUP_NAME" >/dev/null; then - delgroup "$GROUP_NAME" || true + groupdel "$GROUP_NAME" || true fi ;; esac diff --git a/resources-linux/prerm b/resources-linux/prerm index 3c602373..40dbc1e3 100644 --- a/resources-linux/prerm +++ b/resources-linux/prerm @@ -4,7 +4,7 @@ set -e SERVICE_NAME="defguard-service" case "$1" in - remove|upgrade|deconfigure) + 0|1|remove|upgrade|deconfigure) if [ -d /run/systemd/system ]; then # Stop the service before removal/upgrade systemctl stop "$SERVICE_NAME" || true diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index dd6fcaff..778c9e01 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2428,6 +2428,12 @@ dependencies = [ "foldhash", ] +[[package]] +name = "hashbrown" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" + [[package]] name = "hashlink" version = "0.10.0" @@ -2820,7 +2826,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" dependencies = [ "equivalent", - "hashbrown 0.15.5", + "hashbrown 0.16.0", "serde", "serde_core", ] diff --git a/src/pages/client/pages/ClientInstancePage/components/LocationsList/modals/MFAModal/MFAModal.tsx b/src/pages/client/pages/ClientInstancePage/components/LocationsList/modals/MFAModal/MFAModal.tsx index 032e03b0..2307f534 100644 --- a/src/pages/client/pages/ClientInstancePage/components/LocationsList/modals/MFAModal/MFAModal.tsx +++ b/src/pages/client/pages/ClientInstancePage/components/LocationsList/modals/MFAModal/MFAModal.tsx @@ -571,7 +571,6 @@ const MFACodeForm = ({ description, token, proxyUrl, resetState }: MFACodeForm) if (response.ok) { closeModal(); const data = (await response.json()) as MFAFinishResponse; - error(`ARSE ${location.connection_type}`); await connect({ locationId: location?.id, connectionType: location.connection_type,