diff options
| author | Xin LI <delphij@FreeBSD.org> | 2024-11-29 00:41:51 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2024-11-29 02:56:03 +0000 |
| commit | b85ae9d24ea1ea119fba33fc235d40fef02bb2ad (patch) | |
| tree | 5b4ccd57056b9de47acac5080da486af8d95914a | |
| parent | 33d3fd27d77169a669290f0c0b618ed33fd2b590 (diff) | |
| download | ports-b85ae9d24ea1ea119fba33fc235d40fef02bb2ad.tar.gz ports-b85ae9d24ea1ea119fba33fc235d40fef02bb2ad.zip | |
net/openldap26-server: upgrade to 2.6.9.
| -rw-r--r-- | net/openldap26-server/Makefile | 2 | ||||
| -rw-r--r-- | net/openldap26-server/distinfo | 6 | ||||
| -rw-r--r-- | net/openldap26-server/files/patch-libraries_libldap_tls__o.c | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile index b3ea474da171..3981c53e90ab 100644 --- a/net/openldap26-server/Makefile +++ b/net/openldap26-server/Makefile @@ -1,5 +1,5 @@ PORTNAME= openldap -DISTVERSION= 2.6.8 +DISTVERSION= 2.6.9 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \ diff --git a/net/openldap26-server/distinfo b/net/openldap26-server/distinfo index 5aaa7aa1a048..bcc5eec2a031 100644 --- a/net/openldap26-server/distinfo +++ b/net/openldap26-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717220468 -SHA256 (openldap-2.6.8.tgz) = 48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e -SIZE (openldap-2.6.8.tgz) = 6512544 +TIMESTAMP = 1732840058 +SHA256 (openldap-2.6.9.tgz) = 2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff +SIZE (openldap-2.6.9.tgz) = 6516669 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 8ac919526e6b..5d6af668480d 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 2024-01-29 18:52:23 UTC +--- libraries/libldap/tls_o.c.orig 2024-11-26 17:11:04 UTC +++ libraries/libldap/tls_o.c -@@ -281,7 +281,7 @@ tlso_ctx_free ( tls_ctx *ctx ) +@@ -288,7 +288,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 ) { -@@ -427,7 +427,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls +@@ -435,7 +435,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, &oldsuites ); - #endif - if ( oldsuites && !SSL_CTX_set_cipher_list( ctx, oldsuites ) ) + if ( tlso_ctx_cipher13( ctx, lt->lt_ciphersuite, &oldsuites )) + { + Debug1( LDAP_DEBUG_ANY, |