--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock security
Please unblock package kamailio
A security bugreport was reported #775681 [0] by Helmut Grohne <helmut@subdivi.de>
regarding two issues:
> * kamcmd defaults to connecting to unixs:/tmp/kamailio_ctl.
- added default_ctl.patch.
ctl defaults to /var/run/kamailio/kamailio_ctl.
add ctl binrpc module parameter to etc/kamailio/kamailio*cfg
to point this change.
> * The kamailio build definitely is vulnerable as can be seen in
> utils/kamctl/Makefile.
- kamctl_build.patch.
use basedir instead of /tmp
Patch already accepted by upstream [1]
There is an ongoing discussion with upstream about default configs at [2].
So this version will fix those issues. Notice that this version will include
fixes pushed by Anibal Monsalve Salazar <anibal@debian.org> as Non-maintainer upload
4.2.0-1.1 regarding FTBFS on mipsel and mips #767500
unblock kamailio/4.2.0-2
[0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775681
[1] https://github.com/kamailio/kamailio/pull/56
[2] https://github.com/kamailio/kamailio/issues/48
-- System Information:
Debian Release: 8.0
APT prefers testing-updates
APT policy: (500, 'testing-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru kamailio-4.2.0/debian/changelog kamailio-4.2.0/debian/changelog
--- kamailio-4.2.0/debian/changelog 2014-10-21 23:17:18.000000000 +0200
+++ kamailio-4.2.0/debian/changelog 2015-01-28 20:48:03.000000000 +0100
@@ -1,3 +1,21 @@
+kamailio (4.2.0-2) unstable; urgency=medium
+
+ * [d614569] fix fifo and ctl defaults pointing to unsecure /tmp dir
+ Closes: #775681
+
+ -- Victor Seva <linuxmaniac@torreviejawireless.org> Wed, 28 Jan 2015 20:43:44 +0100
+
+kamailio (4.2.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS on mipsel and mips.
+ Add mips/mipsel arch in debian/control.
+ Disable the Mono module on mips in debian/rules (like it is on ia64).
+ Add fix-mips.patch Patch by Dejan Latinovic <Dejan.Latinovic@imgtec.com>
+ Closes: #767500.
+
+ -- Anibal Monsalve Salazar <anibal@debian.org> Thu, 13 Nov 2014 10:48:28 +0000
+
kamailio (4.2.0-1) unstable; urgency=medium
* [8774ae4] Imported Upstream version 4.2.0
diff -Nru kamailio-4.2.0/debian/control kamailio-4.2.0/debian/control
--- kamailio-4.2.0/debian/control 2014-10-21 23:17:18.000000000 +0200
+++ kamailio-4.2.0/debian/control 2015-01-28 20:48:03.000000000 +0100
@@ -23,7 +23,7 @@
libldap2-dev,
liblua5.1-0-dev,
libmemcached-dev,
- libmono-2.0-dev [!ia64],
+ libmono-2.0-dev [!ia64 !mips],
libmysqlclient-dev,
libncurses5-dev,
libpcre3-dev,
@@ -51,7 +51,7 @@
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-voip/kamailio.git
Package: kamailio
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: foreign
Pre-Depends: ${misc:Pre-Depends}
Depends: adduser, python, ${misc:Depends}, ${shlibs:Depends}
@@ -94,7 +94,7 @@
Package: kamailio-dbg
Priority: extra
Section: debug
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -107,7 +107,7 @@
modules. You only need to install it if you need to debug Kamailio.
Package: kamailio-geoip-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -120,7 +120,7 @@
use GeoIP API within configuration file.
Package: kamailio-sqlite-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -133,7 +133,7 @@
This package provides the SQLite database driver for Kamailio.
Package: kamailio-json-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -146,7 +146,7 @@
and the JSON-RPC client over netstrings.
Package: kamailio-memcached-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -160,7 +160,7 @@
server, a high-performance, distributed memory object caching system.
Package: kamailio-lua-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -173,7 +173,7 @@
execute embedded Lua applications within configuration file.
Package: kamailio-mono-modules
-Architecture: amd64 armel i386 powerpc ppc64 s390x
+Architecture: amd64 armel i386 powerpc ppc64 s390x mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -186,7 +186,7 @@
execute embedded Mono applications within configuration file.
Package: kamailio-python-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}),
@@ -202,7 +202,7 @@
execute embedded Python applications within configuration file.
Package: kamailio-redis-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -214,7 +214,7 @@
This package provides the Redis NOSQL database driver for Kamailio.
Package: kamailio-mysql-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}),
@@ -229,7 +229,7 @@
This package provides the MySQL database driver for Kamailio.
Package: kamailio-postgres-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}),
@@ -244,7 +244,7 @@
This package provides the PostgreSQL database driver for Kamailio.
Package: kamailio-cpl-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -257,7 +257,7 @@
Kamailio, turning Kamailio into a CPL server (storage and interpreter).
Package: kamailio-radius-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -271,7 +271,7 @@
RADIUS server.
Package: kamailio-unixodbc-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -283,7 +283,7 @@
This package provides the unixODBC database driver for Kamailio.
Package: kamailio-presence-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -297,7 +297,7 @@
external triggered presence and XCAP support.
Package: kamailio-perl-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -310,7 +310,7 @@
the perlvdb database driver for Kamailio.
Package: kamailio-snmpstats-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}),
@@ -326,7 +326,7 @@
as an AgentX subagent which connects to a master agent.
Package: kamailio-xmpp-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -338,7 +338,7 @@
This package provides the SIP to XMPP IM translator module for Kamailio.
Package: kamailio-xml-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -355,7 +355,7 @@
- xmlops module for XPath operations in configuration file
Package: kamailio-carrierroute-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -368,7 +368,7 @@
solution for routing, balancing and blacklisting.
Package: kamailio-berkeley-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: db-util (>= 4.6.19),
@@ -385,7 +385,7 @@
in files, no additional server is necessary.
Package: kamailio-berkeley-bin
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: foreign
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -399,7 +399,7 @@
install kamailio-berkeley-modules and not this package directly.
Package: kamailio-ldap-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -413,7 +413,7 @@
directory.
Package: kamailio-ims-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -426,7 +426,7 @@
to run as an IMS core.
Package: kamailio-utils-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
diff -Nru kamailio-4.2.0/debian/kamailio.README.Debian kamailio-4.2.0/debian/kamailio.README.Debian
--- kamailio-4.2.0/debian/kamailio.README.Debian 2014-10-21 23:17:18.000000000 +0200
+++ kamailio-4.2.0/debian/kamailio.README.Debian 2015-01-28 20:48:03.000000000 +0100
@@ -14,6 +14,15 @@
as a conffile.
+* different module defaults
+---------------------------
+
+upstream's default configs had been modified. See #775681 for more details.
+
+- mi_fifo: "fifo_name" => "/var/run/kamailio/kamailio_fifo"
+- ctl: "binrpc" => "/var/run/kamailio/kamailio_ctl"
+
+
* Kamailio setup
----------------
@@ -36,4 +45,4 @@
provided by the kamailio-dbg package.
- -- Victor Seva <linuxmaniac@torreviejawireless.org> Mon, 06 Jan 2014 10:38:11 +0100
+ -- Victor Seva <linuxmaniac@torreviejawireless.org> Wed, 28 Jan 2015 20:43:44 +0100
\ No newline at end of file
diff -Nru kamailio-4.2.0/debian/patches/default_ctl.patch kamailio-4.2.0/debian/patches/default_ctl.patch
--- kamailio-4.2.0/debian/patches/default_ctl.patch 1970-01-01 01:00:00.000000000 +0100
+++ kamailio-4.2.0/debian/patches/default_ctl.patch 2015-01-28 20:48:03.000000000 +0100
@@ -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 -Nru kamailio-4.2.0/debian/patches/default_fifo.patch kamailio-4.2.0/debian/patches/default_fifo.patch
--- kamailio-4.2.0/debian/patches/default_fifo.patch 2014-10-21 23:17:18.000000000 +0200
+++ kamailio-4.2.0/debian/patches/default_fifo.patch 2015-01-28 20:48:03.000000000 +0100
@@ -3,7 +3,7 @@
--- a/etc/kamailio.cfg
+++ b/etc/kamailio.cfg
-@@ -287,7 +287,7 @@
+@@ -288,7 +288,7 @@
# ----- mi_fifo params -----
@@ -25,7 +25,7 @@
fi
--- a/utils/kamctl/kamctlrc
+++ b/utils/kamctl/kamctlrc
-@@ -122,7 +122,7 @@
+@@ -124,7 +124,7 @@
# CTLENGINE="FIFO"
## path to FIFO file
@@ -34,7 +34,7 @@
## check ACL names; default on (1); off (0)
# VERIFY_ACL=1
-@@ -140,7 +140,7 @@
+@@ -142,7 +142,7 @@
## Kamailio START Options
## PID file path - default is: /var/run/kamailio.pid
@@ -43,3 +43,25 @@
## Extra start options - default is: not set
# example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64"
+--- a/etc/kamailio-basic.cfg
++++ b/etc/kamailio-basic.cfg
+@@ -191,7 +191,7 @@
+
+
+ # ----- mi_fifo params -----
+-modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
++modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo")
+
+
+ # ----- tm params -----
+--- a/etc/kamailio-oob.cfg
++++ b/etc/kamailio-oob.cfg
+@@ -315,7 +315,7 @@
+
+
+ # ----- mi_fifo params -----
+-modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
++modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo")
+
+
+ # ----- tm params -----
diff -Nru kamailio-4.2.0/debian/patches/fix-mips.patch kamailio-4.2.0/debian/patches/fix-mips.patch
--- kamailio-4.2.0/debian/patches/fix-mips.patch 1970-01-01 01:00:00.000000000 +0100
+++ kamailio-4.2.0/debian/patches/fix-mips.patch 2015-01-28 20:48:03.000000000 +0100
@@ -0,0 +1,51 @@
+Date: Thu, 30 Oct 2014 12:46:42 +0000
+From: Dejan Latinovic <Dejan.Latinovic@imgtec.com>
+Subject: fix for kamailio
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767500
+
+package kamailio FTBFS on mipsel with an error:
+> gcc: error: unrecognized command line option '-minline-all-stringops'
+
+https://buildd.debian.org/status/fetch.php?pkg=kamailio&arch=mipsel&ver=4.2.0-1&stamp=1414487406
+
+The patch below fixes this issue.
+
+Index: kamailio-4.2.0/Makefile.defs
+===================================================================
+--- kamailio-4.2.0.orig/Makefile.defs
++++ kamailio-4.2.0/Makefile.defs
+@@ -1360,12 +1360,13 @@ ifeq ($(CC_NAME), gcc)
+ CFLAGS= -mips2 $(CC_OPT) -funroll-loops $(PROFILE)
+ #if gcc 4.5+ or 4.2+
+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER))))
+- CFLAGS+=-minline-all-stringops -ftree-vectorize \
+- -fno-strict-overflow
++ CFLAGS+=-ftree-vectorize -fno-strict-overflow
++ # not supported on mips: -minline-all-stringops
+ else
+ #if gcc 4.0+
+ ifeq ($(CC_SHORTVER), 4.x)
+- CFLAGS+=-minline-all-stringops -ftree-vectorize
++ CFLAGS+=-ftree-vectorize
++ # not supported on mips: -minline-all-stringops
+ else
+ #if gcc 3.4+
+ ifeq ($(CC_SHORTVER), 3.4)
+@@ -1405,12 +1406,13 @@ ifeq ($(CC_NAME), gcc)
+ CFLAGS= -mips64 $(CC_OPT) -funroll-loops $(PROFILE)
+ #if gcc 4.5+ or 4.2+
+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER))))
+- CFLAGS+=-minline-all-stringops -ftree-vectorize \
+- -fno-strict-overflow
++ CFLAGS+=-ftree-vectorize -fno-strict-overflow
++ # not supported on mips64: -minline-all-stringops
+ else
+ #if gcc 4.0+
+ ifeq ($(CC_SHORTVER), 4.x)
+- CFLAGS+=-minline-all-stringops -ftree-vectorize
++ CFLAGS+=-ftree-vectorize
++ # not supported on mips64: -minline-all-stringops
+ else
+ #if gcc 3.4+
+ ifeq ($(CC_SHORTVER), 3.4)
diff -Nru kamailio-4.2.0/debian/patches/kamctl_build.patch kamailio-4.2.0/debian/patches/kamctl_build.patch
--- kamailio-4.2.0/debian/patches/kamctl_build.patch 1970-01-01 01:00:00.000000000 +0100
+++ kamailio-4.2.0/debian/patches/kamctl_build.patch 2015-01-28 20:48:03.000000000 +0100
@@ -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 \
diff -Nru kamailio-4.2.0/debian/patches/series kamailio-4.2.0/debian/patches/series
--- kamailio-4.2.0/debian/patches/series 2014-10-21 23:17:18.000000000 +0200
+++ kamailio-4.2.0/debian/patches/series 2015-01-28 20:48:03.000000000 +0100
@@ -2,3 +2,6 @@
no_INSTALL_file.patch
fix_export.patch
default_fifo.patch
+kamctl_build.patch
+default_ctl.patch
+fix-mips.patch
diff -Nru kamailio-4.2.0/debian/rules kamailio-4.2.0/debian/rules
--- kamailio-4.2.0/debian/rules 2014-10-21 23:17:18.000000000 +0200
+++ kamailio-4.2.0/debian/rules 2015-01-28 20:48:03.000000000 +0100
@@ -50,6 +50,8 @@
override EXCLUDED_MODULES += mono
else ifeq ($(DEB_HOST_ARCH),sparc)
override EXCLUDED_MODULES += mono
+else ifeq ($(DEB_HOST_ARCH),mips)
+ override EXCLUDED_MODULES += mono
else
override PACKAGE_GROUPS+= mono
endif
--- End Message ---