From 6ccc96c19cba3eae7a1f97feca2be89eeb6ccdda Mon Sep 17 00:00:00 2001 From: Tom Briden Date: Mon, 15 Mar 2021 07:52:14 +0000 Subject: [PATCH] python-sipsimple: version bump to 4.0.1 --- .../0001-Fix-build-with-LibreSSL-2.7.patch | 26 ----------- ...225e566cae2c998504dc5cd76bb30226cb43.patch | 36 +++++++++++++++ .../python-sipsimple-3.4.2-fix-build.patch | 45 ------------------- .../files/python-sipsimple-fix-build.patch | 22 +++++++++ ...res-0 => python-sipsimple-4.0.1.exheres-0} | 21 +++++---- 5 files changed, 68 insertions(+), 82 deletions(-) delete mode 100644 packages/dev-python/python-sipsimple/files/0001-Fix-build-with-LibreSSL-2.7.patch create mode 100644 packages/dev-python/python-sipsimple/files/d75b225e566cae2c998504dc5cd76bb30226cb43.patch delete mode 100644 packages/dev-python/python-sipsimple/files/python-sipsimple-3.4.2-fix-build.patch create mode 100644 packages/dev-python/python-sipsimple/files/python-sipsimple-fix-build.patch rename packages/dev-python/python-sipsimple/{python-sipsimple-3.4.2-r1.exheres-0 => python-sipsimple-4.0.1.exheres-0} (67%) diff --git a/packages/dev-python/python-sipsimple/files/0001-Fix-build-with-LibreSSL-2.7.patch b/packages/dev-python/python-sipsimple/files/0001-Fix-build-with-LibreSSL-2.7.patch deleted file mode 100644 index 8f26714c..00000000 --- a/packages/dev-python/python-sipsimple/files/0001-Fix-build-with-LibreSSL-2.7.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8e0874b1be515abc8845e3ad41c4332f992e5687 Mon Sep 17 00:00:00 2001 -From: Julian Ospald -Date: Tue, 24 Dec 2019 22:17:28 +0100 -Subject: [PATCH] Fix build with LibreSSL 2.7 -Upstream: submitted, https://github.com/AGProjects/python-sipsimple/pull/8 - ---- - deps/pjsip/third_party/zsrtp/include/openssl_compat.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/deps/pjsip/third_party/zsrtp/include/openssl_compat.h b/deps/pjsip/third_party/zsrtp/include/openssl_compat.h -index 5b6e183e..aebbf996 100644 ---- a/deps/pjsip/third_party/zsrtp/include/openssl_compat.h -+++ b/deps/pjsip/third_party/zsrtp/include/openssl_compat.h -@@ -3,7 +3,7 @@ - - #include - --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - static HMAC_CTX *HMAC_CTX_new(void) - { - HMAC_CTX *ctx = (HMAC_CTX*)OPENSSL_malloc(sizeof(HMAC_CTX)); --- -2.24.1 - diff --git a/packages/dev-python/python-sipsimple/files/d75b225e566cae2c998504dc5cd76bb30226cb43.patch b/packages/dev-python/python-sipsimple/files/d75b225e566cae2c998504dc5cd76bb30226cb43.patch new file mode 100644 index 00000000..d86f3ad1 --- /dev/null +++ b/packages/dev-python/python-sipsimple/files/d75b225e566cae2c998504dc5cd76bb30226cb43.patch @@ -0,0 +1,36 @@ +Upstream: Yes +Source: https://github.com/AGProjects/python3-sipsimple/commit/d75b225e566cae2c998504dc5cd76bb30226cb43 + +From d75b225e566cae2c998504dc5cd76bb30226cb43 Mon Sep 17 00:00:00 2001 +From: Adrian Georgescu +Date: Tue, 16 Mar 2021 13:54:03 +0000 +Subject: [PATCH] Decode uri.transport if is bytes in DNS Lookup + +--- + sipsimple/lookup.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sipsimple/lookup.py b/sipsimple/lookup.py +index 8ce86a92..27672da7 100644 +--- a/sipsimple/lookup.py ++++ b/sipsimple/lookup.py +@@ -255,8 +255,9 @@ def lookup_sip_proxy(self, uri, supported_transports, timeout=3.0, lifetime=15.0 + + try: + # If the host part of the URI is an IP address, we will not do any lookup ++ transport = uri.transport.decode() if isinstance(uri.transport, bytes) else uri.transport + if re.match("^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$", uri.host.decode()): +- transport = 'tls' if uri.secure else uri.transport.lower() ++ transport = 'tls' if uri.secure else transport.lower() + if transport not in supported_transports: + raise DNSLookupError("IP transport %s dictated by URI is not supported" % transport) + port = uri.port or (5061 if transport=='tls' else 5060) +@@ -270,7 +271,7 @@ def lookup_sip_proxy(self, uri, supported_transports, timeout=3.0, lifetime=15.0 + + # If the port is specified in the URI, we will only do an A lookup + if uri.port: +- transport = 'tls' if uri.secure else uri.transport.lower() ++ transport = 'tls' if uri.secure else transport.lower() + if transport not in supported_transports: + raise DNSLookupError("Host transport %s dictated by URI is not supported" % transport) + addresses = self._lookup_a_records(resolver, [uri.host.decode()], log_context=log_context) diff --git a/packages/dev-python/python-sipsimple/files/python-sipsimple-3.4.2-fix-build.patch b/packages/dev-python/python-sipsimple/files/python-sipsimple-3.4.2-fix-build.patch deleted file mode 100644 index 871e23c1..00000000 --- a/packages/dev-python/python-sipsimple/files/python-sipsimple-3.4.2-fix-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f786808a36deab01f301905ecdae27e6e17ce197 Mon Sep 17 00:00:00 2001 -From: Charles Barcza -Date: Mon, 13 Mar 2017 14:46:34 +0100 -Subject: [PATCH 1/2] Build fix on Linux -Upstream: submitted, https://github.com/AGProjects/python-sipsimple/pull/1 - ---- - setup_pjsip.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/setup_pjsip.py b/setup_pjsip.py -index 4760e64..a43533d 100644 ---- a/setup_pjsip.py -+++ b/setup_pjsip.py -@@ -157,6 +157,7 @@ def configure_pjsip(self): - if sys_platform == "win32": - cmd = ["bash", "configure"] - else: -+ os.system("chmod +x "+ self.build_dir +"/*configure") - cmd = ["./configure"] - cmd.extend(["--disable-g7221-codec"]) - ffmpeg_path = env.get("SIPSIMPLE_FFMPEG_PATH", None) - -From b80cf7ee9d4c32b4e068eb74492f31ccab1296b2 Mon Sep 17 00:00:00 2001 -From: Charles Barcza -Date: Mon, 13 Mar 2017 14:55:29 +0100 -Subject: [PATCH 2/2] Build fix on Linux - ---- - setup_pjsip.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup_pjsip.py b/setup_pjsip.py -index a43533d..5f1b27b 100644 ---- a/setup_pjsip.py -+++ b/setup_pjsip.py -@@ -157,7 +157,7 @@ def configure_pjsip(self): - if sys_platform == "win32": - cmd = ["bash", "configure"] - else: -- os.system("chmod +x "+ self.build_dir +"/*configure") -+ os.system("chmod +x "+ self.build_dir +"/*configure") - cmd = ["./configure"] - cmd.extend(["--disable-g7221-codec"]) - ffmpeg_path = env.get("SIPSIMPLE_FFMPEG_PATH", None) diff --git a/packages/dev-python/python-sipsimple/files/python-sipsimple-fix-build.patch b/packages/dev-python/python-sipsimple/files/python-sipsimple-fix-build.patch new file mode 100644 index 00000000..ece5b028 --- /dev/null +++ b/packages/dev-python/python-sipsimple/files/python-sipsimple-fix-build.patch @@ -0,0 +1,22 @@ +From f786808a36deab01f301905ecdae27e6e17ce197 Mon Sep 17 00:00:00 2001 +From: Charles Barcza +Date: Mon, 13 Mar 2017 14:46:34 +0100 +Subject: [PATCH 1/2] Build fix on Linux +Upstream: submitted, https://github.com/AGProjects/python-sipsimple/pull/1 + +--- + setup_pjsip.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/setup_pjsip.py b/setup_pjsip.py +index 7dd6c13ff..82e7bd1ca 100644 +--- a/setup_pjsip.py ++++ b/setup_pjsip.py +@@ -160,6 +160,7 @@ class PJSIP_build_ext(build_ext): + if sys_platform == "win32": + cmd = ["bash", "configure"] + else: ++ os.system("chmod +x "+ self.build_dir +"/*configure") + cmd = ["./configure"] + cmd.extend(["--disable-g7221-codec"]) + ffmpeg_path = env.get("SIPSIMPLE_FFMPEG_PATH", None) diff --git a/packages/dev-python/python-sipsimple/python-sipsimple-3.4.2-r1.exheres-0 b/packages/dev-python/python-sipsimple/python-sipsimple-4.0.1.exheres-0 similarity index 67% rename from packages/dev-python/python-sipsimple/python-sipsimple-3.4.2-r1.exheres-0 rename to packages/dev-python/python-sipsimple/python-sipsimple-4.0.1.exheres-0 index a70b89e0..ebddf7ff 100644 --- a/packages/dev-python/python-sipsimple/python-sipsimple-3.4.2-r1.exheres-0 +++ b/packages/dev-python/python-sipsimple/python-sipsimple-4.0.1.exheres-0 @@ -1,8 +1,8 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require github [ user="AGProjects" tag="release-${PV}" ] -require setup-py [ import=distutils blacklist="3" work="${PN}-release-${PV}" ] +require github [ user="AGProjects" pn="python3-sipsimple" tag="${PV}" ] +require setup-py [ import=distutils blacklist="2" multibuild=false ] SUMMARY="SIP SIMPLE client SDK is a Software Development Kit" HOMEPAGE="http://sipsimpleclient.org ${HOMEPAGE}" @@ -21,7 +21,7 @@ DEPENDENCIES=" build+run: dev-db/sqlite:3 dev-libs/icu:= - dev-python/python-application[>=2.5.0][python_abis:*(-)?] + dev-python/python-application[>=3.0.3][python_abis:*(-)?] media/ffmpeg[h264] media-libs/libvpx media-libs/v4l-utils @@ -33,22 +33,21 @@ DEPENDENCIES=" dev-python/dnspython[python_abis:*(-)?] dev-python/greenlet[python_abis:*(-)?] dev-python/lxml[python_abis:*(-)?] - dev-python/python-cjson[python_abis:*(-)?] dev-python/python-dateutil[python_abis:*(-)?] - dev-python/python-eventlib[python_abis:*(-)?] - dev-python/python-gnutls[python_abis:*(-)?] - dev-python/python-msrplib[>=0.19.0][python_abis:*(-)?] - dev-python/python-otr[>=1.2.0][python_abis:*(-)?] - dev-python/python-xcaplib[python_abis:*(-)?] + dev-python/python-eventlib[>=0.3.0][python_abis:*(-)?] + dev-python/python-gnutls[>=3.1.8][python_abis:*(-)?] + dev-python/python-msrplib[>=0.21.0][python_abis:*(-)?] + dev-python/python-otr[>=2.0.1][python_abis:*(-)?] + dev-python/python-xcaplib[>=2.0.0][python_abis:*(-)?] dev-python/zopeinterface[python_abis:*(-)?] media-libs/x264[-10bit] net-twisted/Twisted[python_abis:*(-)?] " DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/${PNV}-fix-build.patch - "${FILES}"/0001-Fix-build-with-LibreSSL-2.7.patch + "${FILES}"/${PN}-fix-build.patch "${FILES}"/${PN}-gcc10-fix.patch + "${FILES}"/d75b225e566cae2c998504dc5cd76bb30226cb43.patch ) src_compile() {