From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A4EE4158086 for ; Fri, 12 Nov 2021 01:36:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58D222BC181; Fri, 12 Nov 2021 01:36:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CC64A2BC181 for ; Fri, 12 Nov 2021 01:36:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A7514342DA2 for ; Fri, 12 Nov 2021 01:36:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16F4E1C0 for ; Fri, 12 Nov 2021 01:36:36 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1636680776.8d80c86857d4c3af405ce22bd54d8569401bde43.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/asterisk/files/, net-misc/asterisk/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/asterisk/asterisk-13.38.3-r1.ebuild net-misc/asterisk/asterisk-13.38.3-r2.ebuild net-misc/asterisk/files/asterisk.tmpfiles-13.38.3-r2.conf net-misc/asterisk/files/asterisk.tmpfiles2.conf net-misc/asterisk/files/initd-13.32.0-r1 net-misc/asterisk/files/initd-13.38.3-r2 X-VCS-Directories: net-misc/asterisk/files/ net-misc/asterisk/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8d80c86857d4c3af405ce22bd54d8569401bde43 X-VCS-Branch: master Date: Fri, 12 Nov 2021 01:36:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c8050cd9-5b19-4262-8f46-19af1c7f9705 X-Archives-Hash: dc6b86daf85900fe0622563478b01035 commit: 8d80c86857d4c3af405ce22bd54d8569401bde43 Author: Jaco Kroon uls co za> AuthorDate: Wed Nov 10 08:04:36 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Nov 12 01:32:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d80c868 net-misc/asterisk: 13.38.3-r2 Revision bump with the specific purpose of addressing: Closes: https://bugs.gentoo.org/822084 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Jaco Kroon uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/22879 Signed-off-by: Sam James gentoo.org> .../{asterisk-13.38.3-r1.ebuild => asterisk-13.38.3-r2.ebuild} | 5 +++-- net-misc/asterisk/files/asterisk.tmpfiles-13.38.3-r2.conf | 1 + net-misc/asterisk/files/asterisk.tmpfiles2.conf | 1 - net-misc/asterisk/files/{initd-13.32.0-r1 => initd-13.38.3-r2} | 8 ++++---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/net-misc/asterisk/asterisk-13.38.3-r1.ebuild b/net-misc/asterisk/asterisk-13.38.3-r2.ebuild similarity index 98% rename from net-misc/asterisk/asterisk-13.38.3-r1.ebuild rename to net-misc/asterisk/asterisk-13.38.3-r2.ebuild index 9c92d3c2042..12bf7e259cb 100644 --- a/net-misc/asterisk/asterisk-13.38.3-r1.ebuild +++ b/net-misc/asterisk/asterisk-13.38.3-r2.ebuild @@ -109,6 +109,7 @@ QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" _make_args=( "NOISY_BUILD=yes" "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" "OPTIMIZE=" "DEBUG=" "DESTDIR=${D}" @@ -292,11 +293,11 @@ src_install() { diropts -m 0750 -o asterisk -g asterisk keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk + newinitd "${FILESDIR}"/initd-13.38.3-r2 asterisk newconfd "${FILESDIR}"/confd-13.32.0 asterisk systemd_dounit "${FILESDIR}"/asterisk.service - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf + newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-13.38.3-r2.conf asterisk.conf systemd_install_serviced "${FILESDIR}"/asterisk.service.conf # Reset diropts else dodoc uses it for doc installations. diff --git a/net-misc/asterisk/files/asterisk.tmpfiles-13.38.3-r2.conf b/net-misc/asterisk/files/asterisk.tmpfiles-13.38.3-r2.conf new file mode 100644 index 00000000000..dc999ee65fc --- /dev/null +++ b/net-misc/asterisk/files/asterisk.tmpfiles-13.38.3-r2.conf @@ -0,0 +1 @@ +d /run/asterisk 0750 asterisk asterisk diff --git a/net-misc/asterisk/files/asterisk.tmpfiles2.conf b/net-misc/asterisk/files/asterisk.tmpfiles2.conf deleted file mode 100644 index ce85c7f5461..00000000000 --- a/net-misc/asterisk/files/asterisk.tmpfiles2.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/run/asterisk 0750 asterisk asterisk diff --git a/net-misc/asterisk/files/initd-13.32.0-r1 b/net-misc/asterisk/files/initd-13.38.3-r2 similarity index 98% rename from net-misc/asterisk/files/initd-13.32.0-r1 rename to net-misc/asterisk/files/initd-13.38.3-r2 index 2a7387dc2eb..8a4555be7ec 100644 --- a/net-misc/asterisk/files/initd-13.32.0-r1 +++ b/net-misc/asterisk/files/initd-13.38.3-r2 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 extra_started_commands="forcestop reload" @@ -30,7 +30,7 @@ setup_svc_variables() local t ast_instancename=asterisk - ast_rundir=/var/run/${RC_SVCNAME} + ast_rundir=/run/${RC_SVCNAME} ast_logdir=/var/log/${RC_SVCNAME} ast_spooldir=/var/spool/${RC_SVCNAME} ast_confdir=/etc/${RC_SVCNAME/.//} @@ -291,7 +291,7 @@ 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 /var/run/asterisk/wrapper_loop.pid)" + kill "$(cat /run/asterisk/wrapper_loop.pid)" eend $? fi @@ -313,7 +313,7 @@ forcestop() { wrapperstop ebegin "Stopping ${ast_instancename} PBX" - start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid + start-stop-daemon --stop --pidfile /run/asterisk/asterisk.pid eend $? }