1 |
commit: 0245edac02246e3a6ace4162546a4e286e5f7044 |
2 |
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 23 20:48:50 2015 +0000 |
4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 23 20:49:05 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0245edac |
7 |
|
8 |
net-voip/yate: fix init script, bug #547346 |
9 |
|
10 |
net-voip/yate/files/yate.initd | 8 ++++---- |
11 |
net-voip/yate/{yate-5.4.0.ebuild => yate-5.4.0-r1.ebuild} | 2 ++ |
12 |
net-voip/yate/{yate-5.5.0.ebuild => yate-5.5.0-r1.ebuild} | 2 ++ |
13 |
.../yatebts/{yatebts-4.0.0-r2.ebuild => yatebts-4.0.0-r3.ebuild} | 2 +- |
14 |
4 files changed, 9 insertions(+), 5 deletions(-) |
15 |
|
16 |
diff --git a/net-voip/yate/files/yate.initd b/net-voip/yate/files/yate.initd |
17 |
index 01f07f4..8c3e402 100644 |
18 |
--- a/net-voip/yate/files/yate.initd |
19 |
+++ b/net-voip/yate/files/yate.initd |
20 |
@@ -1,9 +1,9 @@ |
21 |
#!/sbin/runscript |
22 |
-# Copyright 1999-2009 Gentoo Foundation |
23 |
+# Copyright 1999-2015 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
# $Id$ |
26 |
|
27 |
-opts="${opts} reload" |
28 |
+extra_started_commands="reload" |
29 |
|
30 |
YATE_PIDFILE=${YATE_PIDFILE:-/var/run/${SVCNAME}.pid} |
31 |
YATE_BINARY=${YATE_BINARY:-/usr/bin/yate} |
32 |
@@ -28,7 +28,7 @@ stop() { |
33 |
|
34 |
reload() { |
35 |
ebegin "Reloading ${SVCNAME}" |
36 |
- start-stop-daemon --stop --exec "${YATE_BINARY}" \ |
37 |
- --pidfile "${YATE_PIDFILE}" --signal HUP --oknodo |
38 |
+ start-stop-daemon --signal HUP --exec "${YATE_BINARY}" \ |
39 |
+ --pidfile "${YATE_PIDFILE}" |
40 |
eend $? |
41 |
} |
42 |
|
43 |
diff --git a/net-voip/yate/yate-5.4.0.ebuild b/net-voip/yate/yate-5.4.0-r1.ebuild |
44 |
similarity index 96% |
45 |
rename from net-voip/yate/yate-5.4.0.ebuild |
46 |
rename to net-voip/yate/yate-5.4.0-r1.ebuild |
47 |
index 6f90ed0..4e5524e 100644 |
48 |
--- a/net-voip/yate/yate-5.4.0.ebuild |
49 |
+++ b/net-voip/yate/yate-5.4.0-r1.ebuild |
50 |
@@ -88,4 +88,6 @@ src_install() { |
51 |
else |
52 |
emake DESTDIR="${ED}" install-noapi |
53 |
fi |
54 |
+ newinitd "${FILESDIR}"/yate.initd yate |
55 |
+ newconfd "${FILESDIR}"/yate.confd yate |
56 |
} |
57 |
|
58 |
diff --git a/net-voip/yate/yate-5.5.0.ebuild b/net-voip/yate/yate-5.5.0-r1.ebuild |
59 |
similarity index 96% |
60 |
rename from net-voip/yate/yate-5.5.0.ebuild |
61 |
rename to net-voip/yate/yate-5.5.0-r1.ebuild |
62 |
index 6f90ed0..4e5524e 100644 |
63 |
--- a/net-voip/yate/yate-5.5.0.ebuild |
64 |
+++ b/net-voip/yate/yate-5.5.0-r1.ebuild |
65 |
@@ -88,4 +88,6 @@ src_install() { |
66 |
else |
67 |
emake DESTDIR="${ED}" install-noapi |
68 |
fi |
69 |
+ newinitd "${FILESDIR}"/yate.initd yate |
70 |
+ newconfd "${FILESDIR}"/yate.confd yate |
71 |
} |
72 |
|
73 |
diff --git a/net-wireless/yatebts/yatebts-4.0.0-r2.ebuild b/net-wireless/yatebts/yatebts-4.0.0-r3.ebuild |
74 |
similarity index 97% |
75 |
rename from net-wireless/yatebts/yatebts-4.0.0-r2.ebuild |
76 |
rename to net-wireless/yatebts/yatebts-4.0.0-r3.ebuild |
77 |
index ed833fb..11eb1cb 100644 |
78 |
--- a/net-wireless/yatebts/yatebts-4.0.0-r2.ebuild |
79 |
+++ b/net-wireless/yatebts/yatebts-4.0.0-r3.ebuild |
80 |
@@ -15,7 +15,7 @@ SLOT="0" |
81 |
IUSE="rad1 usrp1 uhd +bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1" |
82 |
|
83 |
RDEPEND=" |
84 |
- =net-voip/yate-5.4.0:=[gsm] |
85 |
+ =net-voip/yate-5.4.0-r1:=[gsm] |
86 |
bladerf? ( net-wireless/bladerf:= ) |
87 |
uhd? ( net-wireless/uhd ) |
88 |
virtual/libusb:1" |