aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/openldap22-server/Makefile12
-rw-r--r--net/openldap22-server/distinfo4
-rw-r--r--net/openldap22-server/files/patch-include::ldap_defaults.h11
-rw-r--r--net/openldap23-server/Makefile12
-rw-r--r--net/openldap23-server/distinfo4
-rw-r--r--net/openldap23-server/files/patch-include::ldap_defaults.h11
-rw-r--r--net/openldap24-server/Makefile12
-rw-r--r--net/openldap24-server/distinfo4
-rw-r--r--net/openldap24-server/files/patch-include::ldap_defaults.h11
9 files changed, 63 insertions, 18 deletions
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index d9b277e0a54..893827852a1 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= openldap
-PORTVERSION= 2.2.15
+PORTVERSION= 2.2.17
PORTREVISION= ${OPENLDAP_PORTREVISION}
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -62,7 +62,7 @@ PORTDOCS= CHANGES drafts rfc
.endif
.if defined(USE_OPENLDAP)
-.error You have `USE_OPENLDAP' defined either in your environment or in make(1) arguments.
+IGNORE= : You have \`USE_OPENLDAP' defined either in your environment or in make(1) arguments
.endif
.else
OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER}
@@ -213,7 +213,7 @@ PLIST_SUB+= BACK_BDB="@comment " \
BACK_HDB="@comment "
BDBLIB= db3.3
.else
-.error WITH_BDB_VER must be 3, 4, 41 or 42
+IGNORE= : WITH_BDB_VER must be 3, 4, 41 or 42
.endif
LIB_DEPENDS+= ${BDBLIB}:${PORTSDIR}/databases/db${WITH_BDB_VER}
@@ -252,7 +252,7 @@ LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
.elif ${WITH_ODBC_TYPE:L} == unixodbc
LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC
.else
-.error WITH_ODBC_TYPE must be iODBC or unixODBC
+IGNORE= : WITH_ODBC_TYPE must be iODBC or unixODBC
.endif
.else
PLIST_SUB+= BACK_SQL="@comment "
@@ -266,6 +266,10 @@ INSTALLS_SHLIB= yes
PLIST_SUB+= SLAPI="@comment "
.endif
+.if defined(WITH_CLDAP)
+CPPFLAGS+= -DLDAP_CONNECTIONLESS
+.endif
+
# Include tcp-wrapper support
.if !defined(WITHOUT_TCP_WRAPPERS) && exists(/usr/include/tcpd.h)
CONFIGURE_ARGS+= --enable-wrappers
diff --git a/net/openldap22-server/distinfo b/net/openldap22-server/distinfo
index cddc18041c2..76fa35c3e3b 100644
--- a/net/openldap22-server/distinfo
+++ b/net/openldap22-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (openldap-2.2.15.tgz) = c8b8693fe266db739b53e2719e9b29db
-SIZE (openldap-2.2.15.tgz) = 2575720
+MD5 (openldap-2.2.17.tgz) = aa10b961d02fbe331cd53214b7746c73
+SIZE (openldap-2.2.17.tgz) = 2569153
diff --git a/net/openldap22-server/files/patch-include::ldap_defaults.h b/net/openldap22-server/files/patch-include::ldap_defaults.h
new file mode 100644
index 00000000000..6ea31dbcd65
--- /dev/null
+++ b/net/openldap22-server/files/patch-include::ldap_defaults.h
@@ -0,0 +1,11 @@
+--- include/ldap_defaults.h.orig Tue Sep 28 20:18:40 2004
++++ include/ldap_defaults.h Tue Sep 28 20:20:01 2004
+@@ -39,7 +39,7 @@
+ #define LDAP_ENV_PREFIX "LDAP"
+
+ /* default ldapi:// socket */
+-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
++#define LDAPI_SOCK "/var/run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
+
+ /*
+ * SLAPD DEFINITIONS
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index d9b277e0a54..893827852a1 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= openldap
-PORTVERSION= 2.2.15
+PORTVERSION= 2.2.17
PORTREVISION= ${OPENLDAP_PORTREVISION}
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -62,7 +62,7 @@ PORTDOCS= CHANGES drafts rfc
.endif
.if defined(USE_OPENLDAP)
-.error You have `USE_OPENLDAP' defined either in your environment or in make(1) arguments.
+IGNORE= : You have \`USE_OPENLDAP' defined either in your environment or in make(1) arguments
.endif
.else
OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER}
@@ -213,7 +213,7 @@ PLIST_SUB+= BACK_BDB="@comment " \
BACK_HDB="@comment "
BDBLIB= db3.3
.else
-.error WITH_BDB_VER must be 3, 4, 41 or 42
+IGNORE= : WITH_BDB_VER must be 3, 4, 41 or 42
.endif
LIB_DEPENDS+= ${BDBLIB}:${PORTSDIR}/databases/db${WITH_BDB_VER}
@@ -252,7 +252,7 @@ LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
.elif ${WITH_ODBC_TYPE:L} == unixodbc
LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC
.else
-.error WITH_ODBC_TYPE must be iODBC or unixODBC
+IGNORE= : WITH_ODBC_TYPE must be iODBC or unixODBC
.endif
.else
PLIST_SUB+= BACK_SQL="@comment "
@@ -266,6 +266,10 @@ INSTALLS_SHLIB= yes
PLIST_SUB+= SLAPI="@comment "
.endif
+.if defined(WITH_CLDAP)
+CPPFLAGS+= -DLDAP_CONNECTIONLESS
+.endif
+
# Include tcp-wrapper support
.if !defined(WITHOUT_TCP_WRAPPERS) && exists(/usr/include/tcpd.h)
CONFIGURE_ARGS+= --enable-wrappers
diff --git a/net/openldap23-server/distinfo b/net/openldap23-server/distinfo
index cddc18041c2..76fa35c3e3b 100644
--- a/net/openldap23-server/distinfo
+++ b/net/openldap23-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (openldap-2.2.15.tgz) = c8b8693fe266db739b53e2719e9b29db
-SIZE (openldap-2.2.15.tgz) = 2575720
+MD5 (openldap-2.2.17.tgz) = aa10b961d02fbe331cd53214b7746c73
+SIZE (openldap-2.2.17.tgz) = 2569153
diff --git a/net/openldap23-server/files/patch-include::ldap_defaults.h b/net/openldap23-server/files/patch-include::ldap_defaults.h
new file mode 100644
index 00000000000..6ea31dbcd65
--- /dev/null
+++ b/net/openldap23-server/files/patch-include::ldap_defaults.h
@@ -0,0 +1,11 @@
+--- include/ldap_defaults.h.orig Tue Sep 28 20:18:40 2004
++++ include/ldap_defaults.h Tue Sep 28 20:20:01 2004
+@@ -39,7 +39,7 @@
+ #define LDAP_ENV_PREFIX "LDAP"
+
+ /* default ldapi:// socket */
+-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
++#define LDAPI_SOCK "/var/run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
+
+ /*
+ * SLAPD DEFINITIONS
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index d9b277e0a54..893827852a1 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= openldap
-PORTVERSION= 2.2.15
+PORTVERSION= 2.2.17
PORTREVISION= ${OPENLDAP_PORTREVISION}
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -62,7 +62,7 @@ PORTDOCS= CHANGES drafts rfc
.endif
.if defined(USE_OPENLDAP)
-.error You have `USE_OPENLDAP' defined either in your environment or in make(1) arguments.
+IGNORE= : You have \`USE_OPENLDAP' defined either in your environment or in make(1) arguments
.endif
.else
OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER}
@@ -213,7 +213,7 @@ PLIST_SUB+= BACK_BDB="@comment " \
BACK_HDB="@comment "
BDBLIB= db3.3
.else
-.error WITH_BDB_VER must be 3, 4, 41 or 42
+IGNORE= : WITH_BDB_VER must be 3, 4, 41 or 42
.endif
LIB_DEPENDS+= ${BDBLIB}:${PORTSDIR}/databases/db${WITH_BDB_VER}
@@ -252,7 +252,7 @@ LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
.elif ${WITH_ODBC_TYPE:L} == unixodbc
LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC
.else
-.error WITH_ODBC_TYPE must be iODBC or unixODBC
+IGNORE= : WITH_ODBC_TYPE must be iODBC or unixODBC
.endif
.else
PLIST_SUB+= BACK_SQL="@comment "
@@ -266,6 +266,10 @@ INSTALLS_SHLIB= yes
PLIST_SUB+= SLAPI="@comment "
.endif
+.if defined(WITH_CLDAP)
+CPPFLAGS+= -DLDAP_CONNECTIONLESS
+.endif
+
# Include tcp-wrapper support
.if !defined(WITHOUT_TCP_WRAPPERS) && exists(/usr/include/tcpd.h)
CONFIGURE_ARGS+= --enable-wrappers
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index cddc18041c2..76fa35c3e3b 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (openldap-2.2.15.tgz) = c8b8693fe266db739b53e2719e9b29db
-SIZE (openldap-2.2.15.tgz) = 2575720
+MD5 (openldap-2.2.17.tgz) = aa10b961d02fbe331cd53214b7746c73
+SIZE (openldap-2.2.17.tgz) = 2569153
diff --git a/net/openldap24-server/files/patch-include::ldap_defaults.h b/net/openldap24-server/files/patch-include::ldap_defaults.h
new file mode 100644
index 00000000000..6ea31dbcd65
--- /dev/null
+++ b/net/openldap24-server/files/patch-include::ldap_defaults.h
@@ -0,0 +1,11 @@
+--- include/ldap_defaults.h.orig Tue Sep 28 20:18:40 2004
++++ include/ldap_defaults.h Tue Sep 28 20:20:01 2004
+@@ -39,7 +39,7 @@
+ #define LDAP_ENV_PREFIX "LDAP"
+
+ /* default ldapi:// socket */
+-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
++#define LDAPI_SOCK "/var/run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
+
+ /*
+ * SLAPD DEFINITIONS
generated by cgit (git 2.34.1) at 2024-12-19 08:52:40 +0800