From nobody Fri Dec 03 18:14:32 2021 X-Original-To: dev-commits-ports-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 ECE5918B82AD; Fri, 3 Dec 2021 18:14:32 +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 4J5LZJ4FW9z3JHw; Fri, 3 Dec 2021 18:14: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 6F54815B84; Fri, 3 Dec 2021 18:14: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 1B3IEWQ3051063; Fri, 3 Dec 2021 18:14:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B3IEW5d051062; Fri, 3 Dec 2021 18:14:32 GMT (envelope-from git) Date: Fri, 3 Dec 2021 18:14:32 GMT Message-Id: <202112031814.1B3IEW5d051062@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthew Seaman Subject: git: 2a74583ea36b - main - sysutils/rsyslog8: update pkg-message and add sample config file List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a74583ea36bedf5f56c4cffcaa88ad317679104 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638555272; 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=pSgYmK4NVsZ2jLMQnJI+WjgQhh9c5Y+H30XIfuKpWJQ=; b=WhTdxxQndULY6IZn1bDRCaWgAHUUSkRtrJoFGn/9ouSJcgyL07pKa9rKVPy/Jf5jA2YpHb 4yXI1zgwMbOky1ZCHoJA1kJTqXI20v72jOJolnfRihmi1pUCTou5jVbuKb0jjHsv2viGAl b89rHqVfZ2SYp6VN6TTfP6G6Xfduve73Wrwc1x3N9kuNlRtp1JpivFn2SVNTv8xTHtsOcf JrPdldjvtHeVvxLx+vnCmZqJ/YXpXf/z1TDfgrI6anlLLTjEIQY1nb7XfID+nWspRUe7Sf tgHk8WLzYI0hV3FImPlR5uhz0sEoXmxqZ3CPkdxhcm8PJTmtMWUk0v7Xf1QaSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638555272; a=rsa-sha256; cv=none; b=j2r3wsHRHOQUge2ZO+HpjWW+oCDGCuNRJzh4HxWuAXL5U/guqi6AhHOkVPhmu9v6tZwAxV pKtTrFAz1aKlUzheROADwh69SyAuJTH4GERzE5ZhCbthT9vMHm7l7BXkz39/OHw8I5qw6J 8XgFVqLGlthbqgy6JCT/fhrwvp1DRmhKWeao7i/6sNzzq7L0A5Ww49NY27tC8dCSsn0mPV AsSZh7nB+loKfZ9Fd+JODLyhec23eMXgjaehRz18+O1oVpFYyyly0iSKByWd4BUeGPfoTC hOzBapGjqJHTo7vZkQKsYqKdRVY5k/N5ftBbbUDkKqGoqWRJPOVPFVPaI9+yGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a74583ea36bedf5f56c4cffcaa88ad317679104 commit 2a74583ea36bedf5f56c4cffcaa88ad317679104 Author: Matthew Seaman AuthorDate: 2021-12-03 18:10:10 +0000 Commit: Matthew Seaman CommitDate: 2021-12-03 18:14:18 +0000 sysutils/rsyslog8: update pkg-message and add sample config file Upstream changes mean that the advice formerly given in pkg-message to modify the default /etc/syslog.conf file as the basis of a new ${PREFIX}/etc/rsyslog.conf are now less useful and confusing to end users. Therefore, update the pkg-message accordingly, and install a sample config file which should duplicated the functionality of the base syslog.conf. PR: 260158 Reported by: Mark Johnston --- sysutils/rsyslog8/Makefile | 5 ++++ sysutils/rsyslog8/files/pkg-message.in | 19 +++++--------- sysutils/rsyslog8/files/rsyslog.conf | 47 ++++++++++++++++++++++++++++++++++ sysutils/rsyslog8/pkg-plist | 2 ++ 4 files changed, 61 insertions(+), 12 deletions(-) diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index 0bfd895b2a9a..e39a8c31eba2 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -1,5 +1,6 @@ PORTNAME= rsyslog PORTVERSION= 8.2110.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -152,6 +153,10 @@ post-patch: @${REINPLACE_CMD} -e 's,/lib/rsyslog,${PREFIX}/lib/rsyslog,' ${WRKSRC}/tools/syslogd.c @${FIND} ${WRKSRC} -name '*.bak' -delete +post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rsyslog.d + ${INSTALL_DATA} ${FILESDIR}/rsyslog.conf ${STAGEDIR}${PREFIX}/etc/rsyslog.conf.sample + post-install-DOCS-on: .for SQL in ${PORTDOCS:M*.sql} @${MKDIR} ${STAGEDIR}${DOCSDIR}/${SQL:H} diff --git a/sysutils/rsyslog8/files/pkg-message.in b/sysutils/rsyslog8/files/pkg-message.in index 87e6076dbf4e..c9dacc98a087 100644 --- a/sysutils/rsyslog8/files/pkg-message.in +++ b/sysutils/rsyslog8/files/pkg-message.in @@ -1,24 +1,19 @@ [ { type: install message: <=notice /var/log/devd.log +# } + +include(file="/usr/local/etc/rsyslog.d/*.conf" mode="optional") diff --git a/sysutils/rsyslog8/pkg-plist b/sysutils/rsyslog8/pkg-plist index 3546b22d7add..7f512c039c16 100644 --- a/sysutils/rsyslog8/pkg-plist +++ b/sysutils/rsyslog8/pkg-plist @@ -1,3 +1,5 @@ +@dir etc/rsyslog.d +@sample etc/rsyslog.conf.sample lib/rsyslog/fmhash.so lib/rsyslog/fmhttp.so lib/rsyslog/im3195.so