yate: Revert to internal regex implementation 379/head
authorRobert Högberg <robert.hogberg@gmail.com>
Tue, 2 Oct 2018 14:53:13 +0000 (16:53 +0200)
committerRobert Högberg <robert.hogberg@gmail.com>
Tue, 2 Oct 2018 17:48:18 +0000 (19:48 +0200)
.. because the musl implementation doesn't seem to be fully compatible
with yate. We switched to the musl implementation in f6ad95d.

Yate has this regexp:
^([[:alpha:]][[:alnum:]]+:)?/?/?([^[:space:][:cntrl:]@]+@)?([[:alnum:]._+-]+|[[][[:xdigit:].:]+[]])(:[0-9]+)?

Given a string like

  sip:012345678@11.111.11.111:5060;user=phone

musl's regexec() returns these matches:

index start end
0     -1    0
1     0     32   sip:012345678@11.111.11.111:5060
2     -1    -1
3     0     14   sip:012345678@
4     14    27   11.111.11.111
5     27    32   :5060

.. but this is what yate expects:

index start end
0     -1    0
1     0     32   sip:012345678@11.111.11.111:5060
2     0     4    sip:
3     4     14   012345678@
4     14    27   11.111.11.111
5     27    32   :5060

Fixes #378

Signed-off-by: Robert Högberg <robert.hogberg@gmail.com>
net/yate/Makefile

index eea22434d41178094ddde67ca24dbd85e7d8568b..6480bbb322fb2a8c4ca4138ecddfbbea30b6d2ed 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=yate
 PKG_VERSION:=6.1.0-1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://yate.null.ro/tarballs/yate6/
@@ -125,6 +125,10 @@ CONFIGURE_ARGS+= \
        --without-doxygen \
        --without-kdoc
 
+# The regexp implementation of musl 1.1.19 is not fully compatible with yate
+CONFIGURE_ARGS+= \
+       --enable-internalregex
+
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-isaccodec),)
 CONFIGURE_ARGS+=$(if $(CONFIG_SOFT_FLOAT),--disable-isac-float --enable-isac-fixed,--disable-isac-fixed --enable-isac-float)
 else