10 files changed, 390 insertions, 6 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5b4496d2ca98..2db39d3fbe61 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk-base/Manifest b/net-misc/asterisk-base/Manifest
index 4d6d9c84a8bb..946d9e951333 100644
--- a/net-misc/asterisk-base/Manifest
+++ b/net-misc/asterisk-base/Manifest
@@ -1,9 +1,11 @@
 AUX asterisk.service-1 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8
 AUX asterisk.service-1.conf 311 BLAKE2B df7af706230a92fa0110f4b081d305c2302a7e6e5aff094ea3f32cfbf7a3f0dcae3c70c5f6a648d47067913450cbb0280b7a69bd2e6dcd3d1b7eaba858739794 SHA512 449d25743b53e2b1947de4af4c63a77e0226d6195c38f4cc9639e9c0c11a360bcbf1ec6492d6c1f6c17325c508f51bc3f82db5e8d80ce33619e353a651c6c092
 AUX asterisk_wrapper-1 7221 BLAKE2B c4c696e6e79329903e5e33cec03cd11db752e2915c247cd4d503cfc00bbafab56a560dc37c8045604b4c793b2289e03096f7b0e66535df53a375e1d74b617dbd SHA512 472ee92546dbf725e9f1fca19e258e0d6c4005923edb27bf0b6bc08a18a86913a54f85edd610c114cd867c601fc029928d49f55afec4387b54566ed3835fca7d
+AUX asterisk_wrapper-2 7225 BLAKE2B a499397610bf48c22d86bbb7b56993ae41458fa185749a61105a99e72c3b79cdf4fa0307fcc6703efac58bb9f8eb7c7fb8aa0e02581e0c9b6f9132a47e33dfcd SHA512 4b083ee919c2e060053c5db4374e0a12b108a30b54ca5f239d84e5b754daf4e9f36ba078bfde6573e7f9027d91298d325c05bbaaa7f3d2622448f40197f4a85e
 AUX confd-1 4050 BLAKE2B cda2632a9b951f2061d4d7e25b221d0473c623860aa96eeb2bf0b8a8354606cc6b22e98ac3450d160e13507c21174d086ebecce3a4b6a470a3e19dc6a6a98784 SHA512 922c59f08f75f9c18955d7337caa8e1b12a0037909903f6afee707ffca8b784011ba35188b8a921ea8b9c6238556dc70bdd1b5716af7894c09821c03b4808340
 AUX initd-1 8882 BLAKE2B 0dd7507254955ccc21688068107211380289ff468ad74140f135097d2babdb1b31db161bf2d91fa237a883a94c4d1af84c31856cee88f07cee52a17f212ad720 SHA512 2dd51d8342e212df4d98576de8b1017d6e7fdd257a70b49d2baf78bc1640911e351ec89b14fe4c55d905d738e277f2b65d4e627535eecc5eb195e7678b3d9759
 AUX logrotate-1 848 BLAKE2B db047c4cc1c3b1ea20ce6a3313332622374bfae9728b09f8b5bb2bfa6136000b95dbfd0a58ac172ac6c41b99c846d8e4ee630ac091f28552b39cfd758772ab4b SHA512 02eba497df35690755755c840534cc00f7851c75f4103381edec2d9c21681c302e2e4a48f218792292bf378b269b6f6a0e4d0b2b571a4e25921624710764b841
 AUX tmpfiles-1.conf 84 BLAKE2B 133761739570a08bebb88059df1a870ddaef194bd1c5a1a4d4626d3791e3cb664b03ff51260892167a22c3cfca2caa02d162e7476070ec1374a92ef24ec799dc SHA512 680a4478d3a501c26fa19e29fad18389e7e02f04c8b9a676ae0f192fa6afbed95a826b74696c6c5459aba5aba6a16c57df8a9c5ff486e9dc8f1cbd01185e9320
 EBUILD asterisk-base-1.ebuild 1009 BLAKE2B fee1b726a36acff9a1ec4c56a157bf5d03363bc869aa82f6ca3bb9e0e68ca0a240248fcdafb1e0280ce9dc564dbeea5b06648b73d7bc43f38f818091012fdbd2 SHA512 c73fdf5eca5afe8fb53e52d76bdb6274fe05e9a1d2b0ec57fb29c91916b7c56b2c36b2895e095a5a8d960da478c81fec024f340ade1269f311fc86b104bb2033
+EBUILD asterisk-base-2.ebuild 1009 BLAKE2B f6eb67305505dd5d808ddd4d3f5fdad78ac169cfdc338eafcaf9801eb4f94b2dbed6069849e223084991e752fd9d217cff232dc844db26031475be14c1d4ef23 SHA512 43f757d7c8fd1b94945a074d13ded8ce71e8b18aecd212b32dd1a0880a6d20e08e93f060f2a9cdd72bc69efb945a72f2b7d06c1678e79a0ca7a04eb20505db64
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/net-misc/asterisk-base/asterisk-base-2.ebuild b/net-misc/asterisk-base/asterisk-base-2.ebuild
new file mode 100644
index 000000000000..7d89202ca56f
--- /dev/null
+++ b/net-misc/asterisk-base/asterisk-base-2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Gentoo Asterisk init scripts"
+HOMEPAGE="https://www.gentoo.org/wiki/No_homepage"
+# Need to set S due to PMS saying we need it existing, but no SRC_URI
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+
+RDEPEND="
+	net-misc/asterisk
+	!<=net-misc/asterisk-16.30.0:0/16
+	!<=net-misc/asterisk-18.18.0:0/18
+	!<=net-misc/asterisk-20.3.0:0/20
+"
+
+src_install() {
+	newinitd "${FILESDIR}/initd-1" asterisk
+	newconfd "${FILESDIR}/confd-1" asterisk
+	newsbin "${FILESDIR}/asterisk_wrapper-2" asterisk_wrapper
+
+	systemd_newunit "${FILESDIR}/asterisk.service-1" asterisk.service
+	systemd_install_serviced "${FILESDIR}/asterisk.service-1.conf" asterisk.service
+
+	newtmpfiles "${FILESDIR}/tmpfiles-1.conf" asterisk.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate-1" asterisk
+}
+
+pkg_postinst() {
+	tmpfiles_process asterisk.conf
+}
diff --git a/net-misc/asterisk-base/files/asterisk_wrapper-2 b/net-misc/asterisk-base/files/asterisk_wrapper-2
new file mode 100644
index 000000000000..cd7d5ff6504e
--- /dev/null
+++ b/net-misc/asterisk-base/files/asterisk_wrapper-2
@@ -0,0 +1,227 @@
+#! /bin/sh
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+progname="$(basename "$0")"
+
+T="$(getopt -o "h" --long "help,corecompress:,corerename:,crashemail:,dumpcore:,instance:,maxfd:,nicelevel:,restartdelay:,rundir:,syslog,tty:" -n "$progname" -- "$@")"
+eval set -- "${T}"
+
+# bash builtins are special ...
+echo_e="$([ "${SHELL}" = "/bin/bash" ] && echo "echo -e" || echo echo)"
+
+rundir=/run/asterisk
+restartdelay=5
+nicelevel=0
+maxfd=4096
+dumpcore=0
+unset tty instance syslog corecompress corerename crashemail
+
+usage() {
+	cat <<USAGE
+USAGE: $progname [options] -- asterisk options"
+OPTIONS:
+	-h|--help
+		Output this text and exit.
+	--corecompress[=tool]
+		asterisk's address space can get quite large, compressing the core dumps can
+		save significant space, especially if asterisk core dumps frequently.
+	--corerename pattern
+		It's assumed core files (if enabled) will go into PWD, this specifies a
+		rename pattern.  The following % codes are recognised:
+			%h - hostname
+			%D - date in format YYYYMMDD
+			%T - time in format HHMMSS
+		It must be mentioned that if kernel.core_pattern (sysctl) is modified
+		from the default 'core' value this option is unlikely to work.
+	--crashemail email@address
+		This will send an email whenver asterisk crashes (does not terminate
+		cleanly with a zero exit code).  You need a working sendmail binary.
+	--dumpcore sizelimit
+		Maximum size of core limit, or the word unlimited.  Default is disabled
+		(sizelimit of 0).
+	--instance name
+		Updated label for sylog logger.
+	--maxfd maxfd
+		Sets the maximum number of file descriptors (default 4096).
+	--nicelevel nicelevel
+		Will set the asterisk nice level to the specified value.
+	--restartdelay delay_in_seconds
+		Number of seconds to wait before attempting to restart asterisk.  This helps
+		to avoid tight-loop crashes.  Defaults to 5s. Minimum 1.
+	--rundir path
+		Where to store the asterisk asterisk_wrapper.pid file.  In order to terminate the
+		wrapper (when asterisk next terminates), remove this file.
+	--syslog
+		Pass to redirect output to syslog rather than using stdout and stderr.
+	--tty tty
+		If asterisk should be attached to a TTY device, then pass this, eg --tty /dev/tty8.
+		Use of this is not recommended in general.
+
+NOTE:  There are some quirks with bash getopt shunting non-options prior to --
+	to asterisk options, so be careful of this.  Typically stuff will break.
+USAGE
+}
+
+matchreg() {
+	local v=$1
+	shift
+	echo "$v" | grep -q "$@"
+}
+
+while [ "$1" != "--" ]; do
+	case "$1" in
+			--corecompress|--corerename|--crashemail|--dumpcore|--instance|--maxfd|--nicelevel|--restartdelay|--rundir|--tty)
+			eval "${1#--}=\"\${2}\""
+			shift 2
+			;;
+		--syslog)
+			eval "${1#--}=1"
+			shift
+			;;
+		--help|-h)
+			usage
+			exit 0
+			;;
+		*)
+			echo "BUG: Don't know how to process option $1." >&2
+			usage >&2
+			exit 1
+			;;
+	esac
+done
+shift # --
+
+if ! matchreg "${restartdelay}" "^[1-9][0-9]*$"; then
+	echo "Invalid --restartdelay value ${restartdelay}, resetting to 5." >&2
+	restartdelay=5
+fi
+
+if ! matchreg "${maxfd}" "^[1-9][0-9]*$"; then
+	echo "Invalid --maxfd value, resetting to 4096." >&2
+	maxfd=4096
+fi
+
+if [ $maxfd -lt 1024 ]; then
+	echo "maxfd is guaranteed too low, bumping to at least 1024" >&2
+	maxfd=1024
+fi
+
+if [ -n "${nicelevel}" ] && ! matchreg "${nicelevel}" -E "^-?[0-9]+$"; then
+	echo "Invalid --nicelevel which much be a valid integer (values from -20 to 20 makes sense)."
+	exit 1
+fi
+
+if [ -n "${corecompress}" -a ! -x "${corecompress}" ]; then
+	corecompress=$(which "${corecompress}" 2>/dev/null)
+	[ -z "${corecompress}" ] && echo "Error locating core compression tool, disabling core compression." >&2
+fi
+
+# Before here will still be output (potentially munged, to the terminal).
+if [ -n "${syslog}" ]; then
+	tdir="$(mktemp -d)"
+	tfifo="${tdir}/asterisk_wrapper.logger.fifo"
+	mkfifo "${tfifo}"
+	logger -t "asterisk_wrapper${instance:+:}${instance}" --id=$$ >/dev/null 2>&1 <"${tfifo}" &
+	exec 1>"${tfifo}"
+	exec 2>&1
+
+	rm "${tfifo}"
+	rmdir "${tdir}"
+fi
+
+echo "Initializing ${progname}"
+
+cleanup(){
+	# There is a tiny race here, if this gets replaced inbetween the read and the rm.
+	# To fix this is quite complex in that we need to keep an fd, compare inode numbers
+	# and manage flock's.
+	[ -r "${rundir}/${progname}.pid" ] && \
+		[ "$(cat "${rundir}/${progname}.pid")" = $$ ] && \
+		rm "${rundir}/${progname}.pid"
+}
+trap cleanup EXIT
+
+# We could be clobbering an old version's pid, in which case it'll just terminate on
+# it's next iteration.  Towards this end, if asterisk.pid exists, attempt to find it's
+# config file and request a core stop when convenient so that we can take over.
+echo $$ > "${rundir}/${progname}.pid"
+if [ -r "${rundir}/asterisk.pid" ]; then
+	ast_pid="$(cat "${rundir}/asterisk.pid")"
+	[ -r "/proc/${ast_pid}/cmdline" ] && ast_conf="$(tr '\0' '\n' < "/proc/${ast_pid}/cmdline" | grep -A1 '^-C$' | tail -n1)" && /usr/sbin/asterisk -C "${ast_conf:-/etc/asterisk/asterisk.conf}" -rx "core stop when convenient"
+	# We may hit a few (depending on how busy the server is a great many number) loop failures still ...
+fi
+
+prlimit --core=${dumpcore} --pid=$$
+prlimit --nofile=${maxfd} --pid=$$
+
+ast_cmd=/usr/sbin/asterisk
+if [ -n "${nicelevel}" ]; then
+	ast_cmd="nice -n ${nicelevel} ${ast_cmd}"
+fi
+
+while [ -r "${rundir}/${progname}.pid" ]; do
+	# Another instance is looking to replace us, so terminate.
+	if [ "$(cat "${rundir}/${progname}.pid")" != $$ ]; then
+		break
+	fi
+
+	echo "Starting asterisk with ${ast_cmd} $*"
+	if [ -n "${tty+yes}" ]; then
+		/bin/stty -F "${tty}" sane
+		${ast_cmd} "$@" >"${tty}" 2>&1 <"${tty}"
+		result=$?
+	else
+		# Purposefully leave stderr alone, this will under certain odd cases (like exceptions,
+		# and other odd cases logged from glibc) result in those logs at least being captured
+		# in syslog.
+		${ast_cmd} "$@" </dev/null >/dev/null
+		result=$?
+	fi
+
+	if [ "$result" -eq 0 ]; then
+		echo "Asterisk terminated normally."
+		break
+	fi
+
+	if [ "$result" -gt 128 ]; then
+		signal="$(( result - 128 ))"
+		signame="$(kill -l $signal 2>/dev/null)"
+		MSG="Asterisk terminated with Signal: $signal (SIG${signame:-???})"
+
+		# TODO: figure out how to use /proc/sys/kernel/core_pattern here, but if someone is using
+		# that, chances are they're already dealing with what we want here.
+		if [ -r core ]; then
+			if [ -n "${corerename+yes}" ]; then
+				core_target="$(echo "${corerename}" | sed -e "s/%h/$(hostname)/" \
+					-e "s/%D/$(date +%Y%m%d)/" -e "s/%T/$(date +%H%M%S)/")"
+				mv core "${core_target}"
+				core_target=$(readlink -f "${core_target}")
+			else
+				core_target=$(readlink -f core)
+			fi
+
+			if [ -n "${corecompress}" ] && [ -x "${corecompress}" ]; then
+				"${corecompress}" "${core_target}"
+			fi
+
+			MSG="${MSG}, Core dumped: ${core_target}"
+		fi
+	else
+		MSG="Asterisk terminated with return code: $result"
+	fi
+
+	[ -n "${tty+yes}" ] \
+		&& echo "${MSG}" >"${tty}" \
+		|| echo "${MSG}"
+
+	if [ -n "${crashemail+yes}" ] && [ -x /usr/sbin/sendmail ]; then
+		$echo_e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
+			 /usr/sbin/sendmail "${crashemail}"
+	fi
+	echo "Restarting asterisk after ${restartdelay}s ..."
+	sleep "${restartdelay}"
+done
+
+echo "Terminating $progname."
+exit 0
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 9faf410b51e3..90776044fd04 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -18,10 +18,10 @@ DIST asterisk-18.18.1.tar.gz 28407009 BLAKE2B b3c3325a8958fa25364c735508357e35e4
 DIST asterisk-20.3.0.tar.gz 28176546 BLAKE2B 488cfe449c040c282afe438847d14f6cc20d1fb034fbb33555f8e43803b481d3f2b890ac01cc7d43278b41040093f8cedfc609c025cfab73fd8b9d23a0f67016 SHA512 332c24c089abca7059d80794b37a4f5dc34f0468a07f5534b0df26c5103e0508c9c5f3f35a02826ed6b33973c26503be2829fd51fa23a8056a58fa2b50b17730
 DIST asterisk-20.3.1.tar.gz 28176262 BLAKE2B 9ee75ee297dc4df37f51f75444d46af083b794cb444ae77b601f17308889db22240939edf04761eb3d41e74e2a67a3329d427861a5a5d34fec6016d6660793bd SHA512 4e34de731211aebe916d19948c41aff370187bfadc1202837a96ebc7f218e5bd7c3936b5b4e34ba6e79c079f77eb5ed038239c903800d5a56ceda2f342218613
 EBUILD asterisk-16.30.0.ebuild 11876 BLAKE2B f26e339dab2fd90cecafe8b0c075dcef4ae75a3602a1c7adb22ec9792166cbb3c3639349f718a7a895b5071876af76982163896bde31245b1e614d830461cb0a SHA512 57624034782f857b181fda0c92ffcbe502ec1ef94a45e1f2f5c27b2863000fee46661d47acd79658450a37dc331b90f8439e9a5bb66999216abda86fbd48b852
-EBUILD asterisk-16.30.1.ebuild 11348 BLAKE2B ee42fcfb4eb46471a3f8236ddc0d9ce799b4bcf21780fe9337b27efcb9552aad9e055937cd22b527621809b40413c8ec39c2a7605ea87742c8612c9dbedbfcf2 SHA512 570b3eb807043c7042d527b58a60917c908a90b71bb0bf277b2db2f6c1d793e980c8d9d3e1ef8463845ba8e4521aa6c65a1b5f84bbfcabadc580835a637a4eed
+EBUILD asterisk-16.30.1.ebuild 11357 BLAKE2B 6e983a41609ccc98942edb6807c733fcec1afddbdd70a4eeb06e16fe0b8696b33857bd5dd41df8a65e8f98a56dab3b45e2d2ce524c414fd6e4b50025ad5fb546 SHA512 2052282ab24303ccba66f4160bccfaedbeb6bcac0b7be6213e2a2b9d1f5bc4d04e83ecb9444d06896ba3ee9cfaffcd71b3f4440258d8eb19fa7247c0bed6973b
 EBUILD asterisk-18.17.0.ebuild 11772 BLAKE2B 516b9c98aa80a7dfaed5f7ba375110cfa39c288d9c22dbb754b46f8ddf62f6ef75198fd1ea8a76e71e319a26e7e34111bca0a9768b40a37b081affed53368981 SHA512 56af8b4d9ede9c4c9a2edd94b9ffaaeffeb07c94c24a633e150ded3423141867dcd83f1ba2072f97431f3a6c0411d9bdaa81c82500c691b9ecd6da2ec7208f76
 EBUILD asterisk-18.18.0.ebuild 11893 BLAKE2B e279eb21e2093e64b4f5169d05de382abb3d408cd07c5d4c4a65b58241cf15b8fd87af8e09624cc1e3dc2aac260cd68ae0a8cf0a6ece035161ef5d7ff9ae6f15 SHA512 cff623204429a910877a18217f9e166adcbf9175991dd006e44b994b6ed140d91ce984489776f50fe6b9efdeeec2e5eeefde205f25013f10bf8d560d321d397d
-EBUILD asterisk-18.18.1.ebuild 11365 BLAKE2B c7db56fbb90d3d5143d3ce9705c7946a7aae2652f43b1b8b6404dab98bbd739b743aba6f8a49869a8f953dfb68f3492a0508fa21e35624b9091ef83251c978fb SHA512 a91c082e70033224b614a3383a7859533188bf7bd15e3431b628dd86fae9956653ca4c05ebf94031cbe05b60554dd950271dd6539abcd999731b41551e97f7a1
+EBUILD asterisk-18.18.1.ebuild 11374 BLAKE2B bb29f1a7e36c060658cc94d3f9f6b36c7f06f03ae561b13d8d628b7b6220ffbccd22370e5158c6cf769f06685c73b50e3889138e273e2be0f13e7bfe4ceb32db SHA512 1408d7b81c53ce77897bb846c6d0b39245514e5016fbb8db379ac162ffc63d476dae2ae7f514db6460fa9e435377d4ab1a4d39e30f1c988fa836577e36639e98
 EBUILD asterisk-20.3.0.ebuild 11716 BLAKE2B e36fa8e3fc140dbc04838127a792b6693c662feee0111b09e5753563ae099789266e5d70239e234b2ec4d8b9d1ed33d11de21dc3e24592ae4a75aacac92ef49d SHA512 458434726c5a5418c99a9c8b6bfee6067e38ef4053b78593dc6eed5807801e1080c559d55e644c0ec3f78ed0181489a639588cda154f050826e276bf3a0ddf3c
-EBUILD asterisk-20.3.1.ebuild 11190 BLAKE2B dea0a8c3e06389e2a37759948d6d29c061426a0484686b9cd31876991794e0a465c08e90ee4181542a3f6843bb85d8f6ae5c21c84eca98f8fe4928bba20cbe07 SHA512 83f7a70bfbfa83d30d3a733ffdeddbd6a5e325fe9a722d290e679996e58eda7dadc40314762dd8a865ceccec8230e691e69e47944d5f60635f3e57c76177778d
+EBUILD asterisk-20.3.1.ebuild 11199 BLAKE2B 4a50600903a51d2b079ed0cbf88b9a526fa47dd6bef3f92cb94d6cc95825a508b031c9714c771cc9f0cb89c4a185280b74ab5511bfb26ccb435b52ec2e829309 SHA512 a7b948d4defe650fb0c52c979cf866f1775cd9eaa9b6eb4d5b0b90ecda6af3554d65869649e6ea853bae92d4b05df2880fcaf994a276f7feeb27b0210fdf2da7
 MISC metadata.xml 1565 BLAKE2B c41d24677c65e3006de867263e723e2530cae9185e260235576df5245e64c49244db82bb2febeb30935b38b5ec1eb5d26f3756f2559868248e766084fe6abcd8 SHA512 465a0a71dbafc0144a2bef2d3cdfe35dbc8e070a8bdd8cfed75c53971a6d9334ca81b4dc575d676cbb43a77f7004a92f992cf9eab3c8bfdd5c8c976dee0d210e
diff --git a/net-misc/asterisk/asterisk-16.30.1.ebuild b/net-misc/asterisk/asterisk-16.30.1.ebuild
index 8cad2f60a465..b2a0d086ac1e 100644
--- a/net-misc/asterisk/asterisk-16.30.1.ebuild
+++ b/net-misc/asterisk/asterisk-16.30.1.ebuild
@@ -96,12 +96,12 @@ DEPEND="acct-user/asterisk
 "
 
 RDEPEND="${DEPEND}
-	net-misc/asterisk-base
 	net-misc/asterisk-core-sounds
 	net-misc/asterisk-extra-sounds
 	net-misc/asterisk-moh-opsound
 	selinux? ( sec-policy/selinux-asterisk )
 	syslog? ( virtual/logger )"
+PDEPEND="net-misc/asterisk-base"
 
 BDEPEND="dev-libs/libxml2:2
 	virtual/pkgconfig"
diff --git a/net-misc/asterisk/asterisk-18.18.1.ebuild b/net-misc/asterisk/asterisk-18.18.1.ebuild
index 72c2d1bb8c17..3f4247463485 100644
--- a/net-misc/asterisk/asterisk-18.18.1.ebuild
+++ b/net-misc/asterisk/asterisk-18.18.1.ebuild
@@ -94,12 +94,12 @@ DEPEND="acct-user/asterisk
 "
 
 RDEPEND="${DEPEND}
-	net-misc/asterisk-base
 	net-misc/asterisk-core-sounds
 	net-misc/asterisk-extra-sounds
 	net-misc/asterisk-moh-opsound
 	selinux? ( sec-policy/selinux-asterisk )
 	syslog? ( virtual/logger )"
+PDEPEND="net-misc/asterisk-base"
 
 BDEPEND="dev-libs/libxml2:2
 	virtual/pkgconfig"
diff --git a/net-misc/asterisk/asterisk-20.3.1.ebuild b/net-misc/asterisk/asterisk-20.3.1.ebuild
index f5f88881f09f..080afa1dc8ea 100644
--- a/net-misc/asterisk/asterisk-20.3.1.ebuild
+++ b/net-misc/asterisk/asterisk-20.3.1.ebuild
@@ -94,11 +94,11 @@ DEPEND="acct-user/asterisk
 "
 
 RDEPEND="${DEPEND}
-	net-misc/asterisk-base
 	net-misc/asterisk-core-sounds
 	net-misc/asterisk-extra-sounds
 	net-misc/asterisk-moh-opsound
 	selinux? ( sec-policy/selinux-asterisk )"
+PDEPEND="net-misc/asterisk-base"
 
 BDEPEND="dev-libs/libxml2:2
 	virtual/pkgconfig"
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index d3a5760c9d13..e74d9a6890e1 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -2,7 +2,9 @@ AUX nextcloud-client-3.6.6-no-redefine-fortify-source.patch 1447 BLAKE2B 14a3a1a
 DIST nextcloud-client-3.8.2.tar.gz 15605319 BLAKE2B babd45d0a38d5206afd9c2b69e7ea580aeb90df2606932cbfc28f688b20bb026e566ca8a30112975ae38c8d9807339433c8b972230c6a8122cb93ffadd2eecab SHA512 231e074fd3dcc8f69d62616ff4aeec5e748891bf93fc783861008a4e04a12066e77e1449d94f599e5edfa9861bad684403aef80e909e095c16170d8607626a9d
 DIST nextcloud-client-3.9.0.tar.gz 15648917 BLAKE2B 50d26c101143d0d3ca690f142d54f195fbdaea2b58e97f8c0199519300053e27cd87290425de396b6e236dd3629aaedd6220a53b03249fa4376e3007e31dba85 SHA512 be289d1714484bfa1b49f23f0db898b3c345df924cfb6cc7ab1db5715524bec7e80eedb8cfc19112778337f81424d498eb2a34d6b3fd05fc6daa161bbcceb480
 DIST nextcloud-client-3.9.1.tar.gz 15733029 BLAKE2B e7e792b2ea7985c02627661b4686bf568dfe8cfe722babbf5507293daec57b754566d259d3fd4bc0b224e1dc34ae0afa4c757e75910c4d6d4ded692f0d7c2b02 SHA512 b3c77243efed3b70a59c157ae6f45ebf8eb8c4926e23bd78b364e93cbc2612ec220db60ef6bd55e288a2eb5a454fea87fd348116057b052a15b5c6c69f0654d2
+DIST nextcloud-client-3.9.4.tar.gz 15768508 BLAKE2B 7c06434538e9e95bed284ba07692d0d4d594639a145c2f3b67b8e81586fb98e1592eca54b9ee3cc638f8226ebb83e89e60a79238c76696fe9ca033209646eb13 SHA512 9f99278deb024ce105bae14d8dadc626b835486858e94f5483e9da3d06340a29e0941648cccfc30714c15ce25a6b77c4aa05a17fc213d7aa84803ffc13dca5a4
 EBUILD nextcloud-client-3.8.2-r1.ebuild 2476 BLAKE2B 77378505eab3f92d0f8d6fc091e6b07f1fa7387e2ef4e36528620290c3b1a8651ed375edb1359751b7c2aee9dc96481c545a5176262b3b95716ee3afbe4f8e2d SHA512 aee5f77f61fcccc44b25c94ec3f9f1689a476b8370d8ec645d7ceb3e80f0ea4a4d2bdc7bccc5f67804b6cb920cc0ef8310f585ede5df7a45cb63c8eb87854ddf
 EBUILD nextcloud-client-3.9.0.ebuild 2478 BLAKE2B 638089d2bd4ff88c3cd31b20e3001e229430b248de2d9411c30b3e4dfb52b9012f78e0cc483bea59d77ed4610c90a67d251bbee5603e3d2f06d55c308f1dda66 SHA512 b7fc99a8d01e54282ef4293147c0c19dc9eaf3c3aa892c93b5f68802e85b4848af55a607b1c2bd47cedffc992a61221dbacf3141fa2a4cd532906440329ab6a2
 EBUILD nextcloud-client-3.9.1.ebuild 2478 BLAKE2B 638089d2bd4ff88c3cd31b20e3001e229430b248de2d9411c30b3e4dfb52b9012f78e0cc483bea59d77ed4610c90a67d251bbee5603e3d2f06d55c308f1dda66 SHA512 b7fc99a8d01e54282ef4293147c0c19dc9eaf3c3aa892c93b5f68802e85b4848af55a607b1c2bd47cedffc992a61221dbacf3141fa2a4cd532906440329ab6a2
+EBUILD nextcloud-client-3.9.4.ebuild 2478 BLAKE2B 638089d2bd4ff88c3cd31b20e3001e229430b248de2d9411c30b3e4dfb52b9012f78e0cc483bea59d77ed4610c90a67d251bbee5603e3d2f06d55c308f1dda66 SHA512 b7fc99a8d01e54282ef4293147c0c19dc9eaf3c3aa892c93b5f68802e85b4848af55a607b1c2bd47cedffc992a61221dbacf3141fa2a4cd532906440329ab6a2
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.9.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.9.4.ebuild
new file mode 100644
index 000000000000..78bd99d7580a
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.9.4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake virtualx xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="
+	https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
+"
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus test webengine"
+RESTRICT="!test? ( test )"
+
+# slot op for qtqui as this package uses private API parts of qtqui
+# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h>
+RDEPEND="
+	>=dev-db/sqlite-3.34:3
+	>=dev-libs/openssl-1.1.0:0=
+	dev-libs/qtkeychain:=[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5=
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	net-libs/libcloudproviders
+	kde-frameworks/karchive:5
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+DEPEND="
+	${RDEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/qtxml:5
+	|| ( gnome-base/librsvg media-gfx/inkscape )
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	test? (
+		dev-qt/qttest:5
+		dev-util/cmocka
+	)
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
+)
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DBUILD_UPDATER=OFF
+		$(cmake_use_find_package doc Sphinx)
+		$(cmake_use_find_package doc PdfLatex)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_compile() {
+	local compile_targets=(all)
+	if use doc; then
+		compile_targets+=(doc doc-man)
+	fi
+	cmake_src_compile ${compile_targets[@]}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}