diff --git a/package/ntpsec/0003-disable-PIE-support.patch b/package/ntpsec/0002-disable-PIE-support.patch similarity index 100% rename from package/ntpsec/0003-disable-PIE-support.patch rename to package/ntpsec/0002-disable-PIE-support.patch diff --git a/package/ntpsec/0003-ntpd-refclock_gpsd.c-Add-missing-time.h-for-strptim.patch b/package/ntpsec/0003-ntpd-refclock_gpsd.c-Add-missing-time.h-for-strptim.patch new file mode 100644 index 0000000000..0a2ae6a259 --- /dev/null +++ b/package/ntpsec/0003-ntpd-refclock_gpsd.c-Add-missing-time.h-for-strptim.patch @@ -0,0 +1,47 @@ +From 904983bf9465017753c6f5b602fc9c98458615f7 Mon Sep 17 00:00:00 2001 +From: "Gary E. Miller" +Date: Mon, 27 Oct 2025 12:35:35 -0700 +Subject: [PATCH] ntpd/refclock_gpsd.c: Add missing time.h for strptime() + +Upstream: https://gitlab.com/NTPsec/ntpsec/-/commit/5137c155d8895cfc50fb577ee720b3b23589c662 + +Signed-off-by: Bernd Kuhls +--- + ntpd/refclock_gpsd.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/ntpd/refclock_gpsd.c b/ntpd/refclock_gpsd.c +index 1dfec3103..0a2987d84 100644 +--- a/ntpd/refclock_gpsd.c ++++ b/ntpd/refclock_gpsd.c +@@ -100,20 +100,20 @@ typedef unsigned long int json_uint; + * header stuff we need + */ + +-#include +-#include +-#include +-#include + #include ++#include + #include ++#include ++#include ++#include // for strptime() ++#include + +-#include ++#include + #include + #include ++#include + #include + +-#include +- + #include "ntpd.h" + #include "ntp_io.h" + #include "ntp_refclock.h" +-- +2.47.3 + diff --git a/package/ntpsec/0004-refclock_gpsd-add-build-fix-for-gcc-14.x.patch b/package/ntpsec/0004-refclock_gpsd-add-build-fix-for-gcc-14.x.patch new file mode 100644 index 0000000000..821a34e966 --- /dev/null +++ b/package/ntpsec/0004-refclock_gpsd-add-build-fix-for-gcc-14.x.patch @@ -0,0 +1,32 @@ +From 55c230d61ece7213506f1dccac76c21aefbade9e Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Mon, 27 Oct 2025 19:18:13 +0100 +Subject: [PATCH] refclock_gpsd: add build fix for gcc => 14.x + +../../ntpd/refclock_gpsd.c:2076:14: error: implicit declaration of + function 'strptime'; did you mean 'strftime'? + [-Wimplicit-function-declaration] + +Upstream: https://gitlab.com/NTPsec/ntpsec/-/merge_requests/1484 + +Signed-off-by: Bernd Kuhls +--- + ntpd/refclock_gpsd.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ntpd/refclock_gpsd.c b/ntpd/refclock_gpsd.c +index a4a6f7095..a3995896a 100644 +--- a/ntpd/refclock_gpsd.c ++++ b/ntpd/refclock_gpsd.c +@@ -59,6 +59,8 @@ + */ + + ++#define _XOPEN_SOURCE ++#define _DEFAULT_SOURCE + #include "config.h" + #include "ntp.h" + #include "ntp_types.h" +-- +2.47.3 + diff --git a/package/ntpsec/ntpsec.hash b/package/ntpsec/ntpsec.hash index a3802c11ba..40c06d6926 100644 --- a/package/ntpsec/ntpsec.hash +++ b/package/ntpsec/ntpsec.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a9ec4416688a1c1c88833f3f6acc35518e3d63409af372eec010455002b33050 ntpsec-NTPsec_1_2_3.tar.bz2 +sha256 3abc1b057a252d214ef2e76aa375fe0d81432c626e75304b17850d68eee0c54f ntpsec-NTPsec_1_2_4.tar.bz2 sha256 074e6e32c86a4c0ef8b3ed25b721ca23aca83df277cd88106ef7177c354615ff LICENSES/Apache-2.0.txt sha256 991d8a58e0b4be84a174a9bd333a8ca33807a0c1ce6d23a2e25a21f7ece482d0 LICENSES/Beerware.txt sha256 899261d6eb6c922cf8f051225411f27b738ba0014be18c2eaf6afbf30d421bb1 LICENSES/BSD-2-Clause.txt diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index 3acf7745cf..d48bc5baa9 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -4,7 +4,7 @@ # ################################################################################ -NTPSEC_VERSION = 1.2.3 +NTPSEC_VERSION = 1.2.4 NTPSEC_SOURCE = ntpsec-NTPsec_$(subst .,_,$(NTPSEC_VERSION)).tar.bz2 NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(subst .,_,$(NTPSEC_VERSION)) NTPSEC_LICENSE = Apache-2.0, \ @@ -37,13 +37,15 @@ NTPSEC_DEPENDENCIES = \ libcap \ openssl +NTPSEC_CONF_ENV = \ + CC="$(HOSTCC)" \ + CFLAGS="$(HOST_CFLAGS)" \ + PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python3-config" + # CC="$(HOSTCC)" is strange but needed to build some host tools, the # cross-compiler will properly be used to build target code thanks to # --cross-compiler NTPSEC_CONF_OPTS = \ - CC="$(HOSTCC)" \ - CFLAGS="$(HOST_CFLAGS)" \ - PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python3-config" \ --libdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/ntp \ --cross-compiler="$(TARGET_CC)" \ --cross-cflags="$(TARGET_CFLAGS) -std=gnu99" \