package/ntpsec: bump version to 1.2.3

- removed 0002-wscript-fix-build-without-stack-protector.patch
  (upstream applied, see [1])

- update license info according to upstream commit [2]
  (add Apache-2.0, Beerware, BSD-4-Clause and ISC, rename license
  file to end with '.txt' suffix)

See [3] for details.

[1] 15862410de
[2] e29d662141
[3] https://gitlab.com/NTPsec/ntpsec/-/releases/NTPsec_1_2_3

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

.checkpackageignore

@@ -922,7 +922,6 @@ package/ntp/0001-nano.patch Upstream
 package/ntp/0002-ntp-syscalls-fallback.patch Upstream
 package/ntp/S49ntp.in Variables
 package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch Upstream
-package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch Upstream
 package/numactl/0001-link-with-latomic-if-needed-again.patch Upstream
 package/nuttcp/0001-susv3-legacy.patch Upstream
 package/nvidia-driver/0001-use-LDFLAGS.patch Upstream

package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch

@@ -1,50 +0,0 @@
-From 0a3ce09c14eb9c7e36aa30a4dafe40e56676d678 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Fri, 24 Feb 2023 11:33:32 +0100
-Subject: [PATCH] wscript: fix build without stack-protector
-
--fstack-protector-all can depends on ssp library availability (e.g. on musl) so
-move the test from cc_test_flags to ld_hardening_flags, this will avoid the
-following build failure:
-
-Checking for library ssp                 : not found
-Checking for library ssp_nonshared       : not found
-Checking if C compiler supports -fstack-protector-all : yes
-
-[...]
-
-The configuration failed
-(complete log in /home/autobuild/autobuild/instance-2/output-1/build/ntpsec-1_2_2/build/config.log)
-
-Fixes:
- - http://autobuild.buildroot.org/results/f38abc6b7f8464836231192cfe078a5b27319a8a
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/ntpsec/ntpsec/pull/6]
----
- wscript | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/wscript b/wscript
-index be396b33b..f301809fc 100644
---- a/wscript
-+++ b/wscript
-@@ -298,7 +298,6 @@ def configure(ctx):
-         ctx.env.LDFLAGS += ["-lssp_nonshared"]
- 
-     cc_test_flags = [
--        ('f_stack_protector_all', '-fstack-protector-all'),
-         ('PIC', '-fPIC'),
-         ('PIE', '-pie -fPIE'),
-         # this quiets most of macOS warnings on -fpie
-@@ -332,6 +331,7 @@ def configure(ctx):
- 
-     # Check which linker flags are supported
-     ld_hardening_flags = [
-+        ('f_stack_protector_all', '-fstack-protector-all'),
-         ("z_now", "-Wl,-z,now"),     # no deferred symbol resolution
-     ]
- 
--- 
-2.39.1
-

package/ntpsec/ntpsec.hash

@@ -1,8 +1,12 @@
 # Locally calculated
-sha256  ef901df5a05d486563db22f4d0dad3840a3bf5d0a9aceb8c3ecaeb396c67a805  ntpsec-NTPsec_1_2_2a.tar.bz2
+sha256  a9ec4416688a1c1c88833f3f6acc35518e3d63409af372eec010455002b33050  ntpsec-NTPsec_1_2_3.tar.bz2
-sha256  899261d6eb6c922cf8f051225411f27b738ba0014be18c2eaf6afbf30d421bb1  LICENSES/BSD-2
+sha256  074e6e32c86a4c0ef8b3ed25b721ca23aca83df277cd88106ef7177c354615ff  LICENSES/Apache-2.0.txt
-sha256  5fe38d8724c53ff4e69f0a3492a368b4a6719700ac16f706efeb01a45c62f2b5  LICENSES/BSD-3
+sha256  991d8a58e0b4be84a174a9bd333a8ca33807a0c1ce6d23a2e25a21f7ece482d0  LICENSES/Beerware.txt
-sha256  9ba9550ad48438d0836ddab3da480b3b69ffa0aac7b7878b5a0039e7ab429411  LICENSES/CC-BY-4.0
+sha256  899261d6eb6c922cf8f051225411f27b738ba0014be18c2eaf6afbf30d421bb1  LICENSES/BSD-2-Clause.txt
-sha256  074415b57c6ba1780483d89e55f40dec3ded96c28aaf47d63c486683ba553e7c  LICENSES/MIT
+sha256  5fe38d8724c53ff4e69f0a3492a368b4a6719700ac16f706efeb01a45c62f2b5  LICENSES/BSD-3-Clause.txt
-sha256  62fec6cd79721af81b7c12f1a679535235fdd22800ab17653042f024187ff274  LICENSES/NTP
+sha256  c80d927f03db7212ba43a869a383e249c19b40859ff0d9e2e2f968e4fdcf005f  LICENSES/BSD-4-Clause.txt
+sha256  9ba9550ad48438d0836ddab3da480b3b69ffa0aac7b7878b5a0039e7ab429411  LICENSES/CC-BY-4.0.txt
+sha256  f2ec607f67bb0dd3053b49835b02110d5cd0f8eb6da3aac4dc0b142a6b299be9  LICENSES/ISC.txt
+sha256  074415b57c6ba1780483d89e55f40dec3ded96c28aaf47d63c486683ba553e7c  LICENSES/MIT.txt
+sha256  62fec6cd79721af81b7c12f1a679535235fdd22800ab17653042f024187ff274  LICENSES/NTP.txt
 sha256  d3b21470adadd9abd9c6d675378f8c371ac5a4ea6dbec91859e02fadca3c0856  docs/copyright.adoc

package/ntpsec/ntpsec.mk

@@ -4,16 +4,28 @@
 #
 ################################################################################
 
-NTPSEC_VERSION = 1.2.2a
+NTPSEC_VERSION = 1.2.3
 NTPSEC_SOURCE = ntpsec-NTPsec_$(subst .,_,$(NTPSEC_VERSION)).tar.bz2
 NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(subst .,_,$(NTPSEC_VERSION))
-NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT, CC-BY-4.0 (docs)
+NTPSEC_LICENSE = Apache-2.0, \
+	Beerware, \
+	BSD-2-Clause.txt, \
+	BSD-3-Clause.txt, \
+	BSD-4-Clause.txt, \
+	ISC.txt, \
+	MIT.txt, \
+	NTP.txt, \
+	CC-BY-4.0.txt (docs)
 NTPSEC_LICENSE_FILES = \
-	LICENSES/BSD-2 \
+	LICENSES/Apache-2.0.txt \
-	LICENSES/BSD-3 \
+	LICENSES/Beerware.txt \
-	LICENSES/CC-BY-4.0 \
+	LICENSES/BSD-2-Clause.txt \
-	LICENSES/MIT \
+	LICENSES/BSD-3-Clause.txt \
-	LICENSES/NTP \
+	LICENSES/BSD-4-Clause.txt \
+	LICENSES/ISC.txt \
+	LICENSES/MIT.txt \
+	LICENSES/NTP.txt \
+	LICENSES/CC-BY-4.0.txt \
 	docs/copyright.adoc
 
 NTPSEC_CPE_ID_VENDOR = ntpsec