diff options
| author | Xin LI <delphij@FreeBSD.org> | 2022-10-21 17:39:00 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2022-10-21 17:43:12 +0000 |
| commit | 682ba7c84914385be04215dadf481f2a3574d242 (patch) | |
| tree | d9195a27f5869062412fac51963a2bbe2f31ec4e | |
| parent | 1426d4738cabe1c48216a733df63c1d7e1432fb9 (diff) | |
| download | ports-682ba7c84914385be04215dadf481f2a3574d242.tar.gz ports-682ba7c84914385be04215dadf481f2a3574d242.zip | |
net/openldap2[4-6]-server: suppress warning message when chown failed.
On UFS with sujournal enabled, the journal is immutable and chown would
fail. This would cause the script to issue an error when a separate UFS
file system is used as OpenLDAP data store, which is not actionable and
causes confusion.
Reported by: Olivier Nicole <on cs.ait.ac.th>
PR: ports/266811
| -rw-r--r-- | net/openldap24-server/Makefile | 2 | ||||
| -rw-r--r-- | net/openldap24-server/files/slapd.in | 4 | ||||
| -rw-r--r-- | net/openldap25-server/Makefile | 2 | ||||
| -rw-r--r-- | net/openldap25-server/files/slapd.in | 4 | ||||
| -rw-r--r-- | net/openldap26-server/Makefile | 2 | ||||
| -rw-r--r-- | net/openldap26-server/files/slapd.in | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 7e62502b29e2..6595efaa663d 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -52,7 +52,7 @@ BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER} .endif PORTREVISION_CLIENT= 4 -PORTREVISION_SERVER= 10 +PORTREVISION_SERVER= 11 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_SHLIB_MINOR= 11.7 OPENLDAP_MAJOR= ${DISTVERSION:R} diff --git a/net/openldap24-server/files/slapd.in b/net/openldap24-server/files/slapd.in index 620c2f4d255c..bdc2ad538a74 100644 --- a/net/openldap24-server/files/slapd.in +++ b/net/openldap24-server/files/slapd.in @@ -99,13 +99,13 @@ start_precmd() mkdir -p "${DBDIR}" [ -f "%%PREFIX%%/etc/openldap/DB_CONFIG.example" ] && cp "%%PREFIX%%/etc/openldap/DB_CONFIG.example" "${DBDIR}/DB_CONFIG" fi - chown -RL "$slapd_owner" "${DBDIR}" + chown -fRL "$slapd_owner" "${DBDIR}" chmod 700 "${DBDIR}" done chown "$slapd_owner" "%%LDAP_RUN_DIR%%" if checkyesno slapd_cn_config; then - chown -R $slapd_owner "%%PREFIX%%/etc/openldap/slapd.d" + chown -fR $slapd_owner "%%PREFIX%%/etc/openldap/slapd.d" else chown $slapd_owner "%%PREFIX%%/etc/openldap/slapd.conf" fi diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile index 7ca0a57e83c3..a199c328399c 100644 --- a/net/openldap25-server/Makefile +++ b/net/openldap25-server/Makefile @@ -45,7 +45,7 @@ CONFLICTS_INSTALL= ${PORTNAME}2[0-46-9]-server ${PORTNAME}-server GNU_CONFIGURE= yes PORTREVISION_CLIENT= 0 -PORTREVISION_SERVER= 1 +PORTREVISION_SERVER= 2 OPENLDAP_SHLIB_MAJOR= 0 OPENLDAP_SHLIB_MINOR= 1.8 OPENLDAP_MAJOR= ${DISTVERSION:R} diff --git a/net/openldap25-server/files/slapd.in b/net/openldap25-server/files/slapd.in index 620c2f4d255c..bdc2ad538a74 100644 --- a/net/openldap25-server/files/slapd.in +++ b/net/openldap25-server/files/slapd.in @@ -99,13 +99,13 @@ start_precmd() mkdir -p "${DBDIR}" [ -f "%%PREFIX%%/etc/openldap/DB_CONFIG.example" ] && cp "%%PREFIX%%/etc/openldap/DB_CONFIG.example" "${DBDIR}/DB_CONFIG" fi - chown -RL "$slapd_owner" "${DBDIR}" + chown -fRL "$slapd_owner" "${DBDIR}" chmod 700 "${DBDIR}" done chown "$slapd_owner" "%%LDAP_RUN_DIR%%" if checkyesno slapd_cn_config; then - chown -R $slapd_owner "%%PREFIX%%/etc/openldap/slapd.d" + chown -fR $slapd_owner "%%PREFIX%%/etc/openldap/slapd.d" else chown $slapd_owner "%%PREFIX%%/etc/openldap/slapd.conf" fi diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile index 4d9aceeddc97..797379952ee0 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= 1 +PORTREVISION_SERVER= 2 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_SHLIB_MINOR= 0.200 diff --git a/net/openldap26-server/files/slapd.in b/net/openldap26-server/files/slapd.in index 620c2f4d255c..bdc2ad538a74 100644 --- a/net/openldap26-server/files/slapd.in +++ b/net/openldap26-server/files/slapd.in @@ -99,13 +99,13 @@ start_precmd() mkdir -p "${DBDIR}" [ -f "%%PREFIX%%/etc/openldap/DB_CONFIG.example" ] && cp "%%PREFIX%%/etc/openldap/DB_CONFIG.example" "${DBDIR}/DB_CONFIG" fi - chown -RL "$slapd_owner" "${DBDIR}" + chown -fRL "$slapd_owner" "${DBDIR}" chmod 700 "${DBDIR}" done chown "$slapd_owner" "%%LDAP_RUN_DIR%%" if checkyesno slapd_cn_config; then - chown -R $slapd_owner "%%PREFIX%%/etc/openldap/slapd.d" + chown -fR $slapd_owner "%%PREFIX%%/etc/openldap/slapd.d" else chown $slapd_owner "%%PREFIX%%/etc/openldap/slapd.conf" fi |