Date: Mon, 7 Feb 2022 00:38:36 GMT From: Xin LI <delphij@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f677d84c0fd2 - main - net/openldap2[456]-server: Fix paths for argsfile and pidfile. Message-ID: <202202070038.2170casE016335@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=f677d84c0fd21d5f278c7a56b7e80ecb3b699a7e commit f677d84c0fd21d5f278c7a56b7e80ecb3b699a7e Author: Tom Warnke <tom@toromtomtom.com> AuthorDate: 2022-02-07 00:35:16 +0000 Commit: Xin LI <delphij@FreeBSD.org> 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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202070038.2170casE016335>