aboutsummaryrefslogtreecommitdiff
path: root/net/openldap24-server
diff options
context:
space:
mode:
Diffstat (limited to 'net/openldap24-server')
-rw-r--r--net/openldap24-server/Makefile3
-rw-r--r--net/openldap24-server/distinfo6
-rw-r--r--net/openldap24-server/files/manpages1
-rw-r--r--net/openldap24-server/files/patch-configure17
-rw-r--r--net/openldap24-server/files/slapd.sh.in2
5 files changed, 20 insertions, 9 deletions
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index a0771682312d..c0186fc5ee50 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= openldap
-DISTVERSION= 2.4.6
+DISTVERSION= 2.4.8
PORTREVISION= ${OPENLDAP_PORTREVISION}
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -113,6 +113,7 @@ WANT_OPENLDAP_VER= 24
.if defined(WITH_SASL) && !defined(WITHOUT_SASL)
WANT_OPENLDAP_SASL= yes
CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.*
+PKGNAMESUFFIX= -sasl-server
.else
CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
.endif
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index df96d5f9d336..a8a2e1e1fe5d 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (openldap-2.4.6.tgz) = 4418da48649297587a3d07c987808a5e
-SHA256 (openldap-2.4.6.tgz) = e3af73a91c9cf7a78d700c348a55792d65fc945218fe7f3abf9a97acd00ac579
-SIZE (openldap-2.4.6.tgz) = 4043736
+MD5 (openldap-2.4.8.tgz) = 5ef2ea680479e0cee13fdf64a4ef548a
+SHA256 (openldap-2.4.8.tgz) = 23d9a45241dcf81ab4094c892eafe7111306b31c34387d5c21c9c918d68e5b80
+SIZE (openldap-2.4.8.tgz) = 4266336
diff --git a/net/openldap24-server/files/manpages b/net/openldap24-server/files/manpages
index f68cb8869011..83d1fd38876e 100644
--- a/net/openldap24-server/files/manpages
+++ b/net/openldap24-server/files/manpages
@@ -206,6 +206,7 @@ MAN5+= ldap.conf.5 \
slapd-perl.5 \
slapd-relay.5 \
slapd-shell.5 \
+ slapd-sock.5 \
slapd-sql.5 \
slapd.access.5 \
slapd.backends.5 \
diff --git a/net/openldap24-server/files/patch-configure b/net/openldap24-server/files/patch-configure
index 4198340d07c7..a2df6201ed60 100644
--- a/net/openldap24-server/files/patch-configure
+++ b/net/openldap24-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Fri Sep 2 03:27:55 2005
-+++ configure Sun Sep 4 16:10:14 2005
-@@ -34922,7 +34922,7 @@
+--- configure.orig 2008-02-11 15:36:45.000000000 -0800
++++ configure 2008-02-19 14:03:01.410279419 -0800
+@@ -31928,7 +31928,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -9,7 +9,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34995,7 +34995,7 @@
+@@ -32004,7 +32004,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -18,3 +18,12 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
+@@ -32263,7 +32263,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-#include <unicode/utypes.h>
++#include <unicode/utypes.h-disabled>
+
+ int
+ main ()
diff --git a/net/openldap24-server/files/slapd.sh.in b/net/openldap24-server/files/slapd.sh.in
index a9771a54f910..341fcaee28d9 100644
--- a/net/openldap24-server/files/slapd.sh.in
+++ b/net/openldap24-server/files/slapd.sh.in
@@ -43,7 +43,7 @@ start_precmd()
{
local slapd_ownername slapd_groupname
- case x"$slapd_owner" in
+ case "$slapd_owner" in
""|[Nn][Oo][Nn][Ee]|[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
;;
*)