[PR PATCH] ntpd-rs: Set cap_net_bind_service during daemon startup allows it to …

[PR PATCH] ntpd-rs: Set cap_net_bind_service during daemon startup allows it to …

[faulesocke]

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

There is a new pull request by faulesocke against master on the void-packages repository

https://github.com/faulesocke/void-packages ntpd-rs
https://github.com/void-linux/void-packages/pull/53896

ntpd-rs: Set cap_net_bind_service during daemon startup allows it to …
…run in server mode and listen on port 123

<!-- 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**|**NO**
-->

<!-- 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/53896.patch is attached

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

From 5111f339525766a7d1b08764f769906724e13ca6 Mon Sep 17 00:00:00 2001
From: Urs Schulz <3109602+faulesocke@users.noreply.github.com>
Date: Wed, 8 Jan 2025 21:54:03 +0100
Subject: [PATCH] ntpd-rs: Set cap_net_bind_service during daemon startup
 allows it to run in server mode and listen on port 123

---
 srcpkgs/ntpd-rs/INSTALL           | 5 -----
 srcpkgs/ntpd-rs/files/ntpd-rs/run | 8 +++++++-
 srcpkgs/ntpd-rs/template          | 3 +--
 3 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 srcpkgs/ntpd-rs/INSTALL

diff --git a/srcpkgs/ntpd-rs/INSTALL b/srcpkgs/ntpd-rs/INSTALL
deleted file mode 100644
index bb7e53afa9362a..00000000000000
--- a/srcpkgs/ntpd-rs/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-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
index d9b5fdbb6423f0..d1d6a6c9065a30 100644
--- a/srcpkgs/ntpd-rs/files/ntpd-rs/run
+++ b/srcpkgs/ntpd-rs/files/ntpd-rs/run
@@ -1,4 +1,10 @@
 #!/bin/sh
 exec 2>&1
+[ -r conf ] && . ./conf
 [ ! -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
+
+exec setpriv --reuid _ntpd_rs --regid _ntpd_rs --clear-groups \
+	--ambient-caps -all,+sys_time,+net_bind_service \
+	--inh-caps -all,+sys_time,+net_bind_service \
+	--bounding-set -all,+sys_time,+net_bind_service \
+	--no-new-privs -- ntp-daemon
diff --git a/srcpkgs/ntpd-rs/template b/srcpkgs/ntpd-rs/template
index a6ba0de08e1d87..653c6d13f78df7 100644
--- a/srcpkgs/ntpd-rs/template
+++ b/srcpkgs/ntpd-rs/template
@@ -1,7 +1,7 @@
 # Template file for 'ntpd-rs'
 pkgname=ntpd-rs
 version=1.4.0
-revision=1
+revision=2
 build_style=cargo
 make_check_args="--
  --skip daemon::keyexchange::tests::client_connection_refused
@@ -9,7 +9,6 @@ make_check_args="--
  --skip daemon::keyexchange::tests::key_exchange_weird_packet
 "
 make_install_args="--path ntpd"
-depends="libcap-progs"
 short_desc="Full-featured implementation of the Network Time Protocol"
 maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
 license="Apache-2.0 OR MIT"

Re: [PR PATCH] [Updated] ntpd-rs: Set cap_net_bind_service during daemon startup allows it to …

[faulesocke]

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

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

https://github.com/faulesocke/void-packages ntpd-rs
https://github.com/void-linux/void-packages/pull/53896

ntpd-rs: Set cap_net_bind_service during daemon startup allows it to …
…run in server mode and listen on port 123

<!-- 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**|**NO**
-->

<!-- 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/53896.patch is attached

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

From c5f8b41e2a843cd12a389b6631689cccf2ae5bc2 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 8 Jan 2025 22:45:20 +0100
Subject: [PATCH] ntpd-rs: Set cap_net_bind_service on startup

Allows it to run in server mode and listen on port 123
---
 srcpkgs/ntpd-rs/INSTALL           | 5 -----
 srcpkgs/ntpd-rs/files/ntpd-rs/run | 8 +++++++-
 srcpkgs/ntpd-rs/template          | 3 +--
 3 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 srcpkgs/ntpd-rs/INSTALL

diff --git a/srcpkgs/ntpd-rs/INSTALL b/srcpkgs/ntpd-rs/INSTALL
deleted file mode 100644
index bb7e53afa9362a..00000000000000
--- a/srcpkgs/ntpd-rs/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-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
index d9b5fdbb6423f0..d1d6a6c9065a30 100644
--- a/srcpkgs/ntpd-rs/files/ntpd-rs/run
+++ b/srcpkgs/ntpd-rs/files/ntpd-rs/run
@@ -1,4 +1,10 @@
 #!/bin/sh
 exec 2>&1
+[ -r conf ] && . ./conf
 [ ! -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
+
+exec setpriv --reuid _ntpd_rs --regid _ntpd_rs --clear-groups \
+	--ambient-caps -all,+sys_time,+net_bind_service \
+	--inh-caps -all,+sys_time,+net_bind_service \
+	--bounding-set -all,+sys_time,+net_bind_service \
+	--no-new-privs -- ntp-daemon
diff --git a/srcpkgs/ntpd-rs/template b/srcpkgs/ntpd-rs/template
index a6ba0de08e1d87..653c6d13f78df7 100644
--- a/srcpkgs/ntpd-rs/template
+++ b/srcpkgs/ntpd-rs/template
@@ -1,7 +1,7 @@
 # Template file for 'ntpd-rs'
 pkgname=ntpd-rs
 version=1.4.0
-revision=1
+revision=2
 build_style=cargo
 make_check_args="--
  --skip daemon::keyexchange::tests::client_connection_refused
@@ -9,7 +9,6 @@ make_check_args="--
  --skip daemon::keyexchange::tests::key_exchange_weird_packet
 "
 make_install_args="--path ntpd"
-depends="libcap-progs"
 short_desc="Full-featured implementation of the Network Time Protocol"
 maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
 license="Apache-2.0 OR MIT"

Re: [PR PATCH] [Merged]: ntpd-rs: Set cap_net_bind_service during daemon startup allows it to …

[tranzystorekk]

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

There's a merged pull request on the void-packages repository

ntpd-rs: Set cap_net_bind_service during daemon startup allows it to …
https://github.com/void-linux/void-packages/pull/53896

Description:
…run in server mode and listen on port 123

<!-- 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**|**NO**
-->

<!-- 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
-->