From nobody Tue Mar 26 21:32:31 2024 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 4V431C6JBzz5FrCv; Tue, 26 Mar 2024 21:32:31 +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 4V431C5rglz4GFf; Tue, 26 Mar 2024 21:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711488751; 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=2zprrnx93ONpuQUyDZaA/tHAQDmt9e2br8DG5nHd4IY=; b=MbEAQhtCknE8OLqYGsjkDqldqL6WyQMpFYIEAzHJbaYvsXl20/sCP2RtdCvsnuWhUT0ehk Sc6pqIHFbtcwa/O4h5zypcwhuCYFmjgzAmYPAVmbQlHYNCi3iyzhAkRFbYlLMur2DG9PcT K3Caxnb8g2yC/zcgZCYx0JrBe8N/WaT8KpxLdcJTn4q576yEmlwyuL9kvPeHu/zxvlbT1b XHpMD8NCFoC2QKBQmaY505yW0F83C5KpehcWRVkwsevjiYyBv43mmM4ynqQ/Jzo/B0BcwJ +ZoVeAQ6/y8dQjiCUMTfQbzzstyURBjs+C8qd+38LEXzR2PVTS3AkqtyAxIYSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711488751; a=rsa-sha256; cv=none; b=cXeh6NshQ/6OpAm/hi6s7Niu3Bb5YlLtCAg35LuhEpU8cKwuPQ+lYrZ5+2JGg7ph9c1qzG 7+RByQrwacxCQxWtWTAc+3p2M3eq4PCryow8oK6iWBYwb7W3blqhoPDWiyTUN9yCAPrHep mbjri/v1Sp+2woQMD/4GVFL68N4yiWC5H6FOZK99dRDhf4GBZi7d0ShKOXnn1/65jKahFc jRn9RAmC5RdwJCJxlb4wktjUo4VQEJpnRI/zGqAjXtHbUTFT+jCvsQsMqL6vO6Vza7l1An L7G71PIwGCEJUMb5urmBvky1NS8lSL+80WpOZHaqrZZN9TFd2NT8eJcpfsfx4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711488751; 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=2zprrnx93ONpuQUyDZaA/tHAQDmt9e2br8DG5nHd4IY=; b=eMVr7TMiBQhDbv+P9iyEBDN2jY2+eFoEl7QhGvWAXwokuqQ1zZ+1lYk9EnNrUFtXb0LiEz KQp1ZR/5jFFR5Hll+xwQVCKZF6T5WNPjnasC9mgRE6qCt6ZbrvVkGdFMMzYJKwwGln1ZAC mm0Rm1pC1s7BHCOoRmI8fmo/x096OG/Jdi5AkGMOWlqSksIlwB+8IVJzBCCrts85tb0vOs f27oG1XJt4cW4A18gPRajKNpdIImSZyjbIWH00OpjcGjVwBsgyQKmbtg5/k3a1Y2X10CtQ UImYZjg039y4kmnIQ2TIMNSoQVbQEbDVhNk29lmmPWDJ2pNsAEV38bTBEsHJ1Q== 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 4V431C5T4WzGpS; Tue, 26 Mar 2024 21:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42QLWVop095218; Tue, 26 Mar 2024 21:32:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42QLWVRk095215; Tue, 26 Mar 2024 21:32:31 GMT (envelope-from git) Date: Tue, 26 Mar 2024 21:32:31 GMT Message-Id: <202403262132.42QLWVRk095215@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Florian Smeets Subject: git: e18075d840eb - main - security/amavisd-new: fix config file installation 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: flo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e18075d840ebaf663f853515312094f215425f69 Auto-Submitted: auto-generated The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=e18075d840ebaf663f853515312094f215425f69 commit e18075d840ebaf663f853515312094f215425f69 Author: Florian Smeets AuthorDate: 2024-03-26 21:31:33 +0000 Commit: Florian Smeets CommitDate: 2024-03-26 21:32:23 +0000 security/amavisd-new: fix config file installation Don't use INSTALL_SCRIPT to install config file. Use the more appropriate INSTALL_DATA. PR: 277972 Reported by: mikael --- security/amavisd-new/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index e12e9a5bd711..d7885de9b9bb 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,6 +1,6 @@ PORTNAME= amavisd-new DISTVERSION= 2.12.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= security @@ -237,9 +237,9 @@ do-install: .for i in amavisd amavisd-agent amavisd-nanny amavisd-release amavisd-snmp-subagent ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin .endfor - ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf ${STAGEDIR}${PREFIX}/etc/amavisd.conf.sample - ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-default ${STAGEDIR}${PREFIX}/etc/amavisd.conf-default - ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-custom.conf ${STAGEDIR}${PREFIX}/etc/amavisd-custom.conf.sample + ${INSTALL_DATA} ${WRKSRC}/amavisd.conf ${STAGEDIR}${PREFIX}/etc/amavisd.conf.sample + ${INSTALL_DATA} ${WRKSRC}/amavisd.conf-default ${STAGEDIR}${PREFIX}/etc/amavisd.conf-default + ${INSTALL_DATA} ${WRKSRC}/amavisd-custom.conf ${STAGEDIR}${PREFIX}/etc/amavisd-custom.conf.sample ${LN} -s ${PREFIX}/sbin/amavisd-release ${STAGEDIR}${PREFIX}/sbin/amavisd-requeue ${MKDIR} ${STAGEDIR}${AMAVISDIR}/var ${MKDIR} ${STAGEDIR}${AMAVISDIR}/tmp