Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kamailio-3.3.x: fix kamailio-utils

Browse source 
Bash shebang is changed to sh. Kamailio utils are modified to be compatible
with ash. Shell colouring is disabled in this change.

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
This commit is contained in:
Jiri Slachta 2014-08-07 17:22:10 +02:00
parent 475d996ab5
commit 2546eadb49
2 changed files with 69 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/kamailio-3.3.x/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=kamailio3
PKG_VERSION:=3.3.7
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz

68
net/kamailio-3.3.x/patches/050-fix-kamailio-utils.patch Normal file
View file

@ -0,0 +1,68 @@
diff -rupN kamailio3-3.3.7/utils/kamctl/kamctl kamailio3-new/utils/kamctl/kamctl
--- kamailio3-3.3.7/utils/kamctl/kamctl 2014-03-06 16:30:33.000000000 +0100
+++ kamailio3-new/utils/kamctl/kamctl 2014-08-07 17:01:21.806954644 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# $Id$
#
diff -rupN kamailio3-3.3.7/utils/kamctl/kamctlrc kamailio3-new/utils/kamctl/kamctlrc
--- kamailio3-3.3.7/utils/kamctl/kamctlrc 2014-03-06 16:30:33.000000000 +0100
+++ kamailio3-new/utils/kamctl/kamctlrc 2014-08-07 17:00:58.446953700 +0200
@@ -142,3 +142,6 @@
## Extra start options - default is: not set
# example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64"
# STARTOPTIONS=
+
+#Disable colour printing in terminal
+NOHLPRINT=1
diff -rupN kamailio3-3.3.7/utils/kamctl/kamdbctl kamailio3-new/utils/kamctl/kamdbctl
--- kamailio3-3.3.7/utils/kamctl/kamdbctl 2014-03-06 16:30:33.000000000 +0100
+++ kamailio3-new/utils/kamctl/kamdbctl 2014-08-07 17:01:15.494954389 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# $Id$
#
diff -rupN kamailio3-3.3.7/utils/kamctl/kamdbctl.base kamailio3-new/utils/kamctl/kamdbctl.base
--- kamailio3-3.3.7/utils/kamctl/kamdbctl.base 2014-03-06 16:30:33.000000000 +0100
+++ kamailio3-new/utils/kamctl/kamdbctl.base 2014-08-07 16:59:44.870950728 +0200
@@ -32,14 +32,14 @@ INSTALL_PRESENCE_TABLES=${INSTALL_PRESEN
# Used by dbtext and db_berkeley to define tables to be created, used by
# postgres to do the grants
-STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs grp
- uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber
- location re_grp trusted address missed_calls usr_preferences
+STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs grp \
+ uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber \
+ location re_grp trusted address missed_calls usr_preferences \
aliases silo dialog dialog_vars dispatcher dialplan}
-EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy
- carrierroute carrier_name domain_name carrierfailureroute userblacklist
+EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy \
+ carrierroute carrier_name domain_name carrierfailureroute userblacklist \
globalblacklist htable purplemap uacreg pl_pipes mtree mtrees}
-PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap
+PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap \
pua rls_presentity rls_watchers}
# SQL definitions
@@ -62,11 +62,11 @@ GREP=${GREP:-grep}
SED=${SED:-sed}
# define what modules should be installed
-STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions
- registrar usrloc msilo alias_db uri_db
- speeddial avpops auth_db pdt dialog dispatcher
+STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions \
+ registrar usrloc msilo alias_db uri_db \
+ speeddial avpops auth_db pdt dialog dispatcher \
dialplan}
-EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
+EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute \
userblacklist htable purple uac pipelimit mtree}
############################################################