[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.1-1-17-gf8f74d9

[jonathan at claws-mail.org]

The branch, master has been updated
       via  f8f74d967318054761b1e3aaa026ca09fe13c884 (commit)
      from  1e613db6aad333014b95cde77e9ef5feb7a11f5c (commit)

Summary of changes:
 packages/packages.current                 |  2 +-
 patches/libpsl-0.21.2/01-localtime_r.diff | 15 +++++++++++++++
 patches/libpsl-0.21.2/02-localtime_r.diff | 26 ++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 patches/libpsl-0.21.2/01-localtime_r.diff
 create mode 100644 patches/libpsl-0.21.2/02-localtime_r.diff


- Log -----------------------------------------------------------------
commit f8f74d967318054761b1e3aaa026ca09fe13c884
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Feb 19 20:00:40 2023 -0700

    Update to libpsl-0.21.2

diff --git a/packages/packages.current b/packages/packages.current
index 8f53e66..b92fe13 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -36,7 +36,7 @@ libgpg_error,1.46,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.
 libical,3.0.16,file,https://github.com/libical/libical/releases/download/v3.0.16/libical-3.0.16.tar.gz,b44705dd71ca4538c86fb16248483ab4b48978524fb1da5097bd76aa2e0f0c33,,
 libiconv,1.17,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz,8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313,,
 libpng,1.6.39,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.39/libpng-1.6.39.tar.xz,1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937,,
-libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
+libpsl,0.21.2,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.2/libpsl-0.21.2.tar.gz,e35991b6e17001afa2c0ca3b10c357650602b92596209b7492802f3768a6285f,,
 libsoup,2.74.3,file,https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.3.tar.xz,e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13,,
 libtasn1,4.19.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.19.0.tar.gz,1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a,,
 libwebp,1.2.4,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.4.tar.gz,7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df,,
diff --git a/patches/libpsl-0.21.2/01-localtime_r.diff b/patches/libpsl-0.21.2/01-localtime_r.diff
new file mode 100644
index 0000000..89bcca6
--- /dev/null
+++ b/patches/libpsl-0.21.2/01-localtime_r.diff
@@ -0,0 +1,15 @@
+diff --git a/tools/psl.c b/tools/psl.c
+index 95d8b65..054d0b6 100644
+--- a/tools/psl.c
++++ b/tools/psl.c
+@@ -38,6 +38,10 @@
+ 
+ #ifdef _WIN32
+ # include <winsock2.h> // WSAStartup, WSACleanup
++
++// Windows does not have localtime_r but has localtime_s, which is more or less
++// the same except that the arguments are reversed
++# define localtime_r(t_sec,t_now) localtime_s(t_now,t_sec)
+ #endif
+ 
+ #include <stdlib.h>
diff --git a/patches/libpsl-0.21.2/02-localtime_r.diff b/patches/libpsl-0.21.2/02-localtime_r.diff
new file mode 100644
index 0000000..2c8fbdb
--- /dev/null
+++ b/patches/libpsl-0.21.2/02-localtime_r.diff
@@ -0,0 +1,26 @@
+diff --git a/tools/psl.c b/tools/psl.c
+index 054d0b6..ed94d5c 100644
+--- a/tools/psl.c
++++ b/tools/psl.c
+@@ -41,7 +41,11 @@
+ 
+ // Windows does not have localtime_r but has localtime_s, which is more or less
+ // the same except that the arguments are reversed
+-# define localtime_r(t_sec,t_now) localtime_s(t_now,t_sec)
++# define LOCALTIME_R_SUCCESSFUL(t_sec,t_now)	\
++	(localtime_s(t_now, t_sec) == 0)
++#else
++# define LOCALTIME_R_SUCCESSFUL(t_sec,t_now)	\
++	(localtime_r(t_sec, t_now) != NULL)
+ #endif
+ 
+ #include <stdlib.h>
+@@ -94,7 +98,7 @@ static const char *time2str(time_t t)
+ 	static char buf[64];
+ 	struct tm tm;
+ 
+-	if (localtime_r(&t, &tm) != NULL)
++	if (LOCALTIME_R_SUCCESSFUL(&t, &tm))
+ 		strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S %Z", &tm);
+ 	else
+ 		strcpy(buf, "--notime--");

-----------------------------------------------------------------------


hooks/post-receive
-- 
Installer sources for Claws Mail Windows port