From nobody Wed Jan 05 17:24:31 2022 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 4AE831921066; 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 4JTbvN3MX0z3HHt; Wed, 5 Jan 2022 17:24:32 +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 BDF5B10754; Wed, 5 Jan 2022 17:24:31 +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 205HOV6h097516; Wed, 5 Jan 2022 17:24:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 205HOVbM097515; Wed, 5 Jan 2022 17:24:31 GMT (envelope-from git) Date: Wed, 5 Jan 2022 17:24:31 GMT Message-Id: <202201051724.205HOVbM097515@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: e7a69f561368 - stable/13 - pkgbase: Create a FreeBSD-syslogd 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e7a69f56136886b2cb54d8e5c42c5bc53b886123 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=gDjUfykYszow68jt+91WGIrNYcGwGfJihV4CKpd+BW4=; b=F/UhsY5l+XOoy0CO7eb0iGW1k5XsyKu1JBZ+b+vcg+MUXRVFWfYJITq12wUVy2qfdEvHa7 9CbW/cJWxal8Ght/d6T5tsSRxv+BS/4S34nDGZJSSesntIp/Ivk7j4CsmTEN07dH3GdnxW nhzOSHVjdWOnQwn7T9+zxJ+33QZSTxb5ev3ZRgLk98zeWcWZDg9/EyFSa85RmDW9K9wbko +F5cuPPpPCB2BpxsLo2OHc2eJad9LD5O4F2cZN9vmoXr5MuB+wvAn2cHkBQ8dCL7nsySry MVokoltdGN6cCwnScFpt040sx+ZpH6TBW00V70/WaVVKhSjBAy7zEaeZdN6zzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641403473; a=rsa-sha256; cv=none; b=xlKunI1spE3YABC0utth1/ymJeaD3v1QlVyxEDEe+QQaWt0LJ5kPo7i0cM0MOCwbu01P+Y I7Im8kI6QeIWKrHlizpmavClB13TXGx0jjAh2AEaQcnWk4TUu7NXRfqfLshe7RCKYe8DZ5 T3KUmkKXLvyNkNqKEBE9uFmCzVgczTPU896vxbEOeYEmn7ybQnS2CmWbsxuvLrPcjubG3H amc1KfYhTdFxDz4EYJxGszFAg9ITj3XUJukOtzjq+gBQXvKBVflSGtWxydtWkQVxkdMjtM Joto7583U3A1NCbjFOQ8XSqzC5GV6ZETMFj+m7uUHio/0KpqwrcQgi3u2bROMA== 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=e7a69f56136886b2cb54d8e5c42c5bc53b886123 commit e7a69f56136886b2cb54d8e5c42c5bc53b886123 Author: Emmanuel Vadot AuthorDate: 2021-12-15 09:34:00 +0000 Commit: Emmanuel Vadot CommitDate: 2022-01-05 17:23:52 +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 (cherry picked from commit 25367c806be5b321b6c7b2fd6bee264b99f240da) --- 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