Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #323 from micmac1/ast-up

Browse source 
Asterisk: version bumps
This commit is contained in:
Jiri Slachta 2018-05-01 21:16:34 +02:00 committed by GitHub
commit fb52a10929
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/asterisk-13.x/Makefile
View file

@ -10,12 +10,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk13 PKG_NAME:=asterisk13
PKG_VERSION:=13.19.2 PKG_VERSION:=13.20.0
PKG_RELEASE:=4 PKG_RELEASE:=1
PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases 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_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=libxml2/host PKG_BUILD_DEPENDS:=libxml2/host
@ -657,7 +657,6 @@ define Build/Configure
./bootstrap.sh ./bootstrap.sh
$(call Build/Configure/Default) $(call Build/Configure/Default)
cd $(PKG_BUILD_DIR)/menuselect; \ cd $(PKG_BUILD_DIR)/menuselect; \
./bootstrap.sh; \
CC="$(HOSTCC)" \ CC="$(HOSTCC)" \
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \ CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
CONFIG_SITE= \ CONFIG_SITE= \

2
net/asterisk-13.x/patches/001-disable-semaphores-check.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -965,19 +965,6 @@ AC_LINK_IFELSE( @@ -953,19 +953,6 @@ AC_LINK_IFELSE(
] ]
) )

2
net/asterisk-13.x/patches/002-undef-res-ninit.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1299,7 +1299,6 @@ AC_LINK_IFELSE( @@ -1287,7 +1287,6 @@ AC_LINK_IFELSE(
#include <resolv.h>], #include <resolv.h>],
[int foo = res_ninit(NULL);])], [int foo = res_ninit(NULL);])],
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)

4
net/asterisk-13.x/patches/052-musl-libcap.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -180,6 +180,9 @@ case "${host_os}" in @@ -170,6 +170,9 @@ case "${host_os}" in
linux-gnu*) linux-gnu*)
OSARCH=linux-gnu OSARCH=linux-gnu
;; ;;
@ -10,7 +10,7 @@
kfreebsd*-gnu) kfreebsd*-gnu)
OSARCH=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]) AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_check_format], [bfd.h], [-ldl -liberty -lz])
fi fi

2
net/asterisk-13.x/patches/056-fix-check_expr2-build.patch
View file

@ -3,7 +3,7 @@
@@ -179,7 +179,6 @@ check_expr2: $(ASTTOPDIR)/main/ast_expr2 @@ -179,7 +179,6 @@ check_expr2: $(ASTTOPDIR)/main/ast_expr2
$(CC) -g -o check_expr2 ast_expr2fz.o ast_expr2z.o -lm $(CC) -g -o check_expr2 ast_expr2fz.o ast_expr2z.o -lm
$(ECHO_PREFIX) echo " [RM] ast_expr2fz.o ast_expr2z.o" $(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 - ./check_expr2 expr2.testinput
smsq: smsq.o strcompat.o smsq: smsq.o strcompat.o

2
net/asterisk-13.x/patches/100-build-reproducibly.patch
View file

@ -17,7 +17,7 @@
* build.h * build.h
--- a/Makefile --- a/Makefile
+++ b/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\">" >> $@ @echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
@for x in $(MOD_SUBDIRS); do \ @for x in $(MOD_SUBDIRS); do \
printf "$$x " ; \ printf "$$x " ; \

11
net/asterisk-15.x/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk15 PKG_NAME:=asterisk15
PKG_VERSION:=15.2.2 PKG_VERSION:=15.3.0
PKG_RELEASE:=4 PKG_RELEASE:=1
PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases 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_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=libxml2/host PKG_BUILD_DEPENDS:=libxml2/host
@ -276,7 +276,6 @@ MODULES_AVAILABLE:= \
res-resolver-unbound \ res-resolver-unbound \
res-rtp-asterisk \ res-rtp-asterisk \
res-rtp-multicast \ res-rtp-multicast \
res-sdp-translator-pjmedia \
res-security-log \ res-security-log \
res-smdi \ res-smdi \
res-snmp \ res-snmp \
@ -593,7 +592,7 @@ CONFIGURE_ARGS+= \
--with-srtp="$(STAGING_DIR)/usr" --with-srtp="$(STAGING_DIR)/usr"
endif 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+= \ CONFIGURE_ARGS+= \
--without-pjproject --without-pjproject
else else
@ -672,7 +671,6 @@ define Build/Configure
./bootstrap.sh ./bootstrap.sh
$(call Build/Configure/Default) $(call Build/Configure/Default)
cd $(PKG_BUILD_DIR)/menuselect; \ cd $(PKG_BUILD_DIR)/menuselect; \
./bootstrap.sh; \
CC="$(HOSTCC)" \ CC="$(HOSTCC)" \
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \ CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
CONFIG_SITE= \ 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-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-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-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-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-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,,)) $(eval $(call BuildAsterisk15Module,res-snmp,SNMP [Sub]Agent for Asterisk,SNMP Agent / SubAgent,+libnetsnmp,res_snmp.conf,res_snmp,,))

2
net/asterisk-15.x/patches/001-disable-semaphores-check.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -992,19 +992,6 @@ AC_LINK_IFELSE( @@ -985,19 +985,6 @@ AC_LINK_IFELSE(
] ]
) )

2
net/asterisk-15.x/patches/002-undef-res-ninit.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1326,7 +1326,6 @@ AC_LINK_IFELSE( @@ -1319,7 +1319,6 @@ AC_LINK_IFELSE(
#include <resolv.h>], #include <resolv.h>],
[int foo = res_ninit(NULL);])], [int foo = res_ninit(NULL);])],
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)

2
net/asterisk-15.x/patches/004-disable-check-for-hrirs.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2739,7 +2739,7 @@ else @@ -2709,7 +2709,7 @@ else
fi fi
# conf_bridge (binaural rendering): check if HRIRs are available # conf_bridge (binaural rendering): check if HRIRs are available

2
net/asterisk-15.x/patches/056-fix-check_expr2-build.patch
View file

@ -3,7 +3,7 @@
@@ -182,7 +182,6 @@ check_expr2: $(ASTTOPDIR)/main/ast_expr2 @@ -182,7 +182,6 @@ check_expr2: $(ASTTOPDIR)/main/ast_expr2
$(CC) -g -o check_expr2 ast_expr2fz.o ast_expr2z.o -lm $(CC) -g -o check_expr2 ast_expr2fz.o ast_expr2z.o -lm
$(ECHO_PREFIX) echo " [RM] ast_expr2fz.o ast_expr2z.o" $(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 - ./check_expr2 expr2.testinput
smsq: smsq.o strcompat.o smsq: smsq.o strcompat.o

2
net/asterisk-15.x/patches/100-build-reproducibly.patch
View file

@ -17,7 +17,7 @@
* build.h * build.h
--- a/Makefile --- a/Makefile
+++ b/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\">" >> $@ @echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
@for x in $(MOD_SUBDIRS); do \ @for x in $(MOD_SUBDIRS); do \
printf "$$x " ; \ printf "$$x " ; \