forked from hasufell/hasufell-repository
python-sipsimple: version bump to 5.2.6
This commit is contained in:
parent
3acd55c4ba
commit
a71c7d61c4
@ -1,36 +0,0 @@
|
|||||||
Upstream: Yes
|
|
||||||
Source: https://github.com/AGProjects/python3-sipsimple/commit/d75b225e566cae2c998504dc5cd76bb30226cb43
|
|
||||||
|
|
||||||
From d75b225e566cae2c998504dc5cd76bb30226cb43 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adrian Georgescu <ag@ag-projects.com>
|
|
||||||
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)
|
|
@ -1,25 +0,0 @@
|
|||||||
Upstream: Submitted
|
|
||||||
Source: https://github.com/AGProjects/python-sipsimple/pull/10
|
|
||||||
|
|
||||||
From 052f7301a0c906c4117dff5453222f12e768bb49 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tom Briden <tom@decompile.me.uk>
|
|
||||||
Date: Thu, 23 Jul 2020 19:22:30 +0100
|
|
||||||
Subject: [PATCH] Fix multiple definition of `PJ_ATTR_MAY_ALIAS' with GCC-10
|
|
||||||
|
|
||||||
---
|
|
||||||
deps/pjsip/pjlib/include/pj/list.h | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/deps/pjsip/pjlib/include/pj/list.h b/deps/pjsip/pjlib/include/pj/list.h
|
|
||||||
index 880f58d4..50510fe3 100644
|
|
||||||
--- a/deps/pjsip/pjlib/include/pj/list.h
|
|
||||||
+++ b/deps/pjsip/pjlib/include/pj/list.h
|
|
||||||
@@ -71,7 +71,7 @@ PJ_BEGIN_DECL
|
|
||||||
* must initialize the 'value' member to an appropriate value (typically the
|
|
||||||
* owner itself).
|
|
||||||
*/
|
|
||||||
-struct pj_list
|
|
||||||
+extern struct pj_list
|
|
||||||
{
|
|
||||||
PJ_DECL_LIST_MEMBER(void);
|
|
||||||
} PJ_ATTR_MAY_ALIAS; /* may_alias avoids warning with gcc-4.4 -Wall -O2 */
|
|
@ -31,6 +31,7 @@ DEPENDENCIES="
|
|||||||
providers:openssl? ( dev-libs/openssl )
|
providers:openssl? ( dev-libs/openssl )
|
||||||
run:
|
run:
|
||||||
dev-python/dnspython[python_abis:*(-)?]
|
dev-python/dnspython[python_abis:*(-)?]
|
||||||
|
dev-python/gevent[python_abis:*(-)?]
|
||||||
dev-python/greenlet[python_abis:*(-)?]
|
dev-python/greenlet[python_abis:*(-)?]
|
||||||
dev-python/lxml[python_abis:*(-)?]
|
dev-python/lxml[python_abis:*(-)?]
|
||||||
dev-python/python-dateutil[python_abis:*(-)?]
|
dev-python/python-dateutil[python_abis:*(-)?]
|
||||||
@ -46,8 +47,6 @@ DEPENDENCIES="
|
|||||||
|
|
||||||
DEFAULT_SRC_PREPARE_PATCHES=(
|
DEFAULT_SRC_PREPARE_PATCHES=(
|
||||||
"${FILES}"/${PN}-fix-build.patch
|
"${FILES}"/${PN}-fix-build.patch
|
||||||
"${FILES}"/${PN}-gcc10-fix.patch
|
|
||||||
"${FILES}"/d75b225e566cae2c998504dc5cd76bb30226cb43.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
src_compile() {
|
src_compile() {
|
Loading…
Reference in New Issue
Block a user