package/spandsp: bump version to 3.0.0
PATCH 1/3 package/spandsp: bump version to 3.0.0
Reformatted hashes.
Switched upstream to freeswitch repo which is maintained by the author of spandsp:
https://github.com/signalwire/freeswitch/issues/681#issuecomment-671498542
The previous project URL http://www.soft-switch.org/ is not reachable anymore.
--- package/spandsp/Config.in | 2 +- package/spandsp/spandsp.hash | 4 ++-- package/spandsp/spandsp.mk | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-)
package/spandsp/Config.in +1 -1
@@ -6,4 +6,4 @@ config BR2_PACKAGE_SPANDSP These range from simple modules, such as DTMF detection, to a complete software FAX machine. - http://www.soft-switch.org/ + https://github.com/freeswitch/spandsp
package/spandsp/spandsp.hash +2 -2
@@ -1,3 +1,3 @@ # sha256 locally computed -sha256 0fcdda74bd9703dd66c3e9721bf2d81bd7c185c539d1887768c2b332ab703d51 spandsp-20180108.tar.gz -sha256 366576cb0b869cd9e95a4882878607314650488ac635e5df0692180382e9666a COPYING +sha256 a11beed46b488a4cac3b0c42042ad28448bcee4c0027a82d5449180bbb178836 spandsp-3.0.0-6ec23e5a7e.tar.gz +sha256 366576cb0b869cd9e95a4882878607314650488ac635e5df0692180382e9666a COPYING
package/spandsp/spandsp.mk +2 -3
@@ -4,9 +4,8 @@ # ################################################################################ -SPANDSP_VERSION = 20180108 -SPANDSP_SITE = https://www.soft-switch.org/downloads/spandsp/snapshots - +SPANDSP_VERSION = 3.0.0-6ec23e5a7e +SPANDSP_SITE = https://files.freeswitch.org/downloads/libs SPANDSP_LICENSE = LGPL-2.1 (library), GPL-2.0 (test suite) SPANDSP_LICENSE_FILES = COPYING
Signature · 1 line
2.27.0
PATCH 2/3 package/sofia-sip: bump version to 1.13.1
Rebased patch 0001.
Added patch 0002 previously used for the sofia-sip library which was bundled with the freeswitch source:
https://git.buildroot.net/buildroot/commit/package/freeswitch?id=3c2e8b2b29a88c35c8a9867537d3ce3d0af85bc2
The bundled library was removed in freeswitch-1.10.4.
Switched upstream to freeswitch repo according to
http://sofia-sip.sourceforge.net/
"This repository is not currently maintained.
The FreeSWITCH project hosts a currently maintained version of this library at https://github.com/freeswitch/sofia-sip"
--- ...reintroduce-soatag_local_sdp_str_ref.patch | 6 ++- .../0002-sofia-sip-fix-s2tcase.c.patch | 38 +++++++++++++++++++ package/sofia-sip/Config.in | 2 +- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 4 +- 5 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 package/sofia-sip/0002-sofia-sip-fix-s2tcase.c.patch
package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch +5 -1
@@ -4,6 +4,10 @@ Date: Thu, 24 Mar 2011 14:45:21 +0200 Subject: [PATCH] soa_tag.h: reintroduce soatag_local_sdp_str_ref Thanks to Erik Habicht <[email protected]> for spotting it + +Signed-off-by: Bernd Kuhls <[email protected]> +[rebased for sofia-sip 1.13.1-d10a3d268c, patch sent upstream + https://github.com/freeswitch/sofia-sip/pull/23] --- libsofia-sip-ua/soa/sofia-sip/soa_tag.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
@@ -12,7 +16,7 @@ diff --git a/libsofia-sip-ua/soa/sofia-sip/soa_tag.h b/libsofia-sip-ua/soa/sofia index 723ca02..d9448d6 100644 --- a/libsofia-sip-ua/soa/sofia-sip/soa_tag.h +++ b/libsofia-sip-ua/soa/sofia-sip/soa_tag.h -@@ -118,7 +118,7 @@ SOFIAPUBVAR tag_typedef_t soatag_local_sdp_ref; +@@ -130,7 +130,7 @@ SOFIAPUBVAR tag_typedef_t soatag_local_sdp_ref; SOFIAPUBVAR tag_typedef_t soatag_local_sdp_str; #define SOATAG_LOCAL_SDP_STR_REF(x) \ soatag_local_sdp_str_ref, tag_str_vr(&(x))
package/sofia-sip/0002-sofia-sip-fix-s2tcase.c.patch new file +38 -0
@@ -0,0 +1,38 @@ +From d66a2e55daf223737c07c59b1be45a2d91212ef6 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls <[email protected]> +Date: Sun, 26 Jul 2020 13:47:16 +0200 +Subject: [PATCH] [sofia-sip] fix s2tcase.c + +Fixes build error with recent libcheck: +https://github.com/freeswitch/sofia-sip/issues/22 + +Signed-off-by: Bernd Kuhls <[email protected]> +--- + s2check/s2tcase.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libs/sofia-sip/s2check/s2tcase.c b/libs/sofia-sip/s2check/s2tcase.c +index 382aaa3ad7..d67694c2ce 100644 +--- a/s2check/s2tcase.c ++++ b/s2check/s2tcase.c +@@ -57,7 +57,7 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name, + if (strcmp(*patterns, "*")) { + printf("%s: selected\n", name); + } +- _tcase_add_test(tc, tf, name, signo, 0, start, end); ++ _tcase_add_test(tc, tf, name, signo, start, end); + return; + } + } +@@ -67,7 +67,7 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name, + if (strcmp(*patterns, "*")) { + printf("%s: selected\n", name); + } +- _tcase_add_test(tc, tf, name, signo, 0, start, end); ++ _tcase_add_test(tc, tf, name, signo, start, end); + return; + } + } +-- +2.27.0 +
package/sofia-sip/Config.in +1 -1
@@ -8,7 +8,7 @@ config BR2_PACKAGE_SOFIA_SIP client software for uses such as VoIP, IM, and many other real-time and person-to-person communication services. - http://sofia-sip.sourceforge.net/ + https://github.com/freeswitch/sofia-sip comment "sofia-sip needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS
package/sofia-sip/sofia-sip.hash +1 -1
@@ -1,4 +1,4 @@ # Locally computed -sha256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 sofia-sip-1.12.11.tar.gz +sha256 4cf0de1aaa1e1737db5a8fe4104021a8e60a148a4534f92b5affdd9782e404aa sofia-sip-1.13.1-d10a3d268c.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS
package/sofia-sip/sofia-sip.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.12.11 -SOFIA_SIP_SITE = http://downloads.sourceforge.net/project/sofia-sip/sofia-sip/$(SOFIA_SIP_VERSION) +SOFIA_SIP_VERSION = 1.13.1-d10a3d268c +SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs SOFIA_SIP_INSTALL_STAGING = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+
Signature · 1 line
2.27.0
Thomas Petazzoni
AppliedPATCH 2/3 package/sofia-sip: bump version to 1.13.1
Quoted 10 lines · On Sat, 29 Aug 2020 22:40:04 +0200 Bernd Kuhls <[email protected]> wrote:
Rebased patch 0001.
Added patch 0002 previously used for the sofia-sip library which was bundled with the freeswitch source:
https://git.buildroot.net/buildroot/commit/package/freeswitch?id=3c2e8b2b29a88c35c8a9867537d3ce3d0af85bc2
The bundled library was removed in freeswitch-1.10.4.Switched upstream to freeswitch repo according to
http://sofia-sip.sourceforge.net/
Quoted 6 lines
"This repository is not currently maintained.
The FreeSWITCH project hosts a currently maintained version of this library at https://github.com/freeswitch/sofia-sip"
Signed-off-by Bernd Kuhls <[email protected]>
Applied to next.
Quoted 1 line
+SOFIA_SIP_VERSION = 1.13.1-d10a3d268c
Same question as for spandsp: why this strange versioning scheme ?
Also, could you update https://release-monitoring.org/project/10509/ ?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 3/3 package/freeswitch: bump version to 1.10.5
In reply to Bernd KuhlsUpstream removed spandsp and sofia-sip from source and now uses external packages, removed patch 0001 which fixed a bug in the internal sofia-sip code, removed insecure md5 and sha1 hashes.
--- .../0001-sofia-sip-fix-s2tcase.c.patch | 38 ------------------- package/freeswitch/Config.in | 2 + package/freeswitch/freeswitch.hash | 11 +----- package/freeswitch/freeswitch.mk | 9 ++--- 4 files changed, 7 insertions(+), 53 deletions(-) delete mode 100644 package/freeswitch/0001-sofia-sip-fix-s2tcase.c.patch
package/freeswitch/0001-sofia-sip-fix-s2tcase.c.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From d66a2e55daf223737c07c59b1be45a2d91212ef6 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls <[email protected]> -Date: Sun, 26 Jul 2020 13:47:16 +0200 -Subject: [PATCH] [sofia-sip] fix s2tcase.c - -Fixes build error with recent libcheck: -https://github.com/signalwire/freeswitch/issues/681 - -Signed-off-by: Bernd Kuhls <[email protected]> ---- - libs/sofia-sip/s2check/s2tcase.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libs/sofia-sip/s2check/s2tcase.c b/libs/sofia-sip/s2check/s2tcase.c -index 382aaa3ad7..d67694c2ce 100644 ---- a/libs/sofia-sip/s2check/s2tcase.c -+++ b/libs/sofia-sip/s2check/s2tcase.c -@@ -57,7 +57,7 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name, - if (strcmp(*patterns, "*")) { - printf("%s: selected\n", name); - } -- _tcase_add_test(tc, tf, name, signo, 0, start, end); -+ _tcase_add_test(tc, tf, name, signo, start, end); - return; - } - } -@@ -67,7 +67,7 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name, - if (strcmp(*patterns, "*")) { - printf("%s: selected\n", name); - } -- _tcase_add_test(tc, tf, name, signo, 0, start, end); -+ _tcase_add_test(tc, tf, name, signo, start, end); - return; - } - } --- -2.27.0 -
package/freeswitch/Config.in +2 -0
@@ -16,6 +16,8 @@ config BR2_PACKAGE_FREESWITCH select BR2_PACKAGE_OPENCV_LIB_OBJDETECT if BR2_PACKAGE_OPENCV select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE + select BR2_PACKAGE_SOFIA_SIP + select BR2_PACKAGE_SPANDSP select BR2_PACKAGE_SPEEX select BR2_PACKAGE_SPEEXDSP select BR2_PACKAGE_SQLITE
package/freeswitch/freeswitch.hash +2 -9
@@ -1,9 +1,5 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.3.-release.tar.xz.md5 -md5 c7d570da3a6fc66c1a286a105680dabf freeswitch-1.10.3.-release.tar.xz -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.3.-release.tar.xz.sha1 -sha1 98139cda8054ec840611c6fc3a585a5c5565ae4d freeswitch-1.10.3.-release.tar.xz -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.3.-release.tar.xz.sha256 -sha256 2d7db07a64ee2f19f9b6e3a4ce76fa42e0fe46c29d95edf1b690a3df3729f307 freeswitch-1.10.3.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.5.-release.tar.xz.sha256 +sha256 3e26600767a82946eca94af2c8f14712783aa83db5fb1cc57585f544aecce327 freeswitch-1.10.5.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt
@@ -12,8 +8,5 @@ sha256 1eefb2ea1db0af7729a9d8a27d7c65d8a37ab185393f935b029aac6828ce315a libs/a sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c -sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 libs/sofia-sip/COPYING -sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 libs/sofia-sip/COPYRIGHTS -sha256 366576cb0b869cd9e95a4882878607314650488ac635e5df0692180382e9666a libs/spandsp/COPYING sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE
package/freeswitch/freeswitch.mk +3 -6
@@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.3 +FREESWITCH_VERSION = 1.10.5 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging
@@ -12,17 +12,12 @@ FREESWITCH_INSTALL_STAGING = YES FREESWITCH_LICENSE = MPL-1.1, \ GPL-3.0+ with font exception (fonts), \ Apache-2.0 (apr, apr-util), \ - LGPL-2.0+ (sofia-sip), \ - LGPL-2.1, GPL-2.0 (spandsp), \ BSD-3-Clause (libsrtp) FREESWITCH_LICENSE_FILES = \ COPYING \ libs/apr/LICENSE \ libs/apr-util/LICENSE \ - libs/sofia-sip/COPYING \ - libs/sofia-sip/COPYRIGHTS \ - libs/spandsp/COPYING \ libs/srtp/LICENSE # required dependencies
@@ -32,6 +27,8 @@ FREESWITCH_DEPENDENCIES = \ libcurl \ openssl \ pcre \ + spandsp \ + sofia-sip \ speex \ sqlite \ tiff \
Signature · 1 line
2.27.0
Thomas Petazzoni
AppliedPATCH 3/3 package/freeswitch: bump version to 1.10.5
Quoted 4 lines · On Sat, 29 Aug 2020 22:40:05 +0200 Bernd Kuhls <[email protected]> wrote:
Upstream removed spandsp and sofia-sip from source and now uses external packages, removed patch 0001 which fixed a bug in the internal sofia-sip code, removed insecure md5 and sha1 hashes.
Quoted 8 lines
Signed-off-by Bernd Kuhls <[email protected]>--- .../0001-sofia-sip-fix-s2tcase.c.patch | 38 ------------------- package/freeswitch/Config.in | 2 + package/freeswitch/freeswitch.hash | 11 +----- package/freeswitch/freeswitch.mk | 9 ++--- 4 files changed, 7 insertions(+), 53 deletions(-) delete mode 100644 package/freeswitch/0001-sofia-sip-fix-s2tcase.c.patch
Applied to next, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/3 package/spandsp: bump version to 3.0.0
In reply to Bernd KuhlsQuoted 10 lines · On Sat, 29 Aug 2020 22:40:03 +0200 Bernd Kuhls <[email protected]> wrote:
Reformatted hashes.
Switched upstream to freeswitch repo which is maintained by the author of spandsp:
https://github.com/signalwire/freeswitch/issues/681#issuecomment-671498542The previous project URL http://www.soft-switch.org/ is not reachable anymore.
Signed-off-by Bernd Kuhls <[email protected]>
I've applied to next, but I have two comments/questions.
Quoted 1 line
+SPANDSP_VERSION = 3.0.0-6ec23e5a7e
This version naming scheme is weird. Why not just 3.0.0 ? What is even more weird is that https://files.freeswitch.org/downloads/libs/ shows two 3.0.0 versions:
spandsp-3.0.0-6ec23e5a7e.tar.gz
spandsp-3.0.0-f995f452ee.tar.gz
Another thing: could you update on release-monitoring.org the definition of this project at
https://release-monitoring.org/project/12600/ to properly track this new upstream location ?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/3 package/spandsp: bump version to 3.0.0
Hi Thomas,
Quoted 7 lines
Quoted 1 line
+SPANDSP_VERSION = 3.0.0-6ec23e5a7e
What is even more weird is that https://files.freeswitch.org/downloads
/libs/ shows two 3.0.0 versions:spandsp-3.0.0-6ec23e5a7e.tar.gz
spandsp-3.0.0-f995f452ee.tar.gz
upstream updated the tarball three days after the initial release:
https://github.com/signalwire/freeswitch/pull/793#issuecomment-675044027
Quoted 3 lines
Another thing: could you update on release-monitoring.org the definition of this project at https://release-monitoring.org/project/12600/ to properly track this new upstream location ?
Tried, but failed to find the correct regex.
Regards, Bernd