From nobody Fri Feb 14 17:10:21 2025 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 4Yvdpj4lGNz5nN78; Fri, 14 Feb 2025 17:10:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yvdpj45YWz40Sr; Fri, 14 Feb 2025 17:10:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739553021; 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=eden3i9LMAIMNMpVEMazgMqujFwfRa9P/IdEqTI0KNQ=; b=Q9JdORsO8TBHaAklc5VSOtKYh8Yc4YW3ZSDKJ1u9ZwMk/ALSV7AJjp/Mad3s2GeaEFFNXC 6KGZ3fKh5KU8fn0AvzKYV9nHjQNsX/EEOQ2b1fCfAPg/Et0JidrwRd5Z2tIfm6XFivT88A 3kuSOSZtJv+yk7lDLwSI4wAHAzde9v18OD65hqi32afYhVYRGCBCbvUZy5Yk/ZqP0JQaIl pKIfM8Q+Pn1QCuu3T4scD1MCk/9zPZ0hiHvcTnscU1AeA3PbvqhBuYzYvCqoFctk/ttXFr yF+heWbrWkRCcGQj5ItI7yoNBPyLWbSSJU6HXLmGAMT6f18UH3mSTfS2vjDdgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739553021; 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=eden3i9LMAIMNMpVEMazgMqujFwfRa9P/IdEqTI0KNQ=; b=FKLjpBq0JzC1/c3xOKmoRHnBo5sznoBfXlqcQdGLebxiYilaXX5b6grATMDmURiXsqqRgT jJB8jwfN2Tj7V3107BpTCWTRPZGUnXXQlBV0arKx/v3tj5LJ6siUZMLTHPNrPj2fff+F7l vM3JL6CFLXsd6mOxF+4XLnXBYOEDLcxSUspP67aiXWHWPbLNGitv/QA2ZyL+73g/Myzv8F kCPjlyuwmZA+tv8ACgtFoZXpFr+hhTMf46aVGl//v40aiAHPthYme8vu/axOgWjSC5NjbE LoSYa0PaeYprI+JoGVo0doocsXqe6xAJvbrQCUIWH4r+ZQropHAIv1pw+uDVaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739553021; a=rsa-sha256; cv=none; b=oBYLbp0JYjCIvlvCCCN957L5p63bpnIbxKLRpM7MhTCnaHCQlikt3swTnZkPGC42SJy5/Y 4ZoYW+tljEgpkYi+TUR38IVyXp99esXggUEHeZXqShMs8uNAfGXA+IIDY08fKwoouzTfk9 xuuD9brlMq1Yf+6iMj9YSOOzfGcVYvq0tjfM2KboRMm/88ivT/ukYK6WD6WbsYl8bl/Zf0 4yEgzHpcWAf+mnxsmAkPvHanWB4UOUb8TSCqywoWmh4amRjcI1695SnVwNtqMyXZIoYNgc ZoHazfahHTBTeunwSpYOn4e0cAjFCeOxDuIkcOocQ/JXw1rx6F2cBHnHn+Oxmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yvdpj3fHRzg1T; Fri, 14 Feb 2025 17:10:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EHALAK087464; Fri, 14 Feb 2025 17:10:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EHALwe087461; Fri, 14 Feb 2025 17:10:21 GMT (envelope-from git) Date: Fri, 14 Feb 2025 17:10:21 GMT Message-Id: <202502141710.51EHALwe087461@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hajimu UMEMOTO Subject: git: bca999a5758a - main - mail/cyrus-imapd310: fix 'pkg -r' install 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ume X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bca999a5758a44b12fdc9e28c097a6a3451ab4a8 Auto-Submitted: auto-generated The branch main has been updated by ume: URL: https://cgit.FreeBSD.org/ports/commit/?id=bca999a5758a44b12fdc9e28c097a6a3451ab4a8 commit bca999a5758a44b12fdc9e28c097a6a3451ab4a8 Author: Hajimu UMEMOTO AuthorDate: 2025-02-14 17:06:42 +0000 Commit: Hajimu UMEMOTO CommitDate: 2025-02-14 17:06:42 +0000 mail/cyrus-imapd310: fix 'pkg -r' install PR: 281294 Reported by: Siva Mahadevan --- mail/cyrus-imapd310/Makefile | 2 +- mail/cyrus-imapd310/files/pkg-deinstall.in | 6 +++--- mail/cyrus-imapd310/files/pkg-install.in | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mail/cyrus-imapd310/Makefile b/mail/cyrus-imapd310/Makefile index eef17d7c6d09..d3a63538dcf5 100644 --- a/mail/cyrus-imapd310/Makefile +++ b/mail/cyrus-imapd310/Makefile @@ -1,6 +1,6 @@ PORTNAME= cyrus-imapd DISTVERSION= 3.10.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/ PKGNAMESUFFIX= ${CYRUS_IMAPD_VER} diff --git a/mail/cyrus-imapd310/files/pkg-deinstall.in b/mail/cyrus-imapd310/files/pkg-deinstall.in index e56484fd6b2b..2e933163aba4 100644 --- a/mail/cyrus-imapd310/files/pkg-deinstall.in +++ b/mail/cyrus-imapd310/files/pkg-deinstall.in @@ -14,16 +14,16 @@ CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} modify_cyrus_user() { USER=${CYRUS_USER} PW=/usr/sbin/pw - if [ -x /usr/sbin/nologin ]; then + if [ -x "${PKG_ROOTDIR}/usr/sbin/nologin" ]; then shell=/usr/sbin/nologin - elif [ -x /sbin/nologin ]; then + elif [ -x "${PKG_ROOTDIR}/sbin/nologin" ]; then shell=/sbin/nologin else shell=/nonexistent fi uhome=/nonexistent - if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then + if ! ${PW} -R "${PKG_ROOTDIR}" mod user ${USER} -d "${uhome}" -s "${shell}"; then echo "*** Failed to update user \`${USER}'." else echo "*** Updated user \`${USER}'." diff --git a/mail/cyrus-imapd310/files/pkg-install.in b/mail/cyrus-imapd310/files/pkg-install.in index c806a61ad6cc..2b7e9053c677 100644 --- a/mail/cyrus-imapd310/files/pkg-install.in +++ b/mail/cyrus-imapd310/files/pkg-install.in @@ -16,7 +16,7 @@ modify_cyrus_user() { shell=/bin/csh uhome=${PKG_PREFIX}/cyrus - if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then + if ! ${PW} -R "${PKG_ROOTDIR}" mod user ${USER} -d "${uhome}" -s "${shell}"; then echo "*** Failed to update user \`${USER}'." else echo "*** Updated user \`${USER}'."