From nobody Thu May 5 06:23:44 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0229F1ACE3F2; Thu, 5 May 2022 06:23:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kv3YX6fQsz4sKg; Thu, 5 May 2022 06:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651731824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5+RO5PZveb93xPouoiIVCxSOpTktsEYQyQjQgfPyz44=; b=TRIn4xFcHTi9uZaLsbO+lwjB+SRnI2AIcfgYJHpQdfSOS80XWhmqwE4MT6cE5l440PcCGR YYgnnklQzPiJu7FWDbD/WaQKErjFt3UfFlYR7MCtAdTagK9w3VX9NUeTYJtj02kcubcicE /xAgF5EFrgSz6Y4p8CTtF2LQ19BTssFQSJrcZq7z2NiysqYYcRPPL8+1knsj7IzGnu79BZ 1aJGTDzoS3UEFX3JPjgAketr0JznOvMoDH1wt/e3902JSxvARzAzkIuNIjCw9sgkhsmBwT vhvQ6EMC194tvg+Ofnu3/wwDXUafDO+MPC9junuP5e+yksLOTTieXsASJMKXzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C216122438; Thu, 5 May 2022 06:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2456NiEj050349; Thu, 5 May 2022 06:23:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2456NiHS050348; Thu, 5 May 2022 06:23:44 GMT (envelope-from git) Date: Thu, 5 May 2022 06:23:44 GMT Message-Id: <202205050623.2456NiHS050348@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Xin LI Subject: git: 874193164a50 - 2022Q2 - net/openldap26-server: Update to 2.6.2. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 874193164a506d0cb3f7e2c35974aaf6b26c1e74 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651731824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5+RO5PZveb93xPouoiIVCxSOpTktsEYQyQjQgfPyz44=; b=gj8x4FzHAvbuhzmlpW0V/L98o/2N1orkPENrai65QTnT7qKo+Gek60NP5smr/kfg+NuBaY qjdHjkAM3eWePlgULYbWLmpUiP8Wf19y7y2XEegcUcek8Rv86bhKthjFX0Q7v7ghxarOuT 2IzzMyvBtQ/C4EG6KNBt3kr+EbPQkRdsgGX62IpbC9FDWfzw1QuCvuIUtPDN67QZ7tZCL/ SC41OzD82s/OSrRgOL4aE2BK/WR0nlurF+5xwUUk+reCay8UcHJf6LFlKZ/71bG379G4v5 soBS1Ii50y8iPz3N1Je2zHOzf4+0iRb/jS7l6TeuqpwoOhqIVCJAMaaRVr2Piw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651731824; a=rsa-sha256; cv=none; b=r00+K8eKuO/m6f6vKC2UFrVd2m2rJj8LQsfu71FVkVki83xTcVqT3nxnl6FtZMAuTPg4V4 un5bM58fuqFkyYMKXWtCY/dXfYqIOdlnQsMYMSA83thaGQ7xWzOlBMt4F8MZi+pnWR3MDD wtgPZhi8tWAZVoy5DBt4yxkVQtqvvS5H6j8PeaimzljUDOZodKRX3nIvbJNwCXCNPPe785 d1PyxeSjdpGgJJW+QefMAvn5CZ4P4SZKzuKqUIPvx4BdFCe7DJHic/UADOKRnlwsDSHVyd 5uf+RyxJa8rOBHo1Kg1WeHeWtZLtCCEqVz7Gr27QEfaHVEQ13CM1Mj+P5f0g7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=874193164a506d0cb3f7e2c35974aaf6b26c1e74 commit 874193164a506d0cb3f7e2c35974aaf6b26c1e74 Author: Xin LI AuthorDate: 2022-05-05 06:15:40 +0000 Commit: Xin LI 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 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 ) {