From owner-dev-commits-ports-all@freebsd.org Wed Sep 22 08:13:51 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CED666ADD59; Wed, 22 Sep 2021 08:13:51 +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 4HDrfR5Nx7z4YwQ; Wed, 22 Sep 2021 08:13:51 +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 992571460F; Wed, 22 Sep 2021 08:13:51 +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 18M8DpEh025966; Wed, 22 Sep 2021 08:13:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18M8DpEg025965; Wed, 22 Sep 2021 08:13:51 GMT (envelope-from git) Date: Wed, 22 Sep 2021 08:13:51 GMT Message-Id: <202109220813.18M8DpEg025965@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 0432ffb9ba1e - 2021Q3 - security/logcheck: Miscellaneous changes and cleanups MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q3 X-Git-Reftype: branch X-Git-Commit: 0432ffb9ba1e1b21b9b326e909997fb959fc4a0c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Sep 2021 08:13:51 -0000 The branch 2021Q3 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=0432ffb9ba1e1b21b9b326e909997fb959fc4a0c commit 0432ffb9ba1e1b21b9b326e909997fb959fc4a0c Author: Yasuhiro Kimura AuthorDate: 2021-08-09 17:26:58 +0000 Commit: Li-Wen Hsu CommitDate: 2021-09-22 08:12:26 +0000 security/logcheck: Miscellaneous changes and cleanups * Replace deprecated @exec keyword with @postexec in plist. * Make owner/group/permission of files/directories under ${DATADIR} and ${ETCDIR} same as upstream as much as possible. * Pet portclippy. * Reformat Makefile with portfmt. PR: 257718 MFH: 2021Q3 (cherry picked from commit f026865e514ab4a99cafa63c99439b40f68d0f58) --- security/logcheck/Makefile | 64 +++++++++++++++++++++++---------------------- security/logcheck/pkg-plist | 5 ++-- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile index be1d4382b89b..3708ef28983f 100644 --- a/security/logcheck/Makefile +++ b/security/logcheck/Makefile @@ -2,6 +2,7 @@ PORTNAME= logcheck PORTVERSION= 1.3.23 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= DEBIAN_POOL DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -13,46 +14,50 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= docbook-to-man>0:textproc/docbook-to-man -RUN_DEPENDS= mime-construct:mail/mime-construct \ +RUN_DEPENDS= bash:shells/bash \ lockfile-create:sysutils/lockfile-progs \ - bash:shells/bash + mime-construct:mail/mime-construct # Enable Perl dependency for logtail script USES= perl5 shebangfix tar:xz - -LOGCHECK_USER= logcheck -LOGCHECK_GROUP= ${LOGCHECK_USER} -USERS= ${LOGCHECK_USER} -GROUPS= ${LOGCHECK_GROUP} - -BASEDIR?= # None. portlint compliance -DBDIR= ${BASEDIR}/var/db/${PORTNAME} -RUNDIR= ${BASEDIR}/var/run/${PORTNAME} - -OPTIONS_DEFINE= CRON DOCS EXAMPLES -CRON_DESC= Install cron script automatically -OPTIONS_DEFAULT=CRON - -WRKSRC= ${WRKDIR}/${PORTNAME} +SHEBANG_FILES= src/detectrotate/*.dtr src/logcheck src/logtail src/logtail2 BINMODE= 755 -SUB_LIST+= LOGCHECK_USER=${LOGCHECK_USER} \ +SUB_FILES= pkg-deinstall pkg-install pkg-message +SUB_LIST+= CRON=${PORT_OPTIONS:MCRON} \ + DBDIR=${DBDIR} \ LOGCHECK_GROUP=${LOGCHECK_GROUP} \ - DBDIR=${DBDIR} CRON=${PORT_OPTIONS:MCRON} -SUB_FILES= pkg-install pkg-deinstall pkg-message -PLIST_SUB+= LOGCHECK_USER=${LOGCHECK_USER} \ + LOGCHECK_USER=${LOGCHECK_USER} +WRKSRC= ${WRKDIR}/${PORTNAME} +USERS= ${LOGCHECK_USER} +GROUPS= ${LOGCHECK_GROUP} +PLIST_SUB+= CHGRP=${CHGRP} \ + CHMOD=${CHMOD} \ + DBDIR=${DBDIR} \ + FIND=${FIND} \ LOGCHECK_GROUP=${LOGCHECK_GROUP} \ - DBDIR=${DBDIR} RUNDIR=${RUNDIR} -SHEBANG_FILES= src/logcheck src/logtail src/logtail2 src/detectrotate/*.dtr -CONFIG_DIRS= cracking.d ignore.d.paranoid ignore.d.server \ - ignore.d.workstation violations.d violations.ignore.d -DOCS= AUTHORS CHANGES CREDITS TODO docs/README* + LOGCHECK_USER=${LOGCHECK_USER} \ + RUNDIR=${RUNDIR} PORTDOCS= ${DOCS:T} -MAN1_FILES= logcheck-test.1 -MAN8_FILES= logcheck.8 logtail.8 logtail2.8 + +OPTIONS_DEFINE= CRON DOCS EXAMPLES +OPTIONS_DEFAULT= CRON +CRON_DESC= Install cron script automatically + +# None. portlint compliance +BASEDIR?= +CONFIG_DIRS= cracking.d ignore.d.paranoid ignore.d.server \ + ignore.d.workstation violations.d violations.ignore.d +DBDIR= ${BASEDIR}/var/db/${PORTNAME} +DOCS= AUTHORS CHANGES CREDITS TODO docs/README* +LOGCHECK_GROUP= ${LOGCHECK_USER} +LOGCHECK_USER= logcheck +MAN1_FILES= logcheck-test.1 +MAN8_FILES= logcheck.8 logtail.8 logtail2.8 REINPLACE_FILES= debian/logcheck.cron.d docs/logcheck.sgml \ docs/logtail2.8 docs/README.logcheck \ docs/README.logcheck-database docs/README.logtail \ etc/logcheck.conf src/logcheck src/logtail2 +RUNDIR= ${BASEDIR}/var/run/${PORTNAME} .include @@ -87,9 +92,6 @@ do-install: ${STAGEDIR}${DATADIR}/detectrotate ${INSTALL_DATA} ${WRKSRC}/debian/logcheck.cron.d \ ${STAGEDIR}${EXAMPLESDIR}/crontab.in - @${ECHO_CMD} '@exec ${CHGRP} -R ${LOGCHECK_GROUP} \ - ${ETCDIR:S|^${PREFIX}/|%D/|} \ - ${DATADIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST} .for i in ${MAN1_FILES} ${INSTALL_MAN} ${WRKSRC}/docs/$i ${STAGEDIR}${MAN1PREFIX}/man/man1 .endfor diff --git a/security/logcheck/pkg-plist b/security/logcheck/pkg-plist index bb689ebe7180..cfc1e81ba9b1 100644 --- a/security/logcheck/pkg-plist +++ b/security/logcheck/pkg-plist @@ -1,7 +1,7 @@ -@mode 640 %%DATADIR%%/detectrotate/10-savelog.dtr %%DATADIR%%/detectrotate/20-logrotate.dtr %%DATADIR%%/detectrotate/30-logrotate-dateext.dtr +@group %%LOGCHECK_GROUP%% %%ETCDIR%%/cracking.d/kernel %%ETCDIR%%/cracking.d/rlogind %%ETCDIR%%/cracking.d/rsh @@ -194,7 +194,7 @@ %%ETCDIR%%/violations.ignore.d/logcheck-sudo @sample %%ETCDIR%%/logcheck.conf.sample @sample %%ETCDIR%%/logcheck.logfiles.sample -@mode +@group bin/logcheck-test man/man1/logcheck-test.1.gz man/man8/logcheck.8.gz @@ -206,3 +206,4 @@ sbin/logtail2 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/crontab.in @dir(%%LOGCHECK_USER%%,%%LOGCHECK_GROUP%%,) %%DBDIR%% @dir(%%LOGCHECK_USER%%,%%LOGCHECK_GROUP%%,) %%RUNDIR%% +@postexec %%FIND%% %%PREFIX%%/%%ETCDIR%%/* -type d -exec %%CHMOD%% 750 {} +