From ca70f0bd4fe26812c6b720a0a4063082f65f27ee Mon Sep 17 00:00:00 2001
From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Wed, 2 Oct 2019 21:08:44 +0200
Subject: [PATCH] kamailio-5.x: update to 5.2.4

Minor version bump.

Also renamed ./files/kamailio.config to ./files/kamailio.conf as per
OpenWrt package policies [1].

One patch refreshed.

[1] https://openwrt.org/docs/guide-developer/package-policies

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---
 net/kamailio-5.x/Makefile                                 | 8 ++++----
 net/kamailio-5.x/files/{kamailio.config => kamailio.conf} | 0
 net/kamailio-5.x/patches/050-fix-kamailio-utils.patch     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename net/kamailio-5.x/files/{kamailio.config => kamailio.conf} (100%)

diff --git a/net/kamailio-5.x/Makefile b/net/kamailio-5.x/Makefile
index c56b6eb..b7b824d 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.1
-PKG_RELEASE:=2
+PKG_VERSION:=5.2.4
+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:=95d2158f97c76124a381364d99de1420f193275c5a1c9f88489c6409702f2c8f
+PKG_HASH:=484488879fa3c790bbd940bb81bac90639f4dccfc1c2b4e75db38f65d4020393
 PKG_USE_MIPS16:=0
 
 PKG_LICENSE:=GPL-2.0+
@@ -271,7 +271,7 @@ $(foreach c,kamailio.cfg kamctlrc,$(call Package/kamailio5/install/conffile,$(1)
 		$(1)/usr/lib/kamailio/
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) \
-		./files/kamailio.config \
+		./files/kamailio.conf \
 		$(1)/etc/config/kamailio
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) \
diff --git a/net/kamailio-5.x/files/kamailio.config b/net/kamailio-5.x/files/kamailio.conf
similarity index 100%
rename from net/kamailio-5.x/files/kamailio.config
rename to net/kamailio-5.x/files/kamailio.conf
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 e52da41..780c181 100644
--- a/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch
+++ b/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch
@@ -27,7 +27,7 @@
 +++ b/utils/kamctl/kamctl.base
 @@ -651,7 +651,7 @@ in SIP_DOMAIN"
  check_aor() {
- 	echo "$1" | $EGREP "^$USERNAME_RE@.*\..*" >/dev/null
+ 	echo "$1" | $EGREP "^$USERNAME_RE@.+" >/dev/null
  	if [ $? -ne 0 ] ; then
 -		echo "error: invalid AoR: $1" > /dev/stderr
 +		echo "error: invalid AoR: $1" >&2
@@ -36,7 +36,7 @@
  }
 @@ -670,7 +670,7 @@ is_aor() {
  check_sipaor() {
- 	echo "$1" | $EGREP "^sip(s)?:$USERNAME_RE@.*\..*" >/dev/null
+ 	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
@@ -45,7 +45,7 @@
  }
 @@ -681,7 +681,7 @@ check_sipaor() {
  check_uri() {
- 	echo "$1" | $EGREP "^sip(s)?:($USERNAME_RE@)?.*\..*"  > /dev/null
+ 	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