| Message ID | ZhuKWDZALDt+xUcI@waldemar-brodkorb.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/asterisk: bump to 20.7.0 | expand |
On 14/04/2024 09:48, Waldemar Brodkorb wrote: > See here for changes: > https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-20-current.md > > There is still an open issue reported upstream: > https://github.com/asterisk/asterisk/issues/671 > > But it seems it is not reproducible by the asterisk developers, so > update the package so others can make use of it. > > Use the external pjsip package, instead of the bundled one. > > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Applied to master, thanks. Regards, Arnout > --- > package/asterisk/Config.in | 2 ++ > package/asterisk/asterisk.hash | 2 +- > package/asterisk/asterisk.mk | 11 +++++++---- > 3 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in > index c52456f8fc..ba5a574042 100644 > --- a/package/asterisk/Config.in > +++ b/package/asterisk/Config.in > @@ -10,6 +10,8 @@ config BR2_PACKAGE_ASTERISK > select BR2_PACKAGE_LIBCURL > select BR2_PACKAGE_LIBEDIT > select BR2_PACKAGE_LIBILBC > + select BR2_PACKAGE_LIBJWT > + select BR2_PACKAGE_LIBPJSIP > select BR2_PACKAGE_LIBXML2 > select BR2_PACKAGE_SQLITE > select BR2_PACKAGE_UTIL_LINUX > diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash > index 246f4219aa..8cb5468249 100644 > --- a/package/asterisk/asterisk.hash > +++ b/package/asterisk/asterisk.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 9def260ac8745a5eac7aceabe1c22f84a283b7812f0eccd760f87ce9eb991d22 asterisk-20.5.2.tar.gz > +sha256 62adff44f5bc415627e16957e6bd528e1782a892e116ff261c46f96ca87c342b asterisk-20.7.0.tar.gz > > # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases > # sha256 locally computed > diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk > index d1f3ea82d3..33d2e78bcf 100644 > --- a/package/asterisk/asterisk.mk > +++ b/package/asterisk/asterisk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ASTERISK_VERSION = 20.5.2 > +ASTERISK_VERSION = 20.7.0 > # Use the github mirror: it's an official mirror maintained by Digium, and > # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. > ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) > @@ -27,7 +27,7 @@ ASTERISK_SELINUX_MODULES = asterisk > > # For patches 0002 and 0003 > ASTERISK_AUTORECONF = YES > -ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson > +ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson -Ithird-party/libjwt > > ASTERISK_DEPENDENCIES = \ > host-asterisk \ > @@ -35,6 +35,8 @@ ASTERISK_DEPENDENCIES = \ > jansson \ > libcurl \ > libedit \ > + libjwt \ > + libpjsip \ > libxml2 \ > sqlite \ > util-linux > @@ -89,10 +91,11 @@ ASTERISK_CONF_OPTS = \ > --with-jansson \ > --with-libcurl \ > --with-ilbc \ > + --with-libjwt="$(STAGING_DIR)/usr" \ > --with-libxml2 \ > --with-libedit="$(STAGING_DIR)/usr" \ > - --with-pjproject \ > - --with-pjproject-bundled \ > + --without-pjproject-bundled \ > + --with-pjproject="$(STAGING_DIR)/usr" \ > --with-sqlite3="$(STAGING_DIR)/usr" \ > --with-sounds-cache=$(ASTERISK_DL_DIR) >
diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in index c52456f8fc..ba5a574042 100644 --- a/package/asterisk/Config.in +++ b/package/asterisk/Config.in @@ -10,6 +10,8 @@ config BR2_PACKAGE_ASTERISK select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBEDIT select BR2_PACKAGE_LIBILBC + select BR2_PACKAGE_LIBJWT + select BR2_PACKAGE_LIBPJSIP select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_SQLITE select BR2_PACKAGE_UTIL_LINUX diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 246f4219aa..8cb5468249 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9def260ac8745a5eac7aceabe1c22f84a283b7812f0eccd760f87ce9eb991d22 asterisk-20.5.2.tar.gz +sha256 62adff44f5bc415627e16957e6bd528e1782a892e116ff261c46f96ca87c342b asterisk-20.7.0.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index d1f3ea82d3..33d2e78bcf 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 20.5.2 +ASTERISK_VERSION = 20.7.0 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) @@ -27,7 +27,7 @@ ASTERISK_SELINUX_MODULES = asterisk # For patches 0002 and 0003 ASTERISK_AUTORECONF = YES -ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson +ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson -Ithird-party/libjwt ASTERISK_DEPENDENCIES = \ host-asterisk \ @@ -35,6 +35,8 @@ ASTERISK_DEPENDENCIES = \ jansson \ libcurl \ libedit \ + libjwt \ + libpjsip \ libxml2 \ sqlite \ util-linux @@ -89,10 +91,11 @@ ASTERISK_CONF_OPTS = \ --with-jansson \ --with-libcurl \ --with-ilbc \ + --with-libjwt="$(STAGING_DIR)/usr" \ --with-libxml2 \ --with-libedit="$(STAGING_DIR)/usr" \ - --with-pjproject \ - --with-pjproject-bundled \ + --without-pjproject-bundled \ + --with-pjproject="$(STAGING_DIR)/usr" \ --with-sqlite3="$(STAGING_DIR)/usr" \ --with-sounds-cache=$(ASTERISK_DL_DIR)
See here for changes: https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-20-current.md There is still an open issue reported upstream: https://github.com/asterisk/asterisk/issues/671 But it seems it is not reproducible by the asterisk developers, so update the package so others can make use of it. Use the external pjsip package, instead of the bundled one. Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> --- package/asterisk/Config.in | 2 ++ package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 11 +++++++---- 3 files changed, 10 insertions(+), 5 deletions(-)