From d8965d5b7b559c9d784c348e188c8e9135c5099f Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 May 2023 20:03:05 +0200 Subject: [PATCH 1/7] bookworm/debian: lua-rex-pcre is now lua-rex-pcre2 ? --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 2005ef3..8c4ec2c 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.1 Package: ssowat Architecture: all -Depends: nginx-extras (>=1.6.2), lua-ldap, lua-json, lua-rex-pcre, lua-filesystem, lua-socket, whois +Depends: nginx-extras (>=1.6.2), lua-ldap, lua-json, lua-rex-pcre2, lua-filesystem, lua-socket, whois Homepage: https://yunohost.org Description: user portal with single sign-on designed for Yunohost A minimalist user portal with single sign-on, designed to be From 5dd7c7269f007f91e2b368d1ef5ed907d2a949c7 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 May 2023 20:32:20 +0200 Subject: [PATCH 2/7] Update changelog for 12.0.0 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 18e455f..979a6e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ssowat (12.0.0) unstable; urgency=low + + - Tmp changelog to prepare Bookworm + + -- Alexandre Aubin Thu, 04 May 2023 20:30:19 +0200 + ssowat (11.1.4) stable; urgency=low - Releasing as stable From c0e38b19a07a0671064baaa82a7ba24aa5dd896e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 15 May 2023 17:22:50 +0200 Subject: [PATCH 3/7] rex_pcre is now rex_pcre2 --- helpers.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers.lua b/helpers.lua index 26d654b..d51bd98 100644 --- a/helpers.lua +++ b/helpers.lua @@ -15,7 +15,7 @@ local logger = require("log") local url_parser = require "socket.url" -- Import Perl regular expressions library -local rex = require "rex_pcre" +local rex = require "rex_pcre2" local is_logged_in = false From 5d207184fddd44cb2514eb5369cdf6f90583afb4 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 13 Jun 2023 14:33:33 +0200 Subject: [PATCH 4/7] debian: we need lua-ldap >=1.3.1, version 1.3.0 is buggy --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 8c4ec2c..ff60631 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.1 Package: ssowat Architecture: all -Depends: nginx-extras (>=1.6.2), lua-ldap, lua-json, lua-rex-pcre2, lua-filesystem, lua-socket, whois +Depends: nginx-extras (>=1.6.2), lua-ldap (>=1.3.1), lua-json, lua-rex-pcre2, lua-filesystem, lua-socket, whois Homepage: https://yunohost.org Description: user portal with single sign-on designed for Yunohost A minimalist user portal with single sign-on, designed to be From 429db4e2d570dcba1ed6bba1bbda816eaa1d1940 Mon Sep 17 00:00:00 2001 From: motcha Date: Tue, 11 Jul 2023 14:31:20 +0000 Subject: [PATCH 5/7] Translated using Weblate (Japanese) Currently translated at 100.0% (47 of 47 strings) Translation: YunoHost/SSOwat Translate-URL: https://translate.yunohost.org/projects/yunohost/ssowat/ja/ --- portal/locales/ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal/locales/ja.json b/portal/locales/ja.json index cce29a5..1cc0624 100644 --- a/portal/locales/ja.json +++ b/portal/locales/ja.json @@ -17,7 +17,7 @@ "logout": "ログアウト", "password_changed": "パスワードが変更されました", "password_not_match": "パスワードが一致しません", - "password_too_simple_1": "パスワードは少なくとも8文字必要です", + "password_too_simple_1": "パスワードは8文字以上である必要があります", "password_too_simple_2": "パスワードは8文字以上で、数字/大文字/小文字の全てを含む必要があります", "password_too_simple_3": "パスワードは8文字以上で、数字/大文字/小文字/特殊文字の全てを含む必要があります", "password_too_simple_4": "パスワードは12文字以上で、数字/大文字/小文字/特殊文字の全てを含む必要があります", From c68f90b83eca01b2cb986142ffb4e5b61c3dda45 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 17 Jul 2023 16:34:57 +0200 Subject: [PATCH 6/7] Update changelog for 11.2 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 18e455f..eb58b1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ssowat (11.2) stable; urgency=low + + - i18n: Translations updated for Chinese (Simplified), German, Indonesian, Japanese + + Thanks to all contributors <3 ! (Christian Wehrli, motcha, Neko Nekowazarashi, Poesty Li) + + -- Alexandre Aubin Mon, 17 Jul 2023 16:34:25 +0200 + ssowat (11.1.4) stable; urgency=low - Releasing as stable From 2880d1cfb9043fa116145284c5ce4c0e2babeca1 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Fri, 8 Sep 2023 19:57:36 +0200 Subject: [PATCH 7/7] Fix helper for bookworm. --- helpers.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers.lua b/helpers.lua index d51bd98..eea03d8 100644 --- a/helpers.lua +++ b/helpers.lua @@ -889,7 +889,7 @@ function edit_user() end ldap:close() - local rex = require "rex_pcre" + local rex = require "rex_pcre2" local rex_flags = rex.flags() local mail_re = rex.new([[^[\w\.\-+%]+@([^\W_A-Z]+([\-]*[^\W_A-Z]+)*\.)+([^\W\d_]{2,})$]], rex_flags.UTF8 + rex_flags.UCP)