From nobody Tue Dec 21 09:18:07 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 6FCFA18EF5BB; Tue, 21 Dec 2021 09:18:10 +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 4JJ9q52fpSz3tqX; 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 0DFA926EC1; Tue, 21 Dec 2021 09:18:08 +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 1BL9I7Ru079717; Tue, 21 Dec 2021 09:18:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BL9I7nf079716; Tue, 21 Dec 2021 09:18:07 GMT (envelope-from git) Date: Tue, 21 Dec 2021 09:18:07 GMT Message-Id: <202112210918.1BL9I7nf079716@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: 25367c806be5 - main - pkgbase: Create a FreeBSD-syslogd 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: 25367c806be5b321b6c7b2fd6bee264b99f240da 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=H3XK7N+b+BhdUlERLZeWJk/lmjbQZbMbRhIWrEdu1ZI=; b=gcrKef+VxYo4S9B8z1rcqoB4fM1kjO053yIVvIWUL6cwOb1BsZ6TeCMS/csrvPOO9PV/JT lXOWoTgR7jcX998YBOTdT1eZLIEfoKTrJAacIfLvxSZTI+X1OoEC41hRMHhd5SOSN8YMwh Bg71ujbQql9dcW7EeDODxs1A5x++Vpq/QK2zL7Ycleb8kJRYseNXkt7skXtR2l37KIzeRj 9eN5bHPhC+A4WtjwlJm1AEQyMFF6d6JiWcGdbmBspksO9mzV9UEd+HrKhht60nEG+whjbI f1O7AuPdwGT5h8Hzos3wwwjEkvDyc9MCZ4ASwPd+Cbm38JWdcnegqq5TesvAHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640078290; a=rsa-sha256; cv=none; b=WH309blQxj3Evq6JnFWpkiUjItsIu0/XAvK1y3CmUf/uaoeLW0hAsmk3W3dCl6rIO+53ZN Qb+1CFIaJP0EF0cfgiHn06ElIyoBwrU3JRfUj5DQhVFQ6zmVQZPFFsN6SKcjjE5JcQLw3G vN0RMnk4ukXh8GbXcO/auzcYriIYutYQZuiGM4clnmdEeiUzGPhKtA4Jhy75BSJYlfeze+ tlye34G2zvwa//JeLvA/4BI4L0f1XINkI4hkIP5m46jGvxbWEDnobcwvB2fSgE1++rCcvM +KxdEORAz53Y9zLxjIo6OewALtoa7aHwgy8iqqEcTz+Mcid2zt/vNf5x+gy6aw== 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=25367c806be5b321b6c7b2fd6bee264b99f240da commit 25367c806be5b321b6c7b2fd6bee264b99f240da Author: Emmanuel Vadot AuthorDate: 2021-12-15 09:34:00 +0000 Commit: Emmanuel Vadot CommitDate: 2021-12-21 09:17:40 +0000 pkgbase: Create a FreeBSD-syslogd package This allow one to not install syslogd and use syslog-ng or any other syslog daemon. While here put some syslog.d file in their own package. MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33455 --- release/packages/Makefile.package | 2 ++ usr.sbin/syslogd/Makefile | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index bef0a753cdd9..2356940828b0 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -110,6 +110,8 @@ svn_COMMENT= Subversion Version Control System svn_DESC= Subversion Version Control System syscons_COMMENT= Syscons Console syscons_DESC= Syscons Console +syslogd_COMMENT= Syslog Daemon +syslogd_DESC= Syslog Daemon tcpd_COMMENT= TCP Wrapper utilities tcpd_DESC= TCP Wrapper utilities telnet_COMMENT= Telnet and telnetd diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile index 8e1e94c9dda8..f96a72274d60 100644 --- a/usr.sbin/syslogd/Makefile +++ b/usr.sbin/syslogd/Makefile @@ -5,11 +5,14 @@ .PATH: ${SRCTOP}/usr.bin/wall +PACKAGE= syslogd + CONFGROUPS= CONFS SYSLOGD_D CONFS= syslog.conf PROG= syslogd MAN= syslog.conf.5 syslogd.8 SRCS= syslogd.c ttymsg.c +SYSLOGD_DPACAKGE= syslogd LIBADD= util @@ -23,7 +26,10 @@ CFLAGS+= -DINET6 SYSLOGD_D= SYSLOGD_DDIR= /etc/syslog.d .if ${MK_FTP} != "no" -SYSLOGD_D+= ftp.conf +CONFGROUPS+= FTP +FTP+= ftp.conf +FTPDIR= /etc/syslog.d +FTPPACKAGE= ftpd .endif .if ${MK_LPR} != "no" @@ -31,7 +37,10 @@ SYSLOGD_D+= lpr.conf .endif .if ${MK_PPP} != "no" -SYSLOGD_D+= ppp.conf +CONFGROUPS+= PPP +PPP+= ppp.conf +PPPDIR= /etc/syslog.d +PPPPACKAGE= ppp .endif CFLAGS+= -I${SRCTOP}/usr.bin/wall