From nobody Sat Jul 16 06:08:10 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 4LlHpM0W7pz4WY0q; Sat, 16 Jul 2022 06:08:11 +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 4LlHpM01k3z3rPb; Sat, 16 Jul 2022 06:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657951691; 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=RDkTMR8shB7V3n97vF5XjA3udLfm4ePPDeuCWniZjSA=; b=rWqWXvOPioGYhu5k0m0ysAw7vH8MP6rxbYPa1VmZwgVicdL1y6ivDMPej6HAC4OnNPVAgo ybIfXve/dKxDcQVfegLlJ+wTJW8VhMnlpTsS66hGioyi7Zd3xduqonnaxELith0FSLvud5 3Bz3X9wv46UdidB881ozV5t/c/WBmwIxVkjCCGggs8ZAGarsjK3xzmFlqwL6rp+okAwDyv pb1dKevLtm+mmZf1VN22unRIgVepYjaDgV1kdub66NLEGtsIhGsKtJktA1svOxYoFJzKHx tSYo15B9F0h1jOF0T8xsMEpByWza1mSvaAKhHS4O6DcUQ2uO4+yFapqbW3Y2Bg== 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 4LlHpL5pJdz19xn; Sat, 16 Jul 2022 06:08:10 +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 26G68AIq036124; Sat, 16 Jul 2022 06:08:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26G68AmL036123; Sat, 16 Jul 2022 06:08:10 GMT (envelope-from git) Date: Sat, 16 Jul 2022 06:08:10 GMT Message-Id: <202207160608.26G68AmL036123@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: b1c698ba6ced - main - net/openldap25-server: update to 2.5.13. 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: b1c698ba6ced71f38f9fa09a2124421986e033a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657951691; 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=RDkTMR8shB7V3n97vF5XjA3udLfm4ePPDeuCWniZjSA=; b=JZj5l5+nhTwtTf/K/CEDgH9UXoNIUVEZh1IsJYqV452OTNmsn0Ke5DIx1b1VKKDTvM9WdN TWfSzC7QEZ2YKLZ3m67YT1XGV0hpYQsJrFDfe9Wp6lcfSGCDdZpaJZCwSRxGO4VsOsjdgS T7oMC+7xkNnt0xvO15MQYrn+QnUiZ6nJBFPFwXNGSJE/3xGAUoZ8svoSq3A5BMNIV9kDaT ErLyFxlFEbpeTCf844lLD8f0txb+ZFGH99zK5kUyZsMNK7lzRPoWj/hZYibh1sC3jP7A+f +xkMAOuTx80mjQr5dYesW3QaXWMDLGF8GgM+RIIzMnGVH0R6eeXnFefMMf0M6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657951691; a=rsa-sha256; cv=none; b=N9EvnIr+g0fSq7jwHoHcdrGworu6sHkfA/InRzss3ZL1DwsJBVHYbditnITOlEWDuawjHf ZjblskgReWTXJY2FRe+DIdBc+IXS4SkY2s4QtMape5mlkShPaPl46Ct79iF2yFDrBGVZe6 THp8fLkbHcOXCpDl+x9DmEQs833/S5Eo4Wp94wUXVTEUXm0/H9j1R8X6/zIy5CKCG++7Nm uGgcwwT0cbMmQkC5jLbGu6zb0ml3rwssoz8hmgr1FRehGdKUZq3ywhqocDqFV+CxdMdhET 7q+IiUvFRhAHJQcf/wfRzgyySq1p58k7Og64VPThK16hnoPpKoa7fj5IRTQcAg== 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=b1c698ba6ced71f38f9fa09a2124421986e033a4 commit b1c698ba6ced71f38f9fa09a2124421986e033a4 Author: Xin LI AuthorDate: 2022-07-16 05:54:04 +0000 Commit: Xin LI CommitDate: 2022-07-16 05:54:52 +0000 net/openldap25-server: update to 2.5.13. --- net/openldap25-server/Makefile | 10 ++++++++-- net/openldap25-server/distinfo | 6 +++--- net/openldap25-server/files/patch-servers_slapd_daemon.c | 14 -------------- net/openldap25-server/pkg-plist | 5 +++++ 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile index 6246c23b5ce5..4b30986aa500 100644 --- a/net/openldap25-server/Makefile +++ b/net/openldap25-server/Makefile @@ -1,7 +1,7 @@ # Created by: Xin LI PORTNAME= openldap -DISTVERSION= 2.5.12 +DISTVERSION= 2.5.13 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \ @@ -48,7 +48,7 @@ GNU_CONFIGURE= yes PORTREVISION_CLIENT= 0 PORTREVISION_SERVER= 0 OPENLDAP_SHLIB_MAJOR= 0 -OPENLDAP_SHLIB_MINOR= 1.7 +OPENLDAP_SHLIB_MINOR= 1.8 OPENLDAP_MAJOR= ${DISTVERSION:R} OPTIONS_DEFINE= DEBUG @@ -81,6 +81,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 @@ -168,6 +169,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 @@ -344,6 +346,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/openldap25-server/distinfo b/net/openldap25-server/distinfo index 4b82506a2c6b..d43b19f5f659 100644 --- a/net/openldap25-server/distinfo +++ b/net/openldap25-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651730006 -SHA256 (openldap-2.5.12.tgz) = d5086cbfc49597fa7d0670a429a9054552d441b16ee8b2435412797ab0e37b96 -SIZE (openldap-2.5.12.tgz) = 6444482 +TIMESTAMP = 1657946132 +SHA256 (openldap-2.5.13.tgz) = ee3c430c4ef7b87c57b622108c7339376d6c27fbbf2767770be3de1df63d008c +SIZE (openldap-2.5.13.tgz) = 6454072 diff --git a/net/openldap25-server/files/patch-servers_slapd_daemon.c b/net/openldap25-server/files/patch-servers_slapd_daemon.c deleted file mode 100644 index 6e6228b2e629..000000000000 --- a/net/openldap25-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/openldap25-server/pkg-plist b/net/openldap25-server/pkg-plist index 4bdf2cce7dc1..b7250829d674 100644 --- a/net/openldap25-server/pkg-plist +++ b/net/openldap25-server/pkg-plist @@ -101,6 +101,11 @@ %%DYNLIST%%libexec/openldap/dynlist-%%OPENLDAP_MAJOR%%.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-%%OPENLDAP_MAJOR%%.so.0 %%HOMEDIR%%libexec/openldap/homedir-%%OPENLDAP_MAJOR%%.so.0.%%SHLIB_MINOR%% %%HOMEDIR%%libexec/openldap/homedir.la