From: Jiri Slachta <slachta@cesnet.cz>
Date: Mon, 27 Oct 2014 09:08:23 +0000 (+0100)
Subject: kamailio: change package directories to be major version specific
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=bbf8cd9a089532946646ce866fa448502b5449a1;p=feed%2Ftelephony.git

kamailio: change package directories to be major version specific

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
---

diff --git a/net/kamailio-3.3.x/Makefile b/net/kamailio-3.3.x/Makefile
deleted file mode 100644
index 9148071..0000000
--- a/net/kamailio-3.3.x/Makefile
+++ /dev/null
@@ -1,274 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=kamailio3
-PKG_VERSION:=3.3.7
-PKG_RELEASE:=6
-
-PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
-PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
-PKG_MD5SUM:=519d1dfbddf7dbead3a020321582d471
-PKG_USE_MIPS16:=0
-
-INCL_MODULES:=
-KAM_MODULES:=
-
-include $(INCLUDE_DIR)/nls.mk
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += $(FPIC)
-PREBUILT_STAMP=$(STAGING_DIR)/stamp/.$(PKG_NAME)_prebuilt
-TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components 1 $(TAR_OPTIONS)
-
-define Package/kamailio3/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Telephony
-  URL:=http://www.kamailio.org/
-  MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
-  DEPENDS:=$(ICONV_DEPENDS) +libncurses +libpthread +libreadline
-endef
-
-define Package/kamailio3
-$(call Package/kamailio3/Default)
-  TITLE:=Mature and flexible open source SIP server, v3.3.x
-  MENU:=1
-endef
-
-define Package/kamailio3-example
-$(call Package/kamailio3/Default)
-  TITLE:=Kamailio3 example config
-  DEPENDS:=kamailio3 \
-	+kamailio3-mod-acc \
-	+kamailio3-mod-maxfwd \
-	+kamailio3-mod-mi-fifo \
-	+kamailio3-mod-pv \
-	+kamailio3-mod-registrar \
-	+kamailio3-mod-rr \
-	+kamailio3-mod-sl \
-	+kamailio3-mod-siputils \
-	+kamailio3-mod-textops \
-	+kamailio3-mod-tm \
-	+kamailio3-mod-uri-db \
-	+kamailio3-mod-usrloc \
-	+kamailio3-mod-xlog
-endef
-
-define Package/kamailio3-example/conffiles
-/etc/default/kamailio
-/etc/kamailio/kamailio.cfg
-endef
-
-define Package/kamailio3-tools
-$(call Package/kamailio3/Default)
-  TITLE:=Kamailio3 control tools
-  DEPENDS:=kamailio3
-endef
-
-define Package/kamailio3-tools/conffiles
-/etc/kamailio/kamctlrc
-endef
-
-define Package/kamailio3/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/sbin/kamailio \
-		$(1)/usr/sbin/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/sbin/sercmd \
-		$(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/kamailio/modules
-	$(INSTALL_DIR) $(1)/usr/lib/kamailio/modules_k
-	$(INSTALL_DIR) $(1)/usr/lib/kamailio/modules_s
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/kamailio/lib*.so* \
-		$(1)/usr/lib/kamailio/
-endef
-
-define Package/kamailio3-example/install
-	$(INSTALL_DIR) $(1)/etc/kamailio
-	$(CP) \
-		$(PKG_INSTALL_DIR)/etc/kamailio/kamailio.cfg \
-		$(1)/etc/kamailio/
-	$(SED) 's,$(PKG_INSTALL_DIR),,g' \
-		$(1)/etc/kamailio/kamailio.cfg
-	$(SED) 's,//lib/kamailio,/usr/lib/kamailio,g' \
-		$(1)/etc/kamailio/kamailio.cfg
-	$(INSTALL_DIR) $(1)/etc/default
-	$(INSTALL_DATA) ./files/kamailio.default $(1)/etc/default/kamailio
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/kamailio.init $(1)/etc/init.d/kamailio
-endef
-
-define Package/kamailio3-tools/install
-	$(INSTALL_DIR) $(1)/etc/kamailio
-	$(CP) \
-		$(PKG_BUILD_DIR)/utils/kamctl/kamctlrc \
-		$(1)/etc/kamailio/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/sbin/kam{ctl,dbctl} \
-		$(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/kamailio
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/kamailio/kamctl \
-		$(1)/usr/lib/kamailio/
-endef
-
-define BuildPlugin
-  define Package/kamailio3-mod-$(1)
-    $$(call Package/kamailio3/Default)
-    TITLE:= kamailio3 $(3) module
-    DEPENDS:=kamailio3 $$(foreach m,$(4),+kamailio3-mod-$$m) $(5)
-  endef
-
-  define Package/kamailio3-mod-$(1)/install
-	[ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/kamailio/$(6)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/kamailio/$(6)/$(2).so $$(1)/usr/lib/kamailio/$(6)/
-  endef
-
-  INCL_MODULES+=$(2)
-  KAM_MODULES+=kamailio3-mod-$(1)
-endef
-
-$(eval $(call BuildPlugin,acc,acc,Accounting,tm,,modules_k))
-#$(eval $(call BuildPlugin,acc-radius,acc_radius,Accounting for RADIUS backend,acc,+libradiusclient-ng @BROKEN,modules_k))
-$(eval $(call BuildPlugin,alias-db,alias_db,Database-backend aliases,db-sqlite,,modules_k))
-$(eval $(call BuildPlugin,auth,auth,Authentication Framework,,,modules))
-$(eval $(call BuildPlugin,auth-db,auth_db,Database-backend authentication,auth db-sqlite,,modules_k))
-$(eval $(call BuildPlugin,auth-diameter,auth_diameter,Diameter-backend authentication,sl,,modules_k))
-#$(eval $(call BuildPlugin,auth-radius,auth_radius,RADIUS-backend authentication,auth,+libradiusclient-ng @BROKEN,modules_k))
-$(eval $(call BuildPlugin,avpops,avpops,AVP operation,,,modules))
-$(eval $(call BuildPlugin,benchmark,benchmark,Config benchmark,,,modules_k))
-$(eval $(call BuildPlugin,cfgutils,cfgutils,Config utilities,,,modules_k))
-$(eval $(call BuildPlugin,cfg-db,cfg_db,Load core and module parameters from database,db-sqlite,,modules))
-$(eval $(call BuildPlugin,cfg-rpc,cfg_rpc,Update core and module parameters at runtime via RPC interface,,,modules))
-#$(eval $(call BuildPlugin,cpl-c,cpl-c,Call Processing language interpreter,tm sl usrloc,+libxml2,modules_k))
-$(eval $(call BuildPlugin,ctl,ctl,BINRPC transport interface,,,modules))
-#$(eval $(call BuildPlugin,db-berkeley,db_berkeley,Berkeley DB Database-backend,,,modules))
-$(eval $(call BuildPlugin,db-flatstore,db_flatstore,Fast writing-only text database-backed,,,modules))
-#$(eval $(call BuildPlugin,db-mysql,db_mysql,MySQL database-backend,,+libmysqlclient @BROKEN,modules))
-$(eval $(call BuildPlugin,db-postgres,db_postgres,PostgreSQL Database-backend,,+libpq,modules))
-$(eval $(call BuildPlugin,db-sqlite,db_sqlite,Sqlite DB support,,+libsqlite3,modules_k))
-$(eval $(call BuildPlugin,db-text,db_text,Text database-backend,,,modules_k))
-$(eval $(call BuildPlugin,db-unixodbc,db_unixodbc,UnixODBC Database-backend,,+unixodbc,modules_k))
-$(eval $(call BuildPlugin,dialog,dialog,Dialog support,rr tm,,modules_k))
-$(eval $(call BuildPlugin,dialplan,dialplan,Dialplan management,,+libpcre,modules))
-$(eval $(call BuildPlugin,dispatcher,dispatcher,Dispatcher,,,modules_s))
-$(eval $(call BuildPlugin,diversion,diversion,Diversion header insertion,,,modules_s))
-$(eval $(call BuildPlugin,domain,domain,Multi-domain support,,,modules_k))
-$(eval $(call BuildPlugin,domainpolicy,domainpolicy,Domain policy,,,modules_k))
-$(eval $(call BuildPlugin,enum,enum,ENUM lookup,,,modules))
-$(eval $(call BuildPlugin,exec,exec,External exec,,,modules_k))
-$(eval $(call BuildPlugin,group,group,Database-backend user-groups,,,modules_k))
-$(eval $(call BuildPlugin,h350,h350,H.350,ldap,+libopenldap,modules_k))
-$(eval $(call BuildPlugin,htable,htable,Hash Table,,,modules_k))
-#$(eval $(call BuildPlugin,imc,imc,IM conferencing,db-mysql tm,,modules_k))
-$(eval $(call BuildPlugin,ipops,ipops,IP and IPv6 operations module,,,modules))
-$(eval $(call BuildPlugin,kex,kex,Core extensions,,,modules_k))
-$(eval $(call BuildPlugin,lcr,lcr,Least Cost Routing,tm,+libpcre,modules))
-$(eval $(call BuildPlugin,ldap,ldap,LDAP connector,,+libopenldap,modules_k))
-$(eval $(call BuildPlugin,maxfwd,maxfwd,Max-Forward processor,,,modules_k))
-$(eval $(call BuildPlugin,mediaproxy,mediaproxy,Automatic NAT traversal,dialog,,modules))
-$(eval $(call BuildPlugin,mi-datagram,mi_datagram,Datagram support for Management Interface,,,modules_k))
-$(eval $(call BuildPlugin,mi-fifo,mi_fifo,FIFO support for Management Interface,,,modules_k))
-#$(eval $(call BuildPlugin,mi-xmlrpc,mi_xmlrpc,XML-RPC support for Management Interface,,+xmlrpc-c,modules_k))
-$(eval $(call BuildPlugin,mi-rpc,mi_rpc,RPC support for Management Interface,,,modules))
-#$(eval $(call BuildPlugin,misc_radius,misc_radius,Generic RADIUS,,+libradiusclient-ng @BROKEN,modules_k))
-$(eval $(call BuildPlugin,msilo,msilo,SIP message silo,tm,,modules_k))
-$(eval $(call BuildPlugin,nat_traversal,nat_traversal,NAT traversal,dialog sl tm,,modules_k))
-$(eval $(call BuildPlugin,nathelper,nathelper,NAT traversal helper,,+rtpproxy,modules_k))
-#$(eval $(call BuildPlugin,osp,osp,OSP peering,auth rr sl tm textops,+libosp,modules_k))
-$(eval $(call BuildPlugin,path,path,SIP path insertion,rr,,modules_k))
-$(eval $(call BuildPlugin,pdt,pdt,Prefix-to-Domain translator,,,modules_k))
-#$(eval $(call BuildPlugin,peering,peering,Perring,,+libradiusclient-ng @BROKEN,modules))
-#$(eval $(call BuildPlugin,perl,perl,Perl,sl,+perl,modules_k))
-#$(eval $(call BuildPlugin,perlvdb,perlvdb,Perl Virtual DB,perl,,modules_k))
-$(eval $(call BuildPlugin,permissions,permissions,Permissions control,,,modules_k))
-$(eval $(call BuildPlugin,pike,pike,Flood detector,,,modules_k))
-$(eval $(call BuildPlugin,presence,presence,Presence server,sl tm,+libxml2,modules_k))
-$(eval $(call BuildPlugin,presence-dialoginfo,presence_dialoginfo,Dialog Event presence,presence,,modules_k))
-$(eval $(call BuildPlugin,presence-mwi,presence_mwi,Message Waiting Indication presence,presence,,modules_k))
-$(eval $(call BuildPlugin,presence-xml,presence_xml,XCAP presence,presence xcap-client,,modules_k))
-$(eval $(call BuildPlugin,pua,pua,Presence User Agent,tm,+libxml2,modules_k))
-$(eval $(call BuildPlugin,pua-bla,pua_bla,Bridged Line Appearence PUA,presence pua usrloc,,modules_k))
-$(eval $(call BuildPlugin,pua-dialoginfo,pua_dialoginfo,Dialog Event PUA,dialog pua,,modules_k))
-$(eval $(call BuildPlugin,pua-mi,pua_mi,PUA Management Interface,pua,,modules_k))
-$(eval $(call BuildPlugin,pua-usrloc,pua_usrloc,PUA User Location,pua usrloc,,modules_k))
-$(eval $(call BuildPlugin,pua-xmpp,pua_xmpp,PUA XMPP,presence pua xmpp,,modules_k))
-#$(eval $(call BuildPlugin,purple,purple,Multi-protocol IM gateway,presence pua,+libpurple,modules_k))
-$(eval $(call BuildPlugin,pv,pv,Pseudo-Variables,,,modules_k))
-$(eval $(call BuildPlugin,qos,qos,QoS control,dialog,,modules_k))
-$(eval $(call BuildPlugin,ratelimit,ratelimit,Traffic shapping,,,modules))
-$(eval $(call BuildPlugin,regex,regex,Regular Expression,,+libpcre,modules_k))
-$(eval $(call BuildPlugin,registrar,registrar,SIP Registrar,usrloc,,modules_k))
-$(eval $(call BuildPlugin,rls,rls,Resource List Server,presence pua tm,+libxml2,modules_k))
-$(eval $(call BuildPlugin,rr,rr,Record-Route and Route,,,modules_k))
-$(eval $(call BuildPlugin,rtimer,rtimer,Routing Timer,,,modules_k))
-$(eval $(call BuildPlugin,rtpproxy,rtpproxy,RTP proxy,tm,,modules))
-$(eval $(call BuildPlugin,sanity,sanity,SIP sanity checks,sl,,modules))
-#$(eval $(call BuildPlugin,seas,seas,SIP Express Application Server,tm,,modules_k))
-$(eval $(call BuildPlugin,sipcapture,sipcapture,SIP capture module,,,modules))
-$(eval $(call BuildPlugin,siptrace,siptrace,SIP trace,,,modules_k))
-$(eval $(call BuildPlugin,siputils,siputils,SIP utilities,sl,,modules_k))
-$(eval $(call BuildPlugin,sl,sl,Stateless replier,,,modules))
-$(eval $(call BuildPlugin,sms,sms,SIP-to-SMS IM gateway,tm,,modules))
-#$(eval $(call BuildPlugin,snmpstats,snmpstats,SNMP,presence usrloc,+libnetsnmp,modules_k))
-$(eval $(call BuildPlugin,speeddial,speeddial,Per-user speed-dial controller,,,modules_k))
-$(eval $(call BuildPlugin,sqlops,sqlops,SQL operations,,,modules_k))
-$(eval $(call BuildPlugin,statistics,statistics,Script statistics,,,modules_k))
-$(eval $(call BuildPlugin,sst,sst,SIP Session Timer,dialog sl,,modules_k))
-$(eval $(call BuildPlugin,textops,textops,Text operations,,,modules_k))
-$(eval $(call BuildPlugin,tls,tls,TLS operations,,+libopenssl,modules))
-$(eval $(call BuildPlugin,tm,tm,Transaction,,,modules))
-$(eval $(call BuildPlugin,tmx,tmx,Transaction module extensions,,,modules_k))
-$(eval $(call BuildPlugin,uac,uac,User Agent Client,tm,,modules_k))
-$(eval $(call BuildPlugin,uac-redirect,uac_redirect,User Agent Client redirection,tm,,modules_k))
-$(eval $(call BuildPlugin,uri-db,uri_db,Database-backend SIP URI checking,,,modules_k))
-$(eval $(call BuildPlugin,userblacklist,userblacklist,User blacklists,,,modules_k))
-$(eval $(call BuildPlugin,usrloc,usrloc,User location,,,modules_k))
-$(eval $(call BuildPlugin,utils,utils,Misc utilities,,+libcurl +libxml2,modules))
-$(eval $(call BuildPlugin,xcap-client,xcap_client,XCAP Client,,+libcurl,modules_k))
-$(eval $(call BuildPlugin,xlog,xlog,Advanced logger,,,modules_k))
-$(eval $(call BuildPlugin,xmpp,xmpp,SIP-to-XMPP Gateway,tm,+libexpat,modules_k))
-
-PKG_MAKE_ARGS:= \
-	prefix=/ \
-	cfg_dir=/etc/kamailio/ \
-	bin_dir=/usr/sbin/ \
-	data_dir=/var/lib/kamailio/ \
-	lib_dir=/usr/lib/kamailio/ \
-	modules_dir=/usr/lib/kamailio/ \
-	include_modules="$(INCL_MODULES)" \
-	cfg_target:=/etc/kamailio/ \
-	TLS_HOOKS=1 \
-	extra_defs="-DUSE_PTHREAD_MUTEX " \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LOCALBASE="$(STAGING_DIR)/usr" \
-	SYSBASE="$(STAGING_DIR)/usr" \
-	PCREDEFS:="$(TARGET_CPPFLAGS)" \
-	PCRELIBS:="$(TARGET_LDFLAGS)" \
-	CROSS_COMPILE=$(TARGET_CROSS) \
-	CC="$(TARGET_CC)" \
-	ARCH="$(ARCH)"  \
-	DESTDIR=$(PKG_INSTALL_DIR) \
-	quiet=verbose
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
-		EXTRA_LIBS=-L$(STAGING_DIR)/usr/lib/ \
-		all
-	$(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
-		install
-endef
-
-$(eval $(call BuildPackage,kamailio3))
-$(eval $(call BuildPackage,kamailio3-example))
-$(eval $(call BuildPackage,kamailio3-tools))
-$(foreach m,$(KAM_MODULES),$(eval $(call BuildPackage,$(m))))
diff --git a/net/kamailio-3.3.x/files/kamailio.default b/net/kamailio-3.3.x/files/kamailio.default
deleted file mode 100644
index a61617b..0000000
--- a/net/kamailio-3.3.x/files/kamailio.default
+++ /dev/null
@@ -1,13 +0,0 @@
-# OPTIONS
-# -n COUNT
-# Specifies the number of children processes forked per interface
-# -N COUNT
-# Specifies the number of children processes forked to handle tcp incoming connections
-# -m SIZE
-# Size of the shared memory which will be allocated (in Megabytes).
-# -u UID
-# Changes the user id under which 
-# -g GID
-# Changes the group id under which 
-
-OPTIONS="-n 4 -m 4 - m 8"
diff --git a/net/kamailio-3.3.x/files/kamailio.init b/net/kamailio-3.3.x/files/kamailio.init
deleted file mode 100644
index dae4546..0000000
--- a/net/kamailio-3.3.x/files/kamailio.init
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=99
-
-BIN_FILE=/usr/sbin/kamailio
-PID_FILE=/var/run/kamailio.pid
-
-start() {
-	start-stop-daemon -S -x $BIN_FILE -b -- -P $PID_FILE
-}
-
-stop() {
-	start-stop-daemon -K -x $BIN_FILE -p $PID_FILE -q
-	rm -rf $PID_FILE
-}
diff --git a/net/kamailio-3.3.x/patches/050-fix-kamailio-utils.patch b/net/kamailio-3.3.x/patches/050-fix-kamailio-utils.patch
deleted file mode 100644
index 9edb793..0000000
--- a/net/kamailio-3.3.x/patches/050-fix-kamailio-utils.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -rupN kamailio3-3.3.7/utils/kamctl/kamctl kamailio3-new/utils/kamctl/kamctl
---- kamailio3-3.3.7/utils/kamctl/kamctl	2014-03-06 16:30:33.000000000 +0100
-+++ kamailio3-new/utils/kamctl/kamctl	2014-08-07 17:01:21.806954644 +0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # $Id$
- #
-diff -rupN kamailio3-3.3.7/utils/kamctl/kamctlrc kamailio3-new/utils/kamctl/kamctlrc
---- kamailio3-3.3.7/utils/kamctl/kamctlrc	2014-03-06 16:30:33.000000000 +0100
-+++ kamailio3-new/utils/kamctl/kamctlrc	2014-08-07 17:00:58.446953700 +0200
-@@ -142,3 +142,6 @@
- ## Extra start options - default is: not set
- # example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64"
- # STARTOPTIONS=
-+
-+#Disable colour printing in terminal
-+NOHLPRINT=1
-diff -rupN kamailio3-3.3.7/utils/kamctl/kamdbctl kamailio3-new/utils/kamctl/kamdbctl
---- kamailio3-3.3.7/utils/kamctl/kamdbctl	2014-03-06 16:30:33.000000000 +0100
-+++ kamailio3-new/utils/kamctl/kamdbctl	2014-08-07 17:01:15.494954389 +0200
-@@ -1,4 +1,4 @@
--#!/bin/bash 
-+#!/bin/sh 
- #
- # $Id$
- #
-diff -rupN kamailio3-3.3.7/utils/kamctl/kamdbctl.base kamailio3-new/utils/kamctl/kamdbctl.base
---- kamailio3-3.3.7/utils/kamctl/kamdbctl.base	2014-03-06 16:30:33.000000000 +0100
-+++ kamailio3-new/utils/kamctl/kamdbctl.base	2014-08-07 16:59:44.870950728 +0200
-@@ -32,14 +32,14 @@ INSTALL_PRESENCE_TABLES=${INSTALL_PRESEN
- 
- # Used by dbtext and db_berkeley to define tables to be created, used by
- # postgres to do the grants
--STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs grp
--		uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber
--		location re_grp trusted address missed_calls usr_preferences
-+STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs grp \
-+		uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber \
-+		location re_grp trusted address missed_calls usr_preferences \
- 		aliases silo dialog dialog_vars dispatcher dialplan}
--EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy
--		carrierroute carrier_name domain_name carrierfailureroute userblacklist
-+EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy \
-+		carrierroute carrier_name domain_name carrierfailureroute userblacklist \
- 		globalblacklist htable purplemap uacreg pl_pipes mtree mtrees}
--PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap 
-+PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap  \
- 		pua rls_presentity rls_watchers}
- 
- # SQL definitions
-@@ -62,11 +62,11 @@ GREP=${GREP:-grep}
- SED=${SED:-sed}
- 
- # define what modules should be installed
--STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions
--				     registrar usrloc msilo alias_db uri_db
--				     speeddial avpops auth_db pdt dialog dispatcher
-+STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions \
-+				     registrar usrloc msilo alias_db uri_db \
-+				     speeddial avpops auth_db pdt dialog dispatcher \
- 				     dialplan}
--EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
-+EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute \
-     userblacklist htable purple uac pipelimit mtree}
- 
- ############################################################
diff --git a/net/kamailio-3.3.x/patches/100-cross_compile.patch b/net/kamailio-3.3.x/patches/100-cross_compile.patch
deleted file mode 100644
index a4ee4d8..0000000
--- a/net/kamailio-3.3.x/patches/100-cross_compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/modules_s/ldap/Makefile
-+++ b/modules_s/ldap/Makefile
-@@ -14,7 +14,7 @@
- # LD_SCOPE_CHILDREN defined
- #DEFS += -DHAVE_SCOPE_CHILDREN
- 
--LIBS=-L$(LOCALBASE)/lib -L /usr/lib -lldap
-+LIBS=-L$(LOCALBASE)/lib -lldap
- 
- DEFS+=-DSER_MOD_INTERFACE
- 
diff --git a/net/kamailio-3.x/Makefile b/net/kamailio-3.x/Makefile
new file mode 100644
index 0000000..9148071
--- /dev/null
+++ b/net/kamailio-3.x/Makefile
@@ -0,0 +1,274 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=kamailio3
+PKG_VERSION:=3.3.7
+PKG_RELEASE:=6
+
+PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
+PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
+PKG_MD5SUM:=519d1dfbddf7dbead3a020321582d471
+PKG_USE_MIPS16:=0
+
+INCL_MODULES:=
+KAM_MODULES:=
+
+include $(INCLUDE_DIR)/nls.mk
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += $(FPIC)
+PREBUILT_STAMP=$(STAGING_DIR)/stamp/.$(PKG_NAME)_prebuilt
+TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components 1 $(TAR_OPTIONS)
+
+define Package/kamailio3/Default
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Telephony
+  URL:=http://www.kamailio.org/
+  MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+  DEPENDS:=$(ICONV_DEPENDS) +libncurses +libpthread +libreadline
+endef
+
+define Package/kamailio3
+$(call Package/kamailio3/Default)
+  TITLE:=Mature and flexible open source SIP server, v3.3.x
+  MENU:=1
+endef
+
+define Package/kamailio3-example
+$(call Package/kamailio3/Default)
+  TITLE:=Kamailio3 example config
+  DEPENDS:=kamailio3 \
+	+kamailio3-mod-acc \
+	+kamailio3-mod-maxfwd \
+	+kamailio3-mod-mi-fifo \
+	+kamailio3-mod-pv \
+	+kamailio3-mod-registrar \
+	+kamailio3-mod-rr \
+	+kamailio3-mod-sl \
+	+kamailio3-mod-siputils \
+	+kamailio3-mod-textops \
+	+kamailio3-mod-tm \
+	+kamailio3-mod-uri-db \
+	+kamailio3-mod-usrloc \
+	+kamailio3-mod-xlog
+endef
+
+define Package/kamailio3-example/conffiles
+/etc/default/kamailio
+/etc/kamailio/kamailio.cfg
+endef
+
+define Package/kamailio3-tools
+$(call Package/kamailio3/Default)
+  TITLE:=Kamailio3 control tools
+  DEPENDS:=kamailio3
+endef
+
+define Package/kamailio3-tools/conffiles
+/etc/kamailio/kamctlrc
+endef
+
+define Package/kamailio3/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/sbin/kamailio \
+		$(1)/usr/sbin/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/sbin/sercmd \
+		$(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib/kamailio/modules
+	$(INSTALL_DIR) $(1)/usr/lib/kamailio/modules_k
+	$(INSTALL_DIR) $(1)/usr/lib/kamailio/modules_s
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/kamailio/lib*.so* \
+		$(1)/usr/lib/kamailio/
+endef
+
+define Package/kamailio3-example/install
+	$(INSTALL_DIR) $(1)/etc/kamailio
+	$(CP) \
+		$(PKG_INSTALL_DIR)/etc/kamailio/kamailio.cfg \
+		$(1)/etc/kamailio/
+	$(SED) 's,$(PKG_INSTALL_DIR),,g' \
+		$(1)/etc/kamailio/kamailio.cfg
+	$(SED) 's,//lib/kamailio,/usr/lib/kamailio,g' \
+		$(1)/etc/kamailio/kamailio.cfg
+	$(INSTALL_DIR) $(1)/etc/default
+	$(INSTALL_DATA) ./files/kamailio.default $(1)/etc/default/kamailio
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/kamailio.init $(1)/etc/init.d/kamailio
+endef
+
+define Package/kamailio3-tools/install
+	$(INSTALL_DIR) $(1)/etc/kamailio
+	$(CP) \
+		$(PKG_BUILD_DIR)/utils/kamctl/kamctlrc \
+		$(1)/etc/kamailio/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/sbin/kam{ctl,dbctl} \
+		$(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib/kamailio
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/kamailio/kamctl \
+		$(1)/usr/lib/kamailio/
+endef
+
+define BuildPlugin
+  define Package/kamailio3-mod-$(1)
+    $$(call Package/kamailio3/Default)
+    TITLE:= kamailio3 $(3) module
+    DEPENDS:=kamailio3 $$(foreach m,$(4),+kamailio3-mod-$$m) $(5)
+  endef
+
+  define Package/kamailio3-mod-$(1)/install
+	[ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/kamailio/$(6)
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/kamailio/$(6)/$(2).so $$(1)/usr/lib/kamailio/$(6)/
+  endef
+
+  INCL_MODULES+=$(2)
+  KAM_MODULES+=kamailio3-mod-$(1)
+endef
+
+$(eval $(call BuildPlugin,acc,acc,Accounting,tm,,modules_k))
+#$(eval $(call BuildPlugin,acc-radius,acc_radius,Accounting for RADIUS backend,acc,+libradiusclient-ng @BROKEN,modules_k))
+$(eval $(call BuildPlugin,alias-db,alias_db,Database-backend aliases,db-sqlite,,modules_k))
+$(eval $(call BuildPlugin,auth,auth,Authentication Framework,,,modules))
+$(eval $(call BuildPlugin,auth-db,auth_db,Database-backend authentication,auth db-sqlite,,modules_k))
+$(eval $(call BuildPlugin,auth-diameter,auth_diameter,Diameter-backend authentication,sl,,modules_k))
+#$(eval $(call BuildPlugin,auth-radius,auth_radius,RADIUS-backend authentication,auth,+libradiusclient-ng @BROKEN,modules_k))
+$(eval $(call BuildPlugin,avpops,avpops,AVP operation,,,modules))
+$(eval $(call BuildPlugin,benchmark,benchmark,Config benchmark,,,modules_k))
+$(eval $(call BuildPlugin,cfgutils,cfgutils,Config utilities,,,modules_k))
+$(eval $(call BuildPlugin,cfg-db,cfg_db,Load core and module parameters from database,db-sqlite,,modules))
+$(eval $(call BuildPlugin,cfg-rpc,cfg_rpc,Update core and module parameters at runtime via RPC interface,,,modules))
+#$(eval $(call BuildPlugin,cpl-c,cpl-c,Call Processing language interpreter,tm sl usrloc,+libxml2,modules_k))
+$(eval $(call BuildPlugin,ctl,ctl,BINRPC transport interface,,,modules))
+#$(eval $(call BuildPlugin,db-berkeley,db_berkeley,Berkeley DB Database-backend,,,modules))
+$(eval $(call BuildPlugin,db-flatstore,db_flatstore,Fast writing-only text database-backed,,,modules))
+#$(eval $(call BuildPlugin,db-mysql,db_mysql,MySQL database-backend,,+libmysqlclient @BROKEN,modules))
+$(eval $(call BuildPlugin,db-postgres,db_postgres,PostgreSQL Database-backend,,+libpq,modules))
+$(eval $(call BuildPlugin,db-sqlite,db_sqlite,Sqlite DB support,,+libsqlite3,modules_k))
+$(eval $(call BuildPlugin,db-text,db_text,Text database-backend,,,modules_k))
+$(eval $(call BuildPlugin,db-unixodbc,db_unixodbc,UnixODBC Database-backend,,+unixodbc,modules_k))
+$(eval $(call BuildPlugin,dialog,dialog,Dialog support,rr tm,,modules_k))
+$(eval $(call BuildPlugin,dialplan,dialplan,Dialplan management,,+libpcre,modules))
+$(eval $(call BuildPlugin,dispatcher,dispatcher,Dispatcher,,,modules_s))
+$(eval $(call BuildPlugin,diversion,diversion,Diversion header insertion,,,modules_s))
+$(eval $(call BuildPlugin,domain,domain,Multi-domain support,,,modules_k))
+$(eval $(call BuildPlugin,domainpolicy,domainpolicy,Domain policy,,,modules_k))
+$(eval $(call BuildPlugin,enum,enum,ENUM lookup,,,modules))
+$(eval $(call BuildPlugin,exec,exec,External exec,,,modules_k))
+$(eval $(call BuildPlugin,group,group,Database-backend user-groups,,,modules_k))
+$(eval $(call BuildPlugin,h350,h350,H.350,ldap,+libopenldap,modules_k))
+$(eval $(call BuildPlugin,htable,htable,Hash Table,,,modules_k))
+#$(eval $(call BuildPlugin,imc,imc,IM conferencing,db-mysql tm,,modules_k))
+$(eval $(call BuildPlugin,ipops,ipops,IP and IPv6 operations module,,,modules))
+$(eval $(call BuildPlugin,kex,kex,Core extensions,,,modules_k))
+$(eval $(call BuildPlugin,lcr,lcr,Least Cost Routing,tm,+libpcre,modules))
+$(eval $(call BuildPlugin,ldap,ldap,LDAP connector,,+libopenldap,modules_k))
+$(eval $(call BuildPlugin,maxfwd,maxfwd,Max-Forward processor,,,modules_k))
+$(eval $(call BuildPlugin,mediaproxy,mediaproxy,Automatic NAT traversal,dialog,,modules))
+$(eval $(call BuildPlugin,mi-datagram,mi_datagram,Datagram support for Management Interface,,,modules_k))
+$(eval $(call BuildPlugin,mi-fifo,mi_fifo,FIFO support for Management Interface,,,modules_k))
+#$(eval $(call BuildPlugin,mi-xmlrpc,mi_xmlrpc,XML-RPC support for Management Interface,,+xmlrpc-c,modules_k))
+$(eval $(call BuildPlugin,mi-rpc,mi_rpc,RPC support for Management Interface,,,modules))
+#$(eval $(call BuildPlugin,misc_radius,misc_radius,Generic RADIUS,,+libradiusclient-ng @BROKEN,modules_k))
+$(eval $(call BuildPlugin,msilo,msilo,SIP message silo,tm,,modules_k))
+$(eval $(call BuildPlugin,nat_traversal,nat_traversal,NAT traversal,dialog sl tm,,modules_k))
+$(eval $(call BuildPlugin,nathelper,nathelper,NAT traversal helper,,+rtpproxy,modules_k))
+#$(eval $(call BuildPlugin,osp,osp,OSP peering,auth rr sl tm textops,+libosp,modules_k))
+$(eval $(call BuildPlugin,path,path,SIP path insertion,rr,,modules_k))
+$(eval $(call BuildPlugin,pdt,pdt,Prefix-to-Domain translator,,,modules_k))
+#$(eval $(call BuildPlugin,peering,peering,Perring,,+libradiusclient-ng @BROKEN,modules))
+#$(eval $(call BuildPlugin,perl,perl,Perl,sl,+perl,modules_k))
+#$(eval $(call BuildPlugin,perlvdb,perlvdb,Perl Virtual DB,perl,,modules_k))
+$(eval $(call BuildPlugin,permissions,permissions,Permissions control,,,modules_k))
+$(eval $(call BuildPlugin,pike,pike,Flood detector,,,modules_k))
+$(eval $(call BuildPlugin,presence,presence,Presence server,sl tm,+libxml2,modules_k))
+$(eval $(call BuildPlugin,presence-dialoginfo,presence_dialoginfo,Dialog Event presence,presence,,modules_k))
+$(eval $(call BuildPlugin,presence-mwi,presence_mwi,Message Waiting Indication presence,presence,,modules_k))
+$(eval $(call BuildPlugin,presence-xml,presence_xml,XCAP presence,presence xcap-client,,modules_k))
+$(eval $(call BuildPlugin,pua,pua,Presence User Agent,tm,+libxml2,modules_k))
+$(eval $(call BuildPlugin,pua-bla,pua_bla,Bridged Line Appearence PUA,presence pua usrloc,,modules_k))
+$(eval $(call BuildPlugin,pua-dialoginfo,pua_dialoginfo,Dialog Event PUA,dialog pua,,modules_k))
+$(eval $(call BuildPlugin,pua-mi,pua_mi,PUA Management Interface,pua,,modules_k))
+$(eval $(call BuildPlugin,pua-usrloc,pua_usrloc,PUA User Location,pua usrloc,,modules_k))
+$(eval $(call BuildPlugin,pua-xmpp,pua_xmpp,PUA XMPP,presence pua xmpp,,modules_k))
+#$(eval $(call BuildPlugin,purple,purple,Multi-protocol IM gateway,presence pua,+libpurple,modules_k))
+$(eval $(call BuildPlugin,pv,pv,Pseudo-Variables,,,modules_k))
+$(eval $(call BuildPlugin,qos,qos,QoS control,dialog,,modules_k))
+$(eval $(call BuildPlugin,ratelimit,ratelimit,Traffic shapping,,,modules))
+$(eval $(call BuildPlugin,regex,regex,Regular Expression,,+libpcre,modules_k))
+$(eval $(call BuildPlugin,registrar,registrar,SIP Registrar,usrloc,,modules_k))
+$(eval $(call BuildPlugin,rls,rls,Resource List Server,presence pua tm,+libxml2,modules_k))
+$(eval $(call BuildPlugin,rr,rr,Record-Route and Route,,,modules_k))
+$(eval $(call BuildPlugin,rtimer,rtimer,Routing Timer,,,modules_k))
+$(eval $(call BuildPlugin,rtpproxy,rtpproxy,RTP proxy,tm,,modules))
+$(eval $(call BuildPlugin,sanity,sanity,SIP sanity checks,sl,,modules))
+#$(eval $(call BuildPlugin,seas,seas,SIP Express Application Server,tm,,modules_k))
+$(eval $(call BuildPlugin,sipcapture,sipcapture,SIP capture module,,,modules))
+$(eval $(call BuildPlugin,siptrace,siptrace,SIP trace,,,modules_k))
+$(eval $(call BuildPlugin,siputils,siputils,SIP utilities,sl,,modules_k))
+$(eval $(call BuildPlugin,sl,sl,Stateless replier,,,modules))
+$(eval $(call BuildPlugin,sms,sms,SIP-to-SMS IM gateway,tm,,modules))
+#$(eval $(call BuildPlugin,snmpstats,snmpstats,SNMP,presence usrloc,+libnetsnmp,modules_k))
+$(eval $(call BuildPlugin,speeddial,speeddial,Per-user speed-dial controller,,,modules_k))
+$(eval $(call BuildPlugin,sqlops,sqlops,SQL operations,,,modules_k))
+$(eval $(call BuildPlugin,statistics,statistics,Script statistics,,,modules_k))
+$(eval $(call BuildPlugin,sst,sst,SIP Session Timer,dialog sl,,modules_k))
+$(eval $(call BuildPlugin,textops,textops,Text operations,,,modules_k))
+$(eval $(call BuildPlugin,tls,tls,TLS operations,,+libopenssl,modules))
+$(eval $(call BuildPlugin,tm,tm,Transaction,,,modules))
+$(eval $(call BuildPlugin,tmx,tmx,Transaction module extensions,,,modules_k))
+$(eval $(call BuildPlugin,uac,uac,User Agent Client,tm,,modules_k))
+$(eval $(call BuildPlugin,uac-redirect,uac_redirect,User Agent Client redirection,tm,,modules_k))
+$(eval $(call BuildPlugin,uri-db,uri_db,Database-backend SIP URI checking,,,modules_k))
+$(eval $(call BuildPlugin,userblacklist,userblacklist,User blacklists,,,modules_k))
+$(eval $(call BuildPlugin,usrloc,usrloc,User location,,,modules_k))
+$(eval $(call BuildPlugin,utils,utils,Misc utilities,,+libcurl +libxml2,modules))
+$(eval $(call BuildPlugin,xcap-client,xcap_client,XCAP Client,,+libcurl,modules_k))
+$(eval $(call BuildPlugin,xlog,xlog,Advanced logger,,,modules_k))
+$(eval $(call BuildPlugin,xmpp,xmpp,SIP-to-XMPP Gateway,tm,+libexpat,modules_k))
+
+PKG_MAKE_ARGS:= \
+	prefix=/ \
+	cfg_dir=/etc/kamailio/ \
+	bin_dir=/usr/sbin/ \
+	data_dir=/var/lib/kamailio/ \
+	lib_dir=/usr/lib/kamailio/ \
+	modules_dir=/usr/lib/kamailio/ \
+	include_modules="$(INCL_MODULES)" \
+	cfg_target:=/etc/kamailio/ \
+	TLS_HOOKS=1 \
+	extra_defs="-DUSE_PTHREAD_MUTEX " \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LOCALBASE="$(STAGING_DIR)/usr" \
+	SYSBASE="$(STAGING_DIR)/usr" \
+	PCREDEFS:="$(TARGET_CPPFLAGS)" \
+	PCRELIBS:="$(TARGET_LDFLAGS)" \
+	CROSS_COMPILE=$(TARGET_CROSS) \
+	CC="$(TARGET_CC)" \
+	ARCH="$(ARCH)"  \
+	DESTDIR=$(PKG_INSTALL_DIR) \
+	quiet=verbose
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
+		EXTRA_LIBS=-L$(STAGING_DIR)/usr/lib/ \
+		all
+	$(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
+		install
+endef
+
+$(eval $(call BuildPackage,kamailio3))
+$(eval $(call BuildPackage,kamailio3-example))
+$(eval $(call BuildPackage,kamailio3-tools))
+$(foreach m,$(KAM_MODULES),$(eval $(call BuildPackage,$(m))))
diff --git a/net/kamailio-3.x/files/kamailio.default b/net/kamailio-3.x/files/kamailio.default
new file mode 100644
index 0000000..a61617b
--- /dev/null
+++ b/net/kamailio-3.x/files/kamailio.default
@@ -0,0 +1,13 @@
+# OPTIONS
+# -n COUNT
+# Specifies the number of children processes forked per interface
+# -N COUNT
+# Specifies the number of children processes forked to handle tcp incoming connections
+# -m SIZE
+# Size of the shared memory which will be allocated (in Megabytes).
+# -u UID
+# Changes the user id under which 
+# -g GID
+# Changes the group id under which 
+
+OPTIONS="-n 4 -m 4 - m 8"
diff --git a/net/kamailio-3.x/files/kamailio.init b/net/kamailio-3.x/files/kamailio.init
new file mode 100644
index 0000000..dae4546
--- /dev/null
+++ b/net/kamailio-3.x/files/kamailio.init
@@ -0,0 +1,16 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2014 OpenWrt.org
+
+START=99
+
+BIN_FILE=/usr/sbin/kamailio
+PID_FILE=/var/run/kamailio.pid
+
+start() {
+	start-stop-daemon -S -x $BIN_FILE -b -- -P $PID_FILE
+}
+
+stop() {
+	start-stop-daemon -K -x $BIN_FILE -p $PID_FILE -q
+	rm -rf $PID_FILE
+}
diff --git a/net/kamailio-3.x/patches/050-fix-kamailio-utils.patch b/net/kamailio-3.x/patches/050-fix-kamailio-utils.patch
new file mode 100644
index 0000000..9edb793
--- /dev/null
+++ b/net/kamailio-3.x/patches/050-fix-kamailio-utils.patch
@@ -0,0 +1,68 @@
+diff -rupN kamailio3-3.3.7/utils/kamctl/kamctl kamailio3-new/utils/kamctl/kamctl
+--- kamailio3-3.3.7/utils/kamctl/kamctl	2014-03-06 16:30:33.000000000 +0100
++++ kamailio3-new/utils/kamctl/kamctl	2014-08-07 17:01:21.806954644 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # $Id$
+ #
+diff -rupN kamailio3-3.3.7/utils/kamctl/kamctlrc kamailio3-new/utils/kamctl/kamctlrc
+--- kamailio3-3.3.7/utils/kamctl/kamctlrc	2014-03-06 16:30:33.000000000 +0100
++++ kamailio3-new/utils/kamctl/kamctlrc	2014-08-07 17:00:58.446953700 +0200
+@@ -142,3 +142,6 @@
+ ## Extra start options - default is: not set
+ # example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64"
+ # STARTOPTIONS=
++
++#Disable colour printing in terminal
++NOHLPRINT=1
+diff -rupN kamailio3-3.3.7/utils/kamctl/kamdbctl kamailio3-new/utils/kamctl/kamdbctl
+--- kamailio3-3.3.7/utils/kamctl/kamdbctl	2014-03-06 16:30:33.000000000 +0100
++++ kamailio3-new/utils/kamctl/kamdbctl	2014-08-07 17:01:15.494954389 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash 
++#!/bin/sh 
+ #
+ # $Id$
+ #
+diff -rupN kamailio3-3.3.7/utils/kamctl/kamdbctl.base kamailio3-new/utils/kamctl/kamdbctl.base
+--- kamailio3-3.3.7/utils/kamctl/kamdbctl.base	2014-03-06 16:30:33.000000000 +0100
++++ kamailio3-new/utils/kamctl/kamdbctl.base	2014-08-07 16:59:44.870950728 +0200
+@@ -32,14 +32,14 @@ INSTALL_PRESENCE_TABLES=${INSTALL_PRESEN
+ 
+ # Used by dbtext and db_berkeley to define tables to be created, used by
+ # postgres to do the grants
+-STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs grp
+-		uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber
+-		location re_grp trusted address missed_calls usr_preferences
++STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs grp \
++		uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber \
++		location re_grp trusted address missed_calls usr_preferences \
+ 		aliases silo dialog dialog_vars dispatcher dialplan}
+-EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy
+-		carrierroute carrier_name domain_name carrierfailureroute userblacklist
++EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy \
++		carrierroute carrier_name domain_name carrierfailureroute userblacklist \
+ 		globalblacklist htable purplemap uacreg pl_pipes mtree mtrees}
+-PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap 
++PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap  \
+ 		pua rls_presentity rls_watchers}
+ 
+ # SQL definitions
+@@ -62,11 +62,11 @@ GREP=${GREP:-grep}
+ SED=${SED:-sed}
+ 
+ # define what modules should be installed
+-STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions
+-				     registrar usrloc msilo alias_db uri_db
+-				     speeddial avpops auth_db pdt dialog dispatcher
++STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions \
++				     registrar usrloc msilo alias_db uri_db \
++				     speeddial avpops auth_db pdt dialog dispatcher \
+ 				     dialplan}
+-EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
++EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute \
+     userblacklist htable purple uac pipelimit mtree}
+ 
+ ############################################################
diff --git a/net/kamailio-3.x/patches/100-cross_compile.patch b/net/kamailio-3.x/patches/100-cross_compile.patch
new file mode 100644
index 0000000..a4ee4d8
--- /dev/null
+++ b/net/kamailio-3.x/patches/100-cross_compile.patch
@@ -0,0 +1,11 @@
+--- a/modules_s/ldap/Makefile
++++ b/modules_s/ldap/Makefile
+@@ -14,7 +14,7 @@
+ # LD_SCOPE_CHILDREN defined
+ #DEFS += -DHAVE_SCOPE_CHILDREN
+ 
+-LIBS=-L$(LOCALBASE)/lib -L /usr/lib -lldap
++LIBS=-L$(LOCALBASE)/lib -lldap
+ 
+ DEFS+=-DSER_MOD_INTERFACE
+ 
diff --git a/net/kamailio-4.1.x/Makefile b/net/kamailio-4.1.x/Makefile
deleted file mode 100644
index f9a6337..0000000
--- a/net/kamailio-4.1.x/Makefile
+++ /dev/null
@@ -1,257 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=kamailio4
-PKG_VERSION:=4.1.6
-PKG_RELEASE:=2
-
-PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
-PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
-PKG_MD5SUM:=000008e7a02e767956bf8fbe6df16e51
-PKG_USE_MIPS16:=0
-
-INCL_MODULES:=
-KAM_MODULES:=
-
-include $(INCLUDE_DIR)/nls.mk
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += $(FPIC)
-PREBUILT_STAMP=$(STAGING_DIR)/stamp/.$(PKG_NAME)_prebuilt
-TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components 1 $(TAR_OPTIONS)
-
-define Package/kamailio4/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Telephony
-  URL:=http://www.kamailio.org/
-  MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
-  DEPENDS:=$(ICONV_DEPENDS) +libncurses +libpthread +libreadline +libxml2
-endef
-
-define Package/kamailio4
-$(call Package/kamailio4/Default)
-  TITLE:=Mature and flexible open source SIP server, v$(PKG_VERSION)
-  MENU:=1
-endef
-
-define Package/kamailio4/conffiles
-/etc/default/kamailio
-/etc/kamailio/kamailio.cfg
-/etc/kamailio/kamailio-advanced.cfg
-/etc/kamailio/dictionary.kamailio
-endef
-
-define Package/kamailio4-tools
-$(call Package/kamailio4/Default)
-  TITLE:=Kamailio4 control tools
-  DEPENDS:=kamailio4
-endef
-
-define Package/kamailio4-tools/conffiles
-/etc/kamailio/kamctlrc
-endef
-
-define Package/kamailio4/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/sbin/{kamailio,kamcmd} \
-		$(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/kamailio/modules
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/lib/kamailio/lib*.so* \
-		$(1)/usr/lib/kamailio/
-	$(INSTALL_DIR) $(1)/etc/kamailio
-	$(CP) \
-		$(PKG_INSTALL_DIR)/etc/kamailio/{kamailio-advanced.cfg,kamailio.cfg} \
-		$(1)/etc/kamailio/
-	$(INSTALL_DIR) $(1)/etc/kamailio
-	$(CP) \
-		$(PKG_INSTALL_DIR)/etc/kamailio/dictionary.kamailio \
-		$(1)/etc/kamailio/
-	$(INSTALL_DIR) $(1)/etc/default
-	$(CP) \
-		./files/kamailio.default \
-		$(1)/etc/default/kamailio
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) \
-		./files/kamailio.init \
-		$(1)/etc/init.d/kamailio
-endef
-
-define Package/kamailio4-tools/install
-	$(INSTALL_DIR) $(1)/etc/kamailio
-	$(CP) \
-		$(PKG_BUILD_DIR)/utils/kamctl/kamctlrc \
-		$(1)/etc/kamailio/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/sbin/kam{ctl,dbctl} \
-		$(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/kamailio
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/kamailio/kamctl \
-		$(1)/usr/lib/kamailio/
-endef
-
-define BuildPlugin
-  define Package/kamailio4-mod-$(1)
-    $$(call Package/kamailio4/Default)
-    TITLE:= kamailio4 $(3) module
-    DEPENDS:=kamailio4 $$(foreach m,$(4),+kamailio4-mod-$$m) $(5)
-  endef
-
-  define Package/kamailio4-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/kamailio/modules
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/kamailio/modules/$(2).so $$(1)/usr/lib/kamailio/modules/
-  endef
-
-  INCL_MODULES+=$(2)
-  KAM_MODULES+=kamailio4-mod-$(1)
-endef
-
-################################
-# Kamailio modules
-# Params:
-# 1 - Package subname
-# 2 - Module name
-# 3 - Module description
-# 4 - Dependencies to internal modules
-# 5 - Dependencies to external libs/apps
-################################
-
-$(eval $(call BuildPlugin,acc,acc,Accounting,tm,))
-$(eval $(call BuildPlugin,alias-db,alias_db,Database-backend aliases,db-sqlite,))
-$(eval $(call BuildPlugin,auth,auth,Authentication Framework,,))
-$(eval $(call BuildPlugin,auth-db,auth_db,Database-backend authentication,auth db-sqlite,))
-$(eval $(call BuildPlugin,auth-diameter,auth_diameter,Diameter-backend authentication,sl,))
-$(eval $(call BuildPlugin,avpops,avpops,AVP operation,,))
-$(eval $(call BuildPlugin,benchmark,benchmark,Config benchmark,,))
-$(eval $(call BuildPlugin,cfgutils,cfgutils,Config utilities,,))
-$(eval $(call BuildPlugin,cfg-db,cfg_db,Load core and module parameters from database,db-sqlite,))
-$(eval $(call BuildPlugin,cfg-rpc,cfg_rpc,Update core and module parameters at runtime via RPC interface,,))
-$(eval $(call BuildPlugin,cnxcc,cnxcc,Limit call duration,dialog,))
-$(eval $(call BuildPlugin,corex,corex,Legacy functions,,))
-$(eval $(call BuildPlugin,ctl,ctl,BINRPC transport interface,,))
-$(eval $(call BuildPlugin,db-flatstore,db_flatstore,Fast writing-only text database-backed,,))
-$(eval $(call BuildPlugin,db-mysql,db_mysql,MySQL database-backend,,+libmysqlclient))
-$(eval $(call BuildPlugin,db-postgres,db_postgres,PostgreSQL Database-backend,,+libpq))
-$(eval $(call BuildPlugin,db-sqlite,db_sqlite,Sqlite DB support,,+libsqlite3))
-$(eval $(call BuildPlugin,db-text,db_text,Text database-backend,,))
-$(eval $(call BuildPlugin,db-unixodbc,db_unixodbc,UnixODBC Database-backend,,+unixodbc))
-$(eval $(call BuildPlugin,dialog,dialog,Dialog support,rr tm,))
-$(eval $(call BuildPlugin,dialog_ng,dialog,Dialog support,rr tm,))
-$(eval $(call BuildPlugin,dialplan,dialplan,Dialplan management,,+libpcre))
-$(eval $(call BuildPlugin,dispatcher,dispatcher,Dispatcher,,))
-$(eval $(call BuildPlugin,diversion,diversion,Diversion header insertion,,))
-$(eval $(call BuildPlugin,domain,domain,Multi-domain support,,))
-$(eval $(call BuildPlugin,domainpolicy,domainpolicy,Domain policy,,))
-$(eval $(call BuildPlugin,enum,enum,ENUM lookup,,))
-$(eval $(call BuildPlugin,exec,exec,External exec,,))
-$(eval $(call BuildPlugin,group,group,Database-backend user-groups,,))
-$(eval $(call BuildPlugin,h350,h350,H.350,ldap,+libopenldap))
-$(eval $(call BuildPlugin,htable,htable,Hash Table,,))
-$(eval $(call BuildPlugin,imc,imc,IM conferencing,db-mysql tm,))
-$(eval $(call BuildPlugin,ipops,ipops,IP and IPv6 operations,,))
-$(eval $(call BuildPlugin,json,json,Access to JSON document attributes,,+libjson))
-$(eval $(call BuildPlugin,kex,kex,Core extensions,,))
-$(eval $(call BuildPlugin,lcr,lcr,Least Cost Routing,tm,+libpcre))
-$(eval $(call BuildPlugin,ldap,ldap,LDAP connector,,+libopenldap))
-$(eval $(call BuildPlugin,maxfwd,maxfwd,Max-Forward processor,,))
-$(eval $(call BuildPlugin,mediaproxy,mediaproxy,Automatic NAT traversal,dialog,))
-$(eval $(call BuildPlugin,mi-datagram,mi_datagram,Datagram support for Management Interface,,))
-$(eval $(call BuildPlugin,mi-fifo,mi_fifo,FIFO support for Management Interface,,))
-$(eval $(call BuildPlugin,mi-rpc,mi_rpc,RPC support for Management Interface,,))
-$(eval $(call BuildPlugin,msilo,msilo,SIP message silo,tm,))
-$(eval $(call BuildPlugin,msrp,msrp,MSRP routing engine,tls,))
-$(eval $(call BuildPlugin,nathelper,nathelper,NAT helper,usrloc,))
-$(eval $(call BuildPlugin,nat_traversal,nat_traversal,NAT traversal,dialog sl tm,))
-$(eval $(call BuildPlugin,path,path,SIP path insertion,rr,))
-$(eval $(call BuildPlugin,pdt,pdt,Prefix-to-Domain translator,,))
-$(eval $(call BuildPlugin,permissions,permissions,Permissions control,,))
-$(eval $(call BuildPlugin,pike,pike,Flood detector,,))
-$(eval $(call BuildPlugin,presence,presence,Presence server,sl tm,+libxml2))
-$(eval $(call BuildPlugin,presence-dialoginfo,presence_dialoginfo,Dialog Event presence,presence,))
-$(eval $(call BuildPlugin,presence-mwi,presence_mwi,Message Waiting Indication presence,presence,))
-$(eval $(call BuildPlugin,presence-xml,presence_xml,XCAP presence,presence xcap-client,))
-$(eval $(call BuildPlugin,pua,pua,Presence User Agent,tm,+libxml2))
-$(eval $(call BuildPlugin,pua-bla,pua_bla,Bridged Line Appearence PUA,presence pua usrloc,))
-$(eval $(call BuildPlugin,pua-dialoginfo,pua_dialoginfo,Dialog Event PUA,dialog pua,))
-$(eval $(call BuildPlugin,pua-mi,pua_mi,PUA Management Interface,pua,))
-$(eval $(call BuildPlugin,pua-usrloc,pua_usrloc,PUA User Location,pua usrloc,))
-$(eval $(call BuildPlugin,pua-xmpp,pua_xmpp,PUA XMPP,presence pua xmpp,))
-$(eval $(call BuildPlugin,pv,pv,Pseudo-Variables,,))
-$(eval $(call BuildPlugin,qos,qos,QoS control,dialog,))
-$(eval $(call BuildPlugin,ratelimit,ratelimit,Traffic shapping,,))
-$(eval $(call BuildPlugin,regex,regex,Regular Expression,,+libpcre))
-$(eval $(call BuildPlugin,registrar,registrar,SIP Registrar,usrloc,))
-$(eval $(call BuildPlugin,rls,rls,Resource List Server,presence pua tm,+libxml2))
-$(eval $(call BuildPlugin,rr,rr,Record-Route and Route,,))
-$(eval $(call BuildPlugin,rtimer,rtimer,Routing Timer,,))
-$(eval $(call BuildPlugin,rtpproxy,rtpproxy,RTP proxy,tm,))
-$(eval $(call BuildPlugin,rtpproxy-ng,rtpproxy-ng,RTP proxy with new control protocol,tm,))
-$(eval $(call BuildPlugin,sanity,sanity,SIP sanity checks,sl,))
-$(eval $(call BuildPlugin,sipcapture,sipcapture,SIP capture,,))
-$(eval $(call BuildPlugin,siptrace,siptrace,SIP trace,,))
-$(eval $(call BuildPlugin,siputils,siputils,SIP utilities,sl,))
-$(eval $(call BuildPlugin,sl,sl,Stateless replier,,))
-$(eval $(call BuildPlugin,sms,sms,SIP-to-SMS IM gateway,tm,))
-$(eval $(call BuildPlugin,speeddial,speeddial,Per-user speed-dial controller,,))
-$(eval $(call BuildPlugin,sqlops,sqlops,SQL operations,,))
-$(eval $(call BuildPlugin,statistics,statistics,Script statistics,,))
-$(eval $(call BuildPlugin,stun,stun,STUN server support,,))
-$(eval $(call BuildPlugin,sst,sst,SIP Session Timer,dialog sl,))
-$(eval $(call BuildPlugin,textops,textops,Text operations,,))
-$(eval $(call BuildPlugin,tls,tls,TLS operations,,+libopenssl))
-$(eval $(call BuildPlugin,topoh,topoh,Topology hiding,rr,))
-$(eval $(call BuildPlugin,tm,tm,Transaction,,))
-$(eval $(call BuildPlugin,tmx,tmx,Transaction module extensions,,))
-$(eval $(call BuildPlugin,uac,uac,User Agent Client,tm,))
-$(eval $(call BuildPlugin,uac-redirect,uac_redirect,User Agent Client redirection,tm,))
-$(eval $(call BuildPlugin,uri-db,uri_db,Database-backend SIP URI checking,,))
-$(eval $(call BuildPlugin,userblacklist,userblacklist,User blacklists,,))
-$(eval $(call BuildPlugin,usrloc,usrloc,User location,,))
-$(eval $(call BuildPlugin,utils,utils,Misc utilities,,+libcurl +libxml2))
-$(eval $(call BuildPlugin,xcap-client,xcap_client,XCAP Client,,+libcurl))
-$(eval $(call BuildPlugin,xlog,xlog,Advanced logger,,))
-$(eval $(call BuildPlugin,xmpp,xmpp,SIP-to-XMPP Gateway,tm,+libexpat))
-
-PKG_MAKE_ARGS:= \
-	prefix=/ \
-	cfg_dir=/etc/kamailio/ \
-	bin_dir=/usr/sbin/ \
-	data_dir=/var/lib/kamailio/ \
-	lib_dir=/usr/lib/kamailio/ \
-	modules_dir=/usr/lib/kamailio/ \
-	include_modules="$(INCL_MODULES)" \
-	cfg_target:=/etc/kamailio/ \
-	TLS_HOOKS=1 \
-	extra_defs="-DUSE_PTHREAD_MUTEX " \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LOCALBASE="$(STAGING_DIR)/usr" \
-	SYSBASE="$(STAGING_DIR)/usr" \
-	PCREDEFS:="$(TARGET_CPPFLAGS)" \
-	PCRELIBS:="$(TARGET_LDFLAGS)" \
-	CROSS_COMPILE=$(TARGET_CROSS) \
-	CC="$(TARGET_CC)" \
-	ARCH="$(ARCH)"  \
-	DESTDIR=$(PKG_INSTALL_DIR) \
-	quiet=verbose
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
-		EXTRA_LIBS=-L$(STAGING_DIR)/usr/lib/ \
-		all
-	$(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
-		install
-endef
-
-$(eval $(call BuildPackage,kamailio4))
-$(eval $(call BuildPackage,kamailio4-tools))
-$(foreach m,$(KAM_MODULES),$(eval $(call BuildPackage,$(m))))
diff --git a/net/kamailio-4.1.x/files/kamailio.default b/net/kamailio-4.1.x/files/kamailio.default
deleted file mode 100644
index a61617b..0000000
--- a/net/kamailio-4.1.x/files/kamailio.default
+++ /dev/null
@@ -1,13 +0,0 @@
-# OPTIONS
-# -n COUNT
-# Specifies the number of children processes forked per interface
-# -N COUNT
-# Specifies the number of children processes forked to handle tcp incoming connections
-# -m SIZE
-# Size of the shared memory which will be allocated (in Megabytes).
-# -u UID
-# Changes the user id under which 
-# -g GID
-# Changes the group id under which 
-
-OPTIONS="-n 4 -m 4 - m 8"
diff --git a/net/kamailio-4.1.x/files/kamailio.init b/net/kamailio-4.1.x/files/kamailio.init
deleted file mode 100644
index dae4546..0000000
--- a/net/kamailio-4.1.x/files/kamailio.init
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=99
-
-BIN_FILE=/usr/sbin/kamailio
-PID_FILE=/var/run/kamailio.pid
-
-start() {
-	start-stop-daemon -S -x $BIN_FILE -b -- -P $PID_FILE
-}
-
-stop() {
-	start-stop-daemon -K -x $BIN_FILE -p $PID_FILE -q
-	rm -rf $PID_FILE
-}
diff --git a/net/kamailio-4.1.x/patches/050-fix-kamailio-utils.patch b/net/kamailio-4.1.x/patches/050-fix-kamailio-utils.patch
deleted file mode 100644
index f9542e1..0000000
--- a/net/kamailio-4.1.x/patches/050-fix-kamailio-utils.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/utils/kamctl/kamctl
-+++ b/utils/kamctl/kamctl
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # $Id$
- #
---- a/utils/kamctl/kamctlrc
-+++ b/utils/kamctl/kamctlrc
-@@ -141,3 +141,6 @@
- ## Extra start options - default is: not set
- # example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64"
- # STARTOPTIONS=
-+
-+# Disable colour printing in terminal
-+NOHLPRINT=1
---- a/utils/kamctl/kamdbctl
-+++ b/utils/kamctl/kamdbctl
-@@ -1,4 +1,4 @@
--#!/bin/bash 
-+#!/bin/sh 
- #
- # $Id$
- #
---- a/utils/kamctl/kamdbctl.base
-+++ b/utils/kamctl/kamdbctl.base
-@@ -33,18 +33,18 @@ INSTALL_DBUID_TABLES=${INSTALL_DBUID_TAB
- 
- # Used by dbtext and db_berkeley to define tables to be created, used by
- # postgres to do the grants
--STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs
--		grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber
--		location location_attrs re_grp trusted address missed_calls
--		usr_preferences aliases silo dialog dialog_vars dispatcher dialplan
-+STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs \
-+		grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber \
-+		location location_attrs re_grp trusted address missed_calls \
-+		usr_preferences aliases silo dialog dialog_vars dispatcher dialplan \
- 		acc_cdrs}
--EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy
--		carrierroute carrier_name domain_name carrierfailureroute userblacklist
--		globalblacklist htable purplemap uacreg pl_pipes mtree mtrees
-+EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy \
-+		carrierroute carrier_name domain_name carrierfailureroute userblacklist \
-+		globalblacklist htable purplemap uacreg pl_pipes mtree mtrees \
- 		sca_subscriptions mohqcalls mohqueues rtpproxy}
--PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap 
-+PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap \
- 		pua rls_presentity rls_watchers}
--DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs
-+DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs \
- 		uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs}
- 
- # SQL definitions
-@@ -68,17 +68,17 @@ GREP=${GREP:-grep}
- SED=${SED:-sed}
- 
- # define what modules should be installed
--STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group
--		permissions registrar usrloc msilo alias_db uri_db speeddial
-+STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group \
-+		permissions registrar usrloc msilo alias_db uri_db speeddial \
- 		avpops auth_db pdt dialog dispatcher dialplan}
- 
- PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls}
- 
--EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
--		userblacklist htable purple uac pipelimit mtree sca mohqueue
-+EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute \
-+		userblacklist htable purple uac pipelimit mtree sca mohqueue \
- 		rtpproxy}
- 
--DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags
-+DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags \
- 		uid_uri_db}
- 
- ############################################################
diff --git a/net/kamailio-4.x/Makefile b/net/kamailio-4.x/Makefile
new file mode 100644
index 0000000..f9a6337
--- /dev/null
+++ b/net/kamailio-4.x/Makefile
@@ -0,0 +1,257 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=kamailio4
+PKG_VERSION:=4.1.6
+PKG_RELEASE:=2
+
+PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
+PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
+PKG_MD5SUM:=000008e7a02e767956bf8fbe6df16e51
+PKG_USE_MIPS16:=0
+
+INCL_MODULES:=
+KAM_MODULES:=
+
+include $(INCLUDE_DIR)/nls.mk
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += $(FPIC)
+PREBUILT_STAMP=$(STAGING_DIR)/stamp/.$(PKG_NAME)_prebuilt
+TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components 1 $(TAR_OPTIONS)
+
+define Package/kamailio4/Default
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Telephony
+  URL:=http://www.kamailio.org/
+  MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+  DEPENDS:=$(ICONV_DEPENDS) +libncurses +libpthread +libreadline +libxml2
+endef
+
+define Package/kamailio4
+$(call Package/kamailio4/Default)
+  TITLE:=Mature and flexible open source SIP server, v$(PKG_VERSION)
+  MENU:=1
+endef
+
+define Package/kamailio4/conffiles
+/etc/default/kamailio
+/etc/kamailio/kamailio.cfg
+/etc/kamailio/kamailio-advanced.cfg
+/etc/kamailio/dictionary.kamailio
+endef
+
+define Package/kamailio4-tools
+$(call Package/kamailio4/Default)
+  TITLE:=Kamailio4 control tools
+  DEPENDS:=kamailio4
+endef
+
+define Package/kamailio4-tools/conffiles
+/etc/kamailio/kamctlrc
+endef
+
+define Package/kamailio4/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/sbin/{kamailio,kamcmd} \
+		$(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib/kamailio/modules
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/lib/kamailio/lib*.so* \
+		$(1)/usr/lib/kamailio/
+	$(INSTALL_DIR) $(1)/etc/kamailio
+	$(CP) \
+		$(PKG_INSTALL_DIR)/etc/kamailio/{kamailio-advanced.cfg,kamailio.cfg} \
+		$(1)/etc/kamailio/
+	$(INSTALL_DIR) $(1)/etc/kamailio
+	$(CP) \
+		$(PKG_INSTALL_DIR)/etc/kamailio/dictionary.kamailio \
+		$(1)/etc/kamailio/
+	$(INSTALL_DIR) $(1)/etc/default
+	$(CP) \
+		./files/kamailio.default \
+		$(1)/etc/default/kamailio
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) \
+		./files/kamailio.init \
+		$(1)/etc/init.d/kamailio
+endef
+
+define Package/kamailio4-tools/install
+	$(INSTALL_DIR) $(1)/etc/kamailio
+	$(CP) \
+		$(PKG_BUILD_DIR)/utils/kamctl/kamctlrc \
+		$(1)/etc/kamailio/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/sbin/kam{ctl,dbctl} \
+		$(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib/kamailio
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/kamailio/kamctl \
+		$(1)/usr/lib/kamailio/
+endef
+
+define BuildPlugin
+  define Package/kamailio4-mod-$(1)
+    $$(call Package/kamailio4/Default)
+    TITLE:= kamailio4 $(3) module
+    DEPENDS:=kamailio4 $$(foreach m,$(4),+kamailio4-mod-$$m) $(5)
+  endef
+
+  define Package/kamailio4-mod-$(1)/install
+	$(INSTALL_DIR) $$(1)/usr/lib/kamailio/modules
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/kamailio/modules/$(2).so $$(1)/usr/lib/kamailio/modules/
+  endef
+
+  INCL_MODULES+=$(2)
+  KAM_MODULES+=kamailio4-mod-$(1)
+endef
+
+################################
+# Kamailio modules
+# Params:
+# 1 - Package subname
+# 2 - Module name
+# 3 - Module description
+# 4 - Dependencies to internal modules
+# 5 - Dependencies to external libs/apps
+################################
+
+$(eval $(call BuildPlugin,acc,acc,Accounting,tm,))
+$(eval $(call BuildPlugin,alias-db,alias_db,Database-backend aliases,db-sqlite,))
+$(eval $(call BuildPlugin,auth,auth,Authentication Framework,,))
+$(eval $(call BuildPlugin,auth-db,auth_db,Database-backend authentication,auth db-sqlite,))
+$(eval $(call BuildPlugin,auth-diameter,auth_diameter,Diameter-backend authentication,sl,))
+$(eval $(call BuildPlugin,avpops,avpops,AVP operation,,))
+$(eval $(call BuildPlugin,benchmark,benchmark,Config benchmark,,))
+$(eval $(call BuildPlugin,cfgutils,cfgutils,Config utilities,,))
+$(eval $(call BuildPlugin,cfg-db,cfg_db,Load core and module parameters from database,db-sqlite,))
+$(eval $(call BuildPlugin,cfg-rpc,cfg_rpc,Update core and module parameters at runtime via RPC interface,,))
+$(eval $(call BuildPlugin,cnxcc,cnxcc,Limit call duration,dialog,))
+$(eval $(call BuildPlugin,corex,corex,Legacy functions,,))
+$(eval $(call BuildPlugin,ctl,ctl,BINRPC transport interface,,))
+$(eval $(call BuildPlugin,db-flatstore,db_flatstore,Fast writing-only text database-backed,,))
+$(eval $(call BuildPlugin,db-mysql,db_mysql,MySQL database-backend,,+libmysqlclient))
+$(eval $(call BuildPlugin,db-postgres,db_postgres,PostgreSQL Database-backend,,+libpq))
+$(eval $(call BuildPlugin,db-sqlite,db_sqlite,Sqlite DB support,,+libsqlite3))
+$(eval $(call BuildPlugin,db-text,db_text,Text database-backend,,))
+$(eval $(call BuildPlugin,db-unixodbc,db_unixodbc,UnixODBC Database-backend,,+unixodbc))
+$(eval $(call BuildPlugin,dialog,dialog,Dialog support,rr tm,))
+$(eval $(call BuildPlugin,dialog_ng,dialog,Dialog support,rr tm,))
+$(eval $(call BuildPlugin,dialplan,dialplan,Dialplan management,,+libpcre))
+$(eval $(call BuildPlugin,dispatcher,dispatcher,Dispatcher,,))
+$(eval $(call BuildPlugin,diversion,diversion,Diversion header insertion,,))
+$(eval $(call BuildPlugin,domain,domain,Multi-domain support,,))
+$(eval $(call BuildPlugin,domainpolicy,domainpolicy,Domain policy,,))
+$(eval $(call BuildPlugin,enum,enum,ENUM lookup,,))
+$(eval $(call BuildPlugin,exec,exec,External exec,,))
+$(eval $(call BuildPlugin,group,group,Database-backend user-groups,,))
+$(eval $(call BuildPlugin,h350,h350,H.350,ldap,+libopenldap))
+$(eval $(call BuildPlugin,htable,htable,Hash Table,,))
+$(eval $(call BuildPlugin,imc,imc,IM conferencing,db-mysql tm,))
+$(eval $(call BuildPlugin,ipops,ipops,IP and IPv6 operations,,))
+$(eval $(call BuildPlugin,json,json,Access to JSON document attributes,,+libjson))
+$(eval $(call BuildPlugin,kex,kex,Core extensions,,))
+$(eval $(call BuildPlugin,lcr,lcr,Least Cost Routing,tm,+libpcre))
+$(eval $(call BuildPlugin,ldap,ldap,LDAP connector,,+libopenldap))
+$(eval $(call BuildPlugin,maxfwd,maxfwd,Max-Forward processor,,))
+$(eval $(call BuildPlugin,mediaproxy,mediaproxy,Automatic NAT traversal,dialog,))
+$(eval $(call BuildPlugin,mi-datagram,mi_datagram,Datagram support for Management Interface,,))
+$(eval $(call BuildPlugin,mi-fifo,mi_fifo,FIFO support for Management Interface,,))
+$(eval $(call BuildPlugin,mi-rpc,mi_rpc,RPC support for Management Interface,,))
+$(eval $(call BuildPlugin,msilo,msilo,SIP message silo,tm,))
+$(eval $(call BuildPlugin,msrp,msrp,MSRP routing engine,tls,))
+$(eval $(call BuildPlugin,nathelper,nathelper,NAT helper,usrloc,))
+$(eval $(call BuildPlugin,nat_traversal,nat_traversal,NAT traversal,dialog sl tm,))
+$(eval $(call BuildPlugin,path,path,SIP path insertion,rr,))
+$(eval $(call BuildPlugin,pdt,pdt,Prefix-to-Domain translator,,))
+$(eval $(call BuildPlugin,permissions,permissions,Permissions control,,))
+$(eval $(call BuildPlugin,pike,pike,Flood detector,,))
+$(eval $(call BuildPlugin,presence,presence,Presence server,sl tm,+libxml2))
+$(eval $(call BuildPlugin,presence-dialoginfo,presence_dialoginfo,Dialog Event presence,presence,))
+$(eval $(call BuildPlugin,presence-mwi,presence_mwi,Message Waiting Indication presence,presence,))
+$(eval $(call BuildPlugin,presence-xml,presence_xml,XCAP presence,presence xcap-client,))
+$(eval $(call BuildPlugin,pua,pua,Presence User Agent,tm,+libxml2))
+$(eval $(call BuildPlugin,pua-bla,pua_bla,Bridged Line Appearence PUA,presence pua usrloc,))
+$(eval $(call BuildPlugin,pua-dialoginfo,pua_dialoginfo,Dialog Event PUA,dialog pua,))
+$(eval $(call BuildPlugin,pua-mi,pua_mi,PUA Management Interface,pua,))
+$(eval $(call BuildPlugin,pua-usrloc,pua_usrloc,PUA User Location,pua usrloc,))
+$(eval $(call BuildPlugin,pua-xmpp,pua_xmpp,PUA XMPP,presence pua xmpp,))
+$(eval $(call BuildPlugin,pv,pv,Pseudo-Variables,,))
+$(eval $(call BuildPlugin,qos,qos,QoS control,dialog,))
+$(eval $(call BuildPlugin,ratelimit,ratelimit,Traffic shapping,,))
+$(eval $(call BuildPlugin,regex,regex,Regular Expression,,+libpcre))
+$(eval $(call BuildPlugin,registrar,registrar,SIP Registrar,usrloc,))
+$(eval $(call BuildPlugin,rls,rls,Resource List Server,presence pua tm,+libxml2))
+$(eval $(call BuildPlugin,rr,rr,Record-Route and Route,,))
+$(eval $(call BuildPlugin,rtimer,rtimer,Routing Timer,,))
+$(eval $(call BuildPlugin,rtpproxy,rtpproxy,RTP proxy,tm,))
+$(eval $(call BuildPlugin,rtpproxy-ng,rtpproxy-ng,RTP proxy with new control protocol,tm,))
+$(eval $(call BuildPlugin,sanity,sanity,SIP sanity checks,sl,))
+$(eval $(call BuildPlugin,sipcapture,sipcapture,SIP capture,,))
+$(eval $(call BuildPlugin,siptrace,siptrace,SIP trace,,))
+$(eval $(call BuildPlugin,siputils,siputils,SIP utilities,sl,))
+$(eval $(call BuildPlugin,sl,sl,Stateless replier,,))
+$(eval $(call BuildPlugin,sms,sms,SIP-to-SMS IM gateway,tm,))
+$(eval $(call BuildPlugin,speeddial,speeddial,Per-user speed-dial controller,,))
+$(eval $(call BuildPlugin,sqlops,sqlops,SQL operations,,))
+$(eval $(call BuildPlugin,statistics,statistics,Script statistics,,))
+$(eval $(call BuildPlugin,stun,stun,STUN server support,,))
+$(eval $(call BuildPlugin,sst,sst,SIP Session Timer,dialog sl,))
+$(eval $(call BuildPlugin,textops,textops,Text operations,,))
+$(eval $(call BuildPlugin,tls,tls,TLS operations,,+libopenssl))
+$(eval $(call BuildPlugin,topoh,topoh,Topology hiding,rr,))
+$(eval $(call BuildPlugin,tm,tm,Transaction,,))
+$(eval $(call BuildPlugin,tmx,tmx,Transaction module extensions,,))
+$(eval $(call BuildPlugin,uac,uac,User Agent Client,tm,))
+$(eval $(call BuildPlugin,uac-redirect,uac_redirect,User Agent Client redirection,tm,))
+$(eval $(call BuildPlugin,uri-db,uri_db,Database-backend SIP URI checking,,))
+$(eval $(call BuildPlugin,userblacklist,userblacklist,User blacklists,,))
+$(eval $(call BuildPlugin,usrloc,usrloc,User location,,))
+$(eval $(call BuildPlugin,utils,utils,Misc utilities,,+libcurl +libxml2))
+$(eval $(call BuildPlugin,xcap-client,xcap_client,XCAP Client,,+libcurl))
+$(eval $(call BuildPlugin,xlog,xlog,Advanced logger,,))
+$(eval $(call BuildPlugin,xmpp,xmpp,SIP-to-XMPP Gateway,tm,+libexpat))
+
+PKG_MAKE_ARGS:= \
+	prefix=/ \
+	cfg_dir=/etc/kamailio/ \
+	bin_dir=/usr/sbin/ \
+	data_dir=/var/lib/kamailio/ \
+	lib_dir=/usr/lib/kamailio/ \
+	modules_dir=/usr/lib/kamailio/ \
+	include_modules="$(INCL_MODULES)" \
+	cfg_target:=/etc/kamailio/ \
+	TLS_HOOKS=1 \
+	extra_defs="-DUSE_PTHREAD_MUTEX " \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LOCALBASE="$(STAGING_DIR)/usr" \
+	SYSBASE="$(STAGING_DIR)/usr" \
+	PCREDEFS:="$(TARGET_CPPFLAGS)" \
+	PCRELIBS:="$(TARGET_LDFLAGS)" \
+	CROSS_COMPILE=$(TARGET_CROSS) \
+	CC="$(TARGET_CC)" \
+	ARCH="$(ARCH)"  \
+	DESTDIR=$(PKG_INSTALL_DIR) \
+	quiet=verbose
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
+		EXTRA_LIBS=-L$(STAGING_DIR)/usr/lib/ \
+		all
+	$(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
+		install
+endef
+
+$(eval $(call BuildPackage,kamailio4))
+$(eval $(call BuildPackage,kamailio4-tools))
+$(foreach m,$(KAM_MODULES),$(eval $(call BuildPackage,$(m))))
diff --git a/net/kamailio-4.x/files/kamailio.default b/net/kamailio-4.x/files/kamailio.default
new file mode 100644
index 0000000..a61617b
--- /dev/null
+++ b/net/kamailio-4.x/files/kamailio.default
@@ -0,0 +1,13 @@
+# OPTIONS
+# -n COUNT
+# Specifies the number of children processes forked per interface
+# -N COUNT
+# Specifies the number of children processes forked to handle tcp incoming connections
+# -m SIZE
+# Size of the shared memory which will be allocated (in Megabytes).
+# -u UID
+# Changes the user id under which 
+# -g GID
+# Changes the group id under which 
+
+OPTIONS="-n 4 -m 4 - m 8"
diff --git a/net/kamailio-4.x/files/kamailio.init b/net/kamailio-4.x/files/kamailio.init
new file mode 100644
index 0000000..dae4546
--- /dev/null
+++ b/net/kamailio-4.x/files/kamailio.init
@@ -0,0 +1,16 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2014 OpenWrt.org
+
+START=99
+
+BIN_FILE=/usr/sbin/kamailio
+PID_FILE=/var/run/kamailio.pid
+
+start() {
+	start-stop-daemon -S -x $BIN_FILE -b -- -P $PID_FILE
+}
+
+stop() {
+	start-stop-daemon -K -x $BIN_FILE -p $PID_FILE -q
+	rm -rf $PID_FILE
+}
diff --git a/net/kamailio-4.x/patches/050-fix-kamailio-utils.patch b/net/kamailio-4.x/patches/050-fix-kamailio-utils.patch
new file mode 100644
index 0000000..f9542e1
--- /dev/null
+++ b/net/kamailio-4.x/patches/050-fix-kamailio-utils.patch
@@ -0,0 +1,78 @@
+--- a/utils/kamctl/kamctl
++++ b/utils/kamctl/kamctl
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # $Id$
+ #
+--- a/utils/kamctl/kamctlrc
++++ b/utils/kamctl/kamctlrc
+@@ -141,3 +141,6 @@
+ ## Extra start options - default is: not set
+ # example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64"
+ # STARTOPTIONS=
++
++# Disable colour printing in terminal
++NOHLPRINT=1
+--- a/utils/kamctl/kamdbctl
++++ b/utils/kamctl/kamdbctl
+@@ -1,4 +1,4 @@
+-#!/bin/bash 
++#!/bin/sh 
+ #
+ # $Id$
+ #
+--- a/utils/kamctl/kamdbctl.base
++++ b/utils/kamctl/kamdbctl.base
+@@ -33,18 +33,18 @@ INSTALL_DBUID_TABLES=${INSTALL_DBUID_TAB
+ 
+ # Used by dbtext and db_berkeley to define tables to be created, used by
+ # postgres to do the grants
+-STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs
+-		grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber
+-		location location_attrs re_grp trusted address missed_calls
+-		usr_preferences aliases silo dialog dialog_vars dispatcher dialplan
++STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs \
++		grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber \
++		location location_attrs re_grp trusted address missed_calls \
++		usr_preferences aliases silo dialog dialog_vars dispatcher dialplan \
+ 		acc_cdrs}
+-EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy
+-		carrierroute carrier_name domain_name carrierfailureroute userblacklist
+-		globalblacklist htable purplemap uacreg pl_pipes mtree mtrees
++EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy \
++		carrierroute carrier_name domain_name carrierfailureroute userblacklist \
++		globalblacklist htable purplemap uacreg pl_pipes mtree mtrees \
+ 		sca_subscriptions mohqcalls mohqueues rtpproxy}
+-PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap 
++PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap \
+ 		pua rls_presentity rls_watchers}
+-DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs
++DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs \
+ 		uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs}
+ 
+ # SQL definitions
+@@ -68,17 +68,17 @@ GREP=${GREP:-grep}
+ SED=${SED:-sed}
+ 
+ # define what modules should be installed
+-STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group
+-		permissions registrar usrloc msilo alias_db uri_db speeddial
++STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group \
++		permissions registrar usrloc msilo alias_db uri_db speeddial \
+ 		avpops auth_db pdt dialog dispatcher dialplan}
+ 
+ PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls}
+ 
+-EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
+-		userblacklist htable purple uac pipelimit mtree sca mohqueue
++EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute \
++		userblacklist htable purple uac pipelimit mtree sca mohqueue \
+ 		rtpproxy}
+ 
+-DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags
++DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags \
+ 		uid_uri_db}
+ 
+ ############################################################