net/openldap25-server: upgrade to 2.5.17.

freebsd · Jan 30, 2024 · 1b62e1b · 1b62e1b
1 parent 4df670b
commit 1b62e1b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 64 deletions.
diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=		openldap
-DISTVERSION=		2.5.16
+DISTVERSION=		2.5.17
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
@@ -45,9 +45,9 @@ CONFLICTS_INSTALL=	${PORTNAME}2[0-46-9]-server ${PORTNAME}-server
 GNU_CONFIGURE=		yes
 
 PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	1
+PORTREVISION_SERVER=	0
 OPENLDAP_SHLIB_MAJOR=	0
-OPENLDAP_SHLIB_MINOR=	1.11
+OPENLDAP_SHLIB_MINOR=	1.12
 OPENLDAP_MAJOR=		${DISTVERSION:R}
 
 OPTIONS_DEFINE=		DEBUG FETCH GSSAPI

diff --git a/net/openldap25-server/distinfo b/net/openldap25-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691645240
-SHA256 (openldap-2.5.16.tgz) = 546ba591822e8bb0e467d40c4d4a30f89d937c3a507fe83a578f582f6a211327
-SIZE (openldap-2.5.16.tgz) = 6455656
+TIMESTAMP = 1706595143
+SHA256 (openldap-2.5.17.tgz) = d706a34b348ae38a9e3e4eb0d2cd5afeb939f2b2db95e6ae3d410d6a75e90e3c
+SIZE (openldap-2.5.17.tgz) = 6461889
diff --git a/net/openldap25-server/files/patch-libraries__libldap__Makefile.in b/net/openldap25-server/files/patch-libraries__libldap__Makefile.in
@@ -1,6 +1,6 @@
---- libraries/libldap/Makefile.in.orig	2021-07-27 17:44:47 UTC
+--- libraries/libldap/Makefile.in.orig	2024-01-29 18:53:15 UTC
 +++ libraries/libldap/Makefile.in
-@@ -86,13 +86,6 @@ install-local: $(CFFILES) FORCE
+@@ -84,13 +84,6 @@ install-local: $(CFFILES) FORCE
  	$(LTFINISH) $(DESTDIR)$(libdir)
  	-$(MKDIR) $(DESTDIR)$(sysconfdir)
  	@for i in $(CFFILES); do \

diff --git a/net/openldap25-server/files/patch-libraries_libldap_tls__o.c b/net/openldap25-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	2024-01-29 18:53:15 UTC
 +++ libraries/libldap/tls_o.c
-@@ -275,7 +275,7 @@ tlso_ctx_free ( tls_ctx *ctx )
+@@ -279,7 +279,7 @@ tlso_ctx_free ( tls_ctx *ctx )
  	SSL_CTX_free( c );
  }
 
@@ -9,12 +9,12 @@
  static char *
  tlso_stecpy( char *dst, const char *src, const char *end )
  {
-@@ -411,7 +411,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls 
- 	}
+@@ -425,7 +425,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls 
 
  	if ( lo->ldo_tls_ciphersuite ) {
+ 		char *oldsuites = lt->lt_ciphersuite;
 -#if OPENSSL_VERSION_NUMBER >= 0x10101000
 +#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(OPENSSL_NO_TLS1_3)
- 		tlso_ctx_cipher13( ctx, lt->lt_ciphersuite );
+ 		tlso_ctx_cipher13( ctx, lt->lt_ciphersuite, &oldsuites );
  #endif
- 		if ( !SSL_CTX_set_cipher_list( ctx, lt->lt_ciphersuite ) )
+ 		if ( oldsuites && !SSL_CTX_set_cipher_list( ctx, oldsuites ) )
diff --git a/net/openldap25-server/files/patch-servers_lloadd_libevent__support.c b/net/openldap25-server/files/patch-servers_lloadd_libevent__support.c
diff --git a/net/openldap25-server/files/patch-servers_lloadd_module__init.c b/net/openldap25-server/files/patch-servers_lloadd_module__init.c