diff --git a/srcpkgs/buku/patches/use-system-cacerts.patch b/srcpkgs/buku/patches/use-system-cacerts.patch index f3aa2b1d70c..05e8cd9eb36 100644 --- a/srcpkgs/buku/patches/use-system-cacerts.patch +++ b/srcpkgs/buku/patches/use-system-cacerts.patch @@ -1,8 +1,8 @@ diff --git buku buku -index b93bdb4..1a55f76 100755 +index 500ccbe..f8e29d3 100755 --- buku +++ buku -@@ -41,7 +41,6 @@ try: +@@ -42,7 +42,6 @@ try: except ImportError: pass from bs4 import BeautifulSoup @@ -10,7 +10,7 @@ index b93bdb4..1a55f76 100755 import urllib3 from urllib3.exceptions import LocationParseError from urllib3.util import parse_url, make_headers -@@ -88,6 +87,8 @@ LOGGER = logging.getLogger() +@@ -93,6 +92,8 @@ LOGGER = logging.getLogger() LOGDBG = LOGGER.debug LOGERR = LOGGER.error @@ -19,63 +19,30 @@ index b93bdb4..1a55f76 100755 class BukuCrypt: """Class to handle encryption and decryption of -@@ -2553,12 +2554,12 @@ class BukuDb: - num_pools=1, - headers=MYHEADERS, - cert_reqs='CERT_REQUIRED', -- ca_certs=certifi.where()) -+ ca_certs=where()) - else: - manager = urllib3.PoolManager(num_pools=1, - headers={'User-Agent': USER_AGENT}, - cert_reqs='CERT_REQUIRED', -- ca_certs=certifi.where()) -+ ca_certs=where()) - - try: - r = manager.request( -@@ -3395,14 +3396,14 @@ def get_PoolManager(): +@@ -2516,7 +2517,7 @@ class BukuDb: + if MYPROXY is None: + gen_headers() +- ca_certs = os.getenv('BUKU_CA_CERTS', default=certifi.where()) ++ ca_certs = os.getenv('BUKU_CA_CERTS', default=where()) + if MYPROXY: + manager = urllib3.ProxyManager( + MYPROXY, +@@ -3426,7 +3427,7 @@ def get_PoolManager(): + ProxyManager or PoolManager + ProxyManager if https_proxy is defined, PoolManager otherwise. + """ +- ca_certs = os.getenv('BUKU_CA_CERTS', default=certifi.where()) ++ ca_certs = os.getenv('BUKU_CA_CERTS', default=where()) if MYPROXY: return urllib3.ProxyManager(MYPROXY, num_pools=1, headers=MYHEADERS, timeout=15, -- cert_reqs='CERT_REQUIRED', ca_certs=certifi.where()) -+ cert_reqs='CERT_REQUIRED', ca_certs=where()) + cert_reqs='CERT_REQUIRED', ca_certs=ca_certs) +@@ -4258,7 +4259,7 @@ def check_upstream_release(): + if MYPROXY is None: + gen_headers() - return urllib3.PoolManager( - num_pools=1, - headers=MYHEADERS, - timeout=15, - cert_reqs='CERT_REQUIRED', -- ca_certs=certifi.where()) -+ ca_certs=where()) - - - def network_handler(url, http_head=False): -@@ -4224,13 +4225,13 @@ def check_upstream_release(): - num_pools=1, - headers=MYHEADERS, - cert_reqs='CERT_REQUIRED', -- ca_certs=certifi.where() -+ ca_certs=where() - ) - else: - manager = urllib3.PoolManager(num_pools=1, - headers={'User-Agent': USER_AGENT}, - cert_reqs='CERT_REQUIRED', -- ca_certs=certifi.where()) -+ ca_certs=where()) - - try: - r = manager.request( -diff --git setup.py setup.py -index 91f9fbb..b6f4cfa 100644 ---- setup.py -+++ setup.py -@@ -57,7 +57,6 @@ setup( - py_modules=['buku'], - install_requires=[ - 'beautifulsoup4>=4.4.1', -- 'certifi', - 'cryptography>=1.2.3', - 'urllib3>=1.23', - 'html5lib>=1.0.1', +- ca_certs = os.getenv('BUKU_CA_CERTS', default=certifi.where()) ++ ca_certs = os.getenv('BUKU_CA_CERTS', default=where()) + if MYPROXY: + manager = urllib3.ProxyManager( + MYPROXY, diff --git a/srcpkgs/buku/template b/srcpkgs/buku/template index 7df1da1b431..2e064fb61da 100644 --- a/srcpkgs/buku/template +++ b/srcpkgs/buku/template @@ -1,6 +1,6 @@ # Template file for 'buku' pkgname=buku -version=4.1 +version=4.2 revision=1 archs=noarch wrksrc="Buku-${version}" @@ -10,7 +10,7 @@ maintainer="Diogo Leal " license="GPL-3.0-or-later" homepage="https://github.com/jarun/Buku" distfiles="https://github.com/jarun/Buku/archive/v${version}.tar.gz" -checksum=a66a423f837c4daed1b4a4084fc58ee6e37ec58f42b9edd2d61c7af0e3d4f343 +checksum=b20e01c5ecd299a9e862e72711ce365e8abd3104d44c692cf10e023897c4d9f6 do_install() { vbin buku