python/python-ldap: Updated for version 3.1.0 + new maintainer.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 48 insertions, 44 deletions

diff --git a/python/python-ldap/README b/python/python-ldap/README
index 7c10422116..6f6f67f890 100644
--- a/python/python-ldap/README
+++ b/python/python-ldap/README
@@ -1,7 +1,6 @@
-Python modules for implementing LDAP clients
+python-ldap provides an object-oriented API to access LDAP directory
+servers from Python programs. Mainly it wraps the OpenLDAP client libs
+for that purpose.
 
-python-ldap: python-ldap provides an object-oriented API to access LDAP 
-directory servers from Python programs. Mainly it wraps the OpenLDAP 2.x 
-libs for that purpose. Additionally the package contains modules for other 
-LDAP-related stuff (e.g. processing LDIF, LDAPURLs, LDAPv3 schema, 
-LDAPv3 extended operations and controls, etc.).
+Additionally, this package contains modules for other LDAP-related
+stuff (e.g. processing LDIF, LDAPURLs, LDAPv3 sub-schema, etc.).
diff --git a/python/python-ldap/python-ldap.SlackBuild b/python/python-ldap/python-ldap.SlackBuild
index 5c392ad917..fea3571710 100644
--- a/python/python-ldap/python-ldap.SlackBuild
+++ b/python/python-ldap/python-ldap.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-ldap
 
-# Copyright 2013 Mohamed LYAHYAOUI <mlyahyaoui@gmail.com>
+# Copyright 2018 Thibaut Notteboom, Paris, FRANCE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,25 +11,25 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-ldap
-VERSION=${VERSION:-2.4.13}
+VERSION=${VERSION:-3.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,10 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="LICENSE README"
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -56,28 +54,35 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py build || exit 1
+python setup.py install --root=$PKG
 
-python setup.py install --root $PKG || exit 1
+# Python 3 support.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGES CONTRIBUTING.rst Doc/ INSTALL LICENCE README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/python-ldap/python-ldap.info b/python/python-ldap/python-ldap.info
index 5eec87fe9d..ba1d9d007a 100644
--- a/python/python-ldap/python-ldap.info
+++ b/python/python-ldap/python-ldap.info
@@ -1,10 +1,10 @@
 PRGNAM="python-ldap"
-VERSION="2.4.13"
-HOMEPAGE="https://www.python-ldap.org"
-DOWNLOAD="https://pypi.python.org/packages/source/p/python-ldap/python-ldap-2.4.13.tar.gz"
-MD5SUM="74b7b50267761540451eade44b2049ee"
+VERSION="3.1.0"
+HOMEPAGE="https://www.python-ldap.org/"
+DOWNLOAD="https://github.com/python-ldap/python-ldap/archive/python-ldap-3.1.0/python-ldap-python-ldap-3.1.0.tar.gz"
+MD5SUM="ced4fef38bbd757bfb5b61b1860c14f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mohamed LYAHYAOUI"
-EMAIL="mlyahyaoui@gmail.com"
+REQUIRES="coverage pyasn1-modules"
+MAINTAINER="Thibaut Notteboom"
+EMAIL="thibaut.notteboom@gmail.com"
diff --git a/python/python-ldap/slack-desc b/python/python-ldap/slack-desc
index 3a04f4e701..9389b23c43 100644
--- a/python/python-ldap/slack-desc
+++ b/python/python-ldap/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
            |-----handy-ruler------------------------------------------------------|
-python-ldap: python-ldap (Python modules for implementing LDAP clients)
+python-ldap: python-ldap (LDAP client API for Python)
 python-ldap:
-python-ldap: Python-ldap: python-ldap provides an object-oriented API to access
-python-ldap: LDAP directory servers from Python programs
+python-ldap: python-ldap provides an object-oriented API to access LDAP directory
+python-ldap: servers from Python programs. Mainly it wraps the OpenLDAP client libs
+python-ldap: for that purpose.
 python-ldap:
-python-ldap:
-python-ldap:
-python-ldap: Homepage: https://www.python-ldap.org
+python-ldap: Additionally, this package contains modules for other LDAP-related
+python-ldap: stuff (e.g. processing LDIF, LDAPURLs, LDAPv3 sub-schema, etc.).
 python-ldap:
 python-ldap:
 python-ldap: