buku: update to 4.4

This commit is contained in:
Nathan Owens 2020-11-30 12:25:49 -06:00 committed by Piraty
parent 089dfa6d31
commit 6aa9caa18a
2 changed files with 27 additions and 14 deletions

View file

@ -1,16 +1,25 @@
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 diff --git buku buku
index 500ccbe..f8e29d3 100755 index 936988a..079d3d2 100755
--- buku --- buku
+++ buku +++ buku
@@ -42,7 +42,6 @@ try: @@ -40,7 +40,6 @@ import threading
except ImportError: import time
pass from typing import Any, Dict, Iterable, List, Optional, Tuple
from bs4 import BeautifulSoup import webbrowser
-import certifi -import certifi
import urllib3 import urllib3
from urllib3.exceptions import LocationParseError from urllib3.exceptions import LocationParseError
from urllib3.util import parse_url, make_headers from urllib3.util import parse_url, make_headers, Retry
@@ -93,6 +92,8 @@ LOGGER = logging.getLogger() @@ -98,6 +97,8 @@ LOGGER = logging.getLogger()
LOGDBG = LOGGER.debug LOGDBG = LOGGER.debug
LOGERR = LOGGER.error LOGERR = LOGGER.error
@ -19,7 +28,7 @@ index 500ccbe..f8e29d3 100755
class BukuCrypt: class BukuCrypt:
"""Class to handle encryption and decryption of """Class to handle encryption and decryption of
@@ -2516,7 +2517,7 @@ class BukuDb: @@ -2565,7 +2566,7 @@ class BukuDb:
if MYPROXY is None: if MYPROXY is None:
gen_headers() gen_headers()
@ -28,7 +37,7 @@ index 500ccbe..f8e29d3 100755
if MYPROXY: if MYPROXY:
manager = urllib3.ProxyManager( manager = urllib3.ProxyManager(
MYPROXY, MYPROXY,
@@ -3426,7 +3427,7 @@ def get_PoolManager(): @@ -3540,7 +3541,7 @@ def get_PoolManager():
ProxyManager or PoolManager ProxyManager or PoolManager
ProxyManager if https_proxy is defined, PoolManager otherwise. ProxyManager if https_proxy is defined, PoolManager otherwise.
""" """
@ -37,7 +46,7 @@ index 500ccbe..f8e29d3 100755
if MYPROXY: if MYPROXY:
return urllib3.ProxyManager(MYPROXY, num_pools=1, headers=MYHEADERS, timeout=15, return urllib3.ProxyManager(MYPROXY, num_pools=1, headers=MYHEADERS, timeout=15,
cert_reqs='CERT_REQUIRED', ca_certs=ca_certs) cert_reqs='CERT_REQUIRED', ca_certs=ca_certs)
@@ -4258,7 +4259,7 @@ def check_upstream_release(): @@ -4390,7 +4391,7 @@ def check_upstream_release():
if MYPROXY is None: if MYPROXY is None:
gen_headers() gen_headers()
@ -46,3 +55,6 @@ index 500ccbe..f8e29d3 100755
if MYPROXY: if MYPROXY:
manager = urllib3.ProxyManager( manager = urllib3.ProxyManager(
MYPROXY, MYPROXY,
--
2.29.2

View file

@ -1,14 +1,15 @@
# Template file for 'buku' # Template file for 'buku'
pkgname=buku pkgname=buku
version=4.3 version=4.4
revision=2 revision=1
depends="python3-urllib3 python3-BeautifulSoup4 python3-cryptography python3-html5lib" depends="python3-urllib3 python3-BeautifulSoup4 python3-cryptography
python3-html5lib"
short_desc="Cmdline bookmark management utility" short_desc="Cmdline bookmark management utility"
maintainer="Diogo Leal <diogo@diogoleal.com>" 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=4c91cb0ac83164153c65705f46af29aaede78a2ed48d836cd2269b0fc71fed7a checksum=c7d755569117ceb85fdda734dcca657e01f6d5252d7d3b9f757faeedfdcac741
do_install() { do_install() {
vbin buku vbin buku