kamailio-3.x: fix kamdbctl and database modules to work properly

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

diff --git a/net/kamailio-3.x/Makefile b/net/kamailio-3.x/Makefile
index 060a450..5cd63dc 100644 (file)
--- a/net/kamailio-3.x/Makefile
+++ b/net/kamailio-3.x/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kamailio3
 PKG_VERSION:=3.3.7
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
 PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
@@ -40,209 +40,180 @@ endef
 
 define Package/kamailio3
 $(call Package/kamailio3/Default)
-  TITLE:=Mature and flexible open source SIP server, v3.3.x
+  TITLE:=Mature and flexible open source SIP server, v$(PKG_NAME)
   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
+define Package/kamailio3/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/dictionary.kamailio
 /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
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kam{ailio,ctl,dbctl} $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sercmd $(1)/usr/sbin/
 
-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/init.d
-       $(INSTALL_BIN) ./files/kamailio.init $(1)/etc/init.d/kamailio
-endef
+       $(INSTALL_DIR) $(1)/usr/lib/kamailio/modules{,_s,_k}
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/kamailio/lib*.so* $(1)/usr/lib/kamailio/
 
-define Package/kamailio3-tools/install
        $(INSTALL_DIR) $(1)/etc/kamailio
        $(CP) \
-               $(PKG_BUILD_DIR)/utils/kamctl/kamctlrc \
+               $(PKG_INSTALL_DIR)/etc/kamailio/{dictionary.kamailio,kamailio.cfg,kamctlrc} \
                $(1)/etc/kamailio/
-       $(INSTALL_DIR) $(1)/usr/sbin
+
+       $(INSTALL_DIR) $(1)/etc/default
        $(CP) \
-               $(PKG_INSTALL_DIR)/usr/sbin/kam{ctl,dbctl} \
-               $(1)/usr/sbin/
+               ./files/kamailio.default \
+               $(1)/etc/default/kamailio
+
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) \
+               ./files/kamailio.init \
+               $(1)/etc/init.d/kamailio
+
        $(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)
+define Package/kamailio3/install/module
+       $(INSTALL_DIR) $(1)/usr/lib/kamailio/$(3)
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/kamailio/$(3)/*$(2).so* $(1)/usr/lib/kamailio/$(3)/
+endef
+
+define Package/kamailio3/install/dbfiles
+       $(INSTALL_DIR) $(1)/usr/share/kamailio/$(2)
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/kamailio/$(2)/* $(1)/usr/share/kamailio/$(2)/
+endef
+
+define BuildKamailio3Module
+  define Package/kamailio3-mod-$(subst _,-,$(1))
     $$(call Package/kamailio3/Default)
-    TITLE:= kamailio3 $(3) module
-    DEPENDS:=kamailio3 $$(foreach m,$(4),+kamailio3-mod-$$m) $(5)
+    TITLE:= kamailio3 $(2) module
+    DEPENDS:=kamailio3 $(4)
+  endef
+
+  define Package/kamailio3-mod-$(subst _,-,$(1))/description
+This package provides support for $(3) in Kamailio.
   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)/
+  define Package/kamailio3-mod-$(subst _,-,$(1))/install
+$(call Package/kamailio3/install/module,$$(1),$(1),$(5))
+$(foreach d,$(6),$(call Package/kamailio3/install/dbfiles,$$(1),$(d));)
   endef
 
-  INCL_MODULES+=$(2)
-  KAM_MODULES+=kamailio3-mod-$(1)
+  INCL_MODULES+=$(1)
+  KAM_MODULES+=kamailio3-mod-$(subst _,-,$(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))
+################################
+# Kamailio module parameters
+# Module params:
+# 1 - Name
+# 2 - Title
+# 3 - Description
+# 4 - Dependencies
+# 5 - Subdir
+# 6 - DB file directories
+################################
+
+$(eval $(call BuildKamailio3Module,acc,Accounting,,+kamailio3-mod-tm,modules_k))
+$(eval $(call BuildKamailio3Module,alias_db,Database-backend aliases,,+kamailio3-mod-db-sqlite,modules_k))
+$(eval $(call BuildKamailio3Module,auth,Authentication Framework,,,modules))
+$(eval $(call BuildKamailio3Module,auth_db,Database-backend authentication,,+kamailio3-mod-auth  +kamailio3-mod-db-sqlite,modules_k))
+$(eval $(call BuildKamailio3Module,auth_diameter,Diameter-backend authentication,,+kamailio3-mod-sl,modules_k))
+$(eval $(call BuildKamailio3Module,avpops,AVP operation,,,modules))
+$(eval $(call BuildKamailio3Module,benchmark,Config benchmark,,,modules_k))
+$(eval $(call BuildKamailio3Module,cfgutils,Config utilities,,,modules_k))
+$(eval $(call BuildKamailio3Module,cfg_db,Load core and module parameters from database,,+kamailio3-mod-db-sqlite,modules))
+$(eval $(call BuildKamailio3Module,cfg_rpc,Update core and module parameters at runtime via RPC interface,,,modules))
+$(eval $(call BuildKamailio3Module,ctl,BINRPC transport interface,,,modules))
+$(eval $(call BuildKamailio3Module,db_flatstore,Fast writing-only text database-backed,,,modules))
+$(eval $(call BuildKamailio3Module,db_mysql,MySQL database-backend,,+libmysqlclient,modules,mysql))
+$(eval $(call BuildKamailio3Module,db_postgres,PostgreSQL Database-backend,,+libpq,modules,postgres))
+$(eval $(call BuildKamailio3Module,db_sqlite,Sqlite DB support,,+libsqlite3,modules_k,db_sqlite))
+$(eval $(call BuildKamailio3Module,db_text,Text database-backend,,,modules_k,dbtext/kamailio))
+$(eval $(call BuildKamailio3Module,db_unixodbc,UnixODBC Database-backend,,+unixodbc,modules_k))
+$(eval $(call BuildKamailio3Module,dialog,Dialog support,,+kamailio3-mod-rr +kamailio3-mod-tm,modules_k))
+$(eval $(call BuildKamailio3Module,dialplan,Dialplan management,,+libpcre,modules))
+$(eval $(call BuildKamailio3Module,dispatcher,Dispatcher,,,modules_s))
+$(eval $(call BuildKamailio3Module,diversion,Diversion header insertion,,,modules_s))
+$(eval $(call BuildKamailio3Module,domain,Multi-domain support,,,modules_k))
+$(eval $(call BuildKamailio3Module,domainpolicy,Domain policy,,,modules_k))
+$(eval $(call BuildKamailio3Module,enum,ENUM lookup,,,modules))
+$(eval $(call BuildKamailio3Module,exec,External exec,,,modules_k))
+$(eval $(call BuildKamailio3Module,group,Database-backend user-groups,,,modules_k))
+$(eval $(call BuildKamailio3Module,h350,H.350,,+kamailio3-mod-ldap +libopenldap,modules_k))
+$(eval $(call BuildKamailio3Module,htable,Hash Table,,,modules_k))
+$(eval $(call BuildKamailio3Module,imc,IM conferencing,,+kamailio3-mod-db-mysql +kamailio3-mod-tm,modules_k))
+$(eval $(call BuildKamailio3Module,ipops,IP and IPv6 operations module,,,modules))
+$(eval $(call BuildKamailio3Module,kex,Core extensions,,,modules_k))
+$(eval $(call BuildKamailio3Module,lcr,Least Cost Routing,,+kamailio3-mod-tm +libpcre,modules))
+$(eval $(call BuildKamailio3Module,ldap,LDAP connector,,+libopenldap,modules_k))
+$(eval $(call BuildKamailio3Module,maxfwd,Max-Forward processor,,,modules_k))
+$(eval $(call BuildKamailio3Module,mediaproxy,Automatic NAT traversal,,+kamailio3-mod-dialog,modules))
+$(eval $(call BuildKamailio3Module,mi_datagram,Datagram support for Management Interface,,,modules_k))
+$(eval $(call BuildKamailio3Module,mi_fifo,FIFO support for Management Interface,,,modules_k))
+$(eval $(call BuildKamailio3Module,mi_rpc,RPC support for Management Interface,,,modules))
+$(eval $(call BuildKamailio3Module,msilo,SIP message silo,,+kamailio3-mod-tm,modules_k))
+$(eval $(call BuildKamailio3Module,nat_traversal,NAT traversal,,+kamailio3-mod-dialog +kamailio3-mod-sl +kamailio3-mod-tm,modules_k))
+$(eval $(call BuildKamailio3Module,nathelper,NAT traversal helper,,+rtpproxy,modules_k))
+$(eval $(call BuildKamailio3Module,path,SIP path insertion,,+kamailio3-mod-rr,modules_k))
+$(eval $(call BuildKamailio3Module,pdt,Prefix-to-Domain translator,,,modules_k))
+$(eval $(call BuildKamailio3Module,permissions,Permissions control,,,modules_k))
+$(eval $(call BuildKamailio3Module,pike,Flood detector,,,modules_k))
+$(eval $(call BuildKamailio3Module,presence,Presence server,,+kamailio3-mod-sl +kamailio3-mod-tm +libxml2,modules_k))
+$(eval $(call BuildKamailio3Module,presence_dialoginfo,Dialog Event presence,,+kamailio3-mod-presence,modules_k))
+$(eval $(call BuildKamailio3Module,presence_mwi,Message Waiting Indication presence,,+kamailio3-mod-presence,modules_k))
+$(eval $(call BuildKamailio3Module,presence_xml,XCAP presence,,+kamailio3-mod-presence +kamailio3-mod-xcap-client,modules_k))
+$(eval $(call BuildKamailio3Module,pua,Presence User Agent,,+kamailio3-mod-tm +libxml2,modules_k))
+$(eval $(call BuildKamailio3Module,pua_bla,Bridged Line Appearence PUA,,+kamailio3-mod-presence +kamailio3-mod-pua +kamailio3-mod-usrloc,modules_k))
+$(eval $(call BuildKamailio3Module,pua_dialoginfo,Dialog Event PUA,,+kamailio3-mod-dialog +kamailio3-mod-pua,modules_k))
+$(eval $(call BuildKamailio3Module,pua_mi,PUA Management Interface,,+kamailio3-mod-pua,modules_k))
+$(eval $(call BuildKamailio3Module,pua_usrloc,PUA User Location,,+kamailio3-mod-pua +kamailio3-mod-usrloc,modules_k))
+$(eval $(call BuildKamailio3Module,pua_xmpp,PUA XMPP,,+kamailio3-mod-presence +kamailio3-mod-pua +kamailio3-mod-xmpp,modules_k))
+$(eval $(call BuildKamailio3Module,pv,Pseudo-Variables,,,modules_k))
+$(eval $(call BuildKamailio3Module,qos,QoS control,,+kamailio3-mod-dialog,modules_k))
+$(eval $(call BuildKamailio3Module,ratelimit,Traffic shapping,,,modules))
+$(eval $(call BuildKamailio3Module,regex,Regular Expression,,+libpcre,modules_k))
+$(eval $(call BuildKamailio3Module,registrar,SIP Registrar,,+kamailio3-mod-usrloc,modules_k))
+$(eval $(call BuildKamailio3Module,rls,Resource List Server,,+kamailio3-mod-presence +kamailio3-mod-pua +kamailio3-mod-tm +libxml2,modules_k))
+$(eval $(call BuildKamailio3Module,rr,Record-Route and Route,,,modules_k))
+$(eval $(call BuildKamailio3Module,rtimer,Routing Timer,,,modules_k))
+$(eval $(call BuildKamailio3Module,rtpproxy,RTP proxy,,+kamailio3-mod-tm,modules))
+$(eval $(call BuildKamailio3Module,sanity,SIP sanity checks,,+kamailio3-mod-sl,modules))
+$(eval $(call BuildKamailio3Module,sipcapture,SIP capture module,,,modules))
+$(eval $(call BuildKamailio3Module,siptrace,SIP trace,,,modules_k))
+$(eval $(call BuildKamailio3Module,siputils,SIP utilities,,+kamailio3-mod-sl,modules_k))
+$(eval $(call BuildKamailio3Module,sl,Stateless replier,,,modules))
+$(eval $(call BuildKamailio3Module,sms,SIP-to-SMS IM gateway,,+kamailio3-mod-tm,modules))
+$(eval $(call BuildKamailio3Module,speeddial,Per-user speed-dial controller,,,modules_k))
+$(eval $(call BuildKamailio3Module,sqlops,SQL operations,,,modules_k))
+$(eval $(call BuildKamailio3Module,statistics,Script statistics,,,modules_k))
+$(eval $(call BuildKamailio3Module,sst,SIP Session Timer,,+kamailio3-mod-dialog +kamailio3-mod-sl,modules_k))
+$(eval $(call BuildKamailio3Module,textops,Text operations,,,modules_k))
+$(eval $(call BuildKamailio3Module,tls,TLS operations,,+libopenssl,modules))
+$(eval $(call BuildKamailio3Module,tm,Transaction,,,modules))
+$(eval $(call BuildKamailio3Module,tmx,Transaction module extensions,,,modules_k))
+$(eval $(call BuildKamailio3Module,uac,User Agent Client,,+kamailio3-mod-tm,modules_k))
+$(eval $(call BuildKamailio3Module,uac_redirect,User Agent Client redirection,,+kamailio3-mod-tm,modules_k))
+$(eval $(call BuildKamailio3Module,uri_db,Database-backend SIP URI checking,,,modules_k))
+$(eval $(call BuildKamailio3Module,userblacklist,User blacklists,,,modules_k))
+$(eval $(call BuildKamailio3Module,usrloc,User location,,+libxml2,modules_k))
+$(eval $(call BuildKamailio3Module,utils,Misc utilities,,+libcurl +libxml2,modules))
+$(eval $(call BuildKamailio3Module,xcap_client,XCAP Client,,+libcurl,modules_k))
+$(eval $(call BuildKamailio3Module,xlog,Advanced logger,,,modules_k))
+$(eval $(call BuildKamailio3Module,xmpp,SIP-to-XMPP Gateway,,+kamailio3-mod-tm +libexpat +libxml2,modules_k))
 
 PKG_MAKE_ARGS:= \
        prefix=/ \
        cfg_dir=/etc/kamailio/ \
        bin_dir=/usr/sbin/ \
-       data_dir=/var/lib/kamailio/ \
+       data_dir=/usr/share/kamailio/ \
        lib_dir=/usr/lib/kamailio/ \
        modules_dir=/usr/lib/kamailio/ \
        include_modules="$(INCL_MODULES)" \
@@ -269,6 +240,4 @@ define Build/Compile
 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 (file)
index 0000000..1fc875d
--- /dev/null
+++ b/net/kamailio-3.x/files/kamailio.default
@@ -0,0 +1,14 @@
+#
+# Kamailio startup options
+#
+
+# Set to yes to enable kamailio, once configured properly.
+#RUN_KAMAILIO=yes
+
+# Amount of shared and private memory to allocate
+# for the running Kamailio server (in Mb)
+#SHM_MEMORY=64
+#PKG_MEMORY=4
+
+# Config file
+#CFGFILE=/etc/kamailio/kamailio.cfg

diff --git a/net/kamailio-3.x/files/kamailio.init b/net/kamailio-3.x/files/kamailio.init
index dae4546..6d66c5a 100644 (file)
--- a/net/kamailio-3.x/files/kamailio.init
+++ b/net/kamailio-3.x/files/kamailio.init
@@ -3,14 +3,28 @@
 
 START=99
 
-BIN_FILE=/usr/sbin/kamailio
-PID_FILE=/var/run/kamailio.pid
+BINFILE=/usr/sbin/kamailio
+PIDFILE=/var/run/kamailio.pid
+DEFAULTS=/etc/default/kamailio
+CFGFILE=/etc/kamailio/kamailio.cfg
+SHM_MEMORY=8
+PKG_MEMORY=2
+RUN_KAMAILIO=no
 
 start() {
-       start-stop-daemon -S -x $BIN_FILE -b -- -P $PID_FILE
+       # Load startup options if available
+       if [ -f $DEFAULTS ]; then
+               . $DEFAULTS
+       fi
+
+       if [ "$RUN_KAMAILIO" != "yes" ]; then
+               echo "[WARNING] Kamailio not yet configured. Edit /etc/default/kamailio first."
+       else
+               start-stop-daemon -S -x $BINFILE -b -- -P $PIDFILE -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY
+       fi
 }
 
 stop() {
-       start-stop-daemon -K -x $BIN_FILE -p $PID_FILE -q
+       start-stop-daemon -K -x $BINFILE -p $PIDFILE -q
        rm -rf $PID_FILE
 }