# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1348266236 -7200
# Node ID 1b957bfaea122815c00969945e566c8937b4e26a
# Parent  005bcc1c949bce5190300a78c3eff86744c566f8
Further refine MySQL research induced sloppy patch changes.

diff -r 005bcc1c949b -r 1b957bfaea12 opensips/opensips.patch.ctlrc
--- a/opensips/opensips.patch.ctlrc	Sat Sep 22 00:05:30 2012 +0200
+++ b/opensips/opensips.patch.ctlrc	Sat Sep 22 00:23:56 2012 +0200
@@ -2,7 +2,7 @@
 diff -Nau scripts/opensipsctlrc.orig scripts/opensipsctlrc
 --- scripts/opensipsctlrc.orig	2011-08-24 10:12:07.000000000 +0200
 +++ scripts/opensipsctlrc	2012-03-22 19:04:38.092856433 +0100
-@@ -1,22 +1,19 @@
+@@ -1,13 +1,9 @@
 -# $Id: opensipsctlrc 9049 2012-05-24 14:03:31Z osas $
 -#
 -# The OpenSIPS configuration file for the control tools.
@@ -20,22 +20,17 @@
  
  ## chrooted directory
  # $CHROOT_DIR="/path/to/chrooted/directory"
+@@ -18,6 +14,9 @@
+ # this parameter.
+ # DBENGINE=MYSQL
  
--## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT, 
--## by default none is loaded
--# If you want to setup a database with opensipsdbctl, you must at least specify
--# this parameter.
--# DBENGINE=MYSQL
-+## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT;
-+## by default none is loaded. Use opensipsdbctl to setup a database.
-+DBENGINE=DBTEXT
-+
 +## Path to MySQL client
 +MYSQL=@l_prefix@/bin/mysql
- 
++
  ## database host
  # DBHOST=localhost
-@@ -25,16 +22,22 @@
+ 
+@@ -25,16 +24,22 @@
  # DBNAME=opensips
  
  # database path used by dbtext or db_berkeley
@@ -62,7 +57,7 @@
  
  # user name column
  # USERCOL="username"
-@@ -43,7 +46,7 @@
+@@ -43,7 +48,7 @@
  # SQL definitions
  # If you change this definitions here, then you must change them 
  # in db/schema/entities.xml too.
@@ -71,7 +66,7 @@
  
  # FOREVER="2020-05-28 21:32:15"
  # DEFAULT_ALIASES_EXPIRES=$FOREVER
-@@ -97,13 +100,16 @@
+@@ -97,13 +102,16 @@
  
  ## control engine: FIFO or UNIXSOCK
  ## - default FIFO
@@ -91,7 +86,7 @@
  # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock
  # MI_CONNECTOR=UDP:192.168.2.133:8000
  # MI_CONNECTOR=XMLRPC:192.168.2.133:8000
-@@ -120,15 +126,16 @@
+@@ -120,15 +128,16 @@
  
  ## do (1) or don't (0) store plaintext passwords
  ## in the subscriber table - default '1'
@@ -115,7 +110,7 @@
 diff -Nau scripts/osipsconsolerc.orig scripts/osipsconsolerc
 --- scripts/osipsconsolerc.orig	2011-07-12 18:42:53.000000000 +0200
 +++ scripts/osipsconsolerc	2012-03-22 19:04:45.670384106 +0100
-@@ -1,51 +1,55 @@
+@@ -1,51 +1,56 @@
 -# $Id: osicpsconsolerc 
 -#
 -# The OpenSIPS configuration file for the control tools.
@@ -130,18 +125,15 @@
  ## your SIP domain
 -# SIP_DOMAIN=opensips.org
 +# SIP_DOMAIN=name.host.tld
-+
-+## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT;
-+## by default none is loaded. Use opensipsdbctl to setup a database.
-+DBENGINE=DBTEXT
  
--## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT, by default none is loaded
--# If you want to setup a database with opensipsdbctl, you must at least specify
--# this parameter.
--# DBENGINE=MYSQL
+ ## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT, by default none is loaded
+ # If you want to setup a database with opensipsdbctl, you must at least specify
+ # this parameter.
+ # DBENGINE=MYSQL
+ 
 +## Path to MySQL client
 +MYSQL=@l_prefix@/bin/mysql
- 
++
  ## database host
  # DBHOST=localhost
  
@@ -194,7 +186,7 @@
  
  
  # Describe what additional tables to install. Valid values for the variables
-@@ -54,14 +58,15 @@
+@@ -54,14 +59,15 @@
  #
  
  # Define what module tables should be installed.
@@ -216,7 +208,7 @@
  
  # opensips extra modules
  # EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist"
-@@ -69,10 +74,10 @@
+@@ -69,10 +75,10 @@
  
  ## type of aliases used: DB - database aliases; UL - usrloc aliases
  ## - default: none
@@ -229,7 +221,7 @@
  # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock
  # MI_CONNECTOR=UDP:192.168.2.133:8000
  # MI_CONNECTOR=XMLRPC:192.168.2.133:8000
-@@ -80,22 +85,18 @@
+@@ -80,22 +86,18 @@
  ## check ACL names; default on (1); off (0)
  # VERIFY_ACL=1