Merge pull request 'blink-bump' (#60) from tombriden/hasufell-repository:blink-bump into master
Reviewed-on: #60
This commit is contained in:
commit
4c6e5947d0
@ -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 */
|
||||
@ -7,6 +7,13 @@ require setup-py [ import=distutils blacklist="2" multibuild=false ]
|
||||
SUMMARY="SIP SIMPLE client SDK is a Software Development Kit"
|
||||
HOMEPAGE="http://sipsimpleclient.org ${HOMEPAGE}"
|
||||
|
||||
ZRTPCPP_SHA="6b3cd8e6783642292bad0c21e3e5e5ce45ff3e03"
|
||||
|
||||
DOWNLOADS+="
|
||||
https://github.com/pjsip/pjproject/archive/2.10.tar.gz
|
||||
https://github.com/wernerd/ZRTPCPP/archive/${ZRTPCPP_SHA}.tar.gz -> ZRTPCPP-${ZRTPCPP_SHA}.tar.gz
|
||||
"
|
||||
|
||||
LICENCES="GPL-3"
|
||||
SLOT="0"
|
||||
PLATFORMS="~amd64 ~x86"
|
||||
@ -31,6 +38,7 @@ DEPENDENCIES="
|
||||
providers:openssl? ( dev-libs/openssl )
|
||||
run:
|
||||
dev-python/dnspython[python_abis:*(-)?]
|
||||
dev-python/gevent[python_abis:*(-)?]
|
||||
dev-python/greenlet[python_abis:*(-)?]
|
||||
dev-python/lxml[python_abis:*(-)?]
|
||||
dev-python/python-dateutil[python_abis:*(-)?]
|
||||
@ -46,10 +54,41 @@ DEPENDENCIES="
|
||||
|
||||
DEFAULT_SRC_PREPARE_PATCHES=(
|
||||
"${FILES}"/${PN}-fix-build.patch
|
||||
"${FILES}"/${PN}-gcc10-fix.patch
|
||||
"${FILES}"/d75b225e566cae2c998504dc5cd76bb30226cb43.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
setup-py_src_prepare
|
||||
|
||||
# MOst of this is straight from get_dependencies.sh but that
|
||||
# wants to download the dependencies directly so we can't use it
|
||||
edo mkdir "${WORK}"/deps/pjsip
|
||||
edo mv "${WORKBASE}"/pjproject*/* "${WORK}"/deps/pjsip/
|
||||
|
||||
edo pushd "${WORK}"/deps/
|
||||
|
||||
# Copy wrapper from old version to third_party/zsrtp/
|
||||
edo mkdir ./pjsip/third_party/zsrtp
|
||||
cp -r zsrtp/include ./pjsip/third_party/zsrtp/
|
||||
cp -r zsrtp/srtp ./pjsip/third_party/zsrtp/
|
||||
cp -r zsrtp/build ./pjsip/third_party/build/zsrtp
|
||||
|
||||
# Copy new version to third_party/zsrtp/
|
||||
mkdir ./pjsip/third_party/zsrtp/zrtp
|
||||
cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/bnlib ./pjsip/third_party/zsrtp/zrtp/
|
||||
cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/common ./pjsip/third_party/zsrtp/zrtp/
|
||||
cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/cryptcommon ./pjsip/third_party/zsrtp/zrtp/
|
||||
cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/srtp ./pjsip/third_party/zsrtp/zrtp/
|
||||
cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/zrtp ./pjsip/third_party/zsrtp/zrtp/
|
||||
cp "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/COPYING ./pjsip/third_party/zsrtp/zrtp/
|
||||
cp "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/README.md ./pjsip/third_party/zsrtp/zrtp/
|
||||
|
||||
for p in patches/*.patch; do
|
||||
expatch -p0 "${p}"
|
||||
done
|
||||
|
||||
edo popd
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# breaks horribly with 'ld'
|
||||
export LD=${CC}
|
||||
@ -14,6 +14,7 @@ MYOPTIONS=""
|
||||
|
||||
DEPENDENCIES="
|
||||
run:
|
||||
dev-python/gevent[python_abis:*(-)?]
|
||||
dev-python/lxml[python_abis:*(-)?]
|
||||
dev-python/python-application[>=3.0.3][python_abis:*(-)?]
|
||||
"
|
||||
@ -25,7 +25,7 @@ DEPENDENCIES="
|
||||
dev-python/python-application[>=3.0.3][python_abis:*(-)?]
|
||||
dev-python/python-dateutil[python_abis:*(-)?]
|
||||
dev-python/python-eventlib[>=0.3.0][python_abis:*(-)?]
|
||||
dev-python/python-sipsimple[>=4.0.1][python_abis:*(-)?]
|
||||
dev-python/python-sipsimple[>=5.2.2][python_abis:*(-)?]
|
||||
dev-python/zopeinterface[python_abis:*(-)?]
|
||||
net-twisted/Twisted[python_abis:*(-)?]
|
||||
"
|
||||
Loading…
Reference in New Issue
Block a user