7 files changed, 120 insertions, 245 deletions
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 7ad89709d73d..58a39da980af 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -2,14 +2,10 @@ AUX ntp.conf 727 BLAKE2B 1b37cee807c41593ffc44994e390c98406c49154477bc2a603ba403
 AUX ntpd-r1.service 613 BLAKE2B 9e0d0fdefa670c2ac25142bfb37880ce4ba0662f70f7cf9acb02f9016bfeabd94a043e92d1b1be11e74b838e9cc91d7d7c1144539917c927537e67f92b45003e SHA512 cdfbc735e157306597ff3c37b5aea34d64c66a69bbb9dbfba6c7eb57d6b201c9d2e86969e5be9b8331e75e1de8eaa17ee4d8f72bed9bc058a6198bf5a2d717c6
 AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fdc0a3ad18c9855b74a70f1a89eb31854bbdad6729753c3a199cddb25b58178a79a0ea0a7050 SHA512 a2fdf88f6f55bcf0a6545db77817e3a740dba50bf56b4fdd80d335e8c909d0880fbd962041754d7f5fb3946ed131d9a739ec72008bacab9f1f47ff82dc74c542
 AUX ntpd.rc-r2 484 BLAKE2B 826a3ee09486d912525fe6d44b967e25d8b31485d89a80987afcf459ea335058ff8a7835f3931017505aad6c5ba60e546b608ce26a51ad38f5972675d0a47559 SHA512 dc89a58edf6f83878d42522a015f2c3e12db9505ea3d6bc4b04e6e82947a7be6e8d143e8808bb58644641dd754744fd4be20c8b944a4261b460c30b95436fc31
-AUX ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch 536 BLAKE2B cac17041a05d0ec22b8d95dbb16118d7603c74a7d4c873422de65451f5ddd74b7d9aceb51714d842ef7c4a37ea638212487d6db99ebfa201b01b9654b732538c SHA512 c54b3304ca467e8434e29d312e5839c788becd8ae9068737ec9725a42f22073ea0e86355999dc6d606c12f4c733497cbe48bd49b6e150c39e6540e581df6087e
 AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0dba7f268febd10fa7599ef6b9bee30199ce10529d2d326719f5b376d301aabfef3beacecd4af813bcef1d6a65d61ab00996d72f1240f83ef8e3 SHA512 3e012ad70507f440ed3a4aca4886a96e40d49a0dd7c14572f664633a56139cb7767e07ee1bb5e8295fc32052914364660c928d11369b6f80193ae7e190e5a48e
-AUX ntpsec-1.2.0-move-newfstatat.patch 544 BLAKE2B 877bb058fc2d06c315c086b5501181bac1a63d3e08bfd900bd3cd651b8dafaac0531357c4b9f30c51eccf17f0debd219daba2d3f115843ad77bb4b9bcdfb47fb SHA512 fe2fac5c6b6cd5c905209685c57ef3a2f2fb14f633b5cd0e73aaace0f7774f76b1cb1b07b6c94558a6bff3017c8498574d12b703495ef314eaf5f1298a9c078f
-AUX ntpsec-1.2.0-seccomp.patch 736 BLAKE2B 9cd75079773786aea7b2c87518d9d8d4c0e49298d4a83fb57354faac5b9169fdec2fd1bd36b7bf58b2938ffa954da06e33d07d77ac518885cb876a78b17ec45e SHA512 4949332917b34ef2895da646b0415bb15aea4db07026bbaba1932312e003688718db7a506f6468cae1e1e9e5a5379acb5d244b3bc570548d30e67f2294863d2d
+AUX ntpsec-1.2.1-seccomp-rollup.patch 2987 BLAKE2B 82bd355cdd169133f232f6514f363e87b6876472d49d69d034dd33aefe7179dc3db5e661909774471635dd947761f5e8ab47ecc0dcf8d6c2e62ffdad06044a3f SHA512 34c1941dfd7d7968fa954fb36411aad5e711767f1c0b6aca52cd8f8c839163110af2d4774a7a41b1f3d0daa49af5823b74e9c8a2a9ec12b9a344c72ce505d279
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
-DIST ntpsec-1.2.0.tar.gz 2625968 BLAKE2B 23ceae5a1f241fcf5a17801fec2f15f9b9d9d64a108bebe29bdc75196303091eaf0efee7df67ce10acefb7c8dba90ce1144a0c0c5432797d7659714d162f26bb SHA512 9e18b3ca2f786a1ea323ba2384b51cff3d862115cea1ae576fc98172c476ac5e7d0d0fc873e47be0b19b050204ea9ed49669d94e66eb94525068dd1b08a8ae71
 DIST ntpsec-1.2.1.tar.gz 2681237 BLAKE2B bfb2674131718dcf9f393e93d1148cfb6631591dbcce1ade91746586f261123b80b238393ac2a763fab119cd627f8eae4b006b023ad2b319e752db9eb4b04cc0 SHA512 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277
-EBUILD ntpsec-1.2.0-r3.ebuild 4484 BLAKE2B 1f32519192c92760de2eecf1b8b4d72f1514da7ca196840d41ad6dc237a903eecce9a33a232c22ae0203be0a41c58e1d298a2177cac909713aaff073b39f77c6 SHA512 5d29ff40f10a9afe490c5f3c2d317eecb8615aff89bf733776a8f702fdc25cf5cf1b7b7510ce3fa149a903d904f1be97e2acd350f43afcc1da6a6c1de7582b9a
-EBUILD ntpsec-1.2.1.ebuild 4485 BLAKE2B d38aa4111729b1364b73441f4f4a5aceef9c3dc3c8db7f2e02dece5293970b9b5fc1936c0fd5cdae7013e5a0cde8d28bba7a9a175da0b0792fa5e94b7271d95d SHA512 6dc6f484ba209bd94b7367d5bb5d02bdc36ff9f7417d7347ab32787cd90a86948237e156cccf3be014284bc6b4fd0e883bd3dd14f73c760882d4cd207216a485
+EBUILD ntpsec-1.2.1-r1.ebuild 4385 BLAKE2B 2491e0e0264e62b0c0df4e0a8ff16db025595cc923e7f5d7377d6b34ba49e54282250c749d2b6ef902656f397e656d9154f8917629ec120a0002fbb712025773 SHA512 b88a7764966d07394af3dc473e5fbc5645dc90a28a3005768900714d7e08e356596cbc23ca49a65974fb929ab8d8acb73f70f5e8d03b9cc3942c5c75880003b1
 EBUILD ntpsec-9999.ebuild 4063 BLAKE2B 46d4c35ff1b73d2af63182f38ea3d3c4b3ab28b53b31764f9e8615922239857df7cbe7397d32202402b91507547e0d6d9834184f13c249bd95e32e39ed4c1cd2 SHA512 55278b3d172de7de1eff6a9269049bbb40270ce16cd6063c550ae0c9a642300899ba22d3953b24e4abe7fb7391cd453a035892915d15d44d0cf7e7f89cc1606b
 MISC metadata.xml 1968 BLAKE2B 7322d8ae32025477e68bee19ef813b5bd8011f750cd9dde23437a7519491db477e85178f3be69356c2cccd2a3519b60fa264988c9cd3fb8d6f8700a1392199d6 SHA512 c4d698ea3cf83e8b624281a3f841742f318f5d52768361debad2aaa7413e8447fd4f62d6b11fc3b25981da6b7f73efbd87d904c9688cdc1e7b54fbb3d88b2154
diff --git a/net-misc/ntpsec/files/ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch b/net-misc/ntpsec/files/ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch
deleted file mode 100644
index ee75d103d2e6..000000000000
--- a/net-misc/ntpsec/files/ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/ntpd/ntp_sandbox.c b/ntpd/ntp_sandbox.c
-index 4e5ceaa36c1a7b452445023e201ddb6211625c52..78ac7aea263ed3d3394b2d32e79a6836f0387434 100644
---- a/ntpd/ntp_sandbox.c
-+++ b/ntpd/ntp_sandbox.c
-@@ -428,6 +428,11 @@ int scmp_sc[] = {
- 	/* gentoo 64-bit and 32-bit, Intel and Arm use mmap */
- 	SCMP_SYS(mmap),
- #endif
-+#if defined(__aarch64__)
-+	SCMP_SYS(faccessat),
-+	SCMP_SYS(newfstatat),
-+	SCMP_SYS(renameat),
-+#endif
- #if defined(__i386__) || defined(__arm__) || defined(__powerpc__)
- 	SCMP_SYS(_newselect),
- 	SCMP_SYS(_llseek),
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.0-move-newfstatat.patch b/net-misc/ntpsec/files/ntpsec-1.2.0-move-newfstatat.patch
deleted file mode 100644
index 75453c6cb5f6..000000000000
--- a/net-misc/ntpsec/files/ntpsec-1.2.0-move-newfstatat.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/ntpd/ntp_sandbox.c b/ntpd/ntp_sandbox.c
-index e66faaa8c..b2af654e5 100644
---- a/ntpd/ntp_sandbox.c
-+++ b/ntpd/ntp_sandbox.c
-@@ -349,6 +349,7 @@ int scmp_sc[] = {
- 	SCMP_SYS(lseek),
- 	SCMP_SYS(membarrier),	/* Needed on Alpine 3.11.3 */
- 	SCMP_SYS(munmap),
-+	SCMP_SYS(newfstatat),
- 	SCMP_SYS(open),
- #ifdef __NR_openat
- 	SCMP_SYS(openat),	/* SUSE */
-@@ -451,7 +452,6 @@ int scmp_sc[] = {
- #endif
- #if defined(__aarch64__)
- 	SCMP_SYS(faccessat),
--	SCMP_SYS(newfstatat),
- 	SCMP_SYS(renameat),
- 	SCMP_SYS(linkat),
- 	SCMP_SYS(unlinkat),
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.0-seccomp.patch b/net-misc/ntpsec/files/ntpsec-1.2.0-seccomp.patch
deleted file mode 100644
index 6e61a06e12d1..000000000000
--- a/net-misc/ntpsec/files/ntpsec-1.2.0-seccomp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/705128
-https://bugs.gentoo.org/786228
---- a/ntpd/ntp_sandbox.c
-+++ b/ntpd/ntp_sandbox.c
-@@ -463,6 +463,15 @@ int scmp_sc[] = {
-        SCMP_SYS(send),
-        SCMP_SYS(stat64),
- #endif
-+#if defined(__arm__)
-+       SCMP_SYS(statx),
-+#endif
-+#if defined(__riscv32__)
-+       SCMP_SYS(faccessat),
-+#endif
-+#if defined(__aarch64__)
-+       SCMP_SYS(syscall),
-+#endif
- };
-        {
-                for (unsigned int i = 0; i < COUNTOF(scmp_sc); i++) {
---- a/ntpd/ntp_sandbox.c
-+++ b/ntpd/ntp_sandbox.c
-@@ -355,6 +355,7 @@ int scmp_sc[] = {
- 	SCMP_SYS(openat),	/* SUSE */
- #endif
- 	SCMP_SYS(poll),
-+	SCMP_SYS(pread64),
- 	SCMP_SYS(pselect6),
- 	SCMP_SYS(read),
- 	SCMP_SYS(recvfrom),    /* Comment this out for testing.
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rollup.patch b/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rollup.patch
new file mode 100644
index 000000000000..c9ba3760cce6
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rollup.patch
@@ -0,0 +1,116 @@
+From 9a13c2bd472786472360f1a6465d8a808f6b8311 Mon Sep 17 00:00:00 2001
+From: Stephen L Arnold <nerdboy@gentoo.org>
+Date: Thu, 2 Dec 2021 20:16:18 -0800
+Subject: [PATCH] ntpd/ntp_sandbox.c: seccomp rollup patch for arm, arm64,
+ riscv, all
+
+* add renameat2, move newfstatat and faccessat, remove arch dups
+* rollup previous patches, remove cruft
+* includes riscv fixes, previous bugs:
+  https://bugs.gentoo.org/705128
+  https://bugs.gentoo.org/786228
+  https://bugs.gentoo.org/823692
+  https://gitlab.com/NTPsec/ntpsec/-/merge_requests/1247
+  https://gitlab.com/NTPsec/ntpsec/-/issues/713
+
+Signed-off-by: Stephen L Arnold <nerdboy@gentoo.org>
+---
+ ntpd/ntp_sandbox.c | 27 +++++++++++++++++++--------
+ 1 file changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/ntpd/ntp_sandbox.c b/ntpd/ntp_sandbox.c
+index e66faaa8c..04eaa003a 100644
+--- a/ntpd/ntp_sandbox.c
++++ b/ntpd/ntp_sandbox.c
+@@ -306,8 +306,8 @@ int scmp_sc[] = {
+ #endif
+ #endif  /* ENABLE_EARLY_DROPROOT */
+ 
+-        SCMP_SYS(accept),
+-        SCMP_SYS(access),
++	SCMP_SYS(accept),
++	SCMP_SYS(access),
+ 	SCMP_SYS(adjtimex),
+ 	SCMP_SYS(bind),
+ 	SCMP_SYS(brk),
+@@ -319,6 +319,9 @@ int scmp_sc[] = {
+ 	SCMP_SYS(connect),
+ 	SCMP_SYS(exit),
+ 	SCMP_SYS(exit_group),
++#ifdef __NR_faccessat
++	SCMP_SYS(faccessat),  /* riscv and aarch64 */
++#endif
+ 	SCMP_SYS(fcntl),
+ 	SCMP_SYS(fstat),
+ 	SCMP_SYS(fsync),
+@@ -349,11 +352,13 @@ int scmp_sc[] = {
+ 	SCMP_SYS(lseek),
+ 	SCMP_SYS(membarrier),	/* Needed on Alpine 3.11.3 */
+ 	SCMP_SYS(munmap),
++	SCMP_SYS(newfstatat),  /* riscv and aarch64 */
+ 	SCMP_SYS(open),
+ #ifdef __NR_openat
+ 	SCMP_SYS(openat),	/* SUSE */
+ #endif
+ 	SCMP_SYS(poll),
++	SCMP_SYS(pread64),
+ 	SCMP_SYS(pselect6),
+ 	SCMP_SYS(read),
+ 	SCMP_SYS(recvfrom),    /* Comment this out for testing.
+@@ -362,6 +367,9 @@ int scmp_sc[] = {
+ 				*/
+ 	SCMP_SYS(recvmsg),
+ 	SCMP_SYS(rename),
++#ifdef __NR_renameat2
++	SCMP_SYS(renameat2),  /* riscv */
++#endif
+ 	SCMP_SYS(rt_sigaction),
+ 	SCMP_SYS(rt_sigprocmask),
+ 	SCMP_SYS(rt_sigreturn),
+@@ -401,6 +409,7 @@ int scmp_sc[] = {
+  * rather than generate a trap.
+  */
+ 	SCMP_SYS(clone),	/* threads */
++	SCMP_SYS(clone3),
+ 	SCMP_SYS(kill),		/* generate signal */
+ 	SCMP_SYS(madvise),
+ 	SCMP_SYS(mprotect),
+@@ -415,9 +424,9 @@ int scmp_sc[] = {
+ 	SCMP_SYS(nanosleep),
+ #endif
+ #ifdef CLOCK_SHM
+-        SCMP_SYS(shmget),
+-        SCMP_SYS(shmat),
+-        SCMP_SYS(shmdt),
++	SCMP_SYS(shmget),
++	SCMP_SYS(shmat),
++	SCMP_SYS(shmdt),
+ #endif
+ 
+ 	SCMP_SYS(fcntl64),
+@@ -450,10 +459,9 @@ int scmp_sc[] = {
+ 	SCMP_SYS(mmap),
+ #endif
+ #if defined(__aarch64__)
+-	SCMP_SYS(faccessat),
+-	SCMP_SYS(newfstatat),
+-	SCMP_SYS(renameat),
+ 	SCMP_SYS(linkat),
++	SCMP_SYS(renameat),
++	SCMP_SYS(syscall),
+ 	SCMP_SYS(unlinkat),
+ #endif
+ #if defined(__i386__) || defined(__arm__) || defined(__powerpc__)
+@@ -463,6 +471,9 @@ int scmp_sc[] = {
+ 	SCMP_SYS(send),
+ 	SCMP_SYS(stat64),
+ #endif
++#if defined(__arm__)
++	SCMP_SYS(statx),
++#endif
+ };
+ 	{
+ 		for (unsigned int i = 0; i < COUNTOF(scmp_sc); i++) {
+-- 
+2.32.0
+
diff --git a/net-misc/ntpsec/ntpsec-1.2.0-r3.ebuild b/net-misc/ntpsec/ntpsec-1.2.0-r3.ebuild
deleted file mode 100644
index 9d2d01df34ea..000000000000
--- a/net-misc/ntpsec/ntpsec-1.2.0-r3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='threads(+)'
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 flag-o-matic waf-utils systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
-	RESTRICT="mirror"
-	KEYWORDS="amd64 arm arm64 ~x86"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea neoclock modem
-	local)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
-
-# net-misc/pps-tools oncore,pps
-CDEPEND="${PYTHON_DEPS}
-	sys-libs/libcap
-	dev-python/psutil[${PYTHON_USEDEP}]
-	libbsd? ( dev-libs/libbsd:0= )
-	dev-libs/openssl:0=
-	seccomp? ( sys-libs/libseccomp )
-"
-RDEPEND="${CDEPEND}
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
-	!net-misc/ntp
-	!net-misc/openntpd
-	acct-group/ntp
-	acct-user/ntp
-"
-DEPEND="${CDEPEND}
-	>=app-text/asciidoc-8.6.8
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	sys-devel/bison
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.8-fix-missing-scmp_sys-on-aarch64.patch"
-	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
-	"${FILESDIR}/${PN}-1.2.0-move-newfstatat.patch"
-	"${FILESDIR}/${PN}-1.2.0-seccomp.patch"
-)
-
-WAF_BINARY="${S}/waf"
-
-src_prepare() {
-	default
-
-	# Remove autostripping of binaries
-	sed -i -e '/Strip binaries/d' wscript || die
-	if ! use libbsd ; then
-		eapply "${FILESDIR}/${PN}-no-bsd.patch"
-	fi
-	# remove extra default pool servers
-	sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
-
-	python_copy_sources
-}
-
-src_configure() {
-	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
-
-	local string_127=""
-	local rclocks="";
-	local CLOCKSTRING=""
-
-	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
-			string_127+="$refclock,"
-		fi
-	done
-	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
-
-	local myconf=(
-		--nopyc
-		--nopyo
-		--enable-pylib ext
-		--refclock="${CLOCKSTRING}"
-		--build-epoch="$(date +%s)"
-		$(use doc	|| echo "--disable-doc")
-		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use samba	&& echo "--enable-mssntp")
-		$(use seccomp	&& echo "--enable-seccomp")
-		$(use smear	&& echo "--enable-leap-smear")
-		$(use tests	&& echo "--alltests")
-		$(use debug	&& echo "--enable-debug")
-	)
-
-	python_configure() {
-		waf-utils_src_configure "${myconf[@]}"
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	unset MAKEOPTS
-	python_compile() {
-		waf-utils_src_compile
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-src_install() {
-	python_install() {
-		waf-utils_src_install
-		python_fix_shebang "${ED}"
-	}
-	python_foreach_impl run_in_build_dir python_install
-	python_foreach_impl python_optimize
-
-	# Install heat generating scripts
-	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
-
-	# Install the openrc files
-	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
-	newconfd "${FILESDIR}"/ntpd.confd ntp
-
-	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
-
-	# Prepare a directory for the ntp.drift file
-	mkdir -pv "${ED}"/var/lib/ntp
-	chown ntp:ntp "${ED}"/var/lib/ntp
-	chmod 770 "${ED}"/var/lib/ntp
-	keepdir /var/lib/ntp
-
-	# Install a log rotate script
-	mkdir -pv "${ED}"/etc/logrotate.d
-	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
-
-	# Install the configuration file and sample configuration
-	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
-	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
-
-	# move doc files to /usr/share/doc/"${P}"
-	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
-}
-
-pkg_postinst() {
-	einfo "If you want to serve time on your local network, then"
-	einfo "you should disable all the ref_clocks unless you have"
-	einfo "one and can get stable time from it.  Feel free to try"
-	einfo "it but PPS probably won't work unless you have a UART"
-	einfo "GPS that actually provides PPS messages."
-}
diff --git a/net-misc/ntpsec/ntpsec-1.2.1.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild
index 60874b5802b2..8835c7ccfcfb 100644
--- a/net-misc/ntpsec/ntpsec-1.2.1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
-	KEYWORDS="amd64 arm arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~riscv ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
@@ -58,10 +58,8 @@ DEPEND="${CDEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.1.8-fix-missing-scmp_sys-on-aarch64.patch"
 	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
-	"${FILESDIR}/${PN}-1.2.0-move-newfstatat.patch"
-	"${FILESDIR}/${PN}-1.2.0-seccomp.patch"
+	"${FILESDIR}/${PN}-1.2.1-seccomp-rollup.patch"
 )
 
 WAF_BINARY="${S}/waf"