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

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

[Mike Gilbert]

commit:     3d6a8bd065528aa255a7e409c05474b5910c574f
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 21:47:34 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 21:48:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d6a8bd0

net-misc/asterisk: make logrotate file work with systemd

Patch by Karsten Kretschmer.

Bug: https://bugs.gentoo.org/593276

Package-Manager: portage-2.3.0_p36

 .../{asterisk-11.21.1.ebuild => asterisk-11.21.1-r1.ebuild}         | 0
 .../{asterisk-13.11.2.ebuild => asterisk-13.11.2-r1.ebuild}         | 0
 net-misc/asterisk/files/1.6.2/asterisk.logrotate4                   | 6 ++++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-misc/asterisk/asterisk-11.21.1.ebuild b/net-misc/asterisk/asterisk-11.21.1-r1.ebuild
similarity index 100%
rename from net-misc/asterisk/asterisk-11.21.1.ebuild
rename to net-misc/asterisk/asterisk-11.21.1-r1.ebuild

diff --git a/net-misc/asterisk/asterisk-13.11.2.ebuild b/net-misc/asterisk/asterisk-13.11.2-r1.ebuild
similarity index 100%
rename from net-misc/asterisk/asterisk-13.11.2.ebuild
rename to net-misc/asterisk/asterisk-13.11.2-r1.ebuild

diff --git a/net-misc/asterisk/files/1.6.2/asterisk.logrotate4 b/net-misc/asterisk/files/1.6.2/asterisk.logrotate4
index 857a970..29e78eb 100644
--- a/net-misc/asterisk/files/1.6.2/asterisk.logrotate4
+++ b/net-misc/asterisk/files/1.6.2/asterisk.logrotate4
@@ -3,7 +3,8 @@
 	notifempty
 
 	postrotate
-		/etc/init.d/asterisk --quiet status && /usr/sbin/asterisk -rnx "logger reload" || /bin/true
+		test -e /run/openrc/softlevel && /etc/init.d/asterisk --quiet status && /usr/sbin/asterisk -rnx "logger reload" || /bin/true
+		test -e /run/systemd/system && systemctl is-active --quiet asterisk.service && /usr/sbin/asterisk -rnx "logger reload" || /bin/true
 	endscript
 }
 
@@ -13,7 +14,8 @@
 	daily
 
 	postrotate
-		/etc/init.d/asterisk --quiet status && /usr/sbin/asterisk -rnx "logger reload" || /bin/true
+		test -e /run/openrc/softlevel && /etc/init.d/asterisk --quiet status && /usr/sbin/asterisk -rnx "logger reload" || /bin/true
+		test -e /run/systemd/system && systemctl is-active --quiet asterisk.service && /usr/sbin/asterisk -rnx "logger reload" || /bin/true
 	endscript
 }