[gentoo-commits] repo/gentoo:master commit in: net-misc/asterisk/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/asterisk/files/

[Joonas Niilola]

commit:     442d02e2a7756ab45d5b6916d92c9387ab45771e
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Wed Apr  1 07:10:16 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Apr  1 14:37:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=442d02e2

net-misc/asterisk: further fix for binutils-2.34 on 13.32.0

Closes: https://bugs.gentoo.org/713840
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/15192
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch b/net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch
index 5be532bf804..6ce797ca4f2 100644
--- a/net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch
+++ b/net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch
@@ -1,8 +1,6 @@
-diff --git a/main/backtrace.c b/main/backtrace.c
-index 2623d7f..1bc9bea 100644
---- a/main/backtrace.c
-+++ b/main/backtrace.c
-@@ -59,6 +59,12 @@
+--- a/main/backtrace.c	2020-03-12 07:37:03.000000000 -0700
++++ b/main/backtrace.c	2020-03-31 23:22:18.272691980 -0700
+@@ -64,6 +64,15 @@
  #if defined(HAVE_DLADDR) && defined(HAVE_BFD) && defined(BETTER_BACKTRACES)
  #include <dlfcn.h>
  #include <bfd.h>
@@ -11,6 +9,9 @@ index 2623d7f..1bc9bea 100644
 +#endif
 +#ifndef bfd_get_section_vma
 +#define bfd_get_section_vma(x, y)	bfd_section_vma(y)
++#endif
++#ifndef bfd_get_section_flags
++#define bfd_get_section_flags(bfd, ptr) ((void) bfd, (ptr)->flags)
 +#endif
  #endif
  

[gentoo-commits] repo/gentoo:master commit in: net-misc/asterisk/files/

[Joonas Niilola]

commit:     d7701464b4571edb08bfa357a40487448154b842
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu May 27 19:02:33 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 06:49:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7701464

net-misc/asterisk: remove unused patch

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/21014
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../asterisk/files/asterisk-16.15.1-r2-autoconf-2.70.patch | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/net-misc/asterisk/files/asterisk-16.15.1-r2-autoconf-2.70.patch b/net-misc/asterisk/files/asterisk-16.15.1-r2-autoconf-2.70.patch
deleted file mode 100644
index 99c59754019..00000000000
--- a/net-misc/asterisk/files/asterisk-16.15.1-r2-autoconf-2.70.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asterisk-16.15.1/configure.ac.o	2021-01-08 18:41:50.979913016 +0200
-+++ asterisk-16.15.1/configure.ac	2021-01-08 18:42:23.739899786 +0200
-@@ -612,11 +612,6 @@
-   AC_MSG_ERROR([*** Could not find dirent header that defines 'DIR'.])
- fi
- 
--AC_HEADER_STDC
--if test "$ac_cv_header_stdc" != "yes"; then
--  AC_MSG_ERROR([*** ANSI C header files not found.])
--fi
--
- AC_HEADER_SYS_WAIT
- if test "$ac_cv_header_sys_wait_h" != "yes"; then
-   AC_MSG_ERROR([*** POSIX.1 compatible sys/wait.h is required.])

[gentoo-commits] repo/gentoo:master commit in: net-misc/asterisk/files/

[John Helmert III]

commit:     3936bafb10bd149224096c2600b6253424851486
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Aug 24 17:38:55 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 21:11:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3936bafb

net-misc/asterisk: remove unused files

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.14
Closes: https://github.com/gentoo/gentoo/pull/27004
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 net-misc/asterisk/files/confd-16.16.2-r1     | 171 -------------
 net-misc/asterisk/files/initd-16.22.0-18.8.0 | 363 ---------------------------
 2 files changed, 534 deletions(-)

diff --git a/net-misc/asterisk/files/confd-16.16.2-r1 b/net-misc/asterisk/files/confd-16.16.2-r1
deleted file mode 100644
index a2da978af924..000000000000
--- a/net-misc/asterisk/files/confd-16.16.2-r1
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-#
-# Additional options for asterisk
-#
-# see "asterisk -h" for a list of options
-#
-# No default.
-#
-#ASTERISK_OPTS=""
-
-#
-# User and group to run asterisk as
-#
-# Value: double-colon separated list of user and group, or empty to run as root:
-#
-#
-# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
-# "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
-# ":asterisk" to run as user "root" and group "asterisk"
-#
-# Default: asterisk
-#
-#ASTERISK_USER="asterisk"
-
-#
-# Nicelevel
-#
-# Set the priority of the asterisk process
-#
-# Value: (highest) -20..19 (lowest)
-#
-# No default (leave scheduling to be system default).
-#
-#ASTERISK_NICE="19"
-
-# Send crash notifications emails to this address
-# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
-#
-# Value: Email address or empty to disable
-#
-# No default.
-#
-#ASTERISK_NOTIFY_EMAIL="root"
-
-#
-# Send asterisk's output to this terminal
-#
-# Value: Full path to device node or a number
-#
-# No default.
-#
-#ASTERISK_TTY="/dev/tty9"
-
-#
-# Start an asterisk console on the terminal specified by ASTERISK_TTY
-#
-# Warning! Use only for debugging, this is a potential security issue!
-#
-# Value: yes/no
-#
-# Default: no
-#
-#ASTERISK_CONSOLE="no"
-
-#
-# Maximum size of core files.
-#
-# Value: Size in bytes, unlimited for no limit or empty to disable.
-#
-# Default:  do not generate core dumps
-#
-#ASTERISK_CORE_SIZE="unlimited"
-
-#
-# ASTERISK_CORE_DIR
-#
-# Value: Directory (will be created if non-existant).
-#
-# Default: /tmp
-#
-#ASTERISK_CORE_DIR="/var/lib/asterisk/core"
-
-#
-# Max number of filedescriptors.  asterisk can trivially run out of
-# descriptors.  In most (SIP) cases it uses at least four descriptors per call,
-# and this is a conservative value.
-#
-# Value: Number of descriptors
-#
-# Default: leave system default in place.
-#
-ASTERISK_MAX_FD="4096"
-
-#
-# Delay time before restarting asterisk after a crash.
-#
-# Value: Number of seconds to sleep after a crash before restarting.
-#
-# Default: 5
-#
-#ASTERISK_RESTART_DELAY=5
-
-#
-# The stop mechanism to use.  Asterisk can do gracefully, when convenient or now.
-# By default we expect you to want to stop as soon as possible, so we default
-#
-# Default: gracefully
-#
-#ASTERISK_STOP_METHOD="when convenient"
-
-#
-# By default the init script waits two minutes for asterisk to stop.  This allows
-# you to change that, or even completely disable and go into wait for ever mode (-1).
-# The value here is in seconds.
-#
-# Default: 120
-#
-#ASTERISK_STOP_TIMEOUT=-1
-
-#
-# Kill these tasks after asterisk crashed
-#
-# Warning! This will kill _ALL_ tasks with the specified names!
-#
-# Value: Space separated list of names in double quotes (e.g. "mpg123 mad")
-#
-# Default is to not do stupid things like killing random processes.
-#
-#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad"
-
-#
-# ASTERISK_CONFDIR
-#
-# If you'd like an alternative folder to /etc/${RC_SVCNAME} to be used
-# (typically /etc/asterisk) to be used for configuration.
-#
-# Default: /etc/${RC_SVCNAME}
-#
-#ASTERISK_CONFDIR="/etc/foo/bar"
-
-# ASTERISK_CACHEDIR
-#
-# Value: Directory to which astcachedir in asterisk.conf is set.
-#
-# Default: /var/cache/asterisk
-#
-#ASTERISK_CACHEDIR="/var/cache/asterisk"
-
-
-#
-# Normally the init script will not wait for asterisk to fully boot.  With this
-# setting set to yes/true/1 it will issue a "core waitfullybooted" directly
-# after starting asterisk, and wait for asterisk to start up completely.  This
-# is useful in certain conditions where other software requires asterisk to be
-# properly started before they themselves can be started.
-#
-# Default:  no
-#
-#ASTERISK_WAITBOOTED=yes
-
-#
-# When core-dumping, the default was to generate core-$(date +%Y%m%d-%H%M%S).
-# In certain highly unusual configurations it's helpful to also get the
-# hostname into this filename.  By enabling this option the wrapper loop will
-# adjust the core file to be named core-$(hostname)-$(date ...).
-#
-# Default: no
-#
-#ASTERISK_CORE_USEHOSTNAME=yes

diff --git a/net-misc/asterisk/files/initd-16.22.0-18.8.0 b/net-misc/asterisk/files/initd-16.22.0-18.8.0
deleted file mode 100644
index ed6fa8bca742..000000000000
--- a/net-misc/asterisk/files/initd-16.22.0-18.8.0
+++ /dev/null
@@ -1,363 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="forcestop reload"
-
-depend() {
-	need net
-	use nscd dns dahdi mysql postgresql slapd capi
-}
-
-is_running() {
-	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
-	PID="$(cat "${ast_rundir}/asterisk.pid")"
-	[ -d "/proc/${PID}" ] || return 1
-	EXE="$(readlink -f /proc/${PID}/exe)"
-	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
-	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
-
-	# PID reported in pidfile is active, and is still an asterisk instance.
-	return 0
-}
-
-# Sets up a few variables for us for use
-# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
-# ast_rundir: directory to be used as run folder (pid and ctl files).
-setup_svc_variables()
-{
-	local t
-
-	ast_instancename=asterisk
-	ast_rundir=/run/${RC_SVCNAME}
-	ast_logdir=/var/log/${RC_SVCNAME}
-	ast_confdir=/etc/${RC_SVCNAME/.//}
-	ast_cachedir=/var/cache/asterisk
-	ast_stop_timeout=120
-	ast_stop_method="gracefully"
-
-	if [ "${RC_SVCNAME}" != "asterisk" ]; then
-		t="${RC_SVCNAME#asterisk.}"
-		if [ "${RC_SVCNAME}" = "${t}" ]; then
-			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
-			return 1
-		fi
-		ast_instancename+="(${t})"
-	fi
-
-	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
-	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
-	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
-	[ -n "${ASTERISK_CACHEDIR}" ] && ast_confdir="${ASTERISK_CACHEDIR}"
-	[ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}"
-	case "${ASTERISK_STOP_METHOD}" in
-		gracefully|when\ convenient|now)
-			ast_stop_method="${ASTERISK_STOP_METHOD}"
-		;;
-	esac
-	ast_group=
-	if [ -n "${ASTERISK_USER}" ]; then
-		ast_user="${ASTERISK_USER%%:*}"
-		if [ "${ast_user}" != "${ASTERISK_USER}" ]; then
-			ast_group="${ASTERISK_USER#*:}"
-			ast_group="${ast_group%%:*}"
-		fi
-	fi
-
-	[ -z "${ast_user}" ] && ast_user=asterisk
-
-	ast_pgroup="$(getent group $(getent passwd "${ast_user}" | awk -F: '{ print $4 }') | sed -re 's/:.*//')"
-
-	return 0
-}
-
-asterisk_run_loop() {
-	local result=0 signal=0
-
-	echo "Initializing ${ast_instancename} wrapper"
-	OPTS="$*"
-
-	trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT
-	touch "${ast_rundir}/wrapper_loop.running"
-
-	while [ -r "${ast_rundir}/wrapper_loop.running" ]; do
-		if [ -n "${TTY}" ]; then
-			/usr/bin/stty -F "${TTY}" sane
-			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}"
-			result=$?
-		else
-			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >/dev/null 2>&1
-			result=$?
-		fi
-
-		if [ "$result" -eq 0 ]; then
-			echo "Asterisk terminated normally"
-			break
-		else
-			if [ "$result" -gt 128 ]; then
-				signal="$(expr "$result" - 128)"
-				MSG="Asterisk terminated with Signal: $signal"
-
-				CORE_TARGET="core-"
-				yesno "${ASTERISK_CORE_USEHOSTNAME}" && CORE_TARGET+="$(hostname)-"
-				CORE_TARGET+="$(date "+%Y%m%d-%H%M%S")"
-
-				local CORE_DUMPED=0
-				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
-					mv "${ASTERISK_CORE_DIR}/core" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
-					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				fi
-
-				[ $CORE_DUMPED -eq 1 ] && \
-					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-			else
-				MSG="Asterisk terminated with return code: $result"
-			fi
-
-			# kill left-over tasks
-			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
-				kill -9 "$(pidof "${X}")";
-			done
-		fi
-
-		[ -n "${TTY}" ] \
-			&& echo "${MSG}" >"${TTY}" \
-			|| echo "${MSG}"
-
-
-		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
-		   [ -x /usr/sbin/sendmail ]; then
-			echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
-				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
-		fi
-		sleep "${ASTERISK_RESTART_DELAY}"
-		echo "Restarting Asterisk..."
-	done
-
-	echo "Terminating wrapper loop."
-	return 0
-}
-
-start() {
-	local OPTS PID
-	local tmp x
-
-	local OPTS ARGS
-
-	setup_svc_variables || return $?
-
-	ebegin "Starting ${ast_instancename} PBX"
-
-	eindent
-
-	# filter (redundant) arguments
-	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
-
-	# default options
-	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
-
-	# ensure that ASTERISK_RESTART_DELAY is integer.
-	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
-	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
-
-	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
-	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
-		ulimit -c ${ASTERISK_CORE_SIZE}
-
-		if [ -n "${ASTERISK_CORE_DIR}" ] && \
-		   [ ! -d "${ASTERISK_CORE_DIR}" ]
-		then
-			checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ASTERISK_CORE_DIR}"
-		fi
-		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
-		cd "${ASTERISK_CORE_DIR}"
-		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
-		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
-
-		OPTS="${OPTS} -g"
-	fi
-
-	if [ -n "${ASTERISK_MAX_FD}" ]; then
-		ulimit -n ${ASTERISK_MAX_FD}
-		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
-	fi
-
-	if [ -n "${ASTERISK_NICE}" ]; then
-		if [ ${ASTERISK_NICE} -ge -20 ] && \
-		   [ ${ASTERISK_NICE} -le  19 ]; then
-			einfo "Nice level                : ${ASTERISK_NICE}"
-			NICE="nice -n ${ASTERISK_NICE} --"
-		else
-			eerror "Nice value must be between -20 and 19"
-			return 1
-		fi
-	else
-		NICE=""
-	fi
-
-	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
-		if [ -x /usr/sbin/sendmail ]; then
-			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
-		else
-			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
-			unset ASTERISK_NOTIFY_EMAIL
-		fi
-	fi
-
-	if [ -n "${ASTERISK_TTY}" ]; then
-		for x in "${ASTERISK_TTY}" \
-			 "/dev/tty${ASTERISK_TTY}" \
-			 "/dev/vc/${ASTERISK_TTY}"
-		do
-			if [ -c "${x}" ]; then
-				TTY="${x}"
-			fi
-		done
-		[ -n "${TTY}" ] && \
-			einfo "Messages are sent to      : ${TTY}"
-	fi
-
-	if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then
-		einfo "Starting Asterisk console : Yes"
-		OPTS="${OPTS} -c"
-	fi
-
-	if ! getent passwd "${ast_user}" &>/dev/null; then
-		eerror "Requested to run asterisk as ${ast_user}, which doesn't exist."
-		return 1
-	fi
-	OPTS="${OPTS} -U ${ast_user}"
-
-	if [ -n "${ast_group}" ] && ! getent group "${ast_group}" &>/dev/null; then
-		eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist."
-		return 1
-	fi
-	[ -n "${ast_group}" ] && OPTS="${OPTS} -G ${ast_group}"
-
-	if [ "${ast_user}" = root ]; then
-		ewarn "Starting asterisk as root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
-	elif [ "${ast_group}" = root ]; then
-		ewarn "Starting asterisk with group root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
-	fi
-
-	checkpath -d -m 0755 -o "${ast_user}:${ast_group}" "${ast_logdir}" "${ast_rundir}"
-	checkpath -d -m 0750 -o "${ast_user}:${ast_group}" "${ast_cachedir}"
-
-	einfo "Starting asterisk as      : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}"
-	asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &>/dev/null &
-	result=$?
-
-	if [ $result -eq 0 ]; then
-		# 2 seconds should be enough for asterisk to start
-		sleep 2
-		is_running
-		result=$?
-
-		[ $result -eq 0 ] || wrapperstop
-	fi
-
-	eoutdent
-	eend $result
-
-	if [ $result -eq 0 ] && yesno "${ASTERISK_WAITBOOTED}"; then
-		if [ ! -r "${ast_rundir}/asterisk.ctl" ]; then
-			# asterisk can crash during startup ...
-			ebegin "Waiting for ctl file to appear"
-			while is_running && [ ! -r "${ast_rundir}/asterisk.ctl" ]; do
-				sleep 1
-			done
-			is_running
-			result=$?
-			eend $result
-		fi
-		if [ $result -eq 0 ]; then
-			ebegin "Waiting for ${ast_instancename} to fully boot"
-			/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null
-			eend $?
-		fi
-	fi
-
-	return $result
-}
-
-wrapperstop() {
-	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
-	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
-		ebegin "Killing ${ast_instancename} wrapper script"
-		kill "$(cat /run/asterisk/wrapper_loop.pid)"
-		eend $?
-	fi
-
-	# The new one (due to "hardened" requirements) uses a simpler
-	# flag to indicate running or shutting down.
-	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
-		ebegin "Signalling ${ast_instancename} wrapper script to terminate"
-		rm "${ast_rundir}/wrapper_loop.running"
-		eend $?
-	fi
-
-	return 0
-}
-
-forcestop() {
-	setup_svc_variables || return $?
-
-	# Just to be sure - when we want to forcestop we should make it all tear down.
-	wrapperstop
-
-	ebegin "Stopping ${ast_instancename} PBX"
-	start-stop-daemon --stop --pidfile /run/asterisk/asterisk.pid
-	eend $?
-}
-
-stop() {
-	setup_svc_variables || return $?
-
-	wrapperstop
-
-	if ! is_running; then
-		eerror "${ast_instancename} is not running!"
-		return 0
-	fi
-
-	ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}"
-	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" &>/dev/null
-	# Now we have to wait until asterisk has _really_ stopped.
-	sleep 1
-	if is_running; then
-		einfon "Waiting for ${ast_instancename} to shutdown ."
-		local cnt=0
-		while is_running; do
-			cnt="$(expr $cnt + 2)"
-			if [ ${ast_stop_timeout} -gt 0 -a $cnt -gt ${ast_stop_timeout} ] ; then
-				echo
-				eend 1 "Failed waiting for ${ast_instancename} to stop."
-				return 1
-			fi
-			sleep 2
-			echo -n "."
-		done
-		echo
-	fi
-	eend 0
-}
-
-reload() {
-	setup_svc_variables || return $?
-
-	if is_running; then
-		ebegin "Forcing ${ast_instancename} to reload configuration"
-		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null
-		eend $?
-	else
-		eerror "${ast_instancename} is not running!"
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: net-misc/asterisk/files/

[Sam James]

commit:     9666ed882a52f3280c9078bf6107fffa1a9da134
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Sun Dec  4 04:38:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 09:11:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9666ed88

net-misc/asterisk: Apply patsub_replacement defences

Per bug #881383, string replacing forms of parameter expansion must take care
to quote - or appropriately escape - any nested parameter expansions, assuming
that their values are intended to be taken literally (as is almost invariably
the case). This has long been the case, but the introduction of the new
patsub_replacement option in bash >=5.2 has brought the issue to the fore.

Note that, in this instance, it's actually a command substitution injected into
the replacement 'string' that merits quoting.

Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Bug: https://bugs.gentoo.org/881383
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1 b/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1
index 477812171a86..8624bfa3383e 100644
--- a/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1
+++ b/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1
@@ -166,9 +166,9 @@ while [[ -r "${rundir}/${progname}.pid" ]]; do
 		if [[ -r core ]]; then
 			if [[ -n "${corerename+yes}" ]]; then
 				core_target="${core_pattern}"
-				core_target="${core_target//%h/$(hostname)}"
-				core_target="${core_target//%D/$(date +%Y%m%d)}"
-				core_target="${core_target//%T/$(date +%H%M%S)}"
+				core_target="${core_target//%h/"$(hostname)"}"
+				core_target="${core_target//%D/"$(date +%Y%m%d)"}"
+				core_target="${core_target//%T/"$(date +%H%M%S)"}"
 				mv core "${core_target}"
 				core_target=$(readlink -f "${core_target}")
 			else