cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to openldap-2.6.3

Browse Source
This commit is contained in:
sthen 2022-07-17 09:02:41 +00:00
parent 3df59dbb3e
commit 6c41f375a3
9 changed files with 19 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
databases/openldap/Makefile
View File

@ -1,7 +1,7 @@
COMMENT-main = LDAP client library and tools
COMMENT-server = LDAP directory server
DISTNAME = openldap-2.6.2
DISTNAME = openldap-2.6.3
MULTI_PACKAGES = -main -server
PKGNAME-main = ${DISTNAME:S/-/-client-/}
@ -38,6 +38,7 @@ DEBUG_PACKAGES = ${BUILD_PACKAGES}
SEPARATE_BUILD = Yes
AUTOCONF_VERSION = 2.69
CONFIGURE_STYLE = autoconf
MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC} ${WRKSRC}/build
USE_GMAKE = Yes
FLAVOR ?=
@ -92,11 +93,6 @@ WANTLIB += heimdal/lib/heimntlm
WANTLIB += heimdal/lib/heimsqlite
.endif
MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC} ${WRKSRC}/build
TEST_TARGET = test
TEST_DEPENDS = shells/bash
LIB_DEPENDS += security/cyrus-sasl2
LIB_DEPENDS-server = ${LIB_DEPENDS} \
${BUILD_PKGPATH},-main \
@ -125,4 +121,11 @@ post-install:
mv ${WRKINST}${SYSCONFDIR}/openldap ${PREFIX}/share/examples/
rm ${PREFIX}/share/examples/openldap/*.default
TEST_TARGET = test
TEST_DEPENDS = shells/bash \
sysutils/coreutils
pre-test:
ln -fs ${LOCALBASE}/bin/gdate ${WRKDIR}/bin/date
.include <bsd.port.mk>

4
databases/openldap/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (openldap-2.6.2.tgz) = gdCTRSMutiSG7PWsrNLFbAxFtKbIwGZhLn9CGiOhz4c=
SIZE (openldap-2.6.2.tgz) = 6448362
SHA256 (openldap-2.6.3.tgz) = 0qKh1x3z13OWscFq11AuZ030RuBgcrDlpOlBw9BsDUY=
SIZE (openldap-2.6.3.tgz) = 6474169

10
databases/openldap/patches/patch-Makefile_in
View File

@ -1,10 +0,0 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -36,3 +36,6 @@ distclean: veryclean FORCE
check: test
test: FORCE
cd tests && $(MAKE) test
+
+test-ldbm: FORCE
+ cd tests; $(MAKE) ldbm

2
databases/openldap/patches/patch-configure_ac
View File

@ -7,7 +7,7 @@ Patch to use it, avoiding the need for Linux/libext2fs libuuid.
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -1066,11 +1066,11 @@ dnl --------------------------------------------------
@@ -1073,11 +1073,11 @@ dnl --------------------------------------------------
dnl UUID Support
have_uuid=no

2
databases/openldap/patches/patch-libraries_libldap_os-ip_c
View File

@ -1,3 +1,5 @@
avoid format/type mismatch on ILP32 archs (time_t is always 64 bit on OpenBSD)
Index: libraries/libldap/os-ip.c
--- libraries/libldap/os-ip.c.orig
+++ libraries/libldap/os-ip.c

2
databases/openldap/patches/patch-libraries_libldap_os-local_c
View File

@ -1,3 +1,5 @@
avoid format/type mismatch on ILP32 archs (time_t is always 64 bit on OpenBSD)
Index: libraries/libldap/os-local.c
--- libraries/libldap/os-local.c.orig
+++ libraries/libldap/os-local.c

4
databases/openldap/patches/patch-servers_slapd_back-mdb_init_c
View File

@ -1,7 +1,9 @@
yes, we're still non-coherent for mmap/file io
Index: servers/slapd/back-mdb/init.c
--- servers/slapd/back-mdb/init.c.orig
+++ servers/slapd/back-mdb/init.c
@@ -169,6 +169,32 @@ mdb_db_open( BackendDB *be, ConfigReply *cr )
@@ -170,6 +170,32 @@ mdb_db_open( BackendDB *be, ConfigReply *cr )
flags = mdb->mi_dbenv_flags;

24
databases/openldap/patches/patch-servers_slapd_daemon_c
View File

@ -1,24 +0,0 @@
https://bugs.openldap.org/show_bug.cgi?id=9847#c3
From ced6652efb8835fcc8c4e7cd8d92830f7d8e2580 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Sat, 14 May 2022 17:16:02 +0100
Subject: [PATCH] ITS#9847 slapd: fix kqueue for FreeBSD/MacOSX/OpenBSD
Index: servers/slapd/daemon.c
--- servers/slapd/daemon.c.orig
+++ servers/slapd/daemon.c
@@ -227,11 +227,10 @@ static slap_daemon_st *slap_daemon;
slap_daemon[t].sd_kq = kqueue(); \
} while (0)
-/* a kqueue fd obtained before a fork can't be used in child process.
- * close it and reacquire it.
+/* a kqueue fd obtained before a fork isn't inherited by child process.
+ * reacquire it.
*/
# define SLAP_SOCK_INIT2() do { \
- close(slap_daemon[0].sd_kq); \
slap_daemon[0].sd_kq = kqueue(); \
} while (0)

11
databases/openldap/patches/patch-servers_slapd_slapd_conf
View File

@ -1,17 +1,6 @@
#1: this is subst'ed in "make install"; patch to avoid using share/examples/...
Index: servers/slapd/slapd.conf
--- servers/slapd/slapd.conf.orig
+++ servers/slapd/slapd.conf
@@ -2,7 +2,7 @@
# See slapd.conf(5) for details on configuration options.
# This file should NOT be world readable.
#
-include %SYSCONFDIR%/schema/core.schema
+include /etc/openldap/schema/core.schema
# Define global ACLs to disable default read access.
@@ -10,8 +10,8 @@ include %SYSCONFDIR%/schema/core.schema
# service AND an understanding of referrals.
#referral ldap://root.openldap.org