Merge branch 'openwrt:master' into master

net/asterisk-chan-sccp/Makefile

@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk-chan-sccp
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 # Updated to v4.3.3 release
 PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git
@@ -26,6 +26,9 @@ PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 PKG_INSTALL:=1
 
+# need iconv.m4, otherwise error during autoreconf
+PKG_BUILD_DEPENDS:=gettext-full
+
 include $(INCLUDE_DIR)/package.mk
 # chan-sccp needs iconv
 include $(INCLUDE_DIR)/nls.mk

net/asterisk-chan-sccp/patches/01-prevent-extra-optimization.patch

@@ -1,6 +1,6 @@
 --- a/autoconf/extra.m4
 +++ b/autoconf/extra.m4
-@@ -491,17 +491,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
+@@ -516,17 +516,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
  			], SUPPORTED_CFLAGS)
  		])
  		AC_SUBST([strip_binaries])
@@ -16,5 +16,5 @@
 -		esac
 -		CFLAGS_saved="${CFLAGS_saved} ${optimize_flag} "
  	])
- 
+ 	
  	AS_IF([test "X${enable_debug}" == "Xyes"], [

net/asterisk-chan-sccp/patches/02-autoconf-2.70.patch

@@ -0,0 +1,11 @@
+--- a/autoconf/acinclude.m4
++++ b/autoconf/acinclude.m4
+@@ -497,7 +497,7 @@ AC_DEFUN([CS_GET_VERSION], [
+   SCCP_REVISION="unknown"
+ 
+   CURRENT=`pwd`
+-  BASE=`dirname $ac_dir`
++  BASE=`dirname $ac_aux_dir`
+   cd $BASE >/dev/null
+   . ./tools/versioncheck silent
+   cd $CURRENT >/dev/null

net/asterisk-chan-sccp/patches/100-reproducible-builds.patch

@@ -1,8 +1,6 @@
-Index: chan-sccp-v4.3.0-20171123/src/chan_sccp.c
-===================================================================
---- chan-sccp-v4.3.0-20171123.orig/src/chan_sccp.c
-+++ chan-sccp-v4.3.0-20171123/src/chan_sccp.c
-@@ -186,7 +186,7 @@ boolean_t sccp_postPBX_load(void)
+--- a/src/chan_sccp.c
++++ b/src/chan_sccp.c
+@@ -198,7 +198,7 @@ boolean_t sccp_postPBX_load(void)
  #else
  	snprintf(SCCP_REVISIONSTR, sizeof(SCCP_REVISIONSTR), "%s", SCCP_REVISION);
  #endif

net/baresip/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=baresip
 PKG_VERSION:=1.1.0
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/baresip/baresip/tar.gz/v$(PKG_VERSION)?

net/baresip/patches/010-fix-parallel-build.patch

@@ -0,0 +1,23 @@
+From d7aeb9393876af3746dacdbacd70c4a5d6dfcf39 Mon Sep 17 00:00:00 2001
+From: Christian Spielberger <c.spielberger@commend.com>
+Date: Sun, 23 May 2021 10:01:04 +0200
+Subject: [PATCH] ctrl_dbus: add dependency to baresipbus.h (#1447) (#1457)
+
+---
+ modules/ctrl_dbus/module.mk | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/modules/ctrl_dbus/module.mk
++++ b/modules/ctrl_dbus/module.mk
+@@ -16,7 +16,10 @@ $(MOD)_CFLAGS	+= -Wno-unused-parameter -
+ 
+ $(MOD)_CCHECK_OPT	= -e baresipbus.h -e baresipbus.c
+ 
+-modules/ctrl_dbus/baresipbus.h modules/ctrl_dbus/baresipbus.c: \
++modules/$(MOD)/baresipbus.o :	modules/$(MOD)/baresipbus.h
++modules/$(MOD)/ctrl_dbus.o :	modules/$(MOD)/baresipbus.h
++
++modules/$(MOD)/baresipbus.h modules/$(MOD)/baresipbus.c: \
+ 	modules/ctrl_dbus/com.github.Baresip.xml
+ 	@cd $(dir $@) && ./gen.sh
+ 

net/kamailio/Makefile

@@ -15,7 +15,7 @@ PKG_RELEASE:=$(AUTORELEASE)
 PKG_SOURCE_URL:=https://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src
 PKG_SOURCE:=kamailio-$(PKG_VERSION)_src.tar.gz
 PKG_HASH:=ea3cd5d688c34208b92072c3844c8276b693e0ca2c688168ea0357978c76b32d
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 
 PKG_LICENSE:=GPL-2.0+
 PKG_LICENSE_FILES:=COPYING