asterisk-15.x: bump to 15.3.0

- patches refreshed
- menuselect is bootstrapped from main bootstrap script now, extra call
  removed
- drop a module that was removed upstream for being incomplete

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

diff --git a/net/asterisk-15.x/Makefile b/net/asterisk-15.x/Makefile
index 614f155a0fa9c1a170c3c8b1869a6a0a957ca145..eef5cc83c4620e2dc23ce810ff563f4765f84046 100644 (file)
--- a/net/asterisk-15.x/Makefile
+++ b/net/asterisk-15.x/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk15
-PKG_VERSION:=15.2.2
-PKG_RELEASE:=4
+PKG_VERSION:=15.3.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
-PKG_HASH:=32abab738127dcd57feed3b3574e6f10dbf624baf5509882313e0c64636fd354
+PKG_HASH:=f424f89f23b72f267ff9baab82d449bebbbf00c54e54fcd06b8fca13788b012c
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=libxml2/host
@@ -276,7 +276,6 @@ MODULES_AVAILABLE:= \
        res-resolver-unbound \
        res-rtp-asterisk \
        res-rtp-multicast \
-       res-sdp-translator-pjmedia \
        res-security-log \
        res-smdi \
        res-snmp \
@@ -593,7 +592,7 @@ CONFIGURE_ARGS+= \
        --with-srtp="$(STAGING_DIR)/usr"
 endif
 
-ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-pjsip)$(CONFIG_PACKAGE_$(PKG_NAME)-res-pjproject)$(CONFIG_PACKAGE_$(PKG_NAME)-res-rtp-asterisk)$(CONFIG_PACKAGE_$(PKG_NAME)-res-sdp-translator-pjmedia),)
+ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-pjsip)$(CONFIG_PACKAGE_$(PKG_NAME)-res-pjproject)$(CONFIG_PACKAGE_$(PKG_NAME)-res-rtp-asterisk),)
 CONFIGURE_ARGS+= \
        --without-pjproject
 else
@@ -672,7 +671,6 @@ define Build/Configure
                ./bootstrap.sh
        $(call Build/Configure/Default)
        cd $(PKG_BUILD_DIR)/menuselect; \
-               ./bootstrap.sh; \
                CC="$(HOSTCC)" \
                CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
                CONFIG_SITE= \
@@ -979,7 +977,6 @@ $(eval $(call BuildAsterisk15Module,res-realtime,RealTime CLI,RealTime CLI,,,res
 $(eval $(call BuildAsterisk15Module,res-resolver-unbound,Unbound DNS resolver,Unbound DNS resolver,+libunbound,resolver_unbound.conf,res_resolver_unbound,,))
 $(eval $(call BuildAsterisk15Module,res-rtp-asterisk,RTP stack,Supports RTP and RTCP with Symmetric RTP support for NAT traversal,+libpjsip +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsua +libpjsua2,rtp.conf,res_rtp_asterisk,,))
 $(eval $(call BuildAsterisk15Module,res-rtp-multicast,RTP multicast engine,Multicast RTP Engine,,,res_rtp_multicast,,))
-$(eval $(call BuildAsterisk15Module,res-sdp-translator-pjmedia,PJMEDIA SDP translator,PJMEDIA SDP translator,+libpjsua2,,res_sdp_translator_pjmedia,,))
 $(eval $(call BuildAsterisk15Module,res-security-log,Security event logging,security event logging,,,res_security_log,,))
 $(eval $(call BuildAsterisk15Module,res-smdi,Provide SMDI,Simple Message Desk Interface capability,,smdi.conf,res_smdi,,))
 $(eval $(call BuildAsterisk15Module,res-snmp,SNMP [Sub]Agent for Asterisk,SNMP Agent / SubAgent,+libnetsnmp,res_snmp.conf,res_snmp,,))

diff --git a/net/asterisk-15.x/patches/001-disable-semaphores-check.patch b/net/asterisk-15.x/patches/001-disable-semaphores-check.patch
index 5bbe7c97c59936e684cdfb3d65ec68d66dcff8a2..9b18063e6e548735ea836d824eb4d62d773544e1 100644 (file)
--- a/net/asterisk-15.x/patches/001-disable-semaphores-check.patch
+++ b/net/asterisk-15.x/patches/001-disable-semaphores-check.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -992,19 +992,6 @@ AC_LINK_IFELSE(
+@@ -985,19 +985,6 @@ AC_LINK_IFELSE(
    ]
  )
  

diff --git a/net/asterisk-15.x/patches/002-undef-res-ninit.patch b/net/asterisk-15.x/patches/002-undef-res-ninit.patch
index 963b97773e389d1e21810dd08c3a394121cb1905..c77178d4108ec4eb98da057fa97f4d797c1d2031 100644 (file)
--- a/net/asterisk-15.x/patches/002-undef-res-ninit.patch
+++ b/net/asterisk-15.x/patches/002-undef-res-ninit.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1326,7 +1326,6 @@ AC_LINK_IFELSE(
+@@ -1319,7 +1319,6 @@ AC_LINK_IFELSE(
                        #include <resolv.h>],
                        [int foo = res_ninit(NULL);])],
        AC_MSG_RESULT(yes)

diff --git a/net/asterisk-15.x/patches/004-disable-check-for-hrirs.patch b/net/asterisk-15.x/patches/004-disable-check-for-hrirs.patch
index cd6d6aa4f2e6714655631d21a7412ec34a81263d..38a9c699319595182f45a002c0a68a7fd79f868a 100644 (file)
--- a/net/asterisk-15.x/patches/004-disable-check-for-hrirs.patch
+++ b/net/asterisk-15.x/patches/004-disable-check-for-hrirs.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2739,7 +2739,7 @@ else
+@@ -2709,7 +2709,7 @@ else
  fi
  
  # conf_bridge (binaural rendering): check if HRIRs are available

diff --git a/net/asterisk-15.x/patches/056-fix-check_expr2-build.patch b/net/asterisk-15.x/patches/056-fix-check_expr2-build.patch
index 4f256ce05a88c5bad9076494c8fb9cef40f7f351..bbbf42c0f7516602c46e6a6827a77d5129e45227 100644 (file)
--- a/net/asterisk-15.x/patches/056-fix-check_expr2-build.patch
+++ b/net/asterisk-15.x/patches/056-fix-check_expr2-build.patch
@@ -3,7 +3,7 @@
 @@ -182,7 +182,6 @@ check_expr2: $(ASTTOPDIR)/main/ast_expr2
        $(CC) -g -o check_expr2 ast_expr2fz.o ast_expr2z.o -lm
        $(ECHO_PREFIX) echo "   [RM] ast_expr2fz.o ast_expr2z.o"
-       rm ast_expr2z.o ast_expr2fz.o 
+       rm ast_expr2z.o ast_expr2fz.o
 -      ./check_expr2 expr2.testinput
  
  smsq: smsq.o strcompat.o

diff --git a/net/asterisk-15.x/patches/100-build-reproducibly.patch b/net/asterisk-15.x/patches/100-build-reproducibly.patch
index e68d191cf251dc29696c32c6dfbf657bad6da4d0..96a49bf2219b10049c632e6d4cda2e749887307b 100644 (file)
--- a/net/asterisk-15.x/patches/100-build-reproducibly.patch
+++ b/net/asterisk-15.x/patches/100-build-reproducibly.patch
@@ -17,7 +17,7 @@
   * build.h
 --- a/Makefile
 +++ b/Makefile
-@@ -476,7 +476,7 @@ doc/core-en_US.xml: makeopts .lastclean
+@@ -479,7 +479,7 @@ doc/core-en_US.xml: makeopts .lastclean
        @echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
        @for x in $(MOD_SUBDIRS); do \
                printf "$$x " ; \