Merge branch 'master' into release_2_1

Changes.md

@@ -1,3 +1,21 @@
+Changes in 2.1.2.1
+=====================
+- [BUGFIX #1]   some fixes to RADIUS tests
+- [BUGFIX #2]   fixed mobileconfig generating an unnecessary profile
+- [BUGFIX #3]   added Kosovo to the list of known federations
+- [BUGFIX #4]   fixed the problem with special anonymous identity not being saved
+- [BUGFIX #5]   fixing the problem with sending invites to multiple addressees
+- [FEATURE #1]  multiple additions to the linux installer: 
+                tinker part of the linux installer; 
+                added --gui flag to the linux installer (mainly for testing);
+                enabled an additional label on the credentials window;
+                catching more exceptions on module import;
+                improving behaviour on missing python module
+- [FEATURE #2]  improved RADIUS/TLS certificate management for NRO
+- [FEATURE #3]  added support for ARM processors in Windows installers
+
+
+
 Changes in 2.1.2
 =====================
 - [FEATURE #1]  add support for device-specific options be displayed only

Makefile

@@ -1,8 +1,8 @@
-VERSION = CAT-2.1.2
-VV = $(VERSION)/
+VERSION = CAT-2.1.2.1
+WLANSetEAPUserData = devices/ms/Files/WLANSetEAPUserData
 .PHONY: translation
 
-all: translation documentation
+all: translation WLANSetEAPUserData documentation
 
 documentation:
 	rm -Rf web/apidoc build 
@@ -41,6 +41,17 @@ translation: pull_from_transifex
         done; \
 	rm messages.mo
 
+WLANSetEAPUserData:
+	rm -rf ${WLANSetEAPUserData}
+	mkdir ${WLANSetEAPUserData}
+	curl -o ${WLANSetEAPUserData}/WLANSetEAPUserData-1.1.zip -L https://github.com/rozmansi/WLANSetEAPUserData/releases/download/1.1/WLANSetEAPUserData-1.1.zip
+	curl -o ${WLANSetEAPUserData}/WLANSetEAPUserData-1.1-src.tar.gz -L https://github.com/rozmansi/WLANSetEAPUserData/archive/refs/tags/1.1.tar.gz
+	cd ${WLANSetEAPUserData}; unzip WLANSetEAPUserData-1.1.zip
+	mv ${WLANSetEAPUserData}/ARM64/WLANSetEAPUserData.exe ${WLANSetEAPUserData}/WLANSetEAPUserDataARM64.exe
+	mv ${WLANSetEAPUserData}/Win32/WLANSetEAPUserData.exe ${WLANSetEAPUserData}/WLANSetEAPUserData32.exe
+	mv ${WLANSetEAPUserData}/x64/WLANSetEAPUserData.exe ${WLANSetEAPUserData}/WLANSetEAPUserData64.exe
+	rmdir ${WLANSetEAPUserData}/ARM64 ${WLANSetEAPUserData}/Win32 ${WLANSetEAPUserData}/x64
+	rm ${WLANSetEAPUserData}/WLANSetEAPUserData-1.1.zip
 
 distribution: all
 	git submodule update --init devices/ms/Files/GEANTLink

core/CAT.php

@@ -54,7 +54,7 @@ class CAT extends \core\common\Entity
     public const VERSION_MAJOR = 2;
     public const VERSION_MINOR = 1;
     public const VERSION_PATCH = 2;
-    public const VERSION_EXTRA = "";
+    public const VERSION_EXTRA = "1";
     private const RELEASE_VERSION = FALSE;
     private const USER_API_VERSION = 2;