From eb94148d8b69f5cefc79a6209a4332380b2140fc Mon Sep 17 00:00:00 2001
From: Jiri Slachta <jiri@slachta.eu>
Date: Tue, 22 Oct 2019 23:52:56 +0200
Subject: [PATCH] kamailio-5.x: version bump to 5.3.0

Signed-off-by: Jiri Slachta <jiri@slachta.eu>
---
 net/kamailio-5.x/Makefile                     |  4 +-
 .../patches/050-fix-kamailio-utils.patch      | 59 -------------------
 2 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/net/kamailio-5.x/Makefile b/net/kamailio-5.x/Makefile
index ef5d303..80c13d8 100644
--- a/net/kamailio-5.x/Makefile
+++ b/net/kamailio-5.x/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kamailio5
-PKG_VERSION:=5.2.5
+PKG_VERSION:=5.3.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src
 PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
-PKG_HASH:=ec6b547b9c3016bca9858da124a9b659d17d7674e60f743a48c0a9e455832b4f
+PKG_HASH:=1bf948620a4036fa473659d3969d5d3887dd25bd2ad20a1ac451ecadaaca447e
 PKG_USE_MIPS16:=0
 
 PKG_LICENSE:=GPL-2.0+
diff --git a/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch b/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch
index 780c181..44276b6 100644
--- a/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch
+++ b/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch
@@ -1,11 +1,3 @@
---- a/utils/kamctl/kamctl
-+++ b/utils/kamctl/kamctl
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # control tool for maintaining Kamailio
- #
 --- a/utils/kamctl/kamctlrc
 +++ b/utils/kamctl/kamctlrc
 @@ -160,3 +160,6 @@
@@ -15,54 +7,3 @@
 +
 +# Disable colour printing in terminal
 +NOHLPRINT=1
---- a/utils/kamctl/kamdbctl
-+++ b/utils/kamctl/kamdbctl
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # control tool for maintaining Kamailio databases
- #
---- a/utils/kamctl/kamctl.base
-+++ b/utils/kamctl/kamctl.base
-@@ -651,7 +651,7 @@ in SIP_DOMAIN"
- check_aor() {
- 	echo "$1" | $EGREP "^$USERNAME_RE@.+" >/dev/null
- 	if [ $? -ne 0 ] ; then
--		echo "error: invalid AoR: $1" > /dev/stderr
-+		echo "error: invalid AoR: $1" >&2
- 		exit 1
- 	fi
- }
-@@ -670,7 +670,7 @@ is_aor() {
- check_sipaor() {
- 	echo "$1" | $EGREP "^sip(s)?:$USERNAME_RE@.+" >/dev/null
- 	if [ $? -ne 0 ] ; then
--		echo "error: invalid SIP AoR: $1" > /dev/stderr
-+		echo "error: invalid SIP AoR: $1" >&2
- 		exit 1
- 	fi
- }
-@@ -681,7 +681,7 @@ check_sipaor() {
- check_uri() {
- 	echo "$1" | $EGREP "^sip(s)?:($USERNAME_RE@)?.+"  > /dev/null
- 	if [ $? -ne 0 ] ; then
--		echo "error: invalid SIP URI: $1" > /dev/stderr
-+		echo "error: invalid SIP URI: $1" >&2
- 		exit 1
- 	fi
- }
---- a/utils/kamctl/kamctl.sqlbase
-+++ b/utils/kamctl/kamctl.sqlbase
-@@ -38,9 +38,9 @@ prompt_pw() {
- 	if [ -z "$DBRWPW" ] ; then
- 		savetty=`stty -g`
- 		if [ -z "$1" ] ; then
--			printf "Password: " > /dev/stderr
-+			printf "Password: " >&2
- 		else
--			printf "$1: " > /dev/stderr
-+			printf "$1: " >&2
- 		fi
- 		stty -echo
-     	read DBRWPW
-- 
2.30.2