From nobody Wed Mar 27 08:31:08 2024 X-Original-To: dev-commits-src-branches@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 4V4Kd90Zktz5GjkS; Wed, 27 Mar 2024 08:31:09 +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 4V4Kd864zNz4Hht; Wed, 27 Mar 2024 08:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711528268; 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=Fiam4xZ50XophVXDvr6N8GVGi/3Z4sCbJcJUcCcXn/4=; b=usj4UBnU5B/TriS9CEh3udDDjDZiWad0O9KLKqgtUVfMvLYrOzrYs4dt1sL+ZgYc9Zxnp6 uWSp/WCf8KZ2A69qbB541JRHO5995cF5ioY/5M4T9lklvNr7a7y8kAM+XO8ymXOqCIHBsA kUcFKP0pUOe63bQE89/UG/t9Kowx8ZoIU6oL+CTrqTUjaov2oP+QQAgeiKEGs8NXSueplw M77E8I7aVmWdzZLmakdfj6AT4uxEho1hWf0oTQwM3Y/BnPPqQ2xKFxsbNtOR74IpU7PCel 3WciTDYFxIIo8S0cSrEGSdUe0MY1xa+kSYEoav2vT521pdLlhdsNT1FnEe07ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711528268; a=rsa-sha256; cv=none; b=ER9oZfirH0t9P4eNrmEJea8Xp07U2hXeWU2ysaSIUSgM0v5RO5JSu4HrNIetZDgKOEg+76 F8ydfBmimfpYss5OiCg9j1AuOrwMTbhcyHBTnNgvI7mWl/hCUMa9bsyv6RryFXna9UfgjF HjE+KjXTtplq8cV40OnYqbst+IWQYYHZTtpYgZstv011F+v9pKrQeYIaWWHtc1KuLcQyvj iZjz9uvv4G6NCAJAMV/n5eelgqOfWw8IJYTkt2LtLo2CDlcBtufuNL2znHvq5D2K9NtOvb gc/O1BbB0+Ybeq7iqvWn9qyKg5WMCNWz/XaLVShJr8TQ2fLNeixArNLdFLiM1Q== 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=1711528268; 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=Fiam4xZ50XophVXDvr6N8GVGi/3Z4sCbJcJUcCcXn/4=; b=NAH+zLHvkAX6z92ZZXsBTFz9UzuhkdJVKj5YIKKont1R5qplI9zCcuF7Q6qa3snFcR5Kzw 8TL+IXmilnTRu5btL9pol+LkC8tWlxAznWNX953mdbLiPoT2F/DCYJ2lS/1y2ON7lBXdnF ewYcuQQA2weXuw/JXP2mt1evFJOJCTuKsVsyYHrJ/80hn6phBsxv1vKPEBAAvdiW4pH5VI NQNtci1L9d57S4Oz22D5Xi4ib/Bp7sG6yccwStxyuTzTybJ/vyW/NPXI1xalg3XGEIBaMg CErX70WAOAYEUvmGB8H0n7IJ1bc5UZ5cs9zPSKSnGhbw6qkTsCMrgkfMZNlY2w== 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 4V4Kd85hftzcYt; Wed, 27 Mar 2024 08:31:08 +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 42R8V8oH006312; Wed, 27 Mar 2024 08:31:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42R8V8jP006309; Wed, 27 Mar 2024 08:31:08 GMT (envelope-from git) Date: Wed, 27 Mar 2024 08:31:08 GMT Message-Id: <202403270831.42R8V8jP006309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 0c66d02e63e5 - stable/14 - pkgbase: separate /etc/mail/aliases from the sendmail package List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0c66d02e63e5bfb5f76bdc3069700e960e3dde77 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0c66d02e63e5bfb5f76bdc3069700e960e3dde77 commit 0c66d02e63e5bfb5f76bdc3069700e960e3dde77 Author: Baptiste Daroussin AuthorDate: 2024-03-20 15:39:39 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-27 08:30:44 +0000 pkgbase: separate /etc/mail/aliases from the sendmail package move /etc/aliases and /etc/mail/aliases into the runtime package this file is used by both sendmail and dma. While here mark this file as a config file so 3way merge is performed (cherry picked from commit 8cd7841d84356adb91450e3daf2c25454a102221) --- etc/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index a680572f66bf..ddef82f64510 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -21,7 +21,7 @@ SUBDIR+=sendmail ETCMAIL=aliases .if ${MK_SENDMAIL} != "no" -ETCMAIL+=Makefile README access.sample virtusertable.sample \ +ETCMAIL_SENDMAIL+=Makefile README access.sample virtusertable.sample \ mailertable.sample .endif @@ -78,13 +78,17 @@ distribution: .if ${MK_MAIL} != "no" cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - -T "package=sendmail" ${ETCMAIL} ${DESTDIR}/etc/mail + -T "package=runtime,config" ${ETCMAIL} ${DESTDIR}/etc/mail if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \ ! -f ${DESTDIR}/etc/aliases ]; then \ - ${INSTALL_SYMLINK} -T "package=sendmail" \ + ${INSTALL_SYMLINK} -T "package=runtime" \ mail/aliases ${DESTDIR}/etc/aliases; \ fi .endif +.if ${MK_SENDMAIL} != "no" + cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ + -T "package=sendmail" ${ETCMAIL_SENDMAIL} ${DESTDIR}/etc/mail +.endif .if ${MK_LOCATE} != "no" ${INSTALL} -o nobody -g ${BINGRP} -m 644 -T "package=runtime"\ /dev/null ${DESTDIR}/var/db/locate.database