From nobody Wed Jan 05 17:24:32 2022 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 BF1631921290; Wed, 5 Jan 2022 17:24:35 +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 4JTbvP3Pzyz3H0M; Wed, 5 Jan 2022 17:24:33 +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 F3144108E9; Wed, 5 Jan 2022 17:24:32 +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 205HOWKM097546; Wed, 5 Jan 2022 17:24:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 205HOWwp097545; Wed, 5 Jan 2022 17:24:32 GMT (envelope-from git) Date: Wed, 5 Jan 2022 17:24:32 GMT Message-Id: <202201051724.205HOWwp097545@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 629c89d95134 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 629c89d951341c81691aa7886fa218c0702a8ebf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641403473; 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=mnxCehlLNZDj/P502XLCoLShpATtE98UnWKldP/yvpc=; b=y4V4UoCp9nPKVGb0j873S3W1qatL+Dv97cJTLuP99VoLesLqiRHObYl36axjXKRtYiHew+ WrGhJMSNuKXfhMNEtsLU3XBvf90rjsaU3HaIQuvjIMnNIwZ3g/532i6TGTQjErfxtefiAd vr3TMqip/Zd+1nmwNNf4nZVzidsj80ULDZmLoDOibXiZY2Hz1YHvf8vr2JZGuQKFeZxiFL qW7MXDliJndG0CZgpXzLNgSkwmquBUt/QxMdrX0z8uwCqkS+zlfc3KPNpYyHf3IBdY25XD HBzP0Ax7kULqaWCnsGVgmji5WVD+21xsLnxzb/4krxe+FI62tVXQFTXJkUovEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641403473; a=rsa-sha256; cv=none; b=WrON9WbcP5LpkGaP62j4Z7tcEZBDLyHoI7dSZQbQj6l9+Xyg+EKqGBVUmBv3ulmaz0sjfr Nq1zBO1PeAKNHKnOse8WT9imF6Plmij5TSooBxXhHjlV8HKHjc4miG6NK/M9zLhjujDsPW LHqPqgrm/J/JSCL+aObdeIjV4LacSWHfpWEIxj6lPwCne7clTm0daDM5fN/DIOJ2o4I9Ff logAALo4V117ymAtd0P2pfvcML7tTcJ08/0a/RCVWn2Q7rIEOUtQC/Xyqrx/cMRS5L3dtW PJbcM1SmkIlHcxbaas8QGSPeDeBLcJn0OfRrWvlwoPVb9Nn7R5YnrAh3tDPx8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=629c89d951341c81691aa7886fa218c0702a8ebf commit 629c89d951341c81691aa7886fa218c0702a8ebf Author: Emmanuel Vadot AuthorDate: 2021-12-15 09:46:00 +0000 Commit: Emmanuel Vadot CommitDate: 2022-01-05 17:23:52 +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 (cherry picked from commit 26ea904caae7e6be8394eb8ca94f282d99f63c8c) --- 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