Re: [PR PATCH] [Updated] New package: ntpd-rs-0.3.7

[tranzystorek-io <tranzystorek-io@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages ntpd-rs
https://github.com/void-linux/void-packages/pull/45739

New package: ntpd-rs-0.3.7
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/45739.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ntpd-rs-45739.patch --]
[-- Type: text/x-diff, Size: 3876 bytes --]

From e9587c614e35a0c407b80c938039ff93ab137352 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 24 Aug 2023 13:25:55 +0200
Subject: [PATCH] New package: ntpd-rs-0.3.7

---
 srcpkgs/ntpd-rs/INSTALL                     |  5 ++++
 srcpkgs/ntpd-rs/files/ntpd-rs/run           |  4 +++
 srcpkgs/ntpd-rs/patches/fix-musl-test.patch | 26 ++++++++++++++++
 srcpkgs/ntpd-rs/template                    | 33 +++++++++++++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 srcpkgs/ntpd-rs/INSTALL
 create mode 100644 srcpkgs/ntpd-rs/files/ntpd-rs/run
 create mode 100644 srcpkgs/ntpd-rs/patches/fix-musl-test.patch
 create mode 100644 srcpkgs/ntpd-rs/template

diff --git a/srcpkgs/ntpd-rs/INSTALL b/srcpkgs/ntpd-rs/INSTALL
new file mode 100644
index 0000000000000..bb7e53afa9362
--- /dev/null
+++ b/srcpkgs/ntpd-rs/INSTALL
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	setcap CAP_SYS_TIME=+ep usr/bin/ntp-daemon
+	;;
+esac
diff --git a/srcpkgs/ntpd-rs/files/ntpd-rs/run b/srcpkgs/ntpd-rs/files/ntpd-rs/run
new file mode 100644
index 0000000000000..d9b5fdbb6423f
--- /dev/null
+++ b/srcpkgs/ntpd-rs/files/ntpd-rs/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+[ ! -d /run/ntpd-rs ] && mkdir /run/ntpd-rs && chown _ntpd_rs:_ntpd_rs /run/ntpd-rs
+exec chpst -u _ntpd_rs:_ntpd_rs ntp-daemon
diff --git a/srcpkgs/ntpd-rs/patches/fix-musl-test.patch b/srcpkgs/ntpd-rs/patches/fix-musl-test.patch
new file mode 100644
index 0000000000000..c98308706d717
--- /dev/null
+++ b/srcpkgs/ntpd-rs/patches/fix-musl-test.patch
@@ -0,0 +1,26 @@
+From c62d259213088ed6a7c0200d731b272f3d158335 Mon Sep 17 00:00:00 2001
+From: David Venhoek <david@tweedegolf.com>
+Date: Thu, 24 Aug 2023 15:20:13 +0200
+Subject: [PATCH] Be a bit more generous in what we accept as error message in
+ test.
+
+---
+ ntp-udp/src/hwtimestamp.rs | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/ntp-udp/src/hwtimestamp.rs b/ntp-udp/src/hwtimestamp.rs
+index bc825a5e..d5648585 100644
+--- a/ntp-udp/src/hwtimestamp.rs
++++ b/ntp-udp/src/hwtimestamp.rs
+@@ -77,7 +77,10 @@ mod tests {
+         udp_socket.connect(("10.0.0.18", 9001))?;
+ 
+         if let Err(e) = get_hardware_timestamp(&udp_socket) {
+-            assert!(e.to_string().contains("Operation not supported"));
++            assert!(
++                e.to_string().contains("Operation not supported")
++                    || e.to_string().contains("Not supported")
++            );
+         }
+ 
+         Ok(())
diff --git a/srcpkgs/ntpd-rs/template b/srcpkgs/ntpd-rs/template
new file mode 100644
index 0000000000000..48379857acddb
--- /dev/null
+++ b/srcpkgs/ntpd-rs/template
@@ -0,0 +1,33 @@
+# Template file for 'ntpd-rs'
+pkgname=ntpd-rs
+version=0.3.7
+revision=1
+build_style=cargo
+make_check_args="--
+ --skip algorithm::kalman::peer::tests::test_offset_steering_and_measurements
+ --skip keyexchange::tests::client_connection_refused
+ --skip interface_name::tests::find_interface_ipv6
+ --skip socket::tests::test_client_basic_ipv6
+ --skip socket::tests::test_server_basic_ipv6"
+make_install_args="--path ntpd"
+depends="libcap-progs"
+short_desc="Full-featured implementation of the Network Time Protocol"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/pendulum-project/ntpd-rs"
+changelog="https://raw.githubusercontent.com/pendulum-project/ntpd-rs/main/CHANGELOG.md"
+distfiles="https://github.com/pendulum-project/ntpd-rs/archive/refs/tags/v${version}.tar.gz"
+checksum=e705447e61a4857875b136d5910b48f2db5dba91b77e59e430c0d651867429ad
+
+system_accounts="_ntpd_rs"
+conf_files="/etc/ntpd-rs/ntp.toml"
+provides="ntp-daemon-0_1"
+alternatives="
+ ntpd:ntpd:/usr/bin/ntp-daemon
+ ntpd:ntpd:/etc/sv/ntpd-rs"
+
+post_install() {
+	vinstall ntp.toml 644 etc/ntpd-rs
+	vlicense LICENSE-MIT
+	vsv ntpd-rs
+}