buku: update to 4.7.
This commit is contained in:
parent
e074a0aa4c
commit
dfd161b39a
|
@ -1,57 +0,0 @@
|
||||||
From 1f4c9edaedbc4bd270993c5a28ef6db3a378efed Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nathan Owens <ndowens@artixlinux.org>
|
|
||||||
Date: Mon, 30 Nov 2020 15:43:56 -0600
|
|
||||||
Subject: [PATCH] Use system cacerts
|
|
||||||
|
|
||||||
---
|
|
||||||
buku | 9 +++++----
|
|
||||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git buku buku
|
|
||||||
index 936988a..079d3d2 100755
|
|
||||||
--- a/buku
|
|
||||||
+++ b/buku
|
|
||||||
@@ -45,7 +45,6 @@ import threading
|
|
||||||
import time
|
|
||||||
from typing import Any, Dict, Iterable, List, Optional, Tuple
|
|
||||||
import webbrowser
|
|
||||||
-import certifi
|
|
||||||
import urllib3
|
|
||||||
from urllib3.exceptions import LocationParseError
|
|
||||||
from urllib3.util import parse_url, make_headers, Retry
|
|
||||||
@@ -105,6 +104,8 @@ LOGGER = logging.getLogger()
|
|
||||||
LOGDBG = LOGGER.debug
|
|
||||||
LOGERR = LOGGER.error
|
|
||||||
|
|
||||||
+def where():
|
|
||||||
+ return '/etc/ssl/certs/ca-certificates.crt'
|
|
||||||
|
|
||||||
class BukuCrypt:
|
|
||||||
"""Class to handle encryption and decryption of
|
|
||||||
@@ -2656,7 +2657,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,
|
|
||||||
@@ -3628,7 +3629,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=ca_certs)
|
|
||||||
@@ -4523,7 +4524,7 @@ def check_upstream_release():
|
|
||||||
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,
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'buku'
|
# Template file for 'buku'
|
||||||
pkgname=buku
|
pkgname=buku
|
||||||
version=4.6
|
version=4.7
|
||||||
revision=1
|
revision=1
|
||||||
depends="python3-urllib3 python3-BeautifulSoup4 python3-cryptography
|
depends="python3-urllib3 python3-BeautifulSoup4 python3-cryptography
|
||||||
python3-html5lib"
|
python3-html5lib"
|
||||||
|
@ -9,7 +9,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
|
||||||
license="GPL-3.0-or-later"
|
license="GPL-3.0-or-later"
|
||||||
homepage="https://github.com/jarun/Buku"
|
homepage="https://github.com/jarun/Buku"
|
||||||
distfiles="https://github.com/jarun/Buku/archive/v${version}.tar.gz"
|
distfiles="https://github.com/jarun/Buku/archive/v${version}.tar.gz"
|
||||||
checksum=2e1968016d3856184db8ac49cdc92a6c70869f62846185f28c8c60ead0c42888
|
checksum=11d0860e66e0eea6c2ce566962ae0f8e34c76dc2317d108a4ae4e5a47097d468
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
vbin buku
|
vbin buku
|
||||||
|
|
Loading…
Reference in New Issue