[gentoo-commits] gentoo-x86 commit in net-misc/asterisk/files/1.4.0: asterisk-1.4.33-inband-indications.patch asterisk-1.4.0-var_rundir.patch asterisk-1.4.33-gsm-pic.patch asterisk-1.4.0-uclibc.patch func_devstate-r6.c asterisk-1.4.37-imap-libs.patch asterisk.logrotate func_volume.c asterisk.confd asterisk.initd

[Tony Vroon (chainsaw)]

chainsaw    10/12/01 17:54:28

  Added:                asterisk-1.4.33-inband-indications.patch
                        asterisk-1.4.0-var_rundir.patch
                        asterisk-1.4.33-gsm-pic.patch
                        asterisk-1.4.0-uclibc.patch func_devstate-r6.c
                        asterisk-1.4.37-imap-libs.patch asterisk.logrotate
                        func_volume.c asterisk.confd asterisk.initd
  Log:
  Add 1.4 branch ebuild & patchset by Kerin Millar, who will be proxy maintaining.
  
  (Portage version: 2.1.9.25/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-misc/asterisk/files/1.4.0/asterisk-1.4.33-inband-indications.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk-1.4.33-inband-indications.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk-1.4.33-inband-indications.patch?rev=1.1&content-type=text/plain

Index: asterisk-1.4.33-inband-indications.patch
===================================================================
--- asterisk-1.4.33.orig/main/channel.c	2010-05-24 20:37:55.000000000 +0100
+++ asterisk-1.4.33/main/channel.c	2010-06-23 15:06:44.949805705 +0100
@@ -1767,6 +1767,8 @@ int ast_activate_generator(struct ast_ch
 			chan->generator->release(chan, chan->generatordata);
 		chan->generatordata = NULL;
 	}
+
+	ast_prod(chan);
 	if (gen->alloc && !(chan->generatordata = gen->alloc(chan, params))) {
 		res = -1;
 	}
@@ -1776,8 +1778,6 @@ int ast_activate_generator(struct ast_ch
 	}
 	ast_channel_unlock(chan);
 
-	ast_prod(chan);
-
 	return res;
 }
 



1.1                  net-misc/asterisk/files/1.4.0/asterisk-1.4.0-var_rundir.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk-1.4.0-var_rundir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk-1.4.0-var_rundir.patch?rev=1.1&content-type=text/plain

Index: asterisk-1.4.0-var_rundir.patch
===================================================================
--- asterisk-1.4.0/Makefile.orig	2006-12-24 03:07:19.000000000 +0000
+++ asterisk-1.4.0/Makefile	2006-12-24 03:07:57.000000000 +0000
@@ -109,7 +109,7 @@
   ASTSBINDIR=$(sbindir)
   ASTSPOOLDIR=$(localstatedir)/spool/asterisk
   ASTLOGDIR=$(localstatedir)/log/asterisk
-  ASTVARRUNDIR=$(localstatedir)/run
+  ASTVARRUNDIR=$(localstatedir)/run/asterisk
   ASTMANDIR=$(mandir)
 ifeq ($(OSARCH),FreeBSD)
   ASTVARLIBDIR=$(prefix)/share/asterisk



1.1                  net-misc/asterisk/files/1.4.0/asterisk-1.4.33-gsm-pic.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk-1.4.33-gsm-pic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk-1.4.33-gsm-pic.patch?rev=1.1&content-type=text/plain

Index: asterisk-1.4.33-gsm-pic.patch
===================================================================
--- asterisk-1.4.33.orig/codecs/gsm/Makefile	2010-03-16 20:47:15.000000000 +0000
+++ asterisk-1.4.33/codecs/gsm/Makefile	2010-06-20 18:21:56.576515592 +0100
@@ -37,30 +37,6 @@
 ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
 ######### probably require gcc. 
 
-ifeq (,$(findstring $(shell uname -s),Darwin SunOS))
-  ifeq (,$(findstring $(PROC),x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
-    ifeq (,$(findstring $(shell uname -m),ppc ppc64 alpha armv4l s390))
-      OPTIMIZE+=-march=$(PROC)
-    endif
-  endif
-else
-  ifneq (,$(findstring $(OSARCH),Darwin))
-    ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
-      # Snow Leopard reports i386, even though it's really x86_64
-      OPTIMIZE+=-mtune=native
-    endif
-  endif
-endif
-
-#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
-#This works for even old (2.96) versions of gcc and provides a small boost either way.
-#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
-#So we go lowest common available by gcc and go a step down, still a step up from
-#the default as we now have a better instruction set to work with. - Belgarath
-ifeq ($(PROC),ultrasparc)
-OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3 
-endif
-
 PG =
 #PG = -g -pg
 ######### Profiling flags.  If you don't know what that means, leave it blank.
@@ -217,10 +193,12 @@
 ifeq ($(OSARCH),linux-gnu)
 ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
 ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
+ifneq ($(K6OPT),)
 GSM_SOURCES+= $(SRC)/k6opt.s
 endif
 endif
 endif
+endif
 
 TOAST_SOURCES = $(SRC)/toast.c 		\
 		$(SRC)/toast_lin.c	\
@@ -269,10 +247,12 @@
 ifeq ($(OSARCH),linux-gnu)
 ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
 ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
+ifneq ($(K6OPT),)
 GSM_OBJECTS+= $(SRC)/k6opt.o
 endif
 endif
 endif
+endif
 
 TOAST_OBJECTS =	$(SRC)/toast.o 		\
 		$(SRC)/toast_lin.o	\



1.1                  net-misc/asterisk/files/1.4.0/asterisk-1.4.0-uclibc.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk-1.4.0-uclibc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk-1.4.0-uclibc.patch?rev=1.1&content-type=text/plain

Index: asterisk-1.4.0-uclibc.patch
===================================================================
--- Makefile.old	2007-01-05 10:12:48 +0000
+++ Makefile	2007-01-05 10:21:52 +0000
@@ -216,6 +216,10 @@
   ASTCFLAGS+=-pthread
 endif
 
+ifeq ($(OSARCH),linux-uclibc)
+  AST_LIBS+=-lpthread -ldl
+endif
+
 ifeq ($(OSARCH),SunOS)
   ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
 endif



1.1                  net-misc/asterisk/files/1.4.0/func_devstate-r6.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/func_devstate-r6.c?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/func_devstate-r6.c?rev=1.1&content-type=text/plain

Index: func_devstate-r6.c
===================================================================
/*
 * Asterisk -- An open source telephony toolkit.
 *
 * Copyright (C) 2007, Digium, Inc.
 *
 * Russell Bryant <russell@××××××.com> 
 *
 * See http://www.asterisk.org for more information about
 * the Asterisk project. Please do not directly contact
 * any of the maintainers of this project for assistance;
 * the project provides a web site, mailing lists and IRC
 * channels for your use.
 *
 * This program is free software, distributed under the terms of
 * the GNU General Public License Version 2. See the LICENSE file
 * at the top of the source tree.
 */

/*! \file
 *
 * \brief Manually controlled blinky lights
 *
 * \author Russell Bryant <russell@××××××.com> 
 *
 * \ingroup functions
 *
 * \note Props go out to Ahrimanes in #asterisk for requesting this at 4:30 AM
 *       when I couldn't sleep.  :)
 */

#include "asterisk.h"

ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.1 $")

#include <stdlib.h>

#include "asterisk/module.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/utils.h"
#include "asterisk/linkedlists.h"
#include "asterisk/devicestate.h"
#include "asterisk/cli.h"
#include "asterisk/astdb.h"

static const char astdb_family[] = "CustomDevstate";

static const char *ast_devstate_str(int state)
{
	const char *res = "UNKNOWN";

	switch (state) {
	case AST_DEVICE_UNKNOWN:
		break;
	case AST_DEVICE_NOT_INUSE:
		res = "NOT_INUSE";
		break;
	case AST_DEVICE_INUSE:
		res = "INUSE";
		break;
	case AST_DEVICE_BUSY:
		res = "BUSY";
		break;
	case AST_DEVICE_INVALID:
		res = "INVALID";
		break;
	case AST_DEVICE_UNAVAILABLE:
		res = "UNAVAILABLE";
		break;
	case AST_DEVICE_RINGING:
		res = "RINGING";
		break;
	case AST_DEVICE_RINGINUSE:
		res = "RINGINUSE";
		break;
	case AST_DEVICE_ONHOLD:
		res = "ONHOLD";
		break;
	}

	return res;
}

static int ast_devstate_val(const char *val)
{
	if (!strcasecmp(val, "NOT_INUSE"))
		return AST_DEVICE_NOT_INUSE;
	else if (!strcasecmp(val, "INUSE"))
		return AST_DEVICE_INUSE;
	else if (!strcasecmp(val, "BUSY"))
		return AST_DEVICE_BUSY;
	else if (!strcasecmp(val, "INVALID"))
		return AST_DEVICE_INVALID;
	else if (!strcasecmp(val, "UNAVAILABLE"))
		return AST_DEVICE_UNAVAILABLE;
	else if (!strcasecmp(val, "RINGING"))
		return AST_DEVICE_RINGING;
	else if (!strcasecmp(val, "RINGINUSE"))
		return AST_DEVICE_RINGINUSE;
	else if (!strcasecmp(val, "ONHOLD"))
		return AST_DEVICE_ONHOLD;

	return AST_DEVICE_UNKNOWN;
}

static int devstate_read(struct ast_channel *chan, char *cmd, char *data, 
	char *buf, size_t len)
{
	ast_copy_string(buf, ast_devstate_str(ast_device_state(data)), len);

	return 0;
}

static int devstate_write(struct ast_channel *chan, char *function,
	char *data, const char *value)
{
	size_t len = strlen("Custom:");

	if (strncasecmp(data, "Custom:", len)) {
		ast_log(LOG_WARNING, "The DEVSTATE function can only be used to set 'Custom:' device state!\n");
		return -1;
	}
	data += len;
	if (ast_strlen_zero(data)) {
		ast_log(LOG_WARNING, "DEVSTATE function called with no custom device name!\n");
		return -1;
	}

	ast_db_put(astdb_family, data, (char *) value);

	ast_device_state_changed("Custom:%s", data);

	return 0;
}

static int custom_devstate_callback(const char *data)
{
	char buf[256] = "";

	ast_db_get(astdb_family, data, buf, sizeof(buf));

	return ast_devstate_val(buf);
}

static int cli_funcdevstate_list(int fd, int argc, char *argv[])
{
	struct ast_db_entry *db_entry, *db_tree;

	if (argc != 2)
		return RESULT_SHOWUSAGE;

	ast_cli(fd, "\n"
	        "---------------------------------------------------------------------\n"
	        "--- Custom Device States --------------------------------------------\n"
	        "---------------------------------------------------------------------\n"
	        "---\n");

	db_entry = db_tree = ast_db_gettree(astdb_family, NULL);
	for (; db_entry; db_entry = db_entry->next) {
		const char *dev_name = strrchr(db_entry->key, '/') + 1;
		if (dev_name <= (const char *) 1)
			continue;
		ast_cli(fd, "--- name: 'custom:%s'  state: '%s'\n"
		               "---\n", dev_name, db_entry->data);
	}
	ast_db_freetree(db_tree);
	db_tree = NULL;

	ast_cli(fd,
	        "---------------------------------------------------------------------\n"
	        "---------------------------------------------------------------------\n"
	        "\n");

	return RESULT_SUCCESS;
}

static struct ast_cli_entry cli_funcdevstate[] = {
	{ { "funcdevstate", "list", }, cli_funcdevstate_list, NULL, NULL },
};

static struct ast_custom_function devstate_function = {
	.name = "DEVSTATE",
	.synopsis = "Get or Set a device state",
	.syntax = "DEVSTATE(device)",
	.desc =
	"  The DEVSTATE function can be used to retrieve the device state from any\n"
	"device state provider.  For example:\n"
	"   NoOp(SIP/mypeer has state ${DEVSTATE(SIP/mypeer)})\n"
	"   NoOp(Conference number 1234 has state ${DEVSTATE(MeetMe:1234)})\n"
	"\n"
	"  The DEVSTATE function can also be used to set custom device state from\n"
	"the dialplan.  The \"Custom:\" prefix must be used.  For example:\n"
	"  Set(DEVSTATE(Custom:lamp1)=BUSY)\n"
	"  Set(DEVSTATE(Custom:lamp2)=NOT_INUSE)\n"
	"You can subscribe to the status of a custom device state using a hint in\n"
	"the dialplan:\n"
	"  exten => 1234,hint,Custom:lamp1\n"
	"\n"
	"  The possible values for both uses of this function are:\n"
	"UNKNOWN | NOT_INUSE | INUSE | BUSY | INVALID | UNAVAILABLE | RINGING\n"
	"RINGINUSE | ONHOLD\n",
	.read = devstate_read,
	.write = devstate_write,
};

static int unload_module(void)
{
	int res = 0;

	res |= ast_custom_function_unregister(&devstate_function);
	ast_devstate_prov_del("Custom");
	ast_cli_unregister_multiple(cli_funcdevstate, ARRAY_LEN(cli_funcdevstate));

	return res;
}

static int load_module(void)
{
	int res = 0;

	res |= ast_custom_function_register(&devstate_function);
	res |= ast_devstate_prov_add("Custom", custom_devstate_callback);
	ast_cli_register_multiple(cli_funcdevstate, ARRAY_LEN(cli_funcdevstate));

	return res;
}

AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Gets or sets a device state in the dialplan");



1.1                  net-misc/asterisk/files/1.4.0/asterisk-1.4.37-imap-libs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk-1.4.37-imap-libs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk-1.4.37-imap-libs.patch?rev=1.1&content-type=text/plain

Index: asterisk-1.4.37-imap-libs.patch
===================================================================
--- asterisk-1.4.37.orig/configure.ac	2010-09-10 01:13:45.000000000 +0100
+++ asterisk-1.4.37/configure.ac	2010-11-27 14:37:29.379718734 +0000
@@ -1032,7 +1032,7 @@
 		CPPFLAGS="${saved_cppflags}"
 		LIBS="${saved_libs}"
 		imap_ldflags=""
-		imap_libs="-lc-client"
+		imap_libs="-lc-client ${IMAP_LIBS}"
 		imap_include="-DUSE_SYSTEM_IMAP" #Try the imap directory first
 		CPPFLAGS="${CPPFLAGS} ${imap_include}"
 		LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`



1.1                  net-misc/asterisk/files/1.4.0/asterisk.logrotate

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk.logrotate?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk.logrotate?rev=1.1&content-type=text/plain

Index: asterisk.logrotate
===================================================================
/var/log/asterisk/messages /var/log/asterisk/queue_log {
	missingok
	notifempty

	postrotate
		/usr/sbin/asterisk -rnx "logger reload" || /bin/true
	endscript
}

/var/log/asterisk/debug /var/log/asterisk/full {
	missingok
	notifempty
	daily

	postrotate
		/usr/sbin/asterisk -rnx "logger reload" || /bin/true
	endscript
}

/var/log/asterisk/cdr-csv/*.csv /var/log/asterisk/cdr-custom/*.csv {
	missingok
	notifempty
	weekly
	rotate 52
}



1.1                  net-misc/asterisk/files/1.4.0/func_volume.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/func_volume.c?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/func_volume.c?rev=1.1&content-type=text/plain

Index: func_volume.c
===================================================================
/*
 * Asterisk -- An open source telephony toolkit.
 *
 * Copyright (C) 2007, Digium, Inc.
 *
 * Joshua Colp <jcolp@××××××.com> 
 *
 * See http://www.asterisk.org for more information about
 * the Asterisk project. Please do not directly contact
 * any of the maintainers of this project for assistance;
 * the project provides a web site, mailing lists and IRC
 * channels for your use.
 *
 * This program is free software, distributed under the terms of
 * the GNU General Public License Version 2. See the LICENSE file
 * at the top of the source tree.
 */

/*! \file
 *
 * \brief Technology independent volume control
 *
 * \author Joshua Colp <jcolp@××××××.com> 
 *
 * \ingroup functions
 *
 */

#include "asterisk.h"

ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.1 $")

#include "asterisk/module.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/utils.h"
#include "asterisk/audiohook.h"

struct volume_information {
	struct ast_audiohook audiohook;
	int tx_gain;
	int rx_gain;
};

static void destroy_callback(void *data)
{
	struct volume_information *vi = data;

	/* Destroy the audiohook, and destroy ourselves */
	ast_audiohook_destroy(&vi->audiohook);
	free(vi);

	return;
}

/*! \brief Static structure for datastore information */
static const struct ast_datastore_info volume_datastore = {
	.type = "volume",
	.destroy = destroy_callback
};

static int volume_callback(struct ast_audiohook *audiohook, struct ast_channel *chan, struct ast_frame *frame, enum ast_audiohook_direction direction)
{
	struct ast_datastore *datastore = NULL;
	struct volume_information *vi = NULL;
	int *gain = NULL;

	/* If the audiohook is stopping it means the channel is shutting down.... but we let the datastore destroy take care of it */
	if (audiohook->status == AST_AUDIOHOOK_STATUS_DONE)
		return 0;

	/* Grab datastore which contains our gain information */
	if (!(datastore = ast_channel_datastore_find(chan, &volume_datastore, NULL)))
		return 0;

	vi = datastore->data;

	/* If this is DTMF then allow them to increase/decrease the gains */
	if (frame->frametype == AST_FRAME_DTMF) {
		/* Only use DTMF coming from the source... not going to it */
		if (direction != AST_AUDIOHOOK_DIRECTION_READ)
			return 0;
		if (frame->subclass == '*') {
			vi->tx_gain += 1;
			vi->rx_gain += 1;
		} else if (frame->subclass == '#') {
			vi->tx_gain -= 1;
			vi->rx_gain -= 1;
		}
	} else if (frame->frametype == AST_FRAME_VOICE) {
		/* Based on direction of frame grab the gain, and confirm it is applicable */
		if (!(gain = (direction == AST_AUDIOHOOK_DIRECTION_READ) ? &vi->rx_gain : &vi->tx_gain) || !*gain)
			return 0;
		/* Apply gain to frame... easy as pi */
		ast_frame_adjust_volume(frame, *gain);
	}

	return 0;
}

static int volume_write(struct ast_channel *chan, char *cmd, char *data, const char *value)
{
	struct ast_datastore *datastore = NULL;
	struct volume_information *vi = NULL;
	int is_new = 0;

	if (!(datastore = ast_channel_datastore_find(chan, &volume_datastore, NULL))) {
		/* Allocate a new datastore to hold the reference to this volume and audiohook information */
		if (!(datastore = ast_channel_datastore_alloc(&volume_datastore, NULL)))
			return 0;
		if (!(vi = ast_calloc(1, sizeof(*vi)))) {
			ast_channel_datastore_free(datastore);
			return 0;
		}
		ast_audiohook_init(&vi->audiohook, AST_AUDIOHOOK_TYPE_MANIPULATE, "Volume");
		vi->audiohook.manipulate_callback = volume_callback;
		ast_set_flag(&vi->audiohook, AST_AUDIOHOOK_WANTS_DTMF);
		is_new = 1;
	} else {
		vi = datastore->data;
	}

	/* Adjust gain on volume information structure */
	if (!strcasecmp(data, "tx"))
		vi->tx_gain = atoi(value);
	else if (!strcasecmp(data, "rx"))
		vi->rx_gain = atoi(value);

	if (is_new) {
		datastore->data = vi;
		ast_channel_datastore_add(chan, datastore);
		ast_audiohook_attach(chan, &vi->audiohook);
	}

	return 0;
}

static struct ast_custom_function volume_function = {
	.name = "VOLUME",
	.synopsis = "Set the TX or RX volume of a channel",
	.syntax = "VOLUME(TX|RX)",
	.desc =
	"  The VOLUME function can be used to increase or decrease the tx or\n"
	"rx gain of any channel.  For example:\n"
	"  Set(VOLUME(TX)=3)\n"
	"  Set(VOLUME(RX)=2)\n",
	.write = volume_write,
};

static int unload_module(void)
{
	return ast_custom_function_unregister(&volume_function);
}

static int load_module(void)
{
	return ast_custom_function_register(&volume_function);
}

AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Technology independent volume control");



1.1                  net-misc/asterisk/files/1.4.0/asterisk.confd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk.confd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk.confd?rev=1.1&content-type=text/plain

Index: asterisk.confd
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk.confd,v 1.1 2010/12/01 17:54:28 chainsaw Exp $

#
# Additional options for asterisk
#
# see "asterisk -h" for a list of options
#
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"
#
#                  "" to run as user "root" and group "root"
#
ASTERISK_USER="asterisk"

#
# Nicelevel
#
# Set the priority of the asterisk process
#
# Value: (highest) -20..19 (lowest)
#
#ASTERISK_NICE="19"

#
# Wrapper script
#
# Value: yes or no/empty
#
ASTERISK_WRAPPER="no"

############# Wrapper script settings #############

#
# 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
#
#ASTERISK_NOTIFY_EMAIL="root"

#
# Send asterisk's output to this terminal
#
# Value: Full path to device node or a number
#
#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 or no/empty
#
ASTERISK_CONSOLE="no"

#
# Maximum size of core files. 
#
# Value: Size in bytes, unlimited for no limit or empty to disable.
# 
#ASTERISK_CORE_SIZE="unlimited"

#
# ASTERISK_CORE_DIR
#
# Value: Directory (will be created if non-existant), default is /tmp
#
ASTERISK_CORE_DIR="/var/lib/asterisk/coredump"

#
# Max number of filedescriptors
#
# Value: Number of descriptors
#
#ASTERISK_MAX_FD="1024"

#
# Kill these tasks after asterisk crashed (ASTERISK_WRAPPER=yes only!)
#
# Warning! This will kill _ALL_ tasks with the specified names!
#
# Value: Space separated list of names in double quotes (e.g. "mpg123 mad")
#
#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad"



1.1                  net-misc/asterisk/files/1.4.0/asterisk.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk.initd?rev=1.1&content-type=text/plain

Index: asterisk.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.4.0/asterisk.initd,v 1.1 2010/12/01 17:54:28 chainsaw Exp $

opts="${opts} forcestop reload"

depend() {
	need net
	use nscd dns dahdi mysql postgresql slapd capi
}

is_running() {
	if [ -z "`pidof asterisk`" ]; then
		return 1
	else
		PID="`cat /var/run/asterisk/asterisk.pid`"
		for x in `pidof asterisk`; do
			if [ "${x}" = "${PID}" ]; then
				return 0
			fi	
		done
	fi

	return 1
}

asterisk_run_loop() {
	logger -t asterisk_wrapper "Initializing asterisk wrapper"

	local OPTS ARGS MSG NICE=""
	local result=0 signal=0

	# default options
	OPTS="-f"  # don't fork / detach breaks wrapper script...

	# filter (redundant) arguments
	ARGS="`echo "${@}" | sed -e "s:-c\|-f::g"`"

	# mangle yes/no options
	ASTERISK_CONSOLE="`echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]'`"

	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
			mkdir -m750 -p "${ASTERISK_CORE_DIR}"

			if [ -n "${ASTERISK_USER}" ]; then
				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
			fi
		fi
		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"

		cd "${ASTERISK_CORE_DIR}"
		echo "   Core dump size            : ${ASTERISK_CORE_SIZE}"
		echo "   Core dump location        : ${ASTERISK_CORE_DIR}"
	fi

	if [ -n "${ASTERISK_MAX_FD}" ]; then
		ulimit -n ${ASTERISK_MAX_FD}
		echo "   Max open filedescriptors  : ${ASTERISK_MAX_FD}"
	fi

	if [ -n "${ASTERISK_NICE}" ]; then
		echo "   Nice level                : ${ASTERISK_NICE}"
		NICE="nice -n ${ASTERISK_NICE} --"
	fi

	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
		if [ -x /usr/sbin/sendmail ]; then
			echo "   Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
		else
			echo "   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}" ] && \
			echo "   Messages are sent to      : ${TTY}"
	fi

	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
		echo "   Starting Asterisk console : ${ASTERISK_CONSOLE}"
		OPTS="${OPTS} -c"
	fi

	OPTS="${OPTS} ${ARGS}"

	trap "rm /var/run/asterisk/wrapper_loop.pid" EXIT
	cut -f4 -d' ' < /proc/self/stat > /var/run/asterisk/wrapper_loop.pid

	while :; do
		if [ -n "${TTY}" ]; then
			/usr/bin/stty -F ${TTY} sane
			${NICE} /usr/sbin/asterisk ${OPTS} >${TTY} 2>&1 <${TTY}
			result=$?
		else
			set -o pipefail
			${NICE} /usr/sbin/asterisk ${OPTS} 2>&1 >/dev/null | logger -t asterisk_wrapper
			result=$?
			set +o pipefail
		fi		

		if [ $result -eq 0 ]; then
			logger -t asterisk_wrapper "Asterisk terminated normally"
			break
		else
			if [ $result -gt 128 ]; then
				signal=`expr $signal - 128`
				MSG="Asterisk terminated with Signal: $signal"

				CORE_TARGET="core-`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} \
			|| logger -t asterisk_wrapper  "${MSG}"


		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
		   [ -x /usr/sbin/sendmail ]; then
			echo -e -n "Subject: Asterisk crashed\n\r${MSG}\n\r" |\
				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
		fi
		sleep 5
		logger -t asterisk_wrapper "Restarting Asterisk..."
	done
	return 0
}

start() {
	local OPTS USER GROUP PID
	local tmp x

	if [ -n "${ASTERISK_NICE}" ]; then
		if [ ${ASTERISK_NICE} -ge -20 ] && \
		   [ ${ASTERISK_NICE} -le  19 ]; then 
			OPTS="--nicelevel ${ASTERISK_NICE}"
		else
			eerror "Nice value must be between -20 and 19"
			return 1
		fi
	fi

	if [ -n "${ASTERISK_USER}" ]; then
		USER=`echo $ASTERISK_USER | sed 's/:.*//'`
		GROUP=`echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }'`
		if [ -n "${USER}" ]; then
			ASTERISK_OPTS="${ASTERISK_OPTS} -U ${USER}"
		fi
		if [ -n "${GROUP}" ]; then
			ASTERISK_OPTS="${ASTERISK_OPTS} -G ${GROUP}"
			GROUP=":${GROUP}"	# make it look nice...
		fi
		for element in `find /var/{log,run}/asterisk`; do
			if [ `stat -c %U $element` != "${USER}" ]; then
 				ewarn "${USER} is not the owner of $element, fixing."
				chown -R ${USER} /var/{log,run}/asterisk
				chmod -R u+r /var/{log,run}/asterisk
				chmod u+x /var/{log,run}/asterisk
			fi;
		done;
		ebegin "Starting asterisk PBX (as ${USER}${GROUP})"
	else
		ebegin "Starting asterisk PBX (as root)"
	fi

	if [ "`echo ${ASTERISK_WRAPPER} | tr '[:upper:]' '[:lower:]'`" != "yes" ]; then
		start-stop-daemon --start --exec /usr/sbin/asterisk \
			${OPTS} -- ${ASTERISK_OPTS}
		result=$?
	else
		asterisk_run_loop ${ASTERISK_OPTS} 2>/dev/null &
		result=$?
	fi

	if [ $result -eq 0 ]; then
		# 2 seconds should be enough for asterisk to start
		sleep 2 
		is_running
		result=$?
	fi

	eend $result
}

forcestop() {
	ebegin "Stopping asterisk PBX"
	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
	eend $?
}

stop() {
	if ! is_running; then
		eerror "Asterisk is not running!"
		return 0
	fi

	if [ -r /var/run/asterisk/wrapper_loop.pid ]; then
		ebegin "Killing wrapper script"
		kill `cat /var/run/asterisk/wrapper_loop.pid`
		eend $?
	fi

	ebegin "Stopping asterisk PBX gracefully"
	/usr/sbin/asterisk -r -x "stop gracefully" &>/dev/null
	# Now we have to wait until asterisk has _really_ stopped.
	sleep 1
	if is_running; then
		einfon "Waiting for asterisk to shutdown ."
		local cnt=0
		while is_running; do
			cnt=`expr $cnt + 1`
			if [ $cnt -gt 60 ] ; then
				# Waited 120 seconds now. Fail.
				echo
				eend 1 "Failed."
				return
			fi
			sleep 2
			echo -n "."
		done
		echo
	fi
	eend 0
}

reload() {
	if is_running; then
		ebegin "Forcing asterisk to reload configuration"
		/usr/sbin/asterisk -r -x "reload" &>/dev/null
		eend $?
	else
		eerror "Asterisk is not running!"
	fi
}