From 799cf3a56b0330f559884b90c7be54a7e0afb287 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Mon, 30 Nov 2020 12:25:49 -0600 Subject: [PATCH] boku: update to 4.4 --- ...ts.patch => 0001-Use-system-cacerts.patch} | 32 +++++++++++++------ srcpkgs/buku/template | 9 +++--- 2 files changed, 27 insertions(+), 14 deletions(-) rename srcpkgs/buku/patches/{use-system-cacerts.patch => 0001-Use-system-cacerts.patch} (65%) diff --git a/srcpkgs/buku/patches/use-system-cacerts.patch b/srcpkgs/buku/patches/0001-Use-system-cacerts.patch similarity index 65% rename from srcpkgs/buku/patches/use-system-cacerts.patch rename to srcpkgs/buku/patches/0001-Use-system-cacerts.patch index 05e8cd9eb36..7391985f460 100644 --- a/srcpkgs/buku/patches/use-system-cacerts.patch +++ b/srcpkgs/buku/patches/0001-Use-system-cacerts.patch @@ -1,16 +1,25 @@ +From 1f4c9edaedbc4bd270993c5a28ef6db3a378efed Mon Sep 17 00:00:00 2001 +From: Nathan Owens +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 500ccbe..f8e29d3 100755 +index 936988a..079d3d2 100755 --- buku +++ buku -@@ -42,7 +42,6 @@ try: - except ImportError: - pass - from bs4 import BeautifulSoup +@@ -40,7 +40,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 -@@ -93,6 +92,8 @@ LOGGER = logging.getLogger() + from urllib3.util import parse_url, make_headers, Retry +@@ -98,6 +97,8 @@ LOGGER = logging.getLogger() LOGDBG = LOGGER.debug LOGERR = LOGGER.error @@ -19,7 +28,7 @@ index 500ccbe..f8e29d3 100755 class BukuCrypt: """Class to handle encryption and decryption of -@@ -2516,7 +2517,7 @@ class BukuDb: +@@ -2565,7 +2566,7 @@ class BukuDb: if MYPROXY is None: gen_headers() @@ -28,7 +37,7 @@ index 500ccbe..f8e29d3 100755 if MYPROXY: manager = urllib3.ProxyManager( MYPROXY, -@@ -3426,7 +3427,7 @@ def get_PoolManager(): +@@ -3540,7 +3541,7 @@ def get_PoolManager(): ProxyManager or PoolManager ProxyManager if https_proxy is defined, PoolManager otherwise. """ @@ -37,7 +46,7 @@ index 500ccbe..f8e29d3 100755 if MYPROXY: return urllib3.ProxyManager(MYPROXY, num_pools=1, headers=MYHEADERS, timeout=15, 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: gen_headers() @@ -46,3 +55,6 @@ index 500ccbe..f8e29d3 100755 if MYPROXY: manager = urllib3.ProxyManager( MYPROXY, +-- +2.29.2 + diff --git a/srcpkgs/buku/template b/srcpkgs/buku/template index 9925789acb2..08ba6c8f874 100644 --- a/srcpkgs/buku/template +++ b/srcpkgs/buku/template @@ -1,14 +1,15 @@ # Template file for 'buku' pkgname=buku -version=4.3 -revision=2 -depends="python3-urllib3 python3-BeautifulSoup4 python3-cryptography python3-html5lib" +version=4.4 +revision=1 +depends="python3-urllib3 python3-BeautifulSoup4 python3-cryptography + python3-html5lib" short_desc="Cmdline bookmark management utility" 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=4c91cb0ac83164153c65705f46af29aaede78a2ed48d836cd2269b0fc71fed7a +checksum=c7d755569117ceb85fdda734dcca657e01f6d5252d7d3b9f757faeedfdcac741 do_install() { vbin buku