main/kamailio: fix default paths for ctl and fifo

also remove ctl module option from default config
it is not loaded by default

3 files changed, 70 insertions, 28 deletions

diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 714ed357c5..3cdfb5e4f8 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -13,7 +13,7 @@ _gittag=HEAD
 
 
 pkgver=4.2.3
-pkgrel=3
+pkgrel=4
 [ -z "${_gitcommit}" ] && _suffix="_src" || _suffix="-${_gitcommit}"
 
 pkgdesc="Open Source SIP Server"
@@ -496,25 +496,25 @@ bad1ac2d4c95043df271d2ea6d37627a  kamailio-4.2-backslash.patch
 4685288dc54680597b00f956dc95d4d6  0001-musl-fixes.patch
 5b7ecf5c4ae06420c028e03721cb9e89  kamailio-4.2-ipops-srv-query.patch
 7df723eb9e14df28adfff8643d99a1a9  DMQ-multi-notify.patch
-5514374d04e040923c1ba9c5fa42978d  default_ctl.patch
+841fa62c432c5d8aeb57ad70d2ec3030  default_ctl.patch
 d0052e6054884b9cec955af4480c7c85  kamctl_build.patch
-24560d64302805abb82737259e28c75f  kamailio.cfg
+299706d97e30a4f0d9b4c873df422866  kamailio.cfg
 0e0a271fd3ddb7e87c01c26c7d041d59  kamailio.initd"
 sha256sums="7dbbca4a515778d3e903380adcc49f727ddc4853238cb905e14c811a5671ed80  kamailio-4.2.3_src.tar.gz
 d7e59be721ed0ad4621d404493b9a519708d801e9d4914b0164b819fa1abcd13  kamailio-4.2-backslash.patch
 b98555ff304b51b82c6cf7e01d757b15ea4f05bd2e603c84d4384df6a6be62b6  0001-musl-fixes.patch
 cfe645fc80eaed8a9e4bd56047f75555b2a9e3edcb3e2b6c6cece1547ab0a574  kamailio-4.2-ipops-srv-query.patch
 384eeaa5b253228341dc7a74ec61314db4b8f2f1c9c2f3bdf9ba189d2d56911d  DMQ-multi-notify.patch
-386bde333069cee161d2ee3e77b6546afd07e5061e2ef6a5a116076b2cff10a9  default_ctl.patch
+755efa4ad126c672bc67c53268260b57f7da1f454cdc1a1601778ed7c7d5f0e5  default_ctl.patch
 e00eefed792acbc1ee6eca8fa7389f9973bd53b68fa7abc573f19f1ff26812a1  kamctl_build.patch
-c7398dbe461bcac2bbb00d70cb0c2265b84527e4f0e436bc1a9dc3bad9874c9a  kamailio.cfg
+8b742ff710ef67ff59ec07a260690ebcdda24fb6f0b7b64dc50433a1bacf99f2  kamailio.cfg
 a90d3ab09a3ed58892e94710a1f80492a61ffad1ccf7ccb5b851bb8f538d32c4  kamailio.initd"
 sha512sums="2f42499fe84eefac236fe3d4aa3c7bc424944236f00b95a7071feaa816b3df5764f84076d57b2137908dab7ff06a2440cc7a53a799216befd9511f8718a2eee5  kamailio-4.2.3_src.tar.gz
 a9bb1e8f9f373264b8351ddae099a36a46ddd46fdec09e468d297ba4f64bb4896e7d6e599da70a424e8a28695ab3f3b4ac940afab534593a6b9d08ae462f001a  kamailio-4.2-backslash.patch
 dea7ef2ccf01357576045ba375d41301e2447b4454324007c7ca1862322835c57045852017192ca5434b32dd1b7a2e9669209b7111889dab335b74f042d0f11f  0001-musl-fixes.patch
 3a9bb5d05b4628f6146b824b8916db259f1da51415398ba420900311d73986d21cab653079080c0e8c55ef512909f542279ca7da944b5ef14520331584ca958f  kamailio-4.2-ipops-srv-query.patch
 7ddf6444c15f7338e7aab779ea5b75f4fd936b51cf5d9ba0d09e813566e527f74e59e100661d2b27db99e5fa042614c83e8145e999a8b6bfcfab71c9595bb626  DMQ-multi-notify.patch
-ab7e33e393a23f4d286a7f6e0f80afc8b71265f242bc2f4308f6bc9a219d5b1b792e5ced359118f18f24d82a8d80f8a2fd210ef65683be8233bd33a2870d7a8a  default_ctl.patch
+2321d8afe29b53057ce21e0552dfb80fd6a0e7dc0caf3c4798a8b253518f4c8c546797302933373f4b055a4531329a36ee2d7117b0a88fe39cf153bfef91a656  default_ctl.patch
 4c2c9bde3a4c44feca2863bb03cb031aa55e1c3df21dc7c0acb3a392c34cb36d9a132bcbdf451a0624f8ec202152f1cf238c89280c32f1c04312ce80427a18c6  kamctl_build.patch
-108efb81c4b387bb547eb569e0c1d6be6d4c28b19b882ba8a5eb70b92dd0b6df371671293943ea45880e13da3adaa1d36187d5a71f32dac867fdc180bcf8cfc6  kamailio.cfg
+c1abf69b48847dc8c7ab0d11ef9adb531aa4635f9d44db6933981edc5a47df374664fb24867b19aa64abbcc9777bf1cd0360d9aea54e27b081065928c61e0f0b  kamailio.cfg
 5ddaa059cdef10462c904f061f7bb085e62ad7501e2ed41f797d9e68822bce4e0e5ca09c1586c3901c920f8ce563c8c3ede860752c2b9bdb8f09908388ef337f  kamailio.initd"
diff --git a/main/kamailio/default_ctl.patch b/main/kamailio/default_ctl.patch
index c702911a70..c33e160490 100644
--- a/main/kamailio/default_ctl.patch
+++ b/main/kamailio/default_ctl.patch
@@ -1,42 +1,51 @@
-Description: change default ctl file
-Author: Victor Seva <linuxmaniac@torreviejawireless.org>
-
---- a/etc/kamailio-basic.cfg
-+++ b/etc/kamailio-basic.cfg
-@@ -193,6 +193,8 @@
+--- kamailio-4.2.3.orig/etc/kamailio-basic.cfg
++++ kamailio-4.2.3/etc/kamailio-basic.cfg
+@@ -191,8 +191,10 @@
+ 
+ 
  # ----- mi_fifo params -----
- modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo")
+-modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
++modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo")
  
 +# ----- ctl params -----
 +modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl")
  
  # ----- tm params -----
  # auto-discard branches from previous serial forking leg
---- a/etc/kamailio-oob.cfg
-+++ b/etc/kamailio-oob.cfg
-@@ -317,6 +317,8 @@
+Only in kamailio-4.2.3: etc/kamailio-basic.cfg.orig
+--- kamailio-4.2.3.orig/etc/kamailio-oob.cfg
++++ kamailio-4.2.3/etc/kamailio-oob.cfg
+@@ -315,8 +315,10 @@
+ 
+ 
  # ----- mi_fifo params -----
- modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo")
+-modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
++modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo")
  
 +# ----- ctl params -----
 +modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl")
  
  # ----- tm params -----
  # auto-discard branches from previous serial forking leg
---- a/etc/kamailio.cfg
-+++ b/etc/kamailio.cfg
-@@ -290,6 +290,8 @@
+Only in kamailio-4.2.3: etc/kamailio-oob.cfg.orig
+--- kamailio-4.2.3.orig/etc/kamailio.cfg
++++ kamailio-4.2.3/etc/kamailio.cfg
+@@ -288,8 +288,10 @@
+ 
+ 
  # ----- mi_fifo params -----
- modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo")
+-modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
++modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo")
  
 +# ----- ctl params -----
 +modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl")
  
  # ----- tm params -----
  # auto-discard branches from previous serial forking leg
---- a/modules/ctl/ctl_defaults.h
-+++ b/modules/ctl/ctl_defaults.h
-@@ -6,7 +6,7 @@
+Only in kamailio-4.2.3: etc/kamailio.cfg.orig
+--- kamailio-4.2.3.orig/modules/ctl/ctl_defaults.h
++++ kamailio-4.2.3/modules/ctl/ctl_defaults.h
+@@ -6,10 +6,10 @@
  /*listen by default on: */
  #ifdef SRNAME
  /* this is used when compiling sercmd tool */
@@ -44,4 +53,39 @@ Author: Victor Seva <linuxmaniac@torreviejawireless.org>
 +#define DEFAULT_CTL_SOCKET  "unixs:/var/run/" SRNAME "/" SRNAME "_ctl"
  #else
  /* this is used when compiling sip server */
- #define DEFAULT_CTL_SOCKET  "unixs:/tmp/" NAME "_ctl"
+-#define DEFAULT_CTL_SOCKET  "unixs:/tmp/" NAME "_ctl"
++#define DEFAULT_CTL_SOCKET  "unixs:/var/run/" NAME "/" NAME "_ctl"
+ #endif
+ /* port used by default for tcp/udp if no port is explicitely specified */
+ #define DEFAULT_CTL_PORT 2049
+--- kamailio-4.2.3.orig/modules/mi_fifo/README
++++ kamailio-4.2.3/modules/mi_fifo/README
+@@ -117,7 +117,7 @@
+ 
+    Example 1.1. Set fifo_name parameter
+ ...
+-modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
++modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo")
+ ...
+ 
+ 4.2. fifo_mode (integer)
+@@ -160,7 +160,7 @@
+ 
+    Directory to be used for creating the reply FIFO files.
+ 
+-   Default value is "/tmp/"
++   Default value is "/var/run/kamailio/"
+ 
+    Example 1.5. Set reply_dir parameter
+ ...
+--- kamailio-4.2.3.orig/modules/mi_fifo/mi_fifo.h
++++ kamailio-4.2.3/modules/mi_fifo/mi_fifo.h
+@@ -34,7 +34,7 @@
+ #ifndef _MI_FIFO_H_
+ #define _MI_FIFO_H_
+ 
+-#define DEFAULT_MI_REPLY_DIR "/tmp/"
++#define DEFAULT_MI_REPLY_DIR "/var/run/kamailio/"
+ 
+ #define DEFAULT_MI_REPLY_IDENT "\t"
+ 
diff --git a/main/kamailio/kamailio.cfg b/main/kamailio/kamailio.cfg
index 90d1c6241a..a8ca9990e9 100644
--- a/main/kamailio/kamailio.cfg
+++ b/main/kamailio/kamailio.cfg
@@ -39,8 +39,6 @@ loadmodule	"xlog.so"
 modparam ( "usrloc", "db_mode", 0 )
 modparam ( "rr", "enable_full_lr", 1 )
 modparam ( "mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo")
-# ----- ctl params -----
-modparam ( "ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl")
 
 
 #--------------------------------------------------------