From 4a321833b7471a885bde7c6edeb027d98dac5a06 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 20 Mar 2015 09:18:57 +0000 Subject: main/kamailio: security fix for CVE-2015-1591 fixes #4002 this is a comination of commit 8ee2bf946adfad5cdf48dd12f72f880bba262d56 and 0838d20c0bb333d9ee42b5922dc699a1dfa34757 --- main/kamailio/APKBUILD | 22 ++-- main/kamailio/default_ctl.patch | 91 +++++++++++++++ main/kamailio/kamailio.cfg | 3 +- main/kamailio/kamctl_build.patch | 236 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 344 insertions(+), 8 deletions(-) create mode 100644 main/kamailio/default_ctl.patch create mode 100644 main/kamailio/kamctl_build.patch diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD index 20b3529c7..6ea8a36ca 100644 --- a/main/kamailio/APKBUILD +++ b/main/kamailio/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason # Maintainer: Nathan Angelacos pkgname=kamailio -pkgver=4.2.1 +pkgver=4.2.3 pkgrel=0 pkgdesc="Open Source SIP Server" url="http://www.kamailio.org/" @@ -208,6 +208,8 @@ done source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz kamailio-4.2-backslash.patch 0001-musl-fixes.patch + default_ctl.patch + kamctl_build.patch kamailio.cfg kamailio.initd " @@ -431,18 +433,24 @@ uuid() { "$_mod_list_uuid" } -md5sums="c2bccebd88156bf02957468e36dda648 kamailio-4.2.1_src.tar.gz +md5sums="f94eb1db3820dba22bd3fdae464e93b3 kamailio-4.2.3_src.tar.gz bad1ac2d4c95043df271d2ea6d37627a kamailio-4.2-backslash.patch 4685288dc54680597b00f956dc95d4d6 0001-musl-fixes.patch -a3c959ec568c43a905710e7d25cd8c25 kamailio.cfg +841fa62c432c5d8aeb57ad70d2ec3030 default_ctl.patch +d0052e6054884b9cec955af4480c7c85 kamctl_build.patch +299706d97e30a4f0d9b4c873df422866 kamailio.cfg 0e0a271fd3ddb7e87c01c26c7d041d59 kamailio.initd" -sha256sums="52169e917b58d3b666fe7b33e46d79128844ae311f359595590d35b57fbfda93 kamailio-4.2.1_src.tar.gz +sha256sums="7dbbca4a515778d3e903380adcc49f727ddc4853238cb905e14c811a5671ed80 kamailio-4.2.3_src.tar.gz d7e59be721ed0ad4621d404493b9a519708d801e9d4914b0164b819fa1abcd13 kamailio-4.2-backslash.patch b98555ff304b51b82c6cf7e01d757b15ea4f05bd2e603c84d4384df6a6be62b6 0001-musl-fixes.patch -8024266849033a917147827c3579a382f10f3796989bebc6de3d7c80c965fb72 kamailio.cfg +755efa4ad126c672bc67c53268260b57f7da1f454cdc1a1601778ed7c7d5f0e5 default_ctl.patch +e00eefed792acbc1ee6eca8fa7389f9973bd53b68fa7abc573f19f1ff26812a1 kamctl_build.patch +8b742ff710ef67ff59ec07a260690ebcdda24fb6f0b7b64dc50433a1bacf99f2 kamailio.cfg a90d3ab09a3ed58892e94710a1f80492a61ffad1ccf7ccb5b851bb8f538d32c4 kamailio.initd" -sha512sums="f15496411ee83759b17cab736ca87d28f4f7cb9b41ebbc2cb300e3bcf1ad81fb09ec90f234edcebf292c6a21cc6e1a1f1125aa031e9fec0306c0339df3517b38 kamailio-4.2.1_src.tar.gz +sha512sums="2f42499fe84eefac236fe3d4aa3c7bc424944236f00b95a7071feaa816b3df5764f84076d57b2137908dab7ff06a2440cc7a53a799216befd9511f8718a2eee5 kamailio-4.2.3_src.tar.gz a9bb1e8f9f373264b8351ddae099a36a46ddd46fdec09e468d297ba4f64bb4896e7d6e599da70a424e8a28695ab3f3b4ac940afab534593a6b9d08ae462f001a kamailio-4.2-backslash.patch dea7ef2ccf01357576045ba375d41301e2447b4454324007c7ca1862322835c57045852017192ca5434b32dd1b7a2e9669209b7111889dab335b74f042d0f11f 0001-musl-fixes.patch -0b666bfa10fd0af97b62749f8691cb3f76d9b40d1abe0a33e810e367bd733d2e8189c89f7f23010ec591116aada6e1a8a403b17449fe775038917617f281ad4d kamailio.cfg +2321d8afe29b53057ce21e0552dfb80fd6a0e7dc0caf3c4798a8b253518f4c8c546797302933373f4b055a4531329a36ee2d7117b0a88fe39cf153bfef91a656 default_ctl.patch +4c2c9bde3a4c44feca2863bb03cb031aa55e1c3df21dc7c0acb3a392c34cb36d9a132bcbdf451a0624f8ec202152f1cf238c89280c32f1c04312ce80427a18c6 kamctl_build.patch +c1abf69b48847dc8c7ab0d11ef9adb531aa4635f9d44db6933981edc5a47df374664fb24867b19aa64abbcc9777bf1cd0360d9aea54e27b081065928c61e0f0b kamailio.cfg 5ddaa059cdef10462c904f061f7bb085e62ad7501e2ed41f797d9e68822bce4e0e5ca09c1586c3901c920f8ce563c8c3ede860752c2b9bdb8f09908388ef337f kamailio.initd" diff --git a/main/kamailio/default_ctl.patch b/main/kamailio/default_ctl.patch new file mode 100644 index 000000000..c33e16049 --- /dev/null +++ b/main/kamailio/default_ctl.patch @@ -0,0 +1,91 @@ +--- 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", "/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 +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", "/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 +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", "/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 +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 */ +-#define DEFAULT_CTL_SOCKET "unixs:/tmp/" SRNAME "_ctl" ++#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:/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 1558cce9c..a8ca9990e 100644 --- a/main/kamailio/kamailio.cfg +++ b/main/kamailio/kamailio.cfg @@ -38,7 +38,8 @@ loadmodule "xlog.so" modparam ( "usrloc", "db_mode", 0 ) modparam ( "rr", "enable_full_lr", 1 ) -modparam ( "mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +modparam ( "mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") + #-------------------------------------------------------- # Section 4: Main Route Block diff --git a/main/kamailio/kamctl_build.patch b/main/kamailio/kamctl_build.patch new file mode 100644 index 000000000..3342ec3f0 --- /dev/null +++ b/main/kamailio/kamctl_build.patch @@ -0,0 +1,236 @@ +--- a/utils/kamctl/Makefile ++++ b/utils/kamctl/Makefile +@@ -25,63 +25,63 @@ + cat kamctl | \ + sed -e "s#/usr/local/sbin#$(bin_target)#g" | \ + sed -e "s#/usr/local/lib/kamailio#$(lib_target)#g" | \ +- sed -e "s#/usr/local/etc/kamailio#$(cfg_target)#g" >/tmp/kamctl ++ sed -e "s#/usr/local/etc/kamailio#$(cfg_target)#g" >$(basedir)/kamctl + $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/kamctl +- $(INSTALL_BIN) /tmp/kamctl $(bin_prefix)/$(bin_dir) +- rm -fr /tmp/kamctl ++ $(INSTALL_BIN) $(basedir)/kamctl $(bin_prefix)/$(bin_dir) ++ rm -fr $(basedir)/kamctl + sed -e "s#/usr/local/sbin#$(bin_target)#g" \ +- < kamctl.base > /tmp/kamctl.base ++ < kamctl.base > $(basedir)/kamctl.base + mkdir -p $(modules_prefix)/$(lib_dir)/kamctl + $(INSTALL_TOUCH) \ + $(modules_prefix)/$(lib_dir)/kamctl +- $(INSTALL_CFG) /tmp/kamctl.base \ ++ $(INSTALL_CFG) $(basedir)/kamctl.base \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.base +- rm -fr /tmp/kamctl.base ++ rm -fr $(basedir)/kamctl.base + sed -e "s#/usr/local#$(bin_target)#g" \ +- < kamctl.ctlbase > /tmp/kamctl.ctlbase +- $(INSTALL_CFG) /tmp/kamctl.ctlbase \ ++ < kamctl.ctlbase > $(basedir)/kamctl.ctlbase ++ $(INSTALL_CFG) $(basedir)/kamctl.ctlbase \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.ctlbase +- rm -fr /tmp/kamctl.ctlbase ++ rm -fr $(basedir)/kamctl.ctlbase + sed -e "s#/usr/local#$(bin_target)#g" \ +- < kamctl.fifo > /tmp/kamctl.fifo +- $(INSTALL_CFG) /tmp/kamctl.fifo \ ++ < kamctl.fifo > $(basedir)/kamctl.fifo ++ $(INSTALL_CFG) $(basedir)/kamctl.fifo \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.fifo +- rm -fr /tmp/kamctl.fifo ++ rm -fr $(basedir)/kamctl.fifo + sed -e "s#/usr/local#$(bin_target)#g" \ +- < kamctl.ser > /tmp/kamctl.ser +- $(INSTALL_CFG) /tmp/kamctl.ser \ ++ < kamctl.ser > $(basedir)/kamctl.ser ++ $(INSTALL_CFG) $(basedir)/kamctl.ser \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.ser +- rm -fr /tmp/kamctl.ser ++ rm -fr $(basedir)/kamctl.ser + sed -e "s#/usr/local#$(bin_target)#g" \ +- < kamctl.ser_mi > /tmp/kamctl.ser_mi +- $(INSTALL_CFG) /tmp/kamctl.ser_mi \ ++ < kamctl.ser_mi > $(basedir)/kamctl.ser_mi ++ $(INSTALL_CFG) $(basedir)/kamctl.ser_mi \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.ser_mi +- rm -fr /tmp/kamctl.ser_mi ++ rm -fr $(basedir)/kamctl.ser_mi + sed -e "s#/usr/local#$(bin_target)#g" \ +- < kamctl.unixsock > /tmp/kamctl.unixsock +- $(INSTALL_CFG) /tmp/kamctl.unixsock \ ++ < kamctl.unixsock > $(basedir)/kamctl.unixsock ++ $(INSTALL_CFG) $(basedir)/kamctl.unixsock \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.unixsock +- rm -fr /tmp/kamctl.unixsock ++ rm -fr $(basedir)/kamctl.unixsock + sed -e "s#/usr/local#$(bin_target)#g" \ +- < kamctl.sqlbase > /tmp/kamctl.sqlbase +- $(INSTALL_CFG) /tmp/kamctl.sqlbase \ ++ < kamctl.sqlbase > $(basedir)/kamctl.sqlbase ++ $(INSTALL_CFG) $(basedir)/kamctl.sqlbase \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.sqlbase +- rm -fr /tmp/kamctl.sqlbase ++ rm -fr $(basedir)/kamctl.sqlbase + # install db setup base script + sed -e "s#/usr/local/sbin#$(bin_target)#g" \ + -e "s#/usr/local/etc/kamailio#$(cfg_target)#g" \ + -e "s#/usr/local/share/kamailio#$(data_target)#g" \ +- < kamdbctl.base > /tmp/kamdbctl.base +- $(INSTALL_CFG) /tmp/kamdbctl.base \ ++ < kamdbctl.base > $(basedir)/kamdbctl.base ++ $(INSTALL_CFG) $(basedir)/kamdbctl.base \ + $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.base +- rm -fr /tmp/kamdbctl.base ++ rm -fr $(basedir)/kamdbctl.base + cat kamdbctl | \ + sed -e "s#/usr/local/sbin#$(bin_target)#g" | \ + sed -e "s#/usr/local/lib/kamailio#$(lib_target)#g" | \ +- sed -e "s#/usr/local/etc/kamailio#$(cfg_target)#g" >/tmp/kamdbctl ++ sed -e "s#/usr/local/etc/kamailio#$(cfg_target)#g" >$(basedir)/kamdbctl + $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/kamdbctl +- $(INSTALL_BIN) /tmp/kamdbctl $(bin_prefix)/$(bin_dir) +- rm -fr /tmp/kamdbctl ++ $(INSTALL_BIN) $(basedir)/kamdbctl $(bin_prefix)/$(bin_dir) ++ rm -fr $(basedir)/kamdbctl + + install-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 + sed -e "s#/etc/$(NAME)/$(NAME)\.cfg#$(cfg_target)$(NAME).cfg#g" \ +@@ -105,15 +105,15 @@ + if [ "$(MYSQLON)" = "yes" ]; then \ + mkdir -p $(modules_prefix)/$(lib_dir)/kamctl ; \ + sed -e "s#/usr/local/sbin#$(bin_target)#g" \ +- < kamctl.mysql > /tmp/kamctl.mysql ; \ +- $(INSTALL_CFG) /tmp/kamctl.mysql \ ++ < kamctl.mysql > $(basedir)/kamctl.mysql ; \ ++ $(INSTALL_CFG) $(basedir)/kamctl.mysql \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.mysql ; \ +- rm -fr /tmp/kamctl.mysql ; \ ++ rm -fr $(basedir)/kamctl.mysql ; \ + sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ +- < kamdbctl.mysql > /tmp/kamdbctl.mysql ; \ ++ < kamdbctl.mysql > $(basedir)/kamdbctl.mysql ; \ + $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.mysql ; \ +- $(INSTALL_CFG) /tmp/kamdbctl.mysql $(modules_prefix)/$(lib_dir)/kamctl/ ; \ +- rm -fr /tmp/kamdbctl.mysql ; \ ++ $(INSTALL_CFG) $(basedir)/kamdbctl.mysql $(modules_prefix)/$(lib_dir)/kamctl/ ; \ ++ rm -fr $(basedir)/kamdbctl.mysql ; \ + mkdir -p $(data_prefix)/$(data_dir)/mysql ; \ + for FILE in $(wildcard mysql/*) ; do \ + if [ -f $$FILE ] ; then \ +@@ -128,15 +128,15 @@ + if [ "$(PGSQLON)" = "yes" ]; then \ + mkdir -p $(modules_prefix)/$(lib_dir)/kamctl ; \ + sed -e "s#/usr/local/sbin#$(bin_target)#g" \ +- < kamctl.pgsql > /tmp/kamctl.pgsql ; \ +- $(INSTALL_CFG) /tmp/kamctl.pgsql \ ++ < kamctl.pgsql > $(basedir)/kamctl.pgsql ; \ ++ $(INSTALL_CFG) $(basedir)/kamctl.pgsql \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.pgsql ; \ +- rm -fr /tmp/kamctl.pgsql ; \ ++ rm -fr $(basedir)/kamctl.pgsql ; \ + sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ +- < kamdbctl.pgsql > /tmp/kamdbctl.pgsql ; \ ++ < kamdbctl.pgsql > $(basedir)/kamdbctl.pgsql ; \ + $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.pgsql ; \ +- $(INSTALL_CFG) /tmp/kamdbctl.pgsql $(modules_prefix)/$(lib_dir)/kamctl/ ; \ +- rm -fr /tmp/kamdbctl.pgsql ; \ ++ $(INSTALL_CFG) $(basedir)/kamdbctl.pgsql $(modules_prefix)/$(lib_dir)/kamctl/ ; \ ++ rm -fr $(basedir)/kamdbctl.pgsql ; \ + mkdir -p $(data_prefix)/$(data_dir)/postgres ; \ + for FILE in $(wildcard postgres/*) ; do \ + if [ -f $$FILE ] ; then \ +@@ -151,20 +151,20 @@ + if [ "$(ORACLEON)" = "yes" ]; then \ + mkdir -p $(modules_prefix)/$(lib_dir)/kamctl ; \ + sed -e "s#/usr/local/sbin#$(bin_target)#g" \ +- < kamctl.oracle > /tmp/kamctl.oracle ; \ +- $(INSTALL_CFG) /tmp/kamctl.oracle \ ++ < kamctl.oracle > $(basedir)/kamctl.oracle ; \ ++ $(INSTALL_CFG) $(basedir)/kamctl.oracle \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.oracle ; \ +- rm -fr /tmp/kamctl.oracle ; \ ++ rm -fr $(basedir)/kamctl.oracle ; \ + sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ +- < kamdbctl.oracle > /tmp/kamdbctl.oracle ; \ ++ < kamdbctl.oracle > $(basedir)/kamdbctl.oracle ; \ + $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.oracle ; \ +- $(INSTALL_CFG) /tmp/kamdbctl.oracle $(modules_prefix)/$(lib_dir)/kamctl/ ; \ +- rm -fr /tmp/kamdbctl.oracle ; \ ++ $(INSTALL_CFG) $(basedir)/kamdbctl.oracle $(modules_prefix)/$(lib_dir)/kamctl/ ; \ ++ rm -fr $(basedir)/kamdbctl.oracle ; \ + sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ +- < kamdbfunc.oracle > /tmp/kamdbfunc.oracle ; \ ++ < kamdbfunc.oracle > $(basedir)/kamdbfunc.oracle ; \ + $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbfunc.oracle ; \ +- $(INSTALL_CFG) /tmp/kamdbfunc.oracle $(modules_prefix)/$(lib_dir)/kamctl/ ; \ +- rm -fr /tmp/kamdbfunc.oracle ; \ ++ $(INSTALL_CFG) $(basedir)/kamdbfunc.oracle $(modules_prefix)/$(lib_dir)/kamctl/ ; \ ++ rm -fr $(basedir)/kamdbfunc.oracle ; \ + mkdir -p $(data_prefix)/$(data_dir)/oracle ; \ + for FILE in $(wildcard oracle/*) ; do \ + if [ -f $$FILE ] ; then \ +@@ -199,15 +199,15 @@ + if [ "$(BERKELEYDBON)" = "yes" ]; then \ + mkdir -p $(modules_prefix)/$(lib_dir)/kamctl ; \ + sed -e "s#/usr/local/share/kamailio/#$(data_target)#g" \ +- < kamctl.db_berkeley > /tmp/kamctl.db_berkeley ; \ +- $(INSTALL_CFG) /tmp/kamctl.db_berkeley \ ++ < kamctl.db_berkeley > $(basedir)/kamctl.db_berkeley ; \ ++ $(INSTALL_CFG) $(basedir)/kamctl.db_berkeley \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.db_berkeley ; \ +- rm -fr /tmp/kamctl.db_berkeley ; \ ++ rm -fr $(basedir)/kamctl.db_berkeley ; \ + sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ +- < kamdbctl.db_berkeley > /tmp/kamdbctl.db_berkeley ; \ ++ < kamdbctl.db_berkeley > $(basedir)/kamdbctl.db_berkeley ; \ + $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.db_berkeley ; \ +- $(INSTALL_CFG) /tmp/kamdbctl.db_berkeley $(modules_prefix)/$(lib_dir)/kamctl/ ; \ +- rm -fr /tmp/kamdbctl.db_berkeley ; \ ++ $(INSTALL_CFG) $(basedir)/kamdbctl.db_berkeley $(modules_prefix)/$(lib_dir)/kamctl/ ; \ ++ rm -fr $(basedir)/kamdbctl.db_berkeley ; \ + mkdir -p $(data_prefix)/$(data_dir)/db_berkeley/kamailio ; \ + for FILE in $(wildcard db_berkeley/kamailio/*) ; do \ + if [ -f $$FILE ] ; then \ +@@ -224,15 +224,15 @@ + if [ "$(DBTEXTON)" = "yes" ]; then \ + mkdir -p $(modules_prefix)/$(lib_dir)/kamctl ; \ + sed -e "s#/usr/local/share/kamailio/#$(data_target)#g" \ +- < kamctl.dbtext > /tmp/kamctl.dbtext ; \ +- $(INSTALL_CFG) /tmp/kamctl.dbtext \ ++ < kamctl.dbtext > $(basedir)/kamctl.dbtext ; \ ++ $(INSTALL_CFG) $(basedir)/kamctl.dbtext \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.dbtext ; \ +- rm -fr /tmp/kamctl.dbtext ; \ ++ rm -fr $(basedir)/kamctl.dbtext ; \ + sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ +- < kamdbctl.dbtext > /tmp/kamdbctl.dbtext ; \ ++ < kamdbctl.dbtext > $(basedir)/kamdbctl.dbtext ; \ + $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.dbtext ; \ +- $(INSTALL_CFG) /tmp/kamdbctl.dbtext $(modules_prefix)/$(lib_dir)/kamctl/ ; \ +- rm -fr /tmp/kamdbctl.dbtext ; \ ++ $(INSTALL_CFG) $(basedir)/kamdbctl.dbtext $(modules_prefix)/$(lib_dir)/kamctl/ ; \ ++ rm -fr $(basedir)/kamdbctl.dbtext ; \ + mkdir -p $(modules_prefix)/$(lib_dir)/kamctl/dbtextdb ; \ + $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/dbtextdb/dbtextdb.py ; \ + $(INSTALL_BIN) dbtextdb/dbtextdb.py $(modules_prefix)/$(lib_dir)/kamctl/dbtextdb/ ; \ +@@ -250,15 +250,15 @@ + if [ "$(SQLITEON)" = "yes" ]; then \ + mkdir -p $(modules_prefix)/$(lib_dir)/kamctl ; \ + sed -e "s#/usr/local/sbin#$(bin_target)#g" \ +- < kamctl.sqlite > /tmp/kamctl.sqlite ; \ +- $(INSTALL_CFG) /tmp/kamctl.sqlite \ ++ < kamctl.sqlite > $(basedir)/kamctl.sqlite ; \ ++ $(INSTALL_CFG) $(basedir)/kamctl.sqlite \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.sqlite ; \ +- rm -fr /tmp/kamctl.sqlite ; \ ++ rm -fr $(basedir)/kamctl.sqlite ; \ + sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ +- < kamdbctl.sqlite > /tmp/kamdbctl.sqlite ; \ ++ < kamdbctl.sqlite > $(basedir)/kamdbctl.sqlite ; \ + $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.sqlite ; \ +- $(INSTALL_CFG) /tmp/kamdbctl.sqlite $(modules_prefix)/$(lib_dir)/kamctl/ ; \ +- rm -fr /tmp/kamdbctl.sqlite ; \ ++ $(INSTALL_CFG) $(basedir)/kamdbctl.sqlite $(modules_prefix)/$(lib_dir)/kamctl/ ; \ ++ rm -fr $(basedir)/kamdbctl.sqlite ; \ + mkdir -p $(data_prefix)/$(data_dir)/db_sqlite ; \ + for FILE in $(wildcard db_sqlite/*) ; do \ + if [ -f $$FILE ] ; then \ -- cgit v1.2.3