Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_158532689868850"
MIME-Version: 1.0
Date: Fri, 27 Mar 2020 16:34:58 +0000
From: "David H. Gutteridge" <gutteridge@netbsd.org>
Subject: CVS commit: pkgsrc/databases/py-ldap
To: pkgsrc-changes@NetBSD.org
Reply-To: gutteridge@netbsd.org
Message-Id: <20200327163458.235C5FB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_158532689868850
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gutteridge
Date:		Fri Mar 27 16:34:58 UTC 2020

Modified Files:
	pkgsrc/databases/py-ldap: Makefile distinfo
Added Files:
	pkgsrc/databases/py-ldap/patches: patch-Makefile

Log Message:
py-ldap: add build fixes

This package requires cyrus-sasl to build. Separately, it had a test(1)
invocation that's non-portable.


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/databases/py-ldap/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/databases/py-ldap/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/py-ldap/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_158532689868850
Content-Disposition: inline
Content-Length: 2500
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/databases/py-ldap/Makefile
diff -u pkgsrc/databases/py-ldap/Makefile:1.84 pkgsrc/databases/py-ldap/Makefile:1.85
--- pkgsrc/databases/py-ldap/Makefile:1.84	Sat Jan 18 21:49:04 2020
+++ pkgsrc/databases/py-ldap/Makefile	Fri Mar 27 16:34:57 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.84 2020/01/18 21:49:04 jperkin Exp $
+# $NetBSD: Makefile,v 1.85 2020/03/27 16:34:57 gutteridge Exp $
 
 DISTNAME=	python-ldap-3.2.0
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-ldap/}
 
@@ -19,6 +19,7 @@ TEST_ENV+=	SBIN=${PREFIX}/sbin
 TEST_ENV+=	SLAPD=${PREFIX}/libexec/slapd
 
 .include "../../databases/openldap-client/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/py-ldap/distinfo
diff -u pkgsrc/databases/py-ldap/distinfo:1.43 pkgsrc/databases/py-ldap/distinfo:1.44
--- pkgsrc/databases/py-ldap/distinfo:1.43	Tue Apr  9 11:51:20 2019
+++ pkgsrc/databases/py-ldap/distinfo	Fri Mar 27 16:34:57 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.43 2019/04/09 11:51:20 adam Exp $
+$NetBSD: distinfo,v 1.44 2020/03/27 16:34:57 gutteridge Exp $
 
 SHA1 (python-ldap-3.2.0.tar.gz) = f0658ddeffd4c059bb804890b80c00d62b70be60
 RMD160 (python-ldap-3.2.0.tar.gz) = 846bf38cb166f478f2cf401f889ad7ecd39b05c5
 SHA512 (python-ldap-3.2.0.tar.gz) = ef2833739fd57ad26d97ae5dba3bca8a47e770ff3f113d06a5bed0841f8fcbbe6cd102e75c753dfff48f5f6041f46a91c6166f3bb9ca44ef9bd643c0666c6b23
 Size (python-ldap-3.2.0.tar.gz) = 367645 bytes
+SHA1 (patch-Makefile) = ef130a8711a94cc070f11baf0d481bbc69ff3910

Added files:

Index: pkgsrc/databases/py-ldap/patches/patch-Makefile
diff -u /dev/null pkgsrc/databases/py-ldap/patches/patch-Makefile:1.1
--- /dev/null	Fri Mar 27 16:34:58 2020
+++ pkgsrc/databases/py-ldap/patches/patch-Makefile	Fri Mar 27 16:34:57 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2020/03/27 16:34:57 gutteridge Exp $
+
+Fix non-portable test expression.
+
+--- Makefile.orig	2018-07-30 16:05:13.000000000 +0000
++++ Makefile
+@@ -74,7 +74,7 @@ valgrind: build $(PYTHON_SUPP)
+ 	    $(PYTHON) setup.py test
+ 
+ 	@grep -A7 "blocks are definitely lost" build/valgrind.log; \
+-	if [ $$? == 0 ]; then \
++	if [ $$? = 0 ]; then \
+ 	    echo "Found definitive leak, see build/valgrind.log"; \
+ 	    exit 1; \
+ 	fi


--_----------=_158532689868850--