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

kamailio-4.1.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:26:07 +02:00
parent 2546eadb49
commit bfa186b58d
2 changed files with 83 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

82
net/kamailio-4.1.x/patches/050-fix-kamailio-utils.patch Normal file
View file

@ -0,0 +1,82 @@
diff -rupN kamailio4-4.1.4/utils/kamctl/kamctl kamailio4-new/utils/kamctl/kamctl
--- kamailio4-4.1.4/utils/kamctl/kamctl 2014-06-12 16:17:28.000000000 +0200
+++ kamailio4-new/utils/kamctl/kamctl 2014-08-07 16:35:34.858892154 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# $Id$
#
diff -rupN kamailio4-4.1.4/utils/kamctl/kamctlrc kamailio4-new/utils/kamctl/kamctlrc
--- kamailio4-4.1.4/utils/kamctl/kamctlrc 2014-06-12 16:17:28.000000000 +0200
+++ kamailio4-new/utils/kamctl/kamctlrc 2014-08-07 16:42:44.190909497 +0200
@@ -145,3 +145,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 kamailio4-4.1.4/utils/kamctl/kamdbctl kamailio4-new/utils/kamctl/kamdbctl
--- kamailio4-4.1.4/utils/kamctl/kamdbctl 2014-06-12 16:17:28.000000000 +0200
+++ kamailio4-new/utils/kamctl/kamdbctl 2014-08-07 16:35:42.986892483 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# $Id$
#
diff -rupN kamailio4-4.1.4/utils/kamctl/kamdbctl.base kamailio4-new/utils/kamctl/kamdbctl.base
--- kamailio4-4.1.4/utils/kamctl/kamdbctl.base 2014-06-12 16:17:28.000000000 +0200
+++ kamailio4-new/utils/kamctl/kamdbctl.base 2014-08-07 16:37:25.962896642 +0200
@@ -33,18 +33,18 @@ INSTALL_DBUID_TABLES=${INSTALL_DBUID_TAB
# 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 location_attrs re_grp trusted address missed_calls
- usr_preferences aliases silo dialog dialog_vars dispatcher dialplan
+STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs \
+ grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber \
+ location location_attrs re_grp trusted address missed_calls \
+ usr_preferences aliases silo dialog dialog_vars dispatcher dialplan \
acc_cdrs}
-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
+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 \
sca_subscriptions mohqcalls mohqueues rtpproxy}
-PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap
+PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap \
pua rls_presentity rls_watchers}
-DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs
+DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs \
uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs}
# SQL definitions
@@ -74,17 +74,17 @@ 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
+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}
PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls}
-EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
- userblacklist htable purple uac pipelimit mtree sca mohqueue
+EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute \
+ userblacklist htable purple uac pipelimit mtree sca mohqueue \
rtpproxy}
-DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags
+DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags \
uid_uri_db}
############################################################