Changes in the Makefile.os4 to fully compile

localtime_r() is not available on Windows but a more-secure variant
of localtime(), localtime_s() is provided on Windows.

Define localtime_r() on Windows as its arguments are reversed as compared
to localetime_s(), to achive more or less the same purpose.

.github/workflows/codeql.yml

@@ -32,7 +32,7 @@ jobs:
         if: ${{ matrix.language == 'cpp' }}
         run: |
           sudo apt-get update
-          sudo apt-get install --yes lzip
+          sudo apt-get install --yes lzip autopoint
 
       - name: Configure (cpp)
         if: ${{ matrix.language == 'cpp' }}

COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2014-2018 Tim Rühsen
+Copyright (C) 2014-2022 Tim Rühsen
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2014-2015 Tim Rühsen
+Copyright (C) 2014-2022 Tim Rühsen
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

Makefile.os4

@@ -0,0 +1,35 @@
+
+USE_CLIB2=YES
+ifeq ($(USE_CLIB2), YES)
+LIBC=clib2
+else
+LIBC=newlib
+endif
+
+all: build
+
+init:
+# git submodule update --init
+	sh ./autogen.sh
+	autoreconf --install --force --symlink
+
+build: init
+	CC="ppc-amigaos-gcc" CFLAGS="-mcrt=${LIBC} -fPIC" CXXFLAGS="-mcrt=${LIBC} -fPIC" LDFlags="-mcrt=${LIBC}" LIBS="-lpthread -athread=native" ./configure --host=ppc-amigaos --enable-shared=no --enable-builtin --disable-runtime && \
+	make -j$(shell nproc)
+
+clean:
+	@make -f Makefile clean
+	@rm -rf autom4te.cache .deps
+	@rm config.log config.status configure libtool Makefile Makefile.in *.m4
+
+release:
+	@mkdir -p release/local/common/include
+	@mkdir -p release/local/clib2/lib
+#	@mkdir -p release/local/newlib/lib
+	@make -f Makefile.os4 USE_CLIB2=YES
+	@cp ./src/.libs/libpsl.a ./src/.libs/libpsl.lai ./src/libpsl.la release/local/clib2/lib/
+	@cp ./include/libpsl.h release/local/common/include/
+#	@make -f Makefile.os4 clean
+#	@make -f Makefile.os4 USE_CLIB2=NO
+#	@cp ./src/.libs/libpsl.a ./src/.libs/libpsl.lai ./src/libpsl.la release/local/newlib/lib/
+	@lha -aeq libpsl.lha release/

NEWS

@@ -1,4 +1,17 @@
-Copyright (C) 2014-2020 Tim Rühsen
+Copyright (C) 2014-2022 Tim Rühsen
+
+26.12.2022 Release V0.21.2
+  * Increased internal label size
+  * Meson build improvements (needs meson >= 0.60.0)
+  * Autoconf build improvements
+  * Add instructions on how to build from tarball
+  * Add WSAStartup() for Windows psl tool and tests
+  * Bump gettext version to 0.19.3
+  * Fix stack buffer overflow WRITE 1 in domain_to_punycode()
+    (Relevant only when built without any IDNA library.)
+  * Fix undefined behavior in library code
+  * Ensures that calls to fopen() and stat() can handle largefiles
+  * Several minor (non-functional) changes
 
 18.07.2020 Release V0.21.1
   * Fixing a test due to recent changes in upstream PSL

fuzz/fuzzer.h

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2017-2018 Tim Ruehsen
+ * Copyright(c) 2017-2022 Tim Ruehsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

fuzz/libpsl_fuzzer.c

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2017-2018 Tim Ruehsen
+ * Copyright(c) 2017-2022 Tim Ruehsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

fuzz/libpsl_load_dafsa_fuzzer.c

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2017-2018 Tim Ruehsen
+ * Copyright(c) 2017-2022 Tim Ruehsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

fuzz/libpsl_load_fuzzer.c

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2017-2018 Tim Ruehsen
+ * Copyright(c) 2017-2022 Tim Ruehsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

fuzz/main.c

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2017-2018 Tim Ruehsen
+ * Copyright(c) 2017-2022 Tim Ruehsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

fuzz/run-afl.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -eu
 #
-# Copyright(c) 2017-2018 Tim Ruehsen
+# Copyright(c) 2017-2022 Tim Ruehsen
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

fuzz/run-clang.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright(c) 2017-2018 Tim Ruehsen
+# Copyright(c) 2017-2022 Tim Ruehsen
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

include/libpsl.h.in

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2014-2018 Tim Ruehsen
+ * Copyright(c) 2014-2022 Tim Ruehsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

libtool_version_info.txt

@@ -1 +1 @@
-8:3:3
+8:4:3

list

@@ -1 +1 @@
-Subproject commit 06a4956ac640e9f93499fda6b2113846687adfb2
+Subproject commit 4aec132984ce028c5b9d7882a31a85e5e5330346

meson.build

@@ -40,17 +40,9 @@ if ['libidn2', 'auto'].contains(enable_runtime)
 endif
 
 if ['libicu', 'auto'].contains(enable_runtime)
-  libicu_dep = dependency('icu-uc', required : false)
-  if not libicu_dep.found() and cc.has_header('unicode/ustring.h')
-    # MSVC: the debug configuration of ICU generated the libraries with d suffix
-    # we must handle this and search for the right library depending on the
-    # build type. Note debugoptimized is just a release build with .pdb files enabled
-    if cc.get_id() == 'msvc' and buildtype == 'debug'
-      libicu_dep = cc.find_library('icuucd', required : false)
-    else
-      libicu_dep = cc.find_library('icuuc', required : false)
-    endif
-  endif
+  libicu_dep = dependency('icu-uc', 'ICU',
+                          components: 'uc',
+                          required : false)
   if libicu_dep.found()
     if enable_runtime == 'auto'
       enable_runtime = 'libicu'

src/psl.c

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2014-2018 Tim Ruehsen
+ * Copyright(c) 2014-2022 Tim Ruehsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

tests/test-is-cookie-domain-acceptable.c

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2014-2018 Tim Ruehsen
+ * Copyright(c) 2014-2022 Tim Ruehsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

tests/test-is-public-all.c

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2014-2018 Tim Ruehsen
+ * Copyright(c) 2014-2022 Tim Ruehsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

tests/test-is-public-builtin.c

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2014-2018 Tim Ruehsen
+ * Copyright(c) 2014-2022 Tim Ruehsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

tests/test-is-public.c

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2014-2018 Tim Ruehsen
+ * Copyright(c) 2014-2022 Tim Ruehsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

tests/test-registrable-domain.c

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2014-2018 Tim Ruehsen
+ * Copyright(c) 2014-2022 Tim Ruehsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

tools/psl.c

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2014-2018 Tim Ruehsen
+ * Copyright(c) 2014-2022 Tim Ruehsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -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>
@@ -88,9 +92,12 @@ static void init_windows(void) {
 static const char *time2str(time_t t)
 {
 	static char buf[64];
-	struct tm *tp = localtime(&t);
+	struct tm tm;
 
-	strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S %Z", tp);
+	if (localtime_r(&t, &tm) != NULL)
+		strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S %Z", &tm);
+	else
+		strcpy(buf, "--notime--");
 	return buf;
 }
 
@@ -160,7 +167,7 @@ int main(int argc, const char *const *argv)
 				printf("psl %s (0x%06x)\n", PACKAGE_VERSION, psl_check_version_number(0));
 				printf("libpsl %s\n", psl_get_version());
 				printf("\n");
-				printf("Copyright (C) 2014-2018 Tim Ruehsen\n");
+				printf("Copyright (C) 2014-2022 Tim Ruehsen\n");
 				printf("License: MIT\n");
 				exit(0);
 			}

version.txt

@@ -1 +1 @@
-0.21.1
+0.21.2