CVS commit: pkgsrc/databases

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May  2 10:59:13 UTC 2019

Modified Files:
        pkgsrc/databases/openldap: Makefile.common
        pkgsrc/databases/openldap-client: Makefile

Log Message:
openldap-client: Fix FD_SETSIZE on SunOS 64-bit.

The OS default is 64k but OpenLDAP sets a hardcoded limit of 4k.  Bump
PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/databases/openldap/Makefile.common
cvs rdiff -u -r1.26 -r1.27 pkgsrc/databases/openldap-client/Makefile

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

Modified files:

Index: pkgsrc/databases/openldap/Makefile.common
diff -u pkgsrc/databases/openldap/Makefile.common:1.42 pkgsrc/databases/openldap/Makefile.common:1.43
--- pkgsrc/databases/openldap/Makefile.common:1.42      Thu Dec 20 17:54:09 2018
+++ pkgsrc/databases/openldap/Makefile.common   Thu May  2 10:59:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2018/12/20 17:54:09 adam Exp $
+# $NetBSD: Makefile.common,v 1.43 2019/05/02 10:59:13 jperkin Exp $
 #
 # used by databases/openldap-client/Makefile
 # used by databases/openldap-cloak/Makefile
@@ -100,6 +100,11 @@ PTH_FDSETSIZE_cmd=                                                 \
 CPPFLAGS+=     -DOPENLDAP_FD_SETSIZE=${PTH_FDSETSIZE_cmd:sh:Q}
 .endif
 
+# OpenLDAP hardcodes this to 4096, disregarding the OS default.
+.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64)
+CPPFLAGS+=     -DOPENLDAP_FD_SETSIZE=65536
+.endif
+
 MAKE_FLAGS+=           moduledir=${OPENLDAP_MODULEDIR}
 INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} sysconfdir=${EGDIR}
 

Index: pkgsrc/databases/openldap-client/Makefile
diff -u pkgsrc/databases/openldap-client/Makefile:1.26 pkgsrc/databases/openldap-client/Makefile:1.27
--- pkgsrc/databases/openldap-client/Makefile:1.26      Fri Jun  2 08:29:56 2017
+++ pkgsrc/databases/openldap-client/Makefile   Thu May  2 10:59:13 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2017/06/02 08:29:56 adam Exp $
+# $NetBSD: Makefile,v 1.27 2019/05/02 10:59:13 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
+PKGREVISION=   1
 COMMENT=       Lightweight Directory Access Protocol libraries and client programs
 
 CONFLICTS+=            openldap<2.3.23nb1