From nobody Sat Jul 16 06:08:11 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 4LlHpN1Gvsz4WY0r; Sat, 16 Jul 2022 06:08:12 +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 4LlHpN0Pqmz3rgh; Sat, 16 Jul 2022 06:08:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657951692; 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=RFSrVPOAluJo9l42DL9LR1pQTEoC9+a/CFaTMNciQto=; b=yQfjPhF1dOd2ReYeTP9c/0Z2BfDtuDRx6B/nub1keNrWGBV1Su1rmQiCPToILtuO6Av4jH 0ptj/ZB285gjXPBmjViofw0MLopoFcpg9lJd9NBzpZ05IV9WsplWAaDBc7q9a9ryrpJ6G+ MG3m9HraWKkckx7megWrKn2ILQMo36Q0f8AentaKfbnHVuSTXC/x8cQqeLpOObyfvUNLpa Ry868nO2uLnG9lmyyTG3BmC0lELQ9uqQ1+TMF6DZVkeljhQhd3Jp9eZbKeNdoqOHL8o3az sFw063uFKOaxF4Fm9+ZBPgIrwfCmem7zJJY1ey36ZWwXZvOkJhHvnL6VRWJVGg== 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 4LlHpM6J44z19xp; Sat, 16 Jul 2022 06:08:11 +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 26G68Brv036148; Sat, 16 Jul 2022 06:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26G68BYG036147; Sat, 16 Jul 2022 06:08:11 GMT (envelope-from git) Date: Sat, 16 Jul 2022 06:08:11 GMT Message-Id: <202207160608.26G68BYG036147@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: 12fb2c769db1 - main - net/openldap26-server: update to 2.6.3. 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/main X-Git-Reftype: branch X-Git-Commit: 12fb2c769db1a6e73ef0ebbb5630e81a3c1803f4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657951692; 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=RFSrVPOAluJo9l42DL9LR1pQTEoC9+a/CFaTMNciQto=; b=JRep05EV6WUAFlYvhnPh3DCYH29G4I+c6gl9gcuZJYboqC+gt8JmXh1nZnHe1ltPy2DOjH 95PIgHD7AE/kJ8DA/LdYyXL9lxCanpo5fJp7FwrmUYieh9INeLXUH/SsefsT2HDbIMH0tI OQy9eOcJ5wHCzarLV6+vajTY8CIVN9dmQlxuKei2OnWe86q3Z1JBhvDqwyqBPddG88GSC8 yKGFLdlV7czaKeBgUf60n35ghLTDz/PPNVjkYdm75Kg06hTRyGQ4FB+sgyV13m1O97IiUF HN6t9pSIBS9WzfUWTa9nLkTcOIZORZ2IemaUktSLCPC4XWksMSdEC3gwrjoyPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657951692; a=rsa-sha256; cv=none; b=tNVAnoXI2Ym350dpvHXU1udsHOYLjUSe7W1LOZlMYWIwHyNznVs6i/TnNgK5hp4JwZURFE 1RjGmCVD498D4kDvoaSgMKwb8HTXYZGTbKo6xHecap9M4ov07ju5BhoS2BDI113z1MWJtr 5fhJJnNzv56RqVhwROZqB798HptB1Egb/NmtqrpGmrk1zGd7rBuCpXE6Ses8bChAMIvQxo P7EKsTt4ZDC/UBKwkuHjt2Xao4IFSa8YsCuJtLiTmUp0KOL+wFwZj5W/SMqMDTNVCAI1jt jSLQA+BNCH+Pir+Rc62++RjMYy+AhnycY9PedFHoHK3LVjOY3IZScWe+betKCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=12fb2c769db1a6e73ef0ebbb5630e81a3c1803f4 commit 12fb2c769db1a6e73ef0ebbb5630e81a3c1803f4 Author: Xin LI AuthorDate: 2022-07-16 05:54:21 +0000 Commit: Xin LI CommitDate: 2022-07-16 05:54:52 +0000 net/openldap26-server: update to 2.6.3. --- net/openldap26-server/Makefile | 8 +++++++- net/openldap26-server/distinfo | 6 +++--- net/openldap26-server/files/patch-servers_slapd_daemon.c | 14 -------------- net/openldap26-server/pkg-plist | 9 +++++++-- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile index 27bd1a32dd31..b3f94eacdc46 100644 --- a/net/openldap26-server/Makefile +++ b/net/openldap26-server/Makefile @@ -1,7 +1,7 @@ # Created by: Xin LI PORTNAME= openldap -DISTVERSION= 2.6.2 +DISTVERSION= 2.6.3 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \ @@ -80,6 +80,7 @@ OPTIONS_GROUP_OVLYS+= DENYOP OPTIONS_GROUP_OVLYS+= DEREF OPTIONS_GROUP_OVLYS+= DYNGROUP OPTIONS_GROUP_OVLYS+= DYNLIST +OPTIONS_GROUP_OVLYS+= EMPTYDS OPTIONS_GROUP_OVLYS+= HOMEDIR OPTIONS_GROUP_OVLYS+= LASTBIND OPTIONS_GROUP_OVLYS+= LASTMOD @@ -167,6 +168,7 @@ ALLOP_DESC= With allop overlay (experimental) AUTOGROUP_DESC= With autogroup overlay (experimental) CLOAK_DESC= With cloak overlay (experimental) DENYOP_DESC= With denyop overlay (experimental) +EMPTYDS_DESC= With emptyds overlay (experimental) LASTBIND_DESC= With lastbind overlay LASTMOD_DESC= With lastmod overlay (experimental) TRACE_DESC= With Trace overlay @@ -342,6 +344,10 @@ CONTRIB_CLEANFILES+= cloak.a CONTRIB_MODULES+= slapd-modules/denyop CONTRIB_CLEANFILES+= denyop.a .endif +.if ${PORT_OPTIONS:MEMPTYDS} +CONTRIB_MODULES+= slapd-modules/emptyds +CONTRIB_CLEANFILES+= emptyds.a +.endif .if ${PORT_OPTIONS:MLASTBIND} CONTRIB_MODULES+= slapd-modules/lastbind CONTRIB_CLEANFILES+= lastbind.a diff --git a/net/openldap26-server/distinfo b/net/openldap26-server/distinfo index 50ed1fa34ab4..7f835cc9a77c 100644 --- a/net/openldap26-server/distinfo +++ b/net/openldap26-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651730071 -SHA256 (openldap-2.6.2.tgz) = 81d09345232eb62486ecf5acacd2c56c0c45b4a6c8c066612e7f421a23a1cf87 -SIZE (openldap-2.6.2.tgz) = 6448362 +TIMESTAMP = 1657946105 +SHA256 (openldap-2.6.3.tgz) = d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46 +SIZE (openldap-2.6.3.tgz) = 6474169 diff --git a/net/openldap26-server/files/patch-servers_slapd_daemon.c b/net/openldap26-server/files/patch-servers_slapd_daemon.c deleted file mode 100644 index 6e6228b2e629..000000000000 --- a/net/openldap26-server/files/patch-servers_slapd_daemon.c +++ /dev/null @@ -1,14 +0,0 @@ ---- servers/slapd/daemon.c.orig 2021-08-18 17:11:41 UTC -+++ servers/slapd/daemon.c -@@ -228,10 +228,9 @@ static slap_daemon_st *slap_daemon; - } while (0) - - /* a kqueue fd obtained before a fork can't be used in child process. -- * close it and reacquire it. -+ * reacquire it. - */ - # define SLAP_SOCK_INIT2() do { \ -- close(slap_daemon[0].sd_kq); \ - slap_daemon[0].sd_kq = kqueue(); \ - } while (0) - diff --git a/net/openldap26-server/pkg-plist b/net/openldap26-server/pkg-plist index b2ac7fe3c422..253c85cbc9a6 100644 --- a/net/openldap26-server/pkg-plist +++ b/net/openldap26-server/pkg-plist @@ -101,6 +101,11 @@ %%DYNLIST%%libexec/openldap/dynlist.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%DYNLIST%%libexec/openldap/dynlist.la %%DYNLIST%%libexec/openldap/dynlist.so +%%EMPTYDS%%libexec/openldap/emptyds.la +%%EMPTYDS%%libexec/openldap/emptyds.so +%%EMPTYDS%%libexec/openldap/emptyds.so.0 +%%EMPTYDS%%libexec/openldap/emptyds.so.0.0.0 +%%EMPTYDS%%man/man5/slapo-emptyds.5.gz %%HOMEDIR%%libexec/openldap/homedir.so.%%SHLIB_MAJOR%% %%HOMEDIR%%libexec/openldap/homedir.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%HOMEDIR%%libexec/openldap/homedir.la @@ -138,8 +143,8 @@ %%PASSWD%%libexec/openldap/back_passwd.so %%PBKDF2%%libexec/openldap/pw-pbkdf2.la %%PBKDF2%%libexec/openldap/pw-pbkdf2.so -%%PBKDF2%%libexec/openldap/pw-pbkdf2.so.%%SHLIB_MAJOR%% -%%PBKDF2%%libexec/openldap/pw-pbkdf2.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +%%PBKDF2%%libexec/openldap/pw-pbkdf2.so.0 +%%PBKDF2%%libexec/openldap/pw-pbkdf2.so.0.0.0 %%PBKDF2%%man/man5/slapd-pw-pbkdf2.5.gz %%PERL%%libexec/openldap/back_perl.so.%%SHLIB_MAJOR%% %%PERL%%libexec/openldap/back_perl.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%