Sat, 22 Sep 2012 00:23:56 +0200
Further refine MySQL research induced sloppy patch changes.
opensips/opensips.patch.ctlrc | file | annotate | diff | comparison | revisions |
1.1 --- a/opensips/opensips.patch.ctlrc Sat Sep 22 00:05:30 2012 +0200 1.2 +++ b/opensips/opensips.patch.ctlrc Sat Sep 22 00:23:56 2012 +0200 1.3 @@ -2,7 +2,7 @@ 1.4 diff -Nau scripts/opensipsctlrc.orig scripts/opensipsctlrc 1.5 --- scripts/opensipsctlrc.orig 2011-08-24 10:12:07.000000000 +0200 1.6 +++ scripts/opensipsctlrc 2012-03-22 19:04:38.092856433 +0100 1.7 -@@ -1,22 +1,19 @@ 1.8 +@@ -1,13 +1,9 @@ 1.9 -# $Id: opensipsctlrc 9049 2012-05-24 14:03:31Z osas $ 1.10 -# 1.11 -# The OpenSIPS configuration file for the control tools. 1.12 @@ -20,22 +20,17 @@ 1.13 1.14 ## chrooted directory 1.15 # $CHROOT_DIR="/path/to/chrooted/directory" 1.16 +@@ -18,6 +14,9 @@ 1.17 + # this parameter. 1.18 + # DBENGINE=MYSQL 1.19 1.20 --## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT, 1.21 --## by default none is loaded 1.22 --# If you want to setup a database with opensipsdbctl, you must at least specify 1.23 --# this parameter. 1.24 --# DBENGINE=MYSQL 1.25 -+## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT; 1.26 -+## by default none is loaded. Use opensipsdbctl to setup a database. 1.27 -+DBENGINE=DBTEXT 1.28 -+ 1.29 +## Path to MySQL client 1.30 +MYSQL=@l_prefix@/bin/mysql 1.31 - 1.32 ++ 1.33 ## database host 1.34 # DBHOST=localhost 1.35 -@@ -25,16 +22,22 @@ 1.36 + 1.37 +@@ -25,16 +24,22 @@ 1.38 # DBNAME=opensips 1.39 1.40 # database path used by dbtext or db_berkeley 1.41 @@ -62,7 +57,7 @@ 1.42 1.43 # user name column 1.44 # USERCOL="username" 1.45 -@@ -43,7 +46,7 @@ 1.46 +@@ -43,7 +48,7 @@ 1.47 # SQL definitions 1.48 # If you change this definitions here, then you must change them 1.49 # in db/schema/entities.xml too. 1.50 @@ -71,7 +66,7 @@ 1.51 1.52 # FOREVER="2020-05-28 21:32:15" 1.53 # DEFAULT_ALIASES_EXPIRES=$FOREVER 1.54 -@@ -97,13 +100,16 @@ 1.55 +@@ -97,13 +102,16 @@ 1.56 1.57 ## control engine: FIFO or UNIXSOCK 1.58 ## - default FIFO 1.59 @@ -91,7 +86,7 @@ 1.60 # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock 1.61 # MI_CONNECTOR=UDP:192.168.2.133:8000 1.62 # MI_CONNECTOR=XMLRPC:192.168.2.133:8000 1.63 -@@ -120,15 +126,16 @@ 1.64 +@@ -120,15 +128,16 @@ 1.65 1.66 ## do (1) or don't (0) store plaintext passwords 1.67 ## in the subscriber table - default '1' 1.68 @@ -115,7 +110,7 @@ 1.69 diff -Nau scripts/osipsconsolerc.orig scripts/osipsconsolerc 1.70 --- scripts/osipsconsolerc.orig 2011-07-12 18:42:53.000000000 +0200 1.71 +++ scripts/osipsconsolerc 2012-03-22 19:04:45.670384106 +0100 1.72 -@@ -1,51 +1,55 @@ 1.73 +@@ -1,51 +1,56 @@ 1.74 -# $Id: osicpsconsolerc 1.75 -# 1.76 -# The OpenSIPS configuration file for the control tools. 1.77 @@ -130,18 +125,15 @@ 1.78 ## your SIP domain 1.79 -# SIP_DOMAIN=opensips.org 1.80 +# SIP_DOMAIN=name.host.tld 1.81 -+ 1.82 -+## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT; 1.83 -+## by default none is loaded. Use opensipsdbctl to setup a database. 1.84 -+DBENGINE=DBTEXT 1.85 1.86 --## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT, by default none is loaded 1.87 --# If you want to setup a database with opensipsdbctl, you must at least specify 1.88 --# this parameter. 1.89 --# DBENGINE=MYSQL 1.90 + ## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT, by default none is loaded 1.91 + # If you want to setup a database with opensipsdbctl, you must at least specify 1.92 + # this parameter. 1.93 + # DBENGINE=MYSQL 1.94 + 1.95 +## Path to MySQL client 1.96 +MYSQL=@l_prefix@/bin/mysql 1.97 - 1.98 ++ 1.99 ## database host 1.100 # DBHOST=localhost 1.101 1.102 @@ -194,7 +186,7 @@ 1.103 1.104 1.105 # Describe what additional tables to install. Valid values for the variables 1.106 -@@ -54,14 +58,15 @@ 1.107 +@@ -54,14 +59,15 @@ 1.108 # 1.109 1.110 # Define what module tables should be installed. 1.111 @@ -216,7 +208,7 @@ 1.112 1.113 # opensips extra modules 1.114 # EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist" 1.115 -@@ -69,10 +74,10 @@ 1.116 +@@ -69,10 +75,10 @@ 1.117 1.118 ## type of aliases used: DB - database aliases; UL - usrloc aliases 1.119 ## - default: none 1.120 @@ -229,7 +221,7 @@ 1.121 # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock 1.122 # MI_CONNECTOR=UDP:192.168.2.133:8000 1.123 # MI_CONNECTOR=XMLRPC:192.168.2.133:8000 1.124 -@@ -80,22 +85,18 @@ 1.125 +@@ -80,22 +86,18 @@ 1.126 ## check ACL names; default on (1); off (0) 1.127 # VERIFY_ACL=1 1.128