Fix p4python package to work with latest OpenSSL

2 files changed, 30 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c27c7a9ecd12..c0c1a1f43dc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
-# Generated by mksrcinfo v8
-# Thu Aug 17 13:39:32 UTC 2017
 pkgbase = python-p4python
 	pkgdesc = Interface to Perforce API for Python
-	pkgver = 2017.1.1526044
-	pkgrel = 3
+	pkgver = 2017.2.1615960
+	pkgrel = 1
 	url = https://www.perforce.com/perforce/doc.current/manuals/p4script/03_python.html
 	arch = any
 	license = custom
 	makedepends = python-setuptools
 	makedepends = python2-setuptools
-	makedepends = openssl-1.0
-	source = python-p4python-2017.1.1526044.tar.gz::https://pypi.python.org/packages/0c/8f/96d49332fcf60434c92df0d6df4290b3ce930e25a99d7b5acdc131fb2e16/p4python-2017.1.1526044.tar.gz
-	md5sums = 8d1142270531d98913046380f266be80
+	source = python-p4python-2017.2.1615960.tar.gz::https://files.pythonhosted.org/packages/37/2f/ae9214f6b08bde402d88a9cdf6faf307cfbe50fee04aeb4b15f89bf09fcd/p4python-2017.2.1615960.tar.gz
+	source = http://ftp.perforce.com/perforce/r18.1/bin.linux26x86_64/p4api.tgz
+	sha256sums = 316499580172a5ed5c873cc361cdd0ecda70bb36cffc2d84c189e53268a06312
+	sha256sums = e1c9e08b4db0b333510ae814e316e506c48f7eb80b654367bed003096ea8a5ec
 
 pkgname = python-p4python
 	pkgdesc = Interface to Perforce API for Python 3
diff --git a/PKGBUILD b/PKGBUILD
index f6170b2758b3..a2866eacf9f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,47 @@
-# Maintainer: Alex Whitt <alex.joseph.whitt@gmail.com>
+# Maintainer: Adrian Bacircea <adrian.bacircea@gmail.com>
+# Contributor: Alex Whitt <alex.joseph.whitt@gmail.com>
 
 _pkgsrcname=p4python
 pkgname=(python-p4python python2-p4python)
-pkgver=2017.1.1526044
-pkgrel=3
+pkgver=2017.2.1615960
+p4apiver=2018.1.1660568
+pkgrel=1
 pkgdesc="Interface to Perforce API for Python"
 url="https://www.perforce.com/perforce/doc.current/manuals/p4script/03_python.html"
 arch=('any')
 license=('custom')
-source=($pkgname-$pkgver.tar.gz::"https://pypi.python.org/packages/0c/8f/96d49332fcf60434c92df0d6df4290b3ce930e25a99d7b5acdc131fb2e16/${_pkgsrcname}-${pkgver}.tar.gz")
-md5sums=('8d1142270531d98913046380f266be80')
-makedepends=('python-setuptools' 'python2-setuptools' 'openssl-1.0')
+source=($pkgname-$pkgver.tar.gz::"https://files.pythonhosted.org/packages/37/2f/ae9214f6b08bde402d88a9cdf6faf307cfbe50fee04aeb4b15f89bf09fcd/p4python-2017.2.1615960.tar.gz"
+        'http://ftp.perforce.com/perforce/r18.1/bin.linux26x86_64/p4api.tgz')
+sha256sums=('316499580172a5ed5c873cc361cdd0ecda70bb36cffc2d84c189e53268a06312'
+            'e1c9e08b4db0b333510ae814e316e506c48f7eb80b654367bed003096ea8a5ec')
+makedepends=('python-setuptools' 'python2-setuptools')
 
 prepare() {
   # Clean up if needed
   rm -rf python-$_pkgsrcname-$pkgver
   rm -rf python2-$_pkgsrcname-$pkgver
 
+  sed -i 's/OpenSSL (\\d)\\.(\\d)\\.(\\d)(\\S+)\\s+\\d+ \\S+ \\d+/OpenSSL (\\d)\\.(\\d)\\.(\\d)(.*)/g' \
+          ${_pkgsrcname}-${pkgver}/setup.py
+  sed -i 's/pattern.match(version_string)/pattern.search(version_string)/g' \
+          ${_pkgsrcname}-${pkgver}/setup.py
+
   # Copy folder, so we can cleanly build for both python versions
   mv $_pkgsrcname-$pkgver python-$_pkgsrcname-$pkgver
   cp -rup python-$_pkgsrcname-$pkgver python2-$_pkgsrcname-$pkgver
+
+  cd ${srcdir}
+  tar -xf p4api.tgz
 }
 
 build() {
   # Build for python 3
   cd python-$_pkgsrcname-$pkgver
-  python setup.py build --ssl /usr/lib/openssl-1.0
+  python setup.py build --apidir ${srcdir}/p4api-${p4apiver}
 
   # Build for python 2
   cd ../python2-$_pkgsrcname-$pkgver
-  python2 setup.py build --ssl /usr/lib/openssl-1.0
+  python2 setup.py build --apidir ${srcdir}/p4api-${p4apiver}
 }
 
 package_python-p4python() {
@@ -38,7 +50,8 @@ package_python-p4python() {
 
   cd $srcdir/python-$_pkgsrcname-$pkgver
 
-  python setup.py install --root="$pkgdir/" --skip-build --optimize=1
+  python setup.py install --root="$pkgdir/" --skip-build --optimize=1 \
+                          --apidir ${srcdir}/p4api-${p4apiver}
   install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 
@@ -48,6 +61,7 @@ package_python2-p4python() {
 
   cd $srcdir/python2-$_pkgsrcname-$pkgver
 
-  python2 setup.py install --root="$pkgdir/" --skip-build --optimize=1
+  python2 setup.py install --root="$pkgdir/" --skip-build --optimize=1 \
+                           --apidir ${srcdir}/p4api-${p4apiver}
   install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }