OpenPKG Specs / changeset

     1.1 --- a/opensips/opensips.patch.ctlrc	Fri Sep 21 22:47:25 2012 +0200
     1.2 +++ b/opensips/opensips.patch.ctlrc	Sat Sep 22 00:05:30 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,16 @@
     1.8 +@@ -1,22 +1,19 @@
     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 @@ -29,10 +29,13 @@
    1.13  +## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT;
    1.14  +## by default none is loaded. Use opensipsdbctl to setup a database.
    1.15  +DBENGINE=DBTEXT
    1.16 ++
    1.17 ++## Path to MySQL client
    1.18 ++MYSQL=@l_prefix@/bin/mysql
    1.19   
    1.20   ## database host
    1.21   # DBHOST=localhost
    1.22 -@@ -25,16 +19,22 @@
    1.23 +@@ -25,16 +22,22 @@
    1.24   # DBNAME=opensips
    1.25   
    1.26   # database path used by dbtext or db_berkeley
    1.27 @@ -59,7 +62,7 @@
    1.28   
    1.29   # user name column
    1.30   # USERCOL="username"
    1.31 -@@ -43,7 +43,7 @@
    1.32 +@@ -43,7 +46,7 @@
    1.33   # SQL definitions
    1.34   # If you change this definitions here, then you must change them 
    1.35   # in db/schema/entities.xml too.
    1.36 @@ -68,7 +71,7 @@
    1.37   
    1.38   # FOREVER="2020-05-28 21:32:15"
    1.39   # DEFAULT_ALIASES_EXPIRES=$FOREVER
    1.40 -@@ -97,13 +97,16 @@
    1.41 +@@ -97,13 +100,16 @@
    1.42   
    1.43   ## control engine: FIFO or UNIXSOCK
    1.44   ## - default FIFO
    1.45 @@ -88,7 +91,7 @@
    1.46   # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock
    1.47   # MI_CONNECTOR=UDP:192.168.2.133:8000
    1.48   # MI_CONNECTOR=XMLRPC:192.168.2.133:8000
    1.49 -@@ -120,15 +123,16 @@
    1.50 +@@ -120,15 +126,16 @@
    1.51   
    1.52   ## do (1) or don't (0) store plaintext passwords
    1.53   ## in the subscriber table - default '1'
    1.54 @@ -112,7 +115,7 @@
    1.55  diff -Nau scripts/osipsconsolerc.orig scripts/osipsconsolerc
    1.56  --- scripts/osipsconsolerc.orig	2011-07-12 18:42:53.000000000 +0200
    1.57  +++ scripts/osipsconsolerc	2012-03-22 19:04:45.670384106 +0100
    1.58 -@@ -1,51 +1,52 @@
    1.59 +@@ -1,51 +1,55 @@
    1.60  -# $Id: osicpsconsolerc 
    1.61  -#
    1.62  -# The OpenSIPS configuration file for the control tools.
    1.63 @@ -127,14 +130,17 @@
    1.64   ## your SIP domain
    1.65  -# SIP_DOMAIN=opensips.org
    1.66  +# SIP_DOMAIN=name.host.tld
    1.67 ++
    1.68 ++## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT;
    1.69 ++## by default none is loaded. Use opensipsdbctl to setup a database.
    1.70 ++DBENGINE=DBTEXT
    1.71   
    1.72  -## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT, by default none is loaded
    1.73  -# If you want to setup a database with opensipsdbctl, you must at least specify
    1.74  -# this parameter.
    1.75  -# DBENGINE=MYSQL
    1.76 -+## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT;
    1.77 -+## by default none is loaded. Use opensipsdbctl to setup a database.
    1.78 -+DBENGINE=DBTEXT
    1.79 ++## Path to MySQL client
    1.80 ++MYSQL=@l_prefix@/bin/mysql
    1.81   
    1.82   ## database host
    1.83   # DBHOST=localhost
    1.84 @@ -188,7 +194,7 @@
    1.85   
    1.86   
    1.87   # Describe what additional tables to install. Valid values for the variables
    1.88 -@@ -54,14 +55,15 @@
    1.89 +@@ -54,14 +58,15 @@
    1.90   #
    1.91   
    1.92   # Define what module tables should be installed.
    1.93 @@ -210,7 +216,7 @@
    1.94   
    1.95   # opensips extra modules
    1.96   # EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist"
    1.97 -@@ -69,10 +71,10 @@
    1.98 +@@ -69,10 +74,10 @@
    1.99   
   1.100   ## type of aliases used: DB - database aliases; UL - usrloc aliases
   1.101   ## - default: none
   1.102 @@ -223,7 +229,7 @@
   1.103   # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock
   1.104   # MI_CONNECTOR=UDP:192.168.2.133:8000
   1.105   # MI_CONNECTOR=XMLRPC:192.168.2.133:8000
   1.106 -@@ -80,22 +82,18 @@
   1.107 +@@ -80,22 +85,18 @@
   1.108   ## check ACL names; default on (1); off (0)
   1.109   # VERIFY_ACL=1
   1.110   

     2.1 --- a/opensips/opensips.spec	Fri Sep 21 22:47:25 2012 +0200
     2.2 +++ b/opensips/opensips.spec	Sat Sep 22 00:05:30 2012 +0200
     2.3 @@ -119,15 +119,15 @@
     2.4  %endif
     2.5  %if "%{with_mysql}" == "yes"
     2.6  BuildPreReq:  mysql
     2.7 -PreReq:       mysql
     2.8 +PreReq:       mysql, perl-dbi::with_mysql
     2.9  %endif
    2.10  %if "%{with_pgsql}" == "yes"
    2.11  BuildPreReq:  postgresql
    2.12 -PreReq:       postgresql
    2.13 +PreReq:       postgresql, perl-dbi::with_pgsql
    2.14  %endif
    2.15  %if "%{with_odbc}" == "yes"
    2.16  BuildPreReq:  unixodbc
    2.17 -PreReq:       unixodbc
    2.18 +PreReq:       unixodbc, perl-dbi::with_odbc
    2.19  %endif
    2.20  %if "%{with_geoip}" == "yes"
    2.21  BuildPreReq:  geoip