From nobody Wed Mar 20 15:45:05 2024 X-Original-To: dev-commits-src-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 4V0Cb56Pdwz5Fnh1; Wed, 20 Mar 2024 15:45:05 +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 4V0Cb55wQ6z55NQ; Wed, 20 Mar 2024 15:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710949505; 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=RUraHRQlUxN/khLm4C1LEgh3847iDPlIkXbmP4qBl7o=; b=VskCFmc4sWkHOBTnheYOlOe0Cxfxf03hAcAs1DNxx80diEiDQYDQDUcO4noQB3wphQakaw 1fQ0Bv0wLhNX5gnzb8/ttg5LtCVyijZ1+2MxlTuP1peeaEvybH2oiy8UcL/EG2e4NnfgYg Xd0Lnh6e9XuB6UfQvGQsigUoBE4XgT46Ne+Uj0XSjsZWsgEsK9WoU4WEjWXH4uDYsv9ZZm QOcZEoa767P+driTFZwocz6YMyruixbhKM3S3qK8LZccB4xaPc3vkEYw/q9R6rEQh/DT+H m/x6p3A+1GijnJDWqyGNfagqFKeXooHeX03jWx2RAnXaDKSt/3lL1okDT5nShA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710949505; a=rsa-sha256; cv=none; b=KHGQTT4ubrO+d4tfeWgAMAfUuPRF17tZy8A3IIbW7XfAnq8wKNOFHVUPKFhCm/505CoXVt gVEs5qdDzWKlIdRmsyyXxnpy7tcJ8s702fhbnMYbRwHw/0JfiPLjPS6TeFo5XbXYCwBQpj 7b/hv9VespC1N6Xrs6CDI/ahnFuNSnykfD35hHLx7dOmtN2WX1svn2OXPjHN03f6OP5lHz Z4K7qDbGsv68d6uJ3daXP4tKgIB0+j5jXPGrDR6qaY621BWKYmf/wjlYzVtr5VDYDhT5B+ SO1oQf5U9Yr2UjaKHt5Pm7Y/gJ+6E2gaHdXbWXMSZLgM/XE69hR1dqBBaT3uVQ== 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=1710949505; 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=RUraHRQlUxN/khLm4C1LEgh3847iDPlIkXbmP4qBl7o=; b=AO4fn0ZaWT3kEeQKy4owL/6knBtbkymHHUeU4OquR1SJUic0Xd2AiW/elUSBg42sWvC0up wzaKuZ956XdC3h4d1CSbFuIVhJfIcXQ2IuA+6yjJofWlKewEAWY6kPD2k6rcp/mJYtwhBr LPDkmI/LzQz3zRXcDGDNUhPmHpoWoSDjJ5uE7uWfi/mbaNdl3tNfdtmg+MIjmQtIdnIf5d LAoVHJmRmygyn6zQfZaSweGqETkGC7+pLNXdQIiSBIJ0gmzc5Wlk3eTBvXy8CrAvvHS5e4 mNjuKdKX7b+GE7zGcQ6pAsS7ngg32qoZvZN12JQBnSEHlnWASmqQnroKnhKLsA== 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 4V0Cb55PmjzxDC; Wed, 20 Mar 2024 15:45:05 +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 42KFj5ah052573; Wed, 20 Mar 2024 15:45:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KFj5PU052570; Wed, 20 Mar 2024 15:45:05 GMT (envelope-from git) Date: Wed, 20 Mar 2024 15:45:05 GMT Message-Id: <202403201545.42KFj5PU052570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8cd7841d8435 - main - pkgbase: separate /etc/mail/aliases from the sendmail package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8cd7841d84356adb91450e3daf2c25454a102221 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8cd7841d84356adb91450e3daf2c25454a102221 commit 8cd7841d84356adb91450e3daf2c25454a102221 Author: Baptiste Daroussin AuthorDate: 2024-03-20 15:39:39 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-20 15:39:39 +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 --- etc/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 229d9380901d..848176fef914 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -20,7 +20,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