1.7.1.r7.gf4c3cd9-1: use urllib3 project's fork, apply 3 fixes from PR's

2 files changed, 47 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f6ee359f553..a435b8648ecd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,20 @@
 pkgbase = python2-pysocks
-	pkgdesc = SOCKS4 and SOCKS5 proxy module (deprecated)
-	pkgver = 1.7.1
-	pkgrel = 3
-	url = https://pypi.org/project/PySocks/1.7.1/
+	pkgdesc = SOCKS4 and SOCKS5 proxy module (deprecated) (Python 2 package)
+	pkgver = 1.7.1.r7.gf4c3cd9
+	pkgrel = 1
+	url = https://github.com/urllib3/PySocks
 	arch = any
 	license = BSD
 	makedepends = python2-setuptools
-	depends = python2
-	provides = python2-socks
-	source = PySocks-1.7.1.tar.gz::https://github.com/Anorov/PySocks/archive/f660e75d4844e64e4b162b0c01f8df8d866ee000.tar.gz
-	b2sums = 7f529112ebb6327886461a26b863c19097f760ce40d695c722a776923fa811c3bffa82d5640927d49324dac41120c851975c78eeb5b0aae116f45b187fa755b1
+	source = PySocks-f4c3cd9897898de69e136c92fd957fd989ee08ec.tar.gz::https://github.com/urllib3/PySocks/archive/f4c3cd9897898de69e136c92fd957fd989ee08ec.tar.gz
+	source = 0001-Fix_HTTP_basic_auth.patch::https://github.com/Anorov/PySocks/pull/147.patch
+	source = 0002-Change_error_type_to_match_native_socket_error.patch::https://github.com/Anorov/PySocks/pull/154.patch
+	source = 0003-Properly_convert_unsigned_integer_fix_urllib3_PySocks_issue_4.patch::https://github.com/urllib3/PySocks/pull/5.patch
+	b2sums = 1c7869c0c49ca44db02b4b9118f703d41be0902d78d38258ed8e93db897736612a9793be4b648495e58d801afa58f14c814243c97055b8f2781d0ed286909c9d
+	b2sums = c43421895dadd00a7845aff973e14eebc12284e4dac71a8c864803beb9e6d418971c518172a194249aece031118e35de074bbf5233a9c5359b3fcb7b99da4f2e
+	b2sums = c05bc0df73783d97879319f69d0b7130380063bd284732944d5876f60a64d05c88e5cafeebd903ef358a5f8cd65818c57a03d842bb95f0c0d4d38d5bd7b099bb
+	b2sums = 76b27a8e8f99dba9e779c638f1b7ffdf5a689fd880cfb69878e9e3f832e23fa32ac0ca0d5c6435db9d9944bab5b006b9800e23dafbae4b63e5fe626f985089be
 
 pkgname = python2-pysocks
+	depends = python2
+	provides = python2-socks=1.7.1
diff --git a/PKGBUILD b/PKGBUILD
index 4e349c5e5455..62786bd632a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,44 +4,52 @@
 
 pkgname='python2-pysocks'
 _name='PySocks'
-pkgver=1.7.1
-_commit='f660e75d4844e64e4b162b0c01f8df8d866ee000'
-pkgrel=3
-pkgdesc='SOCKS4 and SOCKS5 proxy module (deprecated)'
+pkgver=1.7.1.r7.gf4c3cd9
+_commit='f4c3cd9897898de69e136c92fd957fd989ee08ec'
+pkgrel=1
+pkgdesc='SOCKS4 and SOCKS5 proxy module (deprecated) (Python 2 package)'
 arch=('any')
-url="https://pypi.org/project/${_name}/${pkgver}/"
+_repo_maintainer='urllib3'
+url="https://github.com/${_repo_maintainer}/${_name}"
 license=('BSD')
-depends=('python2')
 makedepends=('python2-setuptools')
 # checkdepends=(
 #   'lib32-glibc'
 #   'python2-twisted'
 #   'python2-tornado'
 # )
-provides=('python2-socks')
-_sourcedirname="${_name}-${pkgver}"
-source=("${_sourcedirname}.tar.gz::https://github.com/Anorov/PySocks/archive/$_commit.tar.gz")
-b2sums=('7f529112ebb6327886461a26b863c19097f760ce40d695c722a776923fa811c3bffa82d5640927d49324dac41120c851975c78eeb5b0aae116f45b187fa755b1')
+_tarname="${_name}-${_commit}"
+source=("${_tarname}.tar.gz::${url}/archive/${_commit}.tar.gz"
+        "0001-Fix_HTTP_basic_auth.patch::https://github.com/Anorov/${_name}/pull/147.patch"
+        "0002-Change_error_type_to_match_native_socket_error.patch::https://github.com/Anorov/${_name}/pull/154.patch"
+        "0003-Properly_convert_unsigned_integer_fix_urllib3_PySocks_issue_4.patch::${url}/pull/5.patch")
+b2sums=('1c7869c0c49ca44db02b4b9118f703d41be0902d78d38258ed8e93db897736612a9793be4b648495e58d801afa58f14c814243c97055b8f2781d0ed286909c9d'
+        'c43421895dadd00a7845aff973e14eebc12284e4dac71a8c864803beb9e6d418971c518172a194249aece031118e35de074bbf5233a9c5359b3fcb7b99da4f2e'
+        'c05bc0df73783d97879319f69d0b7130380063bd284732944d5876f60a64d05c88e5cafeebd903ef358a5f8cd65818c57a03d842bb95f0c0d4d38d5bd7b099bb'
+        '76b27a8e8f99dba9e779c638f1b7ffdf5a689fd880cfb69878e9e3f832e23fa32ac0ca0d5c6435db9d9944bab5b006b9800e23dafbae4b63e5fe626f985089be')
 
 prepare() {
-  mv "${_name}-${_commit}" "${_sourcedirname}"
+  cd "${_tarname}"
 
-  cd "${_sourcedirname}"
+  for patch in "${srcdir}"/*.patch; do
+    echo  "--> Applying ${patch}..."
+    patch --verbose --unified -Np1 -i "${patch}"
+    echo
+  done
 
-  # Change hashbangs to python2
-  sed -e 's|#![ ]*/usr/bin/python$|#!/usr/bin/python2|' \
-      -e 's|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|' \
-      -e 's|#![ ]*/bin/env python$|#!/usr/bin/env python2|' \
+  printf "Changing hashbangs in *.py files to refer to 'python2'... "
+  sed -e '1s|#![ ]*/[a-zA-Z0-9./_ ]*python.*|#!/usr/bin/env python2|' \
       -i $(find . -name '*.py')
+  echo "done"
 }
 
 build() {
-  cd "${_sourcedirname}"
+  cd "${_tarname}"
   python2 setup.py build
 }
 
 # check_disabled() {
-#   cd "${_sourcedirname}/test"
+#   cd "${_tarname}/test"
 # 
 #   python2 socks4server.py &
 #   _SOCKS4SERVER=$!
@@ -61,8 +69,12 @@ build() {
 # }
 
 package() {
-  cd "${_sourcedirname}"
-  python2 setup.py install --prefix='/usr' --root="${pkgdir}" --optimize=1
+  depends=('python2')
+  provides=("python2-socks=${pkgver%.r*}")
 
-  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  cd "${_tarname}"
+  python2 setup.py install --root="${pkgdir}" --prefix='/usr' --optimize=1 --skip-build
+
+  install --verbose -Dm 644 'LICENSE' -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install --verbose -Dm 644 'README.md' -t "${pkgdir}/usr/share/doc/${pkgname}"
 }