Update to 2.4.26.

6 files changed, 19 insertions, 26 deletions

diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 5bfde00dc65b..568a22e6552b 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		openldap
-DISTVERSION=		2.4.25
+DISTVERSION=		2.4.26
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -39,8 +39,8 @@ WANT_OPENLDAP_VER?=	24
 BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
-PORTREVISION_CLIENT=	2
-PORTREVISION_SERVER=	2
+PORTREVISION_CLIENT=	0
+PORTREVISION_SERVER=	0
 OPENLDAP_SHLIB_MAJOR=	8
 
 OPTIONS=	SASL "With (Cyrus) SASL2 support" off \
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index cb08a1caa0f4..f7090d4815e9 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openldap-2.4.25.tgz) = 615acc9970ae2f612bae7e8012d63f3194ef02a2a638bc1fd9ca7f31d85c1075
-SIZE (openldap-2.4.25.tgz) = 5250595
+SHA256 (openldap-2.4.26.tgz) = 1f42048cebbcd8647c9c566f8f070946103a15717345915ecd5fccfbe19a7c3d
+SIZE (openldap-2.4.26.tgz) = 5250064
diff --git a/net/openldap24-server/files/manpages b/net/openldap24-server/files/manpages
index 369f397c6ec5..4381caaf9d99 100644
--- a/net/openldap24-server/files/manpages
+++ b/net/openldap24-server/files/manpages
@@ -136,6 +136,7 @@ MLINKS+= \
 	ldap_get_dn.3 ldap_dn2dcedn.3 \
 	ldap_get_dn.3 ldap_dcedn2dn.3 \
 	ldap_get_dn.3 ldap_dn2ad_canonical.3 \
+	ldap_get_dn.3 ldap_dnfree.3 \
 	ldap_get_option.3 ldap_set_option.3 \
 	ldap_get_values.3 ldap_get_values_len.3 \
 	ldap_get_values.3 ldap_value_free.3 \
diff --git a/net/openldap24-server/files/patch-configure b/net/openldap24-server/files/patch-configure
index 790906e997b9..88b3ff1af424 100644
--- a/net/openldap24-server/files/patch-configure
+++ b/net/openldap24-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2011-03-23 18:52:17.000000000 -0700
-+++ configure	2011-04-02 15:28:05.563816386 -0700
-@@ -21598,7 +21598,7 @@
+--- configure.orig	2011-06-30 08:13:36.000000000 -0700
++++ configure	2011-07-01 16:50:58.734235092 -0700
+@@ -21600,7 +21600,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -9,7 +9,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -21646,7 +21646,7 @@
+@@ -21648,7 +21648,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -18,7 +18,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -21936,7 +21936,7 @@
+@@ -21938,7 +21938,7 @@
  		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
@@ -27,12 +27,3 @@
  
  int
  main ()
-@@ -22234,7 +22234,7 @@
- 
- 
- 	if test $ol_cv_lib_fetch != no ; then
--		LUTIL_LIBS="$LUTIL_LIBS $ol_link_fetch"
-+		LIBS="$LIBS $ol_link_fetch"
- 		ol_link_fetch=freebsd
- 
- 	elif test $ol_with_fetch != auto ; then
diff --git a/net/openldap24-server/files/patch-shlib-version b/net/openldap24-server/files/patch-shlib-version
index d2bdb1a9c529..6218e0132783 100644
--- a/net/openldap24-server/files/patch-shlib-version
+++ b/net/openldap24-server/files/patch-shlib-version
@@ -1,14 +1,14 @@
 # I have checked all headers and don't think the shared library
 # bump is a needed one.  We patch it back to prevent large
 # rebuild need.
---- build/version.var.orig	2011-03-25 14:08:12.000000000 -0700
-+++ build/version.var	2011-03-28 01:23:08.215863119 -0700
-@@ -17,7 +17,7 @@
+--- build/version.var.orig	2011-06-30 08:13:36.000000000 -0700
++++ build/version.var	2011-07-05 00:27:39.172875169 -0700
+@@ -17,7 +17,7 @@ ol_major=2
  ol_minor=4
- ol_patch=25
- ol_api_inc=20425
+ ol_patch=26
+ ol_api_inc=20426
 -ol_api_current=9
 +ol_api_current=8
- ol_api_revision=0
+ ol_api_revision=1
  ol_api_age=7
- ol_release_date="2011/03/26"
+ ol_release_date="2011/06/30"
diff --git a/net/openldap24-server/pkg-plist.client b/net/openldap24-server/pkg-plist.client
index e517733663a3..e9305ff03f17 100644
--- a/net/openldap24-server/pkg-plist.client
+++ b/net/openldap24-server/pkg-plist.client
@@ -20,6 +20,7 @@ include/ldap_cdefs.h
 include/ldap_features.h
 include/ldap_schema.h
 include/ldap_utf8.h
+include/ldif.h
 include/slapi-plugin.h
 lib/liblber-2.4.so
 lib/liblber-2.4.so.%%SHLIB_MAJOR%%