summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-networking/recipes-support/ntpsec/ntpsec/0001-Update-to-OpenSSL-3.0.0-alpha15.patch111
-rw-r--r--meta-networking/recipes-support/ntpsec/ntpsec/volatiles.ntpsec3
-rw-r--r--meta-networking/recipes-support/ntpsec/ntpsec_1.2.1.bb113
3 files changed, 227 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/ntpsec/ntpsec/0001-Update-to-OpenSSL-3.0.0-alpha15.patch b/meta-networking/recipes-support/ntpsec/ntpsec/0001-Update-to-OpenSSL-3.0.0-alpha15.patch
new file mode 100644
index 0000000000..825f6c93c3
--- /dev/null
+++ b/meta-networking/recipes-support/ntpsec/ntpsec/0001-Update-to-OpenSSL-3.0.0-alpha15.patch
@@ -0,0 +1,111 @@
1From ba368822d0a197cb84c46c911d40d0c52cf9c391 Mon Sep 17 00:00:00 2001
2From: Hal Murray <hmurray@megapathdsl.net>
3Date: Sun, 2 May 2021 22:24:26 -0700
4Subject: [PATCH] Update to OpenSSL 3.0.0-alpha15
5
6Upstream-Status: Backport [https://gitlab.com/NTPsec/ntpsec/-/commit/ba368822d0a197cb84c46c911d40d0c52cf9c391]
7Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
8Signed-off-by: Alex Kiernan <alexk@zuma.ai>
9---
10 attic/cmac-timing.c | 37 ++++++++++++++-----------------------
11 1 file changed, 14 insertions(+), 23 deletions(-)
12
13diff --git a/attic/cmac-timing.c b/attic/cmac-timing.c
14index c2088db63a4c..464daa76b9e6 100644
15--- a/attic/cmac-timing.c
16+++ b/attic/cmac-timing.c
17@@ -225,28 +225,14 @@ static void DoPKEY(
18 #if OPENSSL_VERSION_NUMBER > 0x20000000L
19 static size_t One_EVP_MAC(
20 EVP_MAC_CTX *ctx, /* context */
21- char *cipher,
22 uint8_t *key, /* key pointer */
23 int keylength, /* key length */
24 uint8_t *pkt, /* packet pointer */
25 int pktlength /* packet length */
26 ) {
27- OSSL_PARAM params[3];
28 size_t len = EVP_MAX_MD_SIZE;
29
30- params[0] =
31- OSSL_PARAM_construct_utf8_string("cipher", cipher, 0);
32- params[1] =
33- OSSL_PARAM_construct_octet_string("key", key, keylength);
34- params[2] = OSSL_PARAM_construct_end();
35- if (0 == EVP_MAC_CTX_set_params(ctx, params)) {
36- unsigned long err = ERR_get_error();
37- char * str = ERR_error_string(err, NULL);
38- printf("## Oops, EVP_MAC_CTX_set_params() failed: %s.\n", str);
39- return 0;
40- }
41-
42- if (0 == EVP_MAC_init(ctx)) {
43+ if (0 == EVP_MAC_init(ctx, key, keylength, NULL)) {
44 unsigned long err = ERR_get_error();
45 char * str = ERR_error_string(err, NULL);
46 printf("## Oops, EVP_MAC_init() failed: %s.\n", str);
47@@ -255,13 +241,13 @@ static size_t One_EVP_MAC(
48 if (0 == EVP_MAC_update(ctx, pkt, pktlength)) {
49 unsigned long err = ERR_get_error();
50 char * str = ERR_error_string(err, NULL);
51- printf("## Oops, EVP_MAC_init() failed: %s.\n", str);
52+ printf("## Oops, EVP_MAC_update() failed: %s.\n", str);
53 return 0;
54 }
55 if (0 == EVP_MAC_final(ctx, answer, &len, sizeof(answer))) {
56 unsigned long err = ERR_get_error();
57 char * str = ERR_error_string(err, NULL);
58- printf("## Oops, EVP_MAC_init() failed: %s.\n", str);
59+ printf("## Oops, EVP_MAC_final() failed: %s.\n", str);
60 return 0;
61 }
62 return len;
63@@ -290,7 +276,7 @@ static void Do_EVP_MAC(
64
65 clock_gettime(CLOCK_MONOTONIC, &start);
66 for (int i = 0; i < SAMPLESIZE; i++) {
67- digestlength = One_EVP_MAC(evp, cbc, key, keylength, pkt, pktlength);
68+ digestlength = One_EVP_MAC(evp, key, keylength, pkt, pktlength);
69 if (0 == digestlength) break;
70 }
71 clock_gettime(CLOCK_MONOTONIC, &stop);
72@@ -305,26 +291,31 @@ static size_t One_EVP_MAC2(
73 uint8_t *pkt, /* packet pointer */
74 int pktlength /* packet length */
75 ) {
76+ EVP_MAC_CTX *dup;
77 size_t len = EVP_MAX_MD_SIZE;
78
79- if (0 == EVP_MAC_init(ctx)) {
80+ // dup = ctx;
81+ dup = EVP_MAC_CTX_dup(ctx);
82+
83+ if (0 == EVP_MAC_init(dup, NULL, 0, NULL)) {
84 unsigned long err = ERR_get_error();
85 char * str = ERR_error_string(err, NULL);
86 printf("## Oops, EVP_MAC_init() failed: %s.\n", str);
87 return 0;
88 }
89- if (0 == EVP_MAC_update(ctx, pkt, pktlength)) {
90+ if (0 == EVP_MAC_update(dup, pkt, pktlength)) {
91 unsigned long err = ERR_get_error();
92 char * str = ERR_error_string(err, NULL);
93- printf("## Oops, EVP_MAC_init() failed: %s.\n", str);
94+ printf("## Oops, EVP_MAC_update() failed: %s.\n", str);
95 return 0;
96 }
97- if (0 == EVP_MAC_final(ctx, answer, &len, sizeof(answer))) {
98+ if (0 == EVP_MAC_final(dup, answer, &len, sizeof(answer))) {
99 unsigned long err = ERR_get_error();
100 char * str = ERR_error_string(err, NULL);
101- printf("## Oops, EVP_MAC_init() failed: %s.\n", str);
102+ printf("## Oops, EVP_MAC_final() failed: %s.\n", str);
103 return 0;
104 }
105+ EVP_MAC_CTX_free(dup);
106 return len;
107 }
108
109--
1102.33.0
111
diff --git a/meta-networking/recipes-support/ntpsec/ntpsec/volatiles.ntpsec b/meta-networking/recipes-support/ntpsec/ntpsec/volatiles.ntpsec
new file mode 100644
index 0000000000..b5f93568cd
--- /dev/null
+++ b/meta-networking/recipes-support/ntpsec/ntpsec/volatiles.ntpsec
@@ -0,0 +1,3 @@
1d ntp ntp 0755 @NTP_USER_HOME@ none
2d ntp ntp 0755 /var/log/ntpstats none
3f ntp ntp 0644 /var/log/ntpd.log none
diff --git a/meta-networking/recipes-support/ntpsec/ntpsec_1.2.1.bb b/meta-networking/recipes-support/ntpsec/ntpsec_1.2.1.bb
new file mode 100644
index 0000000000..1e075b0971
--- /dev/null
+++ b/meta-networking/recipes-support/ntpsec/ntpsec_1.2.1.bb
@@ -0,0 +1,113 @@
1SUMMARY = "The Network Time Protocol suite, refactored"
2HOMEPAGE = "https://www.ntpsec.org/"
3
4LICENSE = "CC-BY-4.0 & BSD-2-Clause & NTP & BSD-3-Clause & MIT"
5LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=0520591566b6ed3a9ced8b15b4d4abf9 \
6 file://libjsmn/LICENSE;md5=38118982429881235de8adf478a8e75d \
7 file://docs/copyright.adoc;md5=9a1e3fce4b630078cb67ba2b619d2b13 \
8 file://libaes_siv/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
9
10DEPENDS += "bison-native \
11 openssl \
12 python3"
13
14SRC_URI = "https://ftp.ntpsec.org/pub/releases/ntpsec-${PV}.tar.gz \
15 file://0001-Update-to-OpenSSL-3.0.0-alpha15.patch \
16 file://volatiles.ntpsec"
17
18SRC_URI[sha256sum] = "f2684835116c80b8f21782a5959a805ba3c44e3a681dd6c17c7cb00cc242c27a"
19
20inherit pkgconfig python3-dir python3targetconfig systemd update-alternatives update-rc.d useradd waf
21
22PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'seccomp systemd', d)} \
23 cap \
24 leap-smear \
25 mdns \
26 mssntp \
27 nts \
28 refclocks"
29PACKAGECONFIG[cap] = ",,libcap"
30PACKAGECONFIG[leap-smear] = "--enable-leap-smear"
31PACKAGECONFIG[mdns] = ",,mdns"
32PACKAGECONFIG[mssntp] = "--enable-mssntp"
33PACKAGECONFIG[nts] = ",--disable-nts"
34PACKAGECONFIG[refclocks] = "--refclock=all,,pps-tools"
35PACKAGECONFIG[seccomp] = "--enable-seccomp,,libseccomp"
36PACKAGECONFIG[systemd] = ",,systemd"
37
38CC[unexport] = "1"
39CFLAGS[unexport] = "1"
40LDFLAGS[unexport] = "1"
41
42export PYTHON_VERSION = "${PYTHON_BASEVERSION}"
43export PYTAG = "cpython${@ d.getVar('PYTHON_BASEVERSION').replace('.', '')}"
44export pyext_PATTERN = "%s.so"
45export PYTHON_LDFLAGS = "-lpthread -ldl"
46
47CFLAGS:append = " -I${PYTHON_INCLUDE_DIR}"
48
49EXTRA_OECONF = "--cross-compiler='${CC}' \
50 --cross-cflags='${CFLAGS}' \
51 --cross-ldflags='${LDFLAGS}' \
52 --pyshebang=${bindir}/python3 \
53 --pythondir=${PYTHON_SITEPACKAGES_DIR} \
54 --pythonarchdir=${PYTHON_SITEPACKAGES_DIR} \
55 --enable-debug \
56 --enable-debug-gdb \
57 --enable-early-droproot"
58
59EXTRA_OEWAF_BUILD ?= "-v"
60
61NTP_USER_HOME ?= "/var/lib/ntp"
62
63do_install:append() {
64 install -d ${D}${sysconfdir}/init.d
65 install -m 755 ${S}/etc/rc/ntpd ${D}${sysconfdir}/init.d
66 cp -r ${S}/etc/ntp.d ${D}${sysconfdir}
67
68 sed -e 's:@NTP_USER_HOME@:${NTP_USER_HOME}:g' ${WORKDIR}/volatiles.ntpsec >${T}/volatiles.ntpsec
69 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
70 cp ${B}/main/etc/* ${D}${systemd_system_unitdir}
71 awk '{print $1, $5, $4, $2, $3, "-"}' ${T}/volatiles.ntpsec >${T}/tmpfiles.ntpsec
72 install -D -m 0644 ${T}/tmpfiles.ntpsec ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf
73 else
74 install -D -m 0644 ${T}/volatiles.ntpsec ${D}${sysconfdir}/default/volatiles/99_${BPN}
75 fi
76}
77
78PACKAGE_BEFORE_PN = "${PN}-python ${PN}-utils ${PN}-viz"
79
80FILES:${PN} += "${nonarch_libdir}/tmpfiles.d/ntpsec.conf"
81FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR} \
82 ${libdir}/libntpc.so.*"
83FILES:${PN}-utils = "${bindir}/ntpdig \
84 ${bindir}/ntpkeygen \
85 ${bindir}/ntpleapfetch \
86 ${bindir}/ntpmon \
87 ${bindir}/ntpq \
88 ${bindir}/ntpsnmpd \
89 ${bindir}/ntpsweep \
90 ${bindir}/ntptrace \
91 ${bindir}/ntpwait"
92FILES:${PN}-viz = "${bindir}/ntplogtemp \
93 ${bindir}/ntpviz"
94
95RDEPENDS:${PN} += "libgcc"
96RDEPENDS:${PN}-utils += "${PN}-python python3-core"
97RDEPENDS:${PN}-viz += "gnuplot ${PN}-python python3-core python3-compression python3-ctypes python3-logging python3-shell"
98
99USERADD_PACKAGES = "${PN}"
100USERADD_PARAM:${PN} = "--system --home-dir ${NTP_USER_HOME} \
101 --no-create-home \
102 --shell /bin/false --user-group ntp"
103
104INITSCRIPT_NAME = "ntpd"
105
106SYSTEMD_PACKAGES = "${PN} ${PN}-viz"
107SYSTEMD_SERVICE:${PN} = "ntpd.service ntp-wait.service"
108SYSTEMD_SERVICE:${PN}-viz = "ntplogtemp.service ntpviz-weekly.timer ntpviz-weekly.service ntpviz-daily.timer ntpviz-daily.service ntplogtemp.timer"
109
110ALTERNATIVE_PRIORITY = "80"
111
112ALTERNATIVE:${PN} = "ntpd"
113ALTERNATIVE_LINK_NAME[ntpd] = "${sbindir}/ntpd"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-24 17:33:25 +0000