summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Kemper2019-10-02 19:08:44 +0000
committerSebastian Kemper2019-10-02 19:10:24 +0000
commitca70f0bd4fe26812c6b720a0a4063082f65f27ee (patch)
tree4f8fdc0142c6794ff198a844ee1011b2044ef78f
parentd9625b5baafab1974d36eda59ca75763b73db34a (diff)
downloadtelephony-ca70f0bd4fe26812c6b720a0a4063082f65f27ee.tar.gz
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>
-rw-r--r--net/kamailio-5.x/Makefile8
-rw-r--r--net/kamailio-5.x/files/kamailio.conf (renamed from net/kamailio-5.x/files/kamailio.config)0
-rw-r--r--net/kamailio-5.x/patches/050-fix-kamailio-utils.patch6
3 files changed, 7 insertions, 7 deletions
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
index f1a9c36..f1a9c36 100644
--- a/net/kamailio-5.x/files/kamailio.config
+++ b/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