From nobody Mon Feb 07 00:38:36 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 3D59619BA3BD; Mon, 7 Feb 2022 00:38:37 +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 4JsS1T13S1z4rxV; Mon, 7 Feb 2022 00:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644194317; 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=vCNl50dN7d4PIqI7akMmrT0ovA5+z59bF3A5LBWiik4=; b=VTJ8rPYv8gQdQ2bsK8Ecf+xrpWWqVU+/JoazcgQxvP9bSjev0W1eUfO+mEGgMNmXREXOUr 8eGgrQVujHnxZ3VT1bfpuD/Xzmg2WNHexXbMU3zcn7/aich6kiSWll62rwr9js5AuYdud8 UlgZ52WTe5N34Tt//o4Mvadj6tASmVunhglo4nzWPd7T+6NnKKSFYABnkzm15GvNOZXMuB Z8Uednc1GkJWoFu0TYetAXDU/3StQXv9E62D2tH0WVSwPNP6QkQ4u3TnhPdl+fQlrUkadt /0Ylrg/wPcT2oMg3yF27HfDCRmWYauKA/f2FCzGfGegR3PdLf0olbZpV8EoWIg== 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 048621C3C2; Mon, 7 Feb 2022 00:38:37 +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 2170calM016336; Mon, 7 Feb 2022 00:38:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2170casE016335; Mon, 7 Feb 2022 00:38:36 GMT (envelope-from git) Date: Mon, 7 Feb 2022 00:38:36 GMT Message-Id: <202202070038.2170casE016335@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: f677d84c0fd2 - main - net/openldap2[456]-server: Fix paths for argsfile and pidfile. 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: f677d84c0fd21d5f278c7a56b7e80ecb3b699a7e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644194317; 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=vCNl50dN7d4PIqI7akMmrT0ovA5+z59bF3A5LBWiik4=; b=uWwZDkNAxOem2WaBBNjLYLe/XzPUDGPwPAa/tWZONj3IAqyXHmg9uBIZUHEth0mLPEoSx7 9LTgWysmSYuj/94HYWOEusOTFhkLK76hXOFLLqcYnpMyL3IVRXqIsVIaTsDiClgdSFEL2z CCQCPFIyqS6e3tphS4K/ItI1Fh16o8vG2QmjN8GQxwY9YqDGPALwrZdqYLHYd0U6cTm6zg vIa69ZJ3GpHYX+EkcjPUMACzUoUjrOBwjw/lgg9Cnp6FRB6K15/HA81CNAioOZfllAjLTs unk+qCGLsWNUgc+/3k2BU6Yk/omr3EMXN5LfrY1iiPpiCrG47Rx55UkvKS2/5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644194317; a=rsa-sha256; cv=none; b=BH4gZKIgaHP2qr904gexY9QdN1yNEr13qd0A8qQxO6nbqJes4CNIzaj1Jg9H2InD0vcMy6 S5MKGmcUKSB7w6Zkz+P7Tz3VyyMqvMnV/KLRP5XlcyLMCdqJyugInyAoY+5TPhmO4iY7ec kecGgQ+P/8i7tPOSkzGCGOboMHXaOmbniyol2FMvLiyWj1UupQSKxPdO1xh890TWSbSNe4 fjfmFq1lDjjBGbSMJFnJkvRlqY51r9qwvR6dPDOHRO/pyHf3tbxSQoRqEB/nQ92hEyfgIJ LURteJXO46a36r+/LUDwe3nFMf5SofFYEh+IYZbkNZyf5He1HwrXn1cjiTitqg== 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=f677d84c0fd21d5f278c7a56b7e80ecb3b699a7e commit f677d84c0fd21d5f278c7a56b7e80ecb3b699a7e Author: Tom Warnke AuthorDate: 2022-02-07 00:35:16 +0000 Commit: Xin LI CommitDate: 2022-02-07 00:38:11 +0000 net/openldap2[456]-server: Fix paths for argsfile and pidfile. The Makefile patches the slapd.conf file with a changed path for the argsfile and pidfile, but the slapd.ldif file remains unchanged. Fix this by patching the paths in the slapd.ldif file as well. PR: ports/261734 --- net/openldap24-server/Makefile | 4 +++- net/openldap25-server/Makefile | 4 +++- net/openldap26-server/Makefile | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index c6cea5eddb8a..605f7f362e72 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -50,7 +50,7 @@ BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER} .endif PORTREVISION_CLIENT= 4 -PORTREVISION_SERVER= 7 +PORTREVISION_SERVER= 8 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_SHLIB_MINOR= 11.7 OPENLDAP_MAJOR= ${DISTVERSION:R} @@ -573,6 +573,8 @@ CONTRIB_CLEANFILES+= smbk5pwd.a post-patch: @${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \ ${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf + @${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \ + ${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.ldif @${REINPLACE_CMD} -e 's|^OPT =.*|OPT = ${CFLAGS}|g' \ -e 's|^CC =.*|CC = ${CC}|g' \ ${SED_MODULES} ${WRKSRC}/contrib/slapd-modules/*/Makefile \ diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile index 4bcf291dc55b..feaa8e5ff5bc 100644 --- a/net/openldap25-server/Makefile +++ b/net/openldap25-server/Makefile @@ -46,7 +46,7 @@ CONFLICTS_INSTALL= ${PORTNAME}2[0-46-9]-server ${PORTNAME}-server GNU_CONFIGURE= yes PORTREVISION_CLIENT= 0 -PORTREVISION_SERVER= 0 +PORTREVISION_SERVER= 1 OPENLDAP_SHLIB_MAJOR= 0 OPENLDAP_SHLIB_MINOR= 1.6 OPENLDAP_MAJOR= ${DISTVERSION:R} @@ -376,6 +376,8 @@ CONTRIB_CLEANFILES+= smbk5pwd.a post-patch: @${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \ ${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf + @${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \ + ${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.ldif @${REINPLACE_CMD} -e 's|^OPT =.*|OPT = ${CFLAGS}|g' \ -e 's|^CC =.*|CC = ${CC}|g' \ ${SED_MODULES} ${WRKSRC}/contrib/slapd-modules/*/Makefile \ diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile index 69ee37de9c72..c5a5b0c7f26e 100644 --- a/net/openldap26-server/Makefile +++ b/net/openldap26-server/Makefile @@ -46,7 +46,7 @@ CONFLICTS_INSTALL= ${PORTNAME}2[0-57-9]-server ${PORTNAME}-server GNU_CONFIGURE= yes PORTREVISION_CLIENT= 0 -PORTREVISION_SERVER= 0 +PORTREVISION_SERVER= 1 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_SHLIB_MINOR= 0.200 @@ -374,6 +374,8 @@ CONTRIB_CLEANFILES+= smbk5pwd.a post-patch: @${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \ ${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf + @${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \ + ${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.ldif @${REINPLACE_CMD} -e 's|^OPT =.*|OPT = ${CFLAGS}|g' \ -e 's|^CC =.*|CC = ${CC}|g' \ ${SED_MODULES} ${WRKSRC}/contrib/slapd-modules/*/Makefile \