From nobody Tue Dec 21 09:18:09 2021 X-Original-To: dev-commits-src-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 D53D818EF259; Tue, 21 Dec 2021 09:18:11 +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 4JJ9q56JqHz3tnK; Tue, 21 Dec 2021 09:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 30960271BA; Tue, 21 Dec 2021 09:18:09 +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 1BL9I9gP079741; Tue, 21 Dec 2021 09:18:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BL9I92e079740; Tue, 21 Dec 2021 09:18:09 GMT (envelope-from git) Date: Tue, 21 Dec 2021 09:18:09 GMT Message-Id: <202112210918.1BL9I92e079740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 26ea904caae7 - main - pkgbase: Create a FreeBSD-newsyslog package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26ea904caae7e6be8394eb8ca94f282d99f63c8c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640078290; 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=VYhIhFsuqWx7bh26Jr3YvmCHGXlYntebq+/lMNKiLNk=; b=PNEUtpdD2zeco7sOi2F4Hh72t64blLOkw3dPjeK65Hq2kc6ppD8XXgEslNMhTfyzFCG9Oi T7oGHg+LPwqOnH6/cORQYm/rumUVGsle6F0mgpQS7ZSSIL3Ot250FnL3w5Up02qmUy6C6Z YaCsKXLP8/bJXuV8bqMmn/I4caEhrhteBffRU9EAvE8lqSycy601cykiGNacAuL6MIcpFh hVOabyAC9V+ZXSI3T4YcQ+5ELOMsnC/iykvyS+waTnbzjJYYdzQ5wyyzWk+bLYAvyJxeEc uQ76+fP4jcDUeoqAbdIMwS7wNzrRpLvgqwcppn9sbrNDu0adEVq18UGomUFuIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640078290; a=rsa-sha256; cv=none; b=Bmfjg36VEbjgxb57oFOuEPx5HklItQJtCB1bI/We1eECRsoYXw0/2wMADz793piWTmk2YV QkQyiSwEcQgNBGjQoQrRVITLyGLl9byfk6RnElWaxa9sBpBvZodEROGaWo6+mUWxDnAzZG fltX/muENljdu5ZXjGc0+8m4eDnpWTCndHwBRvldy3oDQTStip4ZE5cPbqeFdmEG0+Ds8S R3QF4qCB9QliYsNM9SoOlcjtK7VMk5D8mW5pVuw0aOv0zygVUQ5QcIwAZQ6iCMJipAHf8o javZ6olPI4MMq6wAoLCtddaATEMWhs2xKvxpCeI9qMVT56Gzkhw4DgUNrYXHQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=26ea904caae7e6be8394eb8ca94f282d99f63c8c commit 26ea904caae7e6be8394eb8ca94f282d99f63c8c Author: Emmanuel Vadot AuthorDate: 2021-12-15 09:46:00 +0000 Commit: Emmanuel Vadot CommitDate: 2021-12-21 09:17:42 +0000 pkgbase: Create a FreeBSD-newsyslog package This allow one to install it without having to install FreeBSD-utilities. While here put some newsyslog.d file in their own package. MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33456 --- release/packages/Makefile.package | 2 ++ usr.sbin/newsyslog/Makefile | 2 ++ usr.sbin/newsyslog/newsyslog.conf.d/Makefile | 22 ++++++++++++++++++---- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index 2356940828b0..2f90307cfda2 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -79,6 +79,8 @@ mlx-tools_COMMENT= Mellanox Utilities mlx-tools_DESC= Mellanox Utilities mtree_COMMENT= MTREE Files mtree_DESC= MTREE Files +newsyslog_COMMENT= Newsyslog Utility +newsyslog_DESC= Newsyslog Utility nfs_COMMENT= NFS Utilities nfs_DESC= NFS Utilities openssl_COMMENT= OpenSSL Library and Utility diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile index 81237126afed..a0f933333320 100644 --- a/usr.sbin/newsyslog/Makefile +++ b/usr.sbin/newsyslog/Makefile @@ -2,6 +2,8 @@ .include +PACKAGE= newsyslog + CONFS= newsyslog.conf PROG= newsyslog MAN= newsyslog.8 newsyslog.conf.5 diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile index 3974581ff57f..1c8980c2e383 100644 --- a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile +++ b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile @@ -2,12 +2,17 @@ .include +PACKAGE= newsyslog CONFSDIR= /etc/newsyslog.conf.d +CONFGROUPS= CONFS CONFS= .if ${MK_FTP} != "no" -CONFS+= ftp.conf +CONFGROUPS+= FTP +FTP+= ftp.conf +FTPPACKAGE= ftpd +FTPDIR= /etc/newsyslog.conf.d .endif .if ${MK_LPR} != "no" @@ -19,15 +24,24 @@ CONFS+= opensm.conf .endif .if ${MK_PF} != "no" -CONFS+= pf.conf +CONFGROUPS+= PF +PF+= pf.conf +PFPACKAGE= pf +PFDIR= /etc/newsyslog.conf.d .endif .if ${MK_PPP} != "no" -CONFS+= ppp.conf +CONFGROUPS+= PPP +PPP+= ppp.conf +PPPPACKAGE= ppp +PPPDIR= /etc/newsyslog.conf.d .endif .if ${MK_SENDMAIL} != "no" -CONFS+= sendmail.conf +CONFGROUPS+= SENDMAIL +SENDMAIL+= sendmail.conf +SENDMAILPACKAGE= sendmail +SENDMAILDIR= /etc/newsyslog.conf.d .endif .include