Merge branch 'v2.0' into feature/ui-security

packaging/linux/portmaster.desktop

@@ -3,6 +3,7 @@ Name=Portmaster
 GenericName=Application Firewall
 Exec={{exec}} --data=/opt/safing/portmaster --with-prompts --with-notifications 
 Icon={{icon}}
+StartupWMClass=portmaster
 Terminal=false
 Type=Application
 Categories=System

packaging/linux/portmaster.service

@@ -23,6 +23,7 @@ Environment=LOGLEVEL=info
 Environment=PORTMASTER_ARGS=
 EnvironmentFile=-/etc/default/portmaster
 ProtectSystem=true
+ReadWritePaths=/usr/lib/portmaster
 RestrictAddressFamilies=AF_UNIX AF_NETLINK AF_INET AF_INET6
 RestrictNamespaces=yes
 ProtectHome=read-only

packaging/linux/postinst

@@ -28,6 +28,9 @@ if [ -d "$OLD_INSTALLATION_DIR" ]; then
         echo "[ ] V1 migration: Removing V1 shortcuts"
         rm /etc/xdg/autostart/portmaster_notifier.desktop
         rm /usr/share/applications/portmaster_notifier.desktop
+        # app V1 shortcut
+        # NOTE: new V2 shortcut registered as "Portmaster.desktop" (first letter uppercase), so we can distinguish between V1 and V2 shortcuts.
+        rm /usr/share/applications/portmaster.desktop 
 
         # Remove V1 files (except configuration)
         # (keeping V1 configuration for a smooth downgrade, if needed)

packaging/windows/generate_windows_installers.ps1

@@ -50,15 +50,19 @@
 #------------------------------------------------------------------------------
 #
 # Optional arguments:
-# -i, --interactive: Can prompt for user input (e.g. when a file is not found in the primary folder but found in the alternate folder)
-# -v, --version: Explicitly set the version to use for the installer file name
+# -i: (interactive) Can prompt for user input (e.g. when a file is not found in the primary folder but found in the alternate folder)
+# -v: (version)     Explicitly set the version to use for the installer file name
+# -e: (erase)       Just erase work directories
 #------------------------------------------------------------------------------
 param (
     [Alias('i')]
     [switch]$interactive,
 
     [Alias('v')]
-    [string]$version
+    [string]$version,
+
+    [Alias('e')]
+    [switch]$erase
 )
 
 # Save the current directory
@@ -185,7 +189,18 @@ try {
     $destinationDir = "desktop/tauri/src-tauri"
     $binaryDir = "$destinationDir/binary"           #portmaster\desktop\tauri\src-tauri\binary
     $intelDir  = "$destinationDir/intel"            #portmaster\desktop\tauri\src-tauri\intel
-    $targetDir = "$destinationDir/target/release"   #portmaster\desktop\tauri\src-tauri\target\release
+    $targetBase= "$destinationDir/target"           #portmaster\desktop\tauri\src-tauri\target
+    $targetDir = "$targetBase/release"              #portmaster\desktop\tauri\src-tauri\target\release
+
+    # Erasing work directories
+    Write-Output "[+] Erasing work directories: '$binaryDir', '$intelDir', '$targetBase'"
+    Remove-Item -Recurse -Force -Path $binaryDir -ErrorAction SilentlyContinue
+    Remove-Item -Recurse -Force -Path $intelDir -ErrorAction SilentlyContinue
+    Remove-Item -Recurse -Force -Path $targetBase -ErrorAction SilentlyContinue
+    if ($erase) {
+        Write-Output "[ ] Done"
+        exit 0
+    }
 
     # Copying BINARY FILES
     Write-Output "`n[+] Copying binary files:"