From da0674db941134a2045475fdb3246350b9d7425c Mon Sep 17 00:00:00 2001 From: "Charles E. Lehner" Date: Fri, 29 May 2020 19:20:02 +0000 Subject: [PATCH 1/3] python-slowaes: remove package Previously it was needed by electrum, but no longer. --- srcpkgs/python-slowaes/template | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 srcpkgs/python-slowaes/template diff --git a/srcpkgs/python-slowaes/template b/srcpkgs/python-slowaes/template deleted file mode 100644 index 9926458e75e2c3..00000000000000 --- a/srcpkgs/python-slowaes/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'python-slowaes' -pkgname=python-slowaes -version=0.1a1 -revision=1 -archs=noarch -wrksrc="slowaes-${version}" -build_style=python2-module -pycompile_module="slowaes" -hostmakedepends="python-setuptools" -depends="python" -short_desc="Implementation of AES in Python" -maintainer="Charles E. Lehner " -homepage="http://code.google.com/p/slowaes/" -license="Apache-2.0" -distfiles="${PYPI_SITE}/s/slowaes/slowaes-${version}.tar.gz" -checksum=83658ae54cc116b96f7fdb12fdd0efac3a4e8c7c7064e3fac3f4a881aa54bf09 From a25e65ca4cf2a5a0068c37fd7c61ce4220175b3f Mon Sep 17 00:00:00 2001 From: "Charles E. Lehner" Date: Fri, 29 May 2020 17:46:25 +0000 Subject: [PATCH 2/3] python3-aiorpcx: update to 0.18.4 --- srcpkgs/python3-aiorpcx/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-aiorpcx/template b/srcpkgs/python3-aiorpcx/template index 07922e15ccd937..3e25da6752f120 100644 --- a/srcpkgs/python3-aiorpcx/template +++ b/srcpkgs/python3-aiorpcx/template @@ -1,7 +1,7 @@ # Template file for 'python3-aiorpcx' pkgname=python3-aiorpcx -version=0.17.0 -revision=2 +version=0.18.4 +revision=1 archs=noarch wrksrc="aiorpcX-${version}" build_style=python3-module @@ -15,7 +15,7 @@ license="MIT" homepage="https://github.com/kyuupichan/aiorpcX" # missing license in PyPI tarball distfiles="https://github.com/kyuupichan/aiorpcX/archive/${version}.tar.gz" -checksum=b743629e8e3b3783d0a2fe3a25e55f30a35d7f148d863c8b6f0c50db6350c379 +checksum=cfce9d4a6af83d6be8619b2268e57bb21db0a0b36ac29226db580b448c286498 do_check() { python3 -m pytest From e0ad078e698956a203bc5810dcff50c95bfa0968 Mon Sep 17 00:00:00 2001 From: "Charles E. Lehner" Date: Fri, 29 May 2020 16:00:39 +0000 Subject: [PATCH 3/3] electrum: update to 3.3.8 --- srcpkgs/electrum/patches/no-certifi.patch | 34 +++++++++++------------ srcpkgs/electrum/template | 9 +++--- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/srcpkgs/electrum/patches/no-certifi.patch b/srcpkgs/electrum/patches/no-certifi.patch index 7a8650cf90d080..eb215543b29719 100644 --- a/srcpkgs/electrum/patches/no-certifi.patch +++ b/srcpkgs/electrum/patches/no-certifi.patch @@ -2,27 +2,27 @@ Upstream: No Reason: Avoid certifi dependency diff --git contrib/requirements/requirements.txt contrib/requirements/requirements.txt -index 4ca24227..ac60e57c 100644 +index 1159a0469..9e406b56e 100644 --- contrib/requirements/requirements.txt +++ contrib/requirements/requirements.txt -@@ -8,4 +8,3 @@ qdarkstyle<3.0 - aiorpcx>=0.17,<0.18 +@@ -8,4 +8,3 @@ qdarkstyle<2.7 + aiorpcx>=0.18,<0.19 aiohttp>=3.3.0 aiohttp_socks -certifi diff --git electrum/interface.py electrum/interface.py -index 8a019afb..7a5a7e76 100644 +index b5eac439c..14bbd7ab9 100644 --- electrum/interface.py +++ electrum/interface.py -@@ -38,7 +38,6 @@ import aiorpcx - from aiorpcx import RPCSession, Notification, NetAddress +@@ -40,7 +40,6 @@ from aiorpcx import RPCSession, Notification, NetAddress from aiorpcx.curio import timeout_after, TaskTimeout - from aiorpcx.jsonrpc import JSONRPC + from aiorpcx.jsonrpc import JSONRPC, CodeMessageError + from aiorpcx.rawsocket import RSClient -import certifi from .util import ignore_exceptions, log_exceptions, bfh, SilentTaskGroup from . import util -@@ -55,7 +54,7 @@ if TYPE_CHECKING: +@@ -57,7 +56,7 @@ if TYPE_CHECKING: from .network import Network @@ -32,18 +32,18 @@ index 8a019afb..7a5a7e76 100644 BUCKET_NAME_OF_ONION_SERVERS = 'onion' diff --git electrum/paymentrequest.py electrum/paymentrequest.py -index 881a3eea..6221c4f4 100644 +index fedcd1b3a..cba4879c7 100644 --- electrum/paymentrequest.py +++ electrum/paymentrequest.py -@@ -28,7 +28,6 @@ import time - import traceback +@@ -29,7 +29,6 @@ import traceback import json + from typing import Optional -import certifi import urllib.parse import aiohttp -@@ -53,7 +52,7 @@ _logger = get_logger(__name__) +@@ -54,7 +53,7 @@ _logger = get_logger(__name__) REQUEST_HEADERS = {'Accept': 'application/bitcoin-paymentrequest', 'User-Agent': 'Electrum'} ACK_HEADERS = {'Content-Type':'application/bitcoin-payment','Accept':'application/bitcoin-paymentack','User-Agent':'Electrum'} @@ -53,7 +53,7 @@ index 881a3eea..6221c4f4 100644 ca_keyID = None diff --git electrum/util.py electrum/util.py -index 41d99c9f..0fa0ef2f 100644 +index 62df080a9..9c96055ba 100644 --- electrum/util.py +++ electrum/util.py @@ -44,7 +44,6 @@ import ssl @@ -74,7 +74,7 @@ index 41d99c9f..0fa0ef2f 100644 base_units = {'BTC':8, 'mBTC':5, 'bits':2, 'sat':0} diff --git electrum/x509.py electrum/x509.py -index c38edc77..1c406544 100644 +index c38edc77a..1c4065444 100644 --- electrum/x509.py +++ electrum/x509.py @@ -343,7 +343,5 @@ def load_certificates(ca_path): @@ -87,10 +87,10 @@ index c38edc77..1c406544 100644 + ca_path = '/etc/ssl/certs/ca-certificates.crt' ca_list, ca_keyID = load_certificates(ca_path) diff --git run_electrum run_electrum -index 654cf15f..94cca1a0 100755 +index 1f5ee2f03..7891c50f0 100755 --- run_electrum +++ run_electrum -@@ -55,7 +55,6 @@ def check_imports(): +@@ -58,7 +58,6 @@ def check_imports(): import dns import pyaes import ecdsa @@ -98,7 +98,7 @@ index 654cf15f..94cca1a0 100755 import qrcode import google.protobuf import jsonrpclib -@@ -69,7 +68,7 @@ def check_imports(): +@@ -72,7 +71,7 @@ def check_imports(): from google.protobuf import descriptor_pb2 from jsonrpclib import SimpleJSONRPCServer # make sure that certificates are here diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template index 7525e08e9e2e33..835fbf255334cf 100644 --- a/srcpkgs/electrum/template +++ b/srcpkgs/electrum/template @@ -1,25 +1,26 @@ # Template file for 'electrum' pkgname=electrum -version=3.3.6 -revision=2 +version=3.3.8 +revision=1 archs=noarch build_style=python3-module pycompile_module="electrum electrum_gui electrum_plugins" hostmakedepends="python3-PyQt5-devel-tools python3-setuptools" -depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx +depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx>=0.18<0.19 python3-dnspython python3-ecdsa python3-jsonrpclib python3-protobuf python3-pyaes python3-pycryptodome python3-PyQt5 python3-qrcode" # Missing optional dependencies: # btchip - BTChip hardware wallet support # trezor - TREZOR hardware wallet support # keepkey - KeepKey hardware wallet support +# qdarkstyle - Dark theme short_desc="Lightweight Bitcoin wallet" maintainer="Charles E. Lehner " license="MIT" homepage="https://electrum.org/" # patch doesn't apply for PyPI tarball distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz" -checksum=47b4a9f56bc8d092902a7428b74f552607e90183441dc5c8d0346aff14fd1dcd +checksum=52addd8c0d08d3cc7cc34015efd67f7396fe30a74ac668b8fb77f6b3b927fd8b post_install() { sed -i -e 's|electrum %u|electrum|' \