From: Jiri Slachta <slachta@cesnet.cz>
Date: Thu, 15 Jan 2015 07:07:33 +0000 (+0100)
Subject: kamailio-4.x: update to 4.2.2
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=369780190b7d9589942def128f7d20f90457b602;p=feed%2Ftelephony.git

kamailio-4.x: update to 4.2.2

This commit deals with the update of kamailio to version 4.2.2 and
also fixes the mechanism for module inclusion. Instead of building
all modules by default only selected modules are built.

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

diff --git a/net/kamailio-4.x/Makefile b/net/kamailio-4.x/Makefile
index 41acc5c..7feb2dd 100644
--- a/net/kamailio-4.x/Makefile
+++ b/net/kamailio-4.x/Makefile
@@ -8,21 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kamailio4
-PKG_VERSION:=4.2.1
-PKG_RELEASE:=3
+PKG_VERSION:=4.2.2
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
 PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
-PKG_MD5SUM:=c2bccebd88156bf02957468e36dda648
+PKG_MD5SUM:=844e6d44ffb374763eb395d8f1477ec7
 PKG_USE_MIPS16:=0
 
 PKG_LICENSE:=GPL-2.0+
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
 
-INCL_MODULES:=
-KAM_MODULES:=
-
 include $(INCLUDE_DIR)/nls.mk
 include $(INCLUDE_DIR)/package.mk
 
@@ -96,16 +93,15 @@ define BuildKamailio4Module
     DEPENDS:=kamailio4 $(4)
   endef
 
-  define Package/kamailio4-mod-$(subst _,-,$(1))/description
-This package provides support for $(3) in Kamailio.
-  endef
-
   define Package/kamailio4-mod-$(subst _,-,$(1))/install
 $(call Package/kamailio4/install/module,$$(1),$(1))
 $(foreach d,$(5),$(call Package/kamailio4/install/dbfiles,$$(1),$(d));)
   endef
 
+ifneq ($(CONFIG_PACKAGE_kamailio4-mod-$(1)),)
   INCL_MODULES+=$(1)
+endif
+
   KAM_MODULES+=kamailio4-mod-$(subst _,-,$(1))
 endef