From nobody Fri Oct 21 17:43:32 2022 X-Original-To: dev-commits-ports-main@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 4MvBdw2rzTz4gJWn; Fri, 21 Oct 2022 17:43:32 +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 4MvBdw2J0rz49Nx; Fri, 21 Oct 2022 17:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666374212; 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=ilnh3plPbSDhu6c1mILs93rKWRhjgGHf3DpXdq0gZCQ=; b=MMK8/6TpiEtANgg9TXNawqUZDtVo/HKO0onCA4qnLd9HzGySZ1xuu2f+3wwmvxgF4b0fkq eE+wBu7Jk5rB/dWsDxI6COZKDIz1123OtqFvgZsDdown6Kd7pPOukA21yVwltBmMTMcTsS A78a/73zZ34fxGsZ+ZqDxdMVsdqBPzpYCzet6xjjkjy/Eq+Q6TBy5E/JaTNxW3+5AR2GkR HITb1+PNIBZsyWWdDDS8ul0gUcLjA5SGgZXbGlFFi+c+fQIMPDwZKlbItpynfNNlRjnl4r GDLM6v7YUpPy1fkcJZXrVILArlttnrs/ulVPrfMSKb7fw9AxCpxguE8GPUH2gw== 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 4MvBdw1JsbzHhg; Fri, 21 Oct 2022 17:43:32 +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 29LHhWNL080443; Fri, 21 Oct 2022 17:43:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29LHhWS7080442; Fri, 21 Oct 2022 17:43:32 GMT (envelope-from git) Date: Fri, 21 Oct 2022 17:43:32 GMT Message-Id: <202210211743.29LHhWS7080442@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: 682ba7c84914 - main - net/openldap2[4-6]-server: suppress warning message when chown failed. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 682ba7c84914385be04215dadf481f2a3574d242 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666374212; 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=ilnh3plPbSDhu6c1mILs93rKWRhjgGHf3DpXdq0gZCQ=; b=YVNuJW8RzTq0R+9t2JEOjpFxZ3CI/WHu5dIHJ0NueVQkRVMGFvaQ4mc4OGQgIfoliHZvjz 2sQJ6gEs2tYTDTgV10N7oZlwQkpyg/zVUQaYAV29S9sYiiHDCOsqLvf+/pJdS+jmOKA4lR Qaxx5nLHSlqNj7z5dP2v2XOQMof3YyLdgL4Hd4IWo00BszlxCBCuGNUm4KBtQ8oh9hIcQl /guJ3KkZ/1eEYmjACNGeA5ZYphWP29qo6niUhLH3VPlhy4fIOX2P1r5xx5ZzlFnLHgVzGY +CMN1uuLKY5kJcPAnO96F4TnlSdb6Be/y+StyJ/85QwQ0Hp5J+WrEC3wE9m3sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666374212; a=rsa-sha256; cv=none; b=o3/BGHaMWzZfQS32b2ewl1/hT0S3rkusrboY+NJW/Q43892AnnIXqJ2y9YjNHmw2L7D8IR 0BGw8sFL1cazIZ1rODjQJoHAJc4+Bwlep7K+PbvJ+/8noVkYsc0XY4XmrkHNwkTwRAsiyp 9Bj2uWvZmq7KoJ0zMUcIyrt2rneFRJKIsRHOwSoMRsKE9T4U7a0XjsB3Hq3KVgIB+PTS9U EPQLeDP+bSRaMOqBypbR0HugSHU8ehe4XlKA5ui+gE8lYj22UdJbgCsWiaA0uH5M19UB1k wZWyW8QCFiSQaAsPByQMv5JVJ/3JqQr3ciVDO3YhXdWphOC+K5yKiJ7et7e6nQ== 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=682ba7c84914385be04215dadf481f2a3574d242 commit 682ba7c84914385be04215dadf481f2a3574d242 Author: Xin LI AuthorDate: 2022-10-21 17:39:00 +0000 Commit: Xin LI CommitDate: 2022-10-21 17:43:12 +0000 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 PR: ports/266811 --- net/openldap24-server/Makefile | 2 +- net/openldap24-server/files/slapd.in | 4 ++-- net/openldap25-server/Makefile | 2 +- net/openldap25-server/files/slapd.in | 4 ++-- net/openldap26-server/Makefile | 2 +- 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