From: Jiri Slachta <slachta@cesnet.cz>
Date: Thu, 17 Jul 2014 12:08:49 +0000 (+0200)
Subject: kamailio4: update to version 4.1.4
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=90fdcfaf9725731e0906492a1e85eb4186f9647e;p=feed%2Ftelephony.git

kamailio4: update to version 4.1.4

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

diff --git a/net/kamailio-4.1.x/Makefile b/net/kamailio-4.1.x/Makefile
index 90eec47..a0b4c4a 100644
--- a/net/kamailio-4.1.x/Makefile
+++ b/net/kamailio-4.1.x/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kamailio4
-PKG_VERSION:=4.1.2
-PKG_RELEASE:=2
+PKG_VERSION:=4.1.4
+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:=7d48479293db2508045cf7788375f431
+PKG_MD5SUM:=f4a939c5eaf80072a9239980d94cd8e1
 PKG_USE_MIPS16:=0
 
 INCL_MODULES:=
diff --git a/net/kamailio-4.1.x/patches/001-mod-json-fix-library-name.patch b/net/kamailio-4.1.x/patches/001-mod-json-fix-library-name.patch
deleted file mode 100644
index 6eb3ff1..0000000
--- a/net/kamailio-4.1.x/patches/001-mod-json-fix-library-name.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/modules/json/Makefile
-+++ b/modules/json/Makefile
-@@ -11,12 +11,12 @@ LIBS=
- 
- BUILDER = $(shell which pkg-config)
- ifeq ($(BUILDER),)
--	DEFS+=-I/usr/include/json -I$(LOCALBASE)/include/json \
-+	DEFS+=-I/usr/include/json-c -I$(LOCALBASE)/include/json-c \
-        -I$(LOCALBASE)/include
--	LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -ljson
-+	LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -ljson-c
- else
--	DEFS+= $(shell pkg-config --cflags json)
--	LIBS+= $(shell pkg-config --libs json)
-+	DEFS+= $(shell pkg-config --cflags json-c)
-+	LIBS+= $(shell pkg-config --libs json-c)
- endif
- DEFS+=-DKAMAILIO_MOD_INTERFACE
- 
diff --git a/net/kamailio-4.1.x/patches/002-mod-jsonrpc-fix-library-name.patch b/net/kamailio-4.1.x/patches/002-mod-jsonrpc-fix-library-name.patch
deleted file mode 100644
index 3ae8edf..0000000
--- a/net/kamailio-4.1.x/patches/002-mod-jsonrpc-fix-library-name.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/modules/jsonrpc-c/Makefile
-+++ b/modules/jsonrpc-c/Makefile
-@@ -11,12 +11,12 @@ LIBS=-lm
- 
- BUILDER = $(shell which pkg-config)
- ifeq ($(BUILDER),)
--	DEFS+=-I/usr/include/json -I$(LOCALBASE)/include/json \
-+	DEFS+=-I/usr/include/json-c -I$(LOCALBASE)/include/json-c \
-        -I$(LOCALBASE)/include
--	LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -levent -ljson
-+	LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -levent -ljson-c
- else
--	DEFS+= $(shell pkg-config --cflags json)
--	LIBS+= $(shell pkg-config --libs json)
-+	DEFS+= $(shell pkg-config --cflags json-c)
-+	LIBS+= $(shell pkg-config --libs json-c)
- 	DEFS+= $(shell pkg-config --cflags libevent)
- 	LIBS+= $(shell pkg-config --libs libevent)
- endif