From d0faa2bc8ae25ba6f0f7072c273e53458d7f7366 Mon Sep 17 00:00:00 2001
From: Jiri Slachta <slachta@cesnet.cz>
Date: Tue, 23 Sep 2014 10:24:22 +0200
Subject: [PATCH] kamailio-4.1.x: update to 4.1.6

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
---
 net/kamailio-4.1.x/Makefile                        |  6 +++---
 .../patches/050-fix-kamailio-utils.patch           | 24 +++++++++-------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/net/kamailio-4.1.x/Makefile b/net/kamailio-4.1.x/Makefile
index fcb845c..652f685 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.5
-PKG_RELEASE:=3
+PKG_VERSION:=4.1.6
+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:=623b46e969445494655b1aa5ab5ad4b0
+PKG_MD5SUM:=000008e7a02e767956bf8fbe6df16e51
 PKG_USE_MIPS16:=0
 
 INCL_MODULES:=
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
index 72d77b5..f9542e1 100644
--- a/net/kamailio-4.1.x/patches/050-fix-kamailio-utils.patch
+++ b/net/kamailio-4.1.x/patches/050-fix-kamailio-utils.patch
@@ -1,34 +1,30 @@
-diff -rupN kamailio4-4.1.4/utils/kamctl/kamctl kamailio4-new/utils/kamctl/kamctl
---- kamailio4-4.1.4/utils/kamctl/kamctl	2014-06-12 16:17:28.000000000 +0200
-+++ kamailio4-new/utils/kamctl/kamctl	2014-08-07 16:35:34.858892154 +0200
+--- a/utils/kamctl/kamctl
++++ b/utils/kamctl/kamctl
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  #
  # $Id$
  #
-diff -rupN kamailio4-4.1.4/utils/kamctl/kamctlrc kamailio4-new/utils/kamctl/kamctlrc
---- kamailio4-4.1.4/utils/kamctl/kamctlrc	2014-06-12 16:17:28.000000000 +0200
-+++ kamailio4-new/utils/kamctl/kamctlrc	2014-08-07 16:42:44.190909497 +0200
-@@ -145,3 +145,6 @@
+--- 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
-diff -rupN kamailio4-4.1.4/utils/kamctl/kamdbctl kamailio4-new/utils/kamctl/kamdbctl
---- kamailio4-4.1.4/utils/kamctl/kamdbctl	2014-06-12 16:17:28.000000000 +0200
-+++ kamailio4-new/utils/kamctl/kamdbctl	2014-08-07 16:35:42.986892483 +0200
+--- a/utils/kamctl/kamdbctl
++++ b/utils/kamctl/kamdbctl
 @@ -1,4 +1,4 @@
 -#!/bin/bash 
 +#!/bin/sh 
  #
  # $Id$
  #
-diff -rupN kamailio4-4.1.4/utils/kamctl/kamdbctl.base kamailio4-new/utils/kamctl/kamdbctl.base
---- kamailio4-4.1.4/utils/kamctl/kamdbctl.base	2014-06-12 16:17:28.000000000 +0200
-+++ kamailio4-new/utils/kamctl/kamdbctl.base	2014-08-07 16:37:25.962896642 +0200
+--- 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
@@ -57,7 +53,7 @@ diff -rupN kamailio4-4.1.4/utils/kamctl/kamdbctl.base kamailio4-new/utils/kamctl
  		uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs}
  
  # SQL definitions
-@@ -74,17 +74,17 @@ GREP=${GREP:-grep}
+@@ -68,17 +68,17 @@ GREP=${GREP:-grep}
  SED=${SED:-sed}
  
  # define what modules should be installed
-- 
2.11.0