From 0aa4ddfcc4e2610b1ba115e34626bbc52d384990 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 28 Apr 2019 18:58:12 +0000
Subject: Sun Apr 28 18:58:12 UTC 2019

ap/qpdf-8.4.1-x86_64-1.txz:  Upgraded.
l/M2Crypto-0.33.0-x86_64-1.txz:  Upgraded.
l/python-requests-2.21.0-x86_64-4.txz:  Rebuilt.
  Also patch __init__.py to allow a newer urllib3. Thanks to petslack.
x/xkeyboard-config-2.26-noarch-2.txz:  Rebuilt.
  Fixed broken pt keymap. Thanks to sairum.
extra/bash-completion/bash-completion-2.9-noarch-1.txz:  Upgraded.
---
 source/l/python-requests/python-requests.SlackBuild    |  2 +-
 source/l/python-requests/requests.urllib3.version.diff | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'source/l')

diff --git a/source/l/python-requests/python-requests.SlackBuild b/source/l/python-requests/python-requests.SlackBuild
index b80fc33d8..8ba18ea1d 100755
--- a/source/l/python-requests/python-requests.SlackBuild
+++ b/source/l/python-requests/python-requests.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=python-requests
 VERSION=${VERSION:-$(echo requests-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 SRCNAM=requests
 
diff --git a/source/l/python-requests/requests.urllib3.version.diff b/source/l/python-requests/requests.urllib3.version.diff
index 48407b4a7..59f55c84f 100644
--- a/source/l/python-requests/requests.urllib3.version.diff
+++ b/source/l/python-requests/requests.urllib3.version.diff
@@ -1,5 +1,5 @@
 --- ./setup.py.orig	2018-12-10 00:13:32.000000000 -0600
-+++ ./setup.py	2019-04-27 14:15:41.124000032 -0500
++++ ./setup.py	2019-04-28 13:11:33.836514225 -0500
 @@ -44,7 +44,7 @@
  requires = [
      'chardet>=3.0.2,<3.1.0',
@@ -9,3 +9,18 @@
      'certifi>=2017.4.17'
  
  ]
+--- ./requests/__init__.py.orig	2018-12-10 00:13:32.000000000 -0600
++++ ./requests/__init__.py	2019-04-28 13:13:44.711502000 -0500
+@@ -57,10 +57,10 @@
+     # Check urllib3 for compatibility.
+     major, minor, patch = urllib3_version  # noqa: F811
+     major, minor, patch = int(major), int(minor), int(patch)
+-    # urllib3 >= 1.21.1, <= 1.24
++    # urllib3 >= 1.21.1, < 1.26
+     assert major == 1
+     assert minor >= 21
+-    assert minor <= 24
++    assert minor < 26
+ 
+     # Check chardet for compatibility.
+     major, minor, patch = chardet_version.split('.')[:3]
-- 
cgit v1.2.3-80-g2a13