asterisk-13.x: bump to 13.20.0

- patches refreshed
- menuselect is bootstrapped from main bootstrap script now, extra call
  removed

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

diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile
index 43a8dc5628e209a1adb40371dc3a9df6580c7001..54df5cc3acb4da0559cc828a947164659ca54c58 100644 (file)
--- a/net/asterisk-13.x/Makefile
+++ b/net/asterisk-13.x/Makefile
@@ -10,12 +10,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk13
-PKG_VERSION:=13.19.2
-PKG_RELEASE:=4
+PKG_VERSION:=13.20.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
-PKG_HASH:=aab4bf95eea21a3864015d2a49a02e13e9f191f6a68acb0f7b1619da86ce3fb2
+PKG_HASH:=a3d6d953f844867ea11e0be22ee6225049cd4f5870df6ab23454623bcfbc94d5
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=libxml2/host
@@ -657,7 +657,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= \

diff --git a/net/asterisk-13.x/patches/001-disable-semaphores-check.patch b/net/asterisk-13.x/patches/001-disable-semaphores-check.patch
index 277c06cc5d2659c417cd743871b38f40e32ea091..fa09129440ffd843b40f88999378e7860a9246d8 100644 (file)
--- a/net/asterisk-13.x/patches/001-disable-semaphores-check.patch
+++ b/net/asterisk-13.x/patches/001-disable-semaphores-check.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -965,19 +965,6 @@ AC_LINK_IFELSE(
+@@ -953,19 +953,6 @@ AC_LINK_IFELSE(
    ]
  )
  

diff --git a/net/asterisk-13.x/patches/002-undef-res-ninit.patch b/net/asterisk-13.x/patches/002-undef-res-ninit.patch
index 014f06f297bf23602c256d22d7d0f04d1942e605..93d87bf171484eee8db51e6259807e9d50458f31 100644 (file)
--- a/net/asterisk-13.x/patches/002-undef-res-ninit.patch
+++ b/net/asterisk-13.x/patches/002-undef-res-ninit.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1299,7 +1299,6 @@ AC_LINK_IFELSE(
+@@ -1287,7 +1287,6 @@ AC_LINK_IFELSE(
                        #include <resolv.h>],
                        [int foo = res_ninit(NULL);])],
        AC_MSG_RESULT(yes)

diff --git a/net/asterisk-13.x/patches/052-musl-libcap.patch b/net/asterisk-13.x/patches/052-musl-libcap.patch
index f0d6942140e7290c6851e408f6bf04b13a77ac0d..01d2f5c3085ce7384f4040a501807b83b71a4ef3 100644 (file)
--- a/net/asterisk-13.x/patches/052-musl-libcap.patch
+++ b/net/asterisk-13.x/patches/052-musl-libcap.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -180,6 +180,9 @@ case "${host_os}" in
+@@ -170,6 +170,9 @@ case "${host_os}" in
       linux-gnu*)
       OSARCH=linux-gnu
       ;;
@@ -10,7 +10,7 @@
       kfreebsd*-gnu)
       OSARCH=kfreebsd-gnu
       ;;
-@@ -1423,9 +1426,11 @@ if test "${PBX_BFD}" = "0"; then
+@@ -1411,9 +1414,11 @@ if test "${PBX_BFD}" = "0"; then
    AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_check_format], [bfd.h], [-ldl -liberty -lz])
  fi
  

diff --git a/net/asterisk-13.x/patches/056-fix-check_expr2-build.patch b/net/asterisk-13.x/patches/056-fix-check_expr2-build.patch
index 0e5fcf7ff004f0af6a16679de6f3f223c2a63739..71d5e3144737bb892c4343f2c89fdd26f2dd4d81 100644 (file)
--- a/net/asterisk-13.x/patches/056-fix-check_expr2-build.patch
+++ b/net/asterisk-13.x/patches/056-fix-check_expr2-build.patch
@@ -3,7 +3,7 @@
 @@ -179,7 +179,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-13.x/patches/100-build-reproducibly.patch b/net/asterisk-13.x/patches/100-build-reproducibly.patch
index 55875c607818a976c0d2f6f75dd84ad381beb382..627343610482f9c6ab2066f2adb362461d026934 100644 (file)
--- a/net/asterisk-13.x/patches/100-build-reproducibly.patch
+++ b/net/asterisk-13.x/patches/100-build-reproducibly.patch
@@ -17,7 +17,7 @@
   * build.h
 --- a/Makefile
 +++ b/Makefile
-@@ -477,7 +477,7 @@ doc/core-en_US.xml: makeopts .lastclean
+@@ -480,7 +480,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 " ; \