main/kamailio: security fix for CVE-2015-1591

ref #4002
author: Natanael Copa <ncopa@alpinelinux.org> 2015-03-20 09:18:57 +0000
committer: Natanael Copa <ncopa@alpinelinux.org> 2015-03-20 09:23:26 +0000
commit: 8ee2bf946adfad5cdf48dd12f72f880bba262d56 (patch)
tree: 2aa7c66042dd852d8aee5cdaaf7e95dbd8e738d5 /main/kamailio
parent: 0095fa1a7d310b0fdf9ebc126c050c7ae354890f (diff)
download: aports-8ee2bf946adfad5cdf48dd12f72f880bba262d56.tar.bz2
aports-8ee2bf946adfad5cdf48dd12f72f880bba262d56.tar.xz
4 files changed, 299 insertions, 5 deletions
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 4a9943bb29..714ed357c5 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -13,7 +13,7 @@ _gittag=HEAD
 
 
 pkgver=4.2.3
-pkgrel=2
+pkgrel=3
 [ -z "${_gitcommit}" ] && _suffix="_src" || _suffix="-${_gitcommit}"
 
 pkgdesc="Open Source SIP Server"
@@ -227,6 +227,8 @@ source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}${_su
 	0001-musl-fixes.patch
 	kamailio-4.2-ipops-srv-query.patch
 	DMQ-multi-notify.patch
+	default_ctl.patch
+	kamctl_build.patch
 
 	kamailio.cfg
 	kamailio.initd
@@ -494,19 +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
-a3c959ec568c43a905710e7d25cd8c25  kamailio.cfg
+5514374d04e040923c1ba9c5fa42978d  default_ctl.patch
+d0052e6054884b9cec955af4480c7c85  kamctl_build.patch
+24560d64302805abb82737259e28c75f  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
-8024266849033a917147827c3579a382f10f3796989bebc6de3d7c80c965fb72  kamailio.cfg
+386bde333069cee161d2ee3e77b6546afd07e5061e2ef6a5a116076b2cff10a9  default_ctl.patch
+e00eefed792acbc1ee6eca8fa7389f9973bd53b68fa7abc573f19f1ff26812a1  kamctl_build.patch
+c7398dbe461bcac2bbb00d70cb0c2265b84527e4f0e436bc1a9dc3bad9874c9a  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
-0b666bfa10fd0af97b62749f8691cb3f76d9b40d1abe0a33e810e367bd733d2e8189c89f7f23010ec591116aada6e1a8a403b17449fe775038917617f281ad4d  kamailio.cfg
+ab7e33e393a23f4d286a7f6e0f80afc8b71265f242bc2f4308f6bc9a219d5b1b792e5ced359118f18f24d82a8d80f8a2fd210ef65683be8233bd33a2870d7a8a  default_ctl.patch
+4c2c9bde3a4c44feca2863bb03cb031aa55e1c3df21dc7c0acb3a392c34cb36d9a132bcbdf451a0624f8ec202152f1cf238c89280c32f1c04312ce80427a18c6  kamctl_build.patch
+108efb81c4b387bb547eb569e0c1d6be6d4c28b19b882ba8a5eb70b92dd0b6df371671293943ea45880e13da3adaa1d36187d5a71f32dac867fdc180bcf8cfc6  kamailio.cfg
 5ddaa059cdef10462c904f061f7bb085e62ad7501e2ed41f797d9e68822bce4e0e5ca09c1586c3901c920f8ce563c8c3ede860752c2b9bdb8f09908388ef337f  kamailio.initd"
diff --git a/main/kamailio/default_ctl.patch b/main/kamailio/default_ctl.patch
new file mode 100644
index 0000000000..c702911a70
--- /dev/null
+++ b/main/kamailio/default_ctl.patch
@@ -0,0 +1,47 @@
+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 @@
+ # ----- mi_fifo params -----
+ 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 @@
+ # ----- mi_fifo params -----
+ 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 @@
+ # ----- mi_fifo params -----
+ 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 @@
+ /*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"
diff --git a/main/kamailio/kamailio.cfg b/main/kamailio/kamailio.cfg
index 1558cce9ca..90d1c6241a 100644
--- a/main/kamailio/kamailio.cfg
+++ b/main/kamailio/kamailio.cfg
@@ -38,7 +38,10 @@ 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")
+# ----- ctl params -----
+modparam ( "ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl")
+
 
 #--------------------------------------------------------
 # Section 4:  Main Route Block
diff --git a/main/kamailio/kamctl_build.patch b/main/kamailio/kamctl_build.patch
new file mode 100644
index 0000000000..3342ec3f0f
--- /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 \
author	Natanael Copa <ncopa@alpinelinux.org>	2015-03-20 09:18:57 +0000
committer	Natanael Copa <ncopa@alpinelinux.org>	2015-03-20 09:23:26 +0000
commit	8ee2bf946adfad5cdf48dd12f72f880bba262d56 (patch)
tree	2aa7c66042dd852d8aee5cdaaf7e95dbd8e738d5 /main/kamailio
parent	0095fa1a7d310b0fdf9ebc126c050c7ae354890f (diff)
download	aports-8ee2bf946adfad5cdf48dd12f72f880bba262d56.tar.bz2 aports-8ee2bf946adfad5cdf48dd12f72f880bba262d56.tar.xz