[Pkg-voip-commits] r5394 - in /yxa/trunk/debian: changelog init_start.dpatch patches/00list yxa.init
mikma-guest at alioth.debian.org
mikma-guest at alioth.debian.org
Fri Mar 28 23:24:36 UTC 2008
Author: mikma-guest
Date: Fri Mar 28 23:24:35 2008
New Revision: 5394
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5394
Log:
* Start applications using -s switch to erl instead of using custom boot
file, except when running distribution over ssl.
* Add LSB keyword section to init file, and return proper exit status
codes.
Added:
yxa/trunk/debian/init_start.dpatch (with props)
Modified:
yxa/trunk/debian/changelog
yxa/trunk/debian/patches/00list
yxa/trunk/debian/yxa.init
Modified: yxa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/changelog?rev=5394&op=diff
==============================================================================
--- yxa/trunk/debian/changelog (original)
+++ yxa/trunk/debian/changelog Fri Mar 28 23:24:35 2008
@@ -5,6 +5,9 @@
httpd_util:encode_base64/1 (removed in OTP R12B-0).
* Enable IPV6_V6ONLY on IPv6 sockets.
* Fix bug in "eventserver_for_package".
+ * Start applications using -s switch to erl instead of using custom boot
+ file, except when running distribution over ssl.
+ * Add LSB keyword section to init file, and return proper exit status
+ codes.
- -- Mikael Magnusson <mikma at users.sourceforge.net> Tue, 11 Mar 2008 20:37:06 +0100
-
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Sat, 29 Mar 2008 00:23:25 +0100
Added: yxa/trunk/debian/init_start.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/init_start.dpatch?rev=5394&op=file
==============================================================================
--- yxa/trunk/debian/init_start.dpatch (added)
+++ yxa/trunk/debian/init_start.dpatch Fri Mar 28 23:24:35 2008
@@ -1,0 +1,154 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## init_start.dpatch by <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Start applications using -s switch to erl instead of using custom
+## DP: boot file.
+
+ at DPATCH@
+diff -urNad yxa-1.0~/scripts/init.sh.in yxa-1.0/scripts/init.sh.in
+--- yxa-1.0~/scripts/init.sh.in 2006-08-04 10:52:49.000000000 +0200
++++ yxa-1.0/scripts/init.sh.in 2008-03-28 23:02:33.000000000 +0100
+@@ -329,7 +329,7 @@
+ fi
+ fi
+ fi
+- ${erl} -boot "$bootfile" -pz ${beamdir} \
++ ${erl} $boot_start_ssl -s ${PROGRAMNAME} -pz ${beamdir} \
+ $EXTRA_ERL_ARGUMENTS \
+ -name $name \
+ -yxa_config $configpath \
+diff -urNad yxa-1.0~/src/appserver.erl yxa-1.0/src/appserver.erl
+--- yxa-1.0~/src/appserver.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/appserver.erl 2008-03-28 22:59:09.000000000 +0100
+@@ -23,6 +23,11 @@
+
+ -export([test/0]).
+
++-export([
++ start/0,
++ stop/0
++ ]).
++
+ %%--------------------------------------------------------------------
+ %%% Application specific exports, exported for CPL subsystem
+ %%--------------------------------------------------------------------
+@@ -47,6 +52,11 @@
+ -define(APPSERVER_GLUE_TIMEOUT, 1200 * 1000).
+ -define(SIPPIPE_TIMEOUT, 900).
+
++start() ->
++ application:start(?MODULE).
++
++stop() ->
++ application:stop(?MODULE).
+
+ %%====================================================================
+ %% Behaviour functions
+diff -urNad yxa-1.0~/src/event/eventserver.erl yxa-1.0/src/event/eventserver.erl
+--- yxa-1.0~/src/event/eventserver.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/event/eventserver.erl 2008-03-28 23:00:05.000000000 +0100
+@@ -22,6 +22,11 @@
+
+ -export([test/0]).
+
++-export([
++ start/0,
++ stop/0
++ ]).
++
+ %%--------------------------------------------------------------------
+ %%% Application specific exports
+ %%--------------------------------------------------------------------
+@@ -41,6 +46,11 @@
+ -define(EVENTSERVER_T, eventserver_t).
+ -define(SHUTDOWN_TIMEOUT, 10).
+
++start() ->
++ application:start(?MODULE).
++
++stop() ->
++ application:stop(?MODULE).
+
+ %%====================================================================
+ %% Behaviour functions
+diff -urNad yxa-1.0~/src/incomingproxy.erl yxa-1.0/src/incomingproxy.erl
+--- yxa-1.0~/src/incomingproxy.erl 2008-03-28 22:55:56.000000000 +0100
++++ yxa-1.0/src/incomingproxy.erl 2008-03-28 22:58:54.000000000 +0100
+@@ -24,12 +24,22 @@
+
+ -export([test/0]).
+
++-export([
++ start/0,
++ stop/0
++ ]).
++
+ %%--------------------------------------------------------------------
+ %% Include files
+ %%--------------------------------------------------------------------
+ -include("siprecords.hrl").
+ -include("sipsocket.hrl").
+
++start() ->
++ application:start(?MODULE).
++
++stop() ->
++ application:stop(?MODULE).
+
+ %%====================================================================
+ %% Behaviour functions
+diff -urNad yxa-1.0~/src/outgoingproxy.erl yxa-1.0/src/outgoingproxy.erl
+--- yxa-1.0~/src/outgoingproxy.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/outgoingproxy.erl 2008-03-28 22:59:02.000000000 +0100
+@@ -26,12 +26,23 @@
+
+ -export([test/0]).
+
++-export([
++ start/0,
++ stop/0
++ ]).
++
+ %%--------------------------------------------------------------------
+ %% Include files
+ %%--------------------------------------------------------------------
+ -include("siprecords.hrl").
+ -include("sipsocket.hrl").
+
++start() ->
++ application:start(?MODULE).
++
++stop() ->
++ application:stop(?MODULE).
++
+ %%====================================================================
+ %% Behaviour functions
+ %% Standard YXA SIP-application callback functions
+diff -urNad yxa-1.0~/src/pstnproxy.erl yxa-1.0/src/pstnproxy.erl
+--- yxa-1.0~/src/pstnproxy.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/pstnproxy.erl 2008-03-28 22:59:31.000000000 +0100
+@@ -27,6 +27,11 @@
+
+ -export([test/0]).
+
++-export([
++ start/0,
++ stop/0
++ ]).
++
+ %%--------------------------------------------------------------------
+ %% Include files
+ %%--------------------------------------------------------------------
+@@ -34,6 +39,11 @@
+ -include("sipsocket.hrl").
+ -include("pstnproxy.hrl").
+
++start() ->
++ application:start(?MODULE).
++
++stop() ->
++ application:stop(?MODULE).
+
+ %%====================================================================
+ %% Behaviour functions
Propchange: yxa/trunk/debian/init_start.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: yxa/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/00list?rev=5394&op=diff
==============================================================================
--- yxa/trunk/debian/patches/00list (original)
+++ yxa/trunk/debian/patches/00list Fri Mar 28 23:24:35 2008
@@ -10,3 +10,4 @@
ssl_util
eventserver_for_package
ipv6_v6only
+init_start
Modified: yxa/trunk/debian/yxa.init
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/yxa.init?rev=5394&op=diff
==============================================================================
--- yxa/trunk/debian/yxa.init (original)
+++ yxa/trunk/debian/yxa.init Fri Mar 28 23:24:35 2008
@@ -10,6 +10,18 @@
# by Mikael Magnusson <mikma at users.sourceforge.net>
# Version: @(#)skeleton 1.9 26-Feb-2001 miquels at cistron.nl
#
+
+### BEGIN INIT INFO
+# Provides: yxa
+# Required-Start: $remote_fs $network $named $syslog $time
+# Required-Stop: $remote_fs $network $named $syslog $time
+# Should-Start:
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: SIP server
+# Description: SIP server applications written in Erlang
+### END INIT INFO
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
NAME=yxa
@@ -33,7 +45,8 @@
*)
echo "Invalid service name: $service"
usage
- exit 1
+ # Invalid argument
+ exit 2
;;
esac
@@ -95,7 +108,8 @@
;;
*)
usage
- exit 1
+ # Unimplemented feature
+ exit 3
;;
esac
}
@@ -107,7 +121,8 @@
if test $# -lt 1; then
usage
- exit 1
+ # Invalid argument(s)
+ exit 2
fi
ACTION=$1
@@ -147,7 +162,8 @@
;;
*)
usage
- exit 1
+ # Unimplemented feature
+ exit 3
;;
esac
More information about the Pkg-voip-commits
mailing list