From 30564b4f921f26299a27c9983e360df324acaf2e Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Sat, 2 May 2026 12:33:06 +0300 Subject: [PATCH 1/8] =?UTF-8?q?Allow=20tag=20names=20in=20languages=20?= =?UTF-8?q?=E2=80=8B=E2=80=8Bother=20than=20English=20(zm=5Fcreate.sql.in)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/zm_create.sql.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in index 6a9b11328b4..cc3028e1b51 100644 --- a/db/zm_create.sql.in +++ b/db/zm_create.sql.in @@ -1312,7 +1312,7 @@ CREATE TABLE Reports ( CREATE TABLE `Tags` ( `Id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `Name` varchar(64) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '', + `Name` varchar(64) CHARACTER SET latin1 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', `CreateDate` TIMESTAMP DEFAULT CURRENT_TIMESTAMP, `CreatedBy` int(10) unsigned, `LastAssignedDate` dateTime, From c3d3ea5569d76706a458047583729170f4a0fa05 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Sat, 2 May 2026 12:59:16 +0300 Subject: [PATCH 2/8] Create zm_update-1.39.6.sql --- db/zm_update-1.39.6.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 db/zm_update-1.39.6.sql diff --git a/db/zm_update-1.39.6.sql b/db/zm_update-1.39.6.sql new file mode 100644 index 00000000000..97fded3ed1a --- /dev/null +++ b/db/zm_update-1.39.6.sql @@ -0,0 +1,6 @@ +-- +-- This updates a 1.39.5 database to 1.39.6 +-- +-- Make changes to the Tags table and change the Name column's COLLATE to utf8mb4_unicode_ci +-- +ALTER TABLE `Tags` MODIFY `Name` VARCHAR(64) COLLATE `utf8mb4_unicode_ci` NOT NULL DEFAULT ''; From e365280caecca5dfc339dec0bacd41a8d526d846 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Sat, 2 May 2026 13:03:50 +0300 Subject: [PATCH 3/8] Bump version to 1.39.6 (zoneminder.spec) --- distros/redhat/zoneminder.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index 03b9a5e751c..c56e2077b47 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -21,7 +21,7 @@ %global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}} Name: zoneminder -Version: 1.39.5 +Version: 1.39.6 Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons From fdc02fc0959842cbbdae0f97b245cbbef34f37ef Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Sat, 2 May 2026 13:04:40 +0300 Subject: [PATCH 4/8] Bump version to 1.39.6 --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 713e6275cb1..d16306730ff 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.39.5 +1.39.6 From dce6965548f843fe4195662ebaa7e46527c7a9f2 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Sat, 2 May 2026 17:09:43 +0300 Subject: [PATCH 5/8] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- db/zm_create.sql.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in index cc3028e1b51..b318ab8ce9d 100644 --- a/db/zm_create.sql.in +++ b/db/zm_create.sql.in @@ -1312,7 +1312,7 @@ CREATE TABLE Reports ( CREATE TABLE `Tags` ( `Id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `Name` varchar(64) CHARACTER SET latin1 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `Name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', `CreateDate` TIMESTAMP DEFAULT CURRENT_TIMESTAMP, `CreatedBy` int(10) unsigned, `LastAssignedDate` dateTime, From c702d2374b758cf4cd4f0b588e6efe66f56fbc76 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Sat, 2 May 2026 17:20:19 +0300 Subject: [PATCH 6/8] To avoid problems when modifying the database, we'll continue to use the "*_bin" collation instead of "*_unicode_ci" (zm_update-1.39.6.sql). --- db/zm_update-1.39.6.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/zm_update-1.39.6.sql b/db/zm_update-1.39.6.sql index 97fded3ed1a..0ce6f188ada 100644 --- a/db/zm_update-1.39.6.sql +++ b/db/zm_update-1.39.6.sql @@ -1,6 +1,6 @@ -- -- This updates a 1.39.5 database to 1.39.6 -- --- Make changes to the Tags table and change the Name column's COLLATE to utf8mb4_unicode_ci +-- Make changes to the Tags table and change the Name column's COLLATE to utf8mb4_bin -- -ALTER TABLE `Tags` MODIFY `Name` VARCHAR(64) COLLATE `utf8mb4_unicode_ci` NOT NULL DEFAULT ''; +ALTER TABLE `Tags` MODIFY `Name` VARCHAR(64) COLLATE `utf8mb4_bin` NOT NULL DEFAULT ''; From 1c989e8bf7d71e2c34bc7466925903d6b6a2dc26 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Wed, 6 May 2026 17:01:15 +0300 Subject: [PATCH 7/8] Potential fix for pull request finding The changes to `utf8mb4_unicode_ci` were made deliberately, as I don't think case-sensitivity and accent sensitivity are necessary. Yes, updated installations and new ones will behave differently, but if the user's account is clean, i.e., a new installation, there won't be any conflicts. Well, I don't think using `utf8mb4_unicode_ci` is mandatory for new installations. Let's use `utf8mb4_bin`. Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- db/zm_create.sql.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in index b318ab8ce9d..25c37187d7e 100644 --- a/db/zm_create.sql.in +++ b/db/zm_create.sql.in @@ -1312,7 +1312,7 @@ CREATE TABLE Reports ( CREATE TABLE `Tags` ( `Id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `Name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `Name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '', `CreateDate` TIMESTAMP DEFAULT CURRENT_TIMESTAMP, `CreatedBy` int(10) unsigned, `LastAssignedDate` dateTime, From 4ff7020ca66582683d50a50dc5f526127881e872 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Wed, 6 May 2026 17:04:41 +0300 Subject: [PATCH 8/8] Update zm_update-1.39.6.sql --- db/zm_update-1.39.6.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/zm_update-1.39.6.sql b/db/zm_update-1.39.6.sql index 0ce6f188ada..0d02f88717a 100644 --- a/db/zm_update-1.39.6.sql +++ b/db/zm_update-1.39.6.sql @@ -3,4 +3,4 @@ -- -- Make changes to the Tags table and change the Name column's COLLATE to utf8mb4_bin -- -ALTER TABLE `Tags` MODIFY `Name` VARCHAR(64) COLLATE `utf8mb4_bin` NOT NULL DEFAULT ''; +ALTER TABLE `Tags` MODIFY `Name` VARCHAR(64) CHARACTER SET `utf8mb4` COLLATE `utf8mb4_bin` NOT NULL DEFAULT '';