git: 874193164a50 - 2022Q2 - net/openldap26-server: Update to 2.6.2.

The branch 2022Q2 has been updated by delphij:

URL: https://cgit.FreeBSD.org/ports/commit/?id=874193164a506d0cb3f7e2c35974aaf6b26c1e74

commit 874193164a506d0cb3f7e2c35974aaf6b26c1e74
Author:     Xin LI <delphij@FreeBSD.org>
AuthorDate: 2022-05-05 06:15:40 +0000
Commit:     Xin LI <delphij@FreeBSD.org>
CommitDate: 2022-05-05 06:22:10 +0000

    net/openldap26-server: Update to 2.6.2.
    
    MFH:            2022Q2
    (cherry picked from commit b6055b74f259ff4f7767840ec5373942f389cb22)
---
 net/openldap26-server/Makefile                               | 4 ++--
 net/openldap26-server/distinfo                               | 6 +++---
 net/openldap26-server/files/patch-include__ldap_defaults.h   | 8 ++++----
 net/openldap26-server/files/patch-libraries_libldap_tls__o.c | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile
index c5a5b0c7f26e..6f3a36331852 100644
--- a/net/openldap26-server/Makefile
+++ b/net/openldap26-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Xin LI <delphij@FreeBSD.org>
 
 PORTNAME=		openldap
-DISTVERSION=		2.6.1
+DISTVERSION=		2.6.2
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
@@ -46,7 +46,7 @@ CONFLICTS_INSTALL=	${PORTNAME}2[0-57-9]-server ${PORTNAME}-server
 GNU_CONFIGURE=		yes
 
 PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	1
+PORTREVISION_SERVER=	0
 OPENLDAP_SHLIB_MAJOR=	2
 OPENLDAP_SHLIB_MINOR=	0.200
 
diff --git a/net/openldap26-server/distinfo b/net/openldap26-server/distinfo
index 64090b54a42d..50ed1fa34ab4 100644
--- a/net/openldap26-server/distinfo
+++ b/net/openldap26-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642828021
-SHA256 (openldap-2.6.1.tgz) = 9d576ea6962d7db8a2e2808574e8c257c15aef55f403a1fb5a0faf35de70e6f3
-SIZE (openldap-2.6.1.tgz) = 6440418
+TIMESTAMP = 1651730071
+SHA256 (openldap-2.6.2.tgz) = 81d09345232eb62486ecf5acacd2c56c0c45b4a6c8c066612e7f421a23a1cf87
+SIZE (openldap-2.6.2.tgz) = 6448362
diff --git a/net/openldap26-server/files/patch-include__ldap_defaults.h b/net/openldap26-server/files/patch-include__ldap_defaults.h
index b14af6f6ab27..a82e3f7325a4 100644
--- a/net/openldap26-server/files/patch-include__ldap_defaults.h
+++ b/net/openldap26-server/files/patch-include__ldap_defaults.h
@@ -1,11 +1,11 @@
---- include/ldap_defaults.h.orig	2021-07-27 17:44:47 UTC
+--- include/ldap_defaults.h.orig	2022-05-04 14:55:23 UTC
 +++ include/ldap_defaults.h
-@@ -39,7 +39,7 @@
- #define LDAP_ENV_PREFIX "LDAP"
+@@ -40,7 +40,7 @@
  
  /* default ldapi:// socket */
+ #ifndef LDAPI_SOCK
 -#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
 +#define LDAPI_SOCK "/var/run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
+ #endif
  
  /*
-  * SLAPD DEFINITIONS
diff --git a/net/openldap26-server/files/patch-libraries_libldap_tls__o.c b/net/openldap26-server/files/patch-libraries_libldap_tls__o.c
index 3c9bccd4dc15..6566cbb201a0 100644
--- a/net/openldap26-server/files/patch-libraries_libldap_tls__o.c
+++ b/net/openldap26-server/files/patch-libraries_libldap_tls__o.c
@@ -1,6 +1,6 @@
---- libraries/libldap/tls_o.c.orig	2021-07-27 17:44:47 UTC
+--- libraries/libldap/tls_o.c.orig	2022-05-04 14:55:23 UTC
 +++ libraries/libldap/tls_o.c
-@@ -275,7 +275,7 @@ tlso_ctx_free ( tls_ctx *ctx )
+@@ -281,7 +281,7 @@ tlso_ctx_free ( tls_ctx *ctx )
  	SSL_CTX_free( c );
  }
  
@@ -9,7 +9,7 @@
  static char *
  tlso_stecpy( char *dst, const char *src, const char *end )
  {
-@@ -411,7 +411,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls 
+@@ -417,7 +417,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls 
  	}
  
  	if ( lo->ldo_tls_ciphersuite ) {