[Midnightbsd-cvs] mports [18296] trunk/security/logcheck: logcheck 1.3.17
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Mar 24 08:28:25 EDT 2015
Revision: 18296
http://svnweb.midnightbsd.org/mports/?rev=18296
Author: laffer1
Date: 2015-03-24 08:28:24 -0400 (Tue, 24 Mar 2015)
Log Message:
-----------
logcheck 1.3.17
Modified Paths:
--------------
trunk/security/logcheck/Makefile
trunk/security/logcheck/distinfo
trunk/security/logcheck/files/extra-patch-src__logcheck.in
trunk/security/logcheck/files/pkg-deinstall.in
trunk/security/logcheck/files/pkg-install.in
trunk/security/logcheck/pkg-descr
trunk/security/logcheck/pkg-plist
Modified: trunk/security/logcheck/Makefile
===================================================================
--- trunk/security/logcheck/Makefile 2015-03-24 12:27:09 UTC (rev 18295)
+++ trunk/security/logcheck/Makefile 2015-03-24 12:28:24 UTC (rev 18296)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= logcheck
-PORTVERSION= 1.3.14
+PORTVERSION= 1.3.17
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -15,27 +15,38 @@
bash:${PORTSDIR}/shells/bash
LOGCHECK_USER= logcheck
-LOGCHECK_UID= 915
-LOGCHECK_GROUP= logcheck
-LOGCHECK_GID= 915
+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
+CRON_DESC= Install cron script automatically
+.if !defined(BATCH)
+OPTIONS_DEFAULT=CRON
+.endif
+
# Enable Perl dependency for logtail script
-USE_PERL5= yes
+USES= perl5 shebangfix tar:xz
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC= ${WRKDIR}/${DISTNAME:S!_!-!}
BINMODE= 755
-SHAREMODE= 640
SUB_LIST+= LOGCHECK_USER=${LOGCHECK_USER} \
- LOGCHECK_UID=${LOGCHECK_UID} \
LOGCHECK_GROUP=${LOGCHECK_GROUP} \
- LOGCHECK_GID=${LOGCHECK_GID} \
- PW=${PW}
+ CRON=${PORT_OPTIONS:MCRON}
SUB_FILES= pkg-install pkg-deinstall pkg-message
+PLIST_SUB+= LOGCHECK_USER=${LOGCHECK_USER} \
+ LOGCHECK_GROUP=${LOGCHECK_GROUP} \
+ DBDIR=${DBDIR} RUNDIR=${RUNDIR}
+SHEBANG_FILES= src/logcheck src/logtail src/logtail2
CONFIG_DIRS= cracking.d ignore.d.paranoid ignore.d.server \
ignore.d.workstation violations.d violations.ignore.d
DOCS= AUTHORS CHANGES CREDITS LICENSE TODO docs/README*
PORTDOCS= ${DOCS:T}
-MAN8= logcheck.8 logtail.8 logtail2.8
+MAN_FILES= logcheck.8 logtail.8 logtail2.8
PATCH_LIST= extra-patch-debian__logcheck.cron.d \
extra-patch-docs__logcheck.8 \
@@ -44,59 +55,49 @@
extra-patch-src__logtail2
EXTRA_PATCHES= ${PATCH_LIST:C|^|${WRKDIR}/|g}
+.include <bsd.port.pre.mk>
+
pre-patch:
.for patch in ${PATCH_LIST}
@${SED} ${_SUB_LIST_TEMP} ${FILESDIR}/${patch}.in > ${WRKDIR}/${patch}
.endfor
+post-patch:
+ @${FIND} ${WRKSRC}/rulefiles -type f -name \*.orig -delete
+
do-build:
@${REINPLACE_CMD} -e 's!/var/log/syslog!/var/log/messages!' \
${WRKSRC}/etc/logcheck.logfiles
- @${REINPLACE_CMD} -e "s|#!/usr/bin/perl|#!${PERL}|" \
- ${WRKSRC}/src/logtail
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/src/logcheck ${PREFIX}/sbin
- ${INSTALL_SCRIPT} ${WRKSRC}/src/logtail ${PREFIX}/sbin
- ${INSTALL_SCRIPT} ${WRKSRC}/src/logtail2 ${PREFIX}/sbin
- @PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
- @${INSTALL} -d /var/db/logcheck
- @${INSTALL} -d /var/run/logcheck
- ${CHOWN} ${LOGCHECK_USER}:${LOGCHECK_GROUP} /var/db/logcheck
- @${ECHO_CMD} '@exec ${CHOWN} -R ${LOGCHECK_USER}:${LOGCHECK_GROUP} \
- /var/db/logcheck' >> ${TMPPLIST}
- ${CHOWN} ${LOGCHECK_USER}:${LOGCHECK_GROUP} /var/run/logcheck
- @${ECHO_CMD} '@exec ${CHOWN} -R ${LOGCHECK_USER}:${LOGCHECK_GROUP} \
- /var/run/logcheck' >> ${TMPPLIST}
- @${INSTALL} -d ${ETCDIR}
- @${INSTALL_DATA} ${WRKSRC}/etc/logcheck.conf \
- ${ETCDIR}/logcheck.conf.sample
- @${INSTALL_DATA} ${WRKSRC}/etc/logcheck.logfiles \
- ${ETCDIR}/logcheck.logfiles.sample
+ @${MKDIR} ${STAGEDIR}${DATADIR}/detectrotate \
+ ${STAGEDIR}${DBDIR} \
+ ${STAGEDIR}${DOCSDIR} \
+ ${STAGEDIR}${ETCDIR} \
+ ${STAGEDIR}${EXAMPLESDIR} \
+ ${STAGEDIR}${RUNDIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/logcheck ${STAGEDIR}${PREFIX}/sbin
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/logtail ${STAGEDIR}${PREFIX}/sbin
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/logtail2 ${STAGEDIR}${PREFIX}/sbin
+ ${INSTALL_DATA} ${WRKSRC}/etc/logcheck.conf \
+ ${STAGEDIR}${ETCDIR}/logcheck.conf.sample
+ ${INSTALL_DATA} ${WRKSRC}/etc/logcheck.logfiles \
+ ${STAGEDIR}${ETCDIR}/logcheck.logfiles.sample
.for i in ${CONFIG_DIRS}
- @${INSTALL} -d ${ETCDIR}/${i}
- @${INSTALL_DATA} ${WRKSRC}/rulefiles/linux/${i}/* ${ETCDIR}/${i}
+ @${MKDIR} ${STAGEDIR}${ETCDIR}/${i}
+ ${INSTALL_DATA} ${WRKSRC}/rulefiles/linux/${i}/* \
+ ${STAGEDIR}${ETCDIR}/${i}
.endfor
- @${INSTALL} -d ${DATADIR}/detectrotate
- @${INSTALL_DATA} ${WRKSRC}/src/detectrotate/*.dtr ${DATADIR}/detectrotate
-.if !defined(NOPORTEXAMPLES)
- @${INSTALL} -d ${EXAMPLESDIR}
- @${INSTALL_DATA} ${WRKSRC}/debian/logcheck.cron.d \
- ${EXAMPLESDIR}/crontab.in
-.endif
- ${CHOWN} -R root:${LOGCHECK_GROUP} ${ETCDIR}
- @${ECHO_CMD} '@exec ${CHOWN} -R root:${LOGCHECK_GROUP} \
- ${ETCDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
- ${CHOWN} -R root:${LOGCHECK_GROUP} ${DATADIR}
- @${ECHO_CMD} '@exec ${CHOWN} -R root:${LOGCHECK_GROUP} \
+ ${INSTALL_DATA} ${WRKSRC}/src/detectrotate/*.dtr \
+ ${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}
- @${INSTALL_MAN} ${WRKSRC}/docs/*.8 ${MAN8PREFIX}/man/man8
+.for i in ${MAN_FILES}
+ ${INSTALL_MAN} ${WRKSRC}/docs/$i ${STAGEDIR}${MAN8PREFIX}/man/man8
+.endfor
+ cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-post-install:
-.if !defined(NOPORTDOCS)
- @${INSTALL} -d ${DOCSDIR}
- @cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
- @${CHMOD} 644 ${DOCSDIR}/*
-.endif
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: trunk/security/logcheck/distinfo
===================================================================
--- trunk/security/logcheck/distinfo 2015-03-24 12:27:09 UTC (rev 18295)
+++ trunk/security/logcheck/distinfo 2015-03-24 12:28:24 UTC (rev 18296)
@@ -1,3 +1,2 @@
-SHA256 (logcheck_1.3.14.tar.gz) = aba50525b075e6b3446e18ff70b85d0704c82bcf80a5e21e4a5d2c27c555f6b0
-RMD160 (logcheck_1.3.14.tar.gz) = 27e46ce8de2f7182dd628c57209fbbde3a9572c1
-SIZE (logcheck_1.3.14.tar.gz) = 161518
+SHA256 (logcheck_1.3.17.tar.xz) = c2d3fc323e8c6555e91d956385dbfd0f67b55872ed0f6a7ad8ad2526a9faf03a
+SIZE (logcheck_1.3.17.tar.xz) = 130956
Modified: trunk/security/logcheck/files/extra-patch-src__logcheck.in
===================================================================
--- trunk/security/logcheck/files/extra-patch-src__logcheck.in 2015-03-24 12:27:09 UTC (rev 18295)
+++ trunk/security/logcheck/files/extra-patch-src__logcheck.in 2015-03-24 12:28:24 UTC (rev 18296)
@@ -1,11 +1,5 @@
--- src/logcheck.orig 2010-07-07 15:59:57.000000000 -0400
+++ src/logcheck 2010-07-07 16:19:33.000000000 -0400
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!%%LOCALBASE%%/bin/bash
- #
- # Copyright (C) 2004-2010 Debian Logcheck Team
- # <logcheck-devel at alioth.lists.debian.org>
@@ -24,17 +24,10 @@
if [ `id -u` = 0 ]; then
@@ -49,7 +43,7 @@
SORTUNIQ=0
SUPPORT_CRACKING_IGNORE=0
SYSLOGSUMMARY=0
--LOCKDIR=/var/lock/logcheck
+-LOCKDIR=/run/lock/logcheck
+LOCKDIR=/var/run/logcheck
LOCKFILE="$LOCKDIR/logcheck"
Modified: trunk/security/logcheck/files/pkg-deinstall.in
===================================================================
--- trunk/security/logcheck/files/pkg-deinstall.in 2015-03-24 12:27:09 UTC (rev 18295)
+++ trunk/security/logcheck/files/pkg-deinstall.in 2015-03-24 12:28:24 UTC (rev 18296)
@@ -21,13 +21,5 @@
rm -f /var/cron/tabs/${user}
echo "---> Removed crontab for \"${user}\"."
fi
-
- if %%PW%% user show ${user} > /dev/null 2>&1; then
- %%PW%% user del ${user}
- echo "---> Removed user \"${user}\" and group \"${group}\"."
- fi
- if %%PW%% group show ${group} > /dev/null 2>&1; then
- %%PW%% group del ${group}
- fi
;;
esac
Modified: trunk/security/logcheck/files/pkg-install.in
===================================================================
--- trunk/security/logcheck/files/pkg-install.in 2015-03-24 12:27:09 UTC (rev 18295)
+++ trunk/security/logcheck/files/pkg-install.in 2015-03-24 12:28:24 UTC (rev 18296)
@@ -1,30 +1,12 @@
#!/bin/sh
user="%%LOGCHECK_USER%%"
-uid="%%LOGCHECK_UID%%"
group="%%LOGCHECK_GROUP%%"
-gid="%%LOGCHECK_GID%%"
-descr="Logcheck system account"
-homedir="/var/db/logcheck"
-shell="%%LOCALBASE%%/bin/bash"
configfiles="logcheck.conf logcheck.logfiles"
case $2 in
-PRE-INSTALL)
- if %%PW%% group show ${group} > /dev/null 2>&1; then
- echo "---> You already have a group \"${group}\", so I will use it."
- else
- %%PW%% group add "${group}" -g "${gid}"
- echo "---> Created group \"${group}\"."
- fi
- if %%PW%% user show ${user} > /dev/null 2>&1; then
- echo "---> You already have a user \"${user}\", so I will use it."
- else
- %%PW%% user add -n ${user} -c "${descr}" -d "${homedir}" -s "${shell}" -g ${group} -u "${uid}"
- echo "---> Created user \"${user}\"."
- fi
-;;
POST-INSTALL)
+ if [ "%%CRON%%" = "CRON" ]; then
if [ -f %%EXAMPLESDIR%%/crontab.in ] ; then
if /usr/bin/crontab -u "${user}" -l >/tmp/logchecktab$$ 2>&1 ; then
if test -s /tmp/logchecktab$$; then
@@ -48,6 +30,13 @@
fi
rm -f /tmp/logchecktab$$
fi
+ else
+ echo "---> Crontab file was not installed for user \"${user}\""
+ if [ -f %%EXAMPLESDIR%%/crontab.in ]; then
+ echo "---> A sample crontab file can be found in %%EXAMPLESDIR%%/crontab.in"
+ echo "---> for manual installation."
+ fi
+ fi
for f in ${configfiles}; do
if [ ! -e %%PREFIX%%/etc/logcheck/${f} ]; then
Modified: trunk/security/logcheck/pkg-descr
===================================================================
--- trunk/security/logcheck/pkg-descr 2015-03-24 12:27:09 UTC (rev 18295)
+++ trunk/security/logcheck/pkg-descr 2015-03-24 12:28:24 UTC (rev 18296)
@@ -4,4 +4,4 @@
in your logfiles automatically and will send the summaries to you
via e-mail. Logcheck is run as a cron job.
-WWW: http://alioth.debian.org/projects/logcheck/
+WWW: http://logcheck.alioth.debian.org/
Modified: trunk/security/logcheck/pkg-plist
===================================================================
--- trunk/security/logcheck/pkg-plist 2015-03-24 12:27:09 UTC (rev 18295)
+++ trunk/security/logcheck/pkg-plist 2015-03-24 12:28:24 UTC (rev 18296)
@@ -1,3 +1,4 @@
+ at mode 640
%%ETCDIR%%/cracking.d/kernel
%%ETCDIR%%/cracking.d/rlogind
%%ETCDIR%%/cracking.d/rsh
@@ -46,9 +47,9 @@
%%ETCDIR%%/ignore.d.server/dhcp
%%ETCDIR%%/ignore.d.server/dictd
%%ETCDIR%%/ignore.d.server/dkfilter
-%%ETCDIR%%/ignore.d.server/dkim-filter
%%ETCDIR%%/ignore.d.server/dnsmasq
%%ETCDIR%%/ignore.d.server/dovecot
+%%ETCDIR%%/ignore.d.server/dropbear
%%ETCDIR%%/ignore.d.server/dspam
%%ETCDIR%%/ignore.d.server/epmd
%%ETCDIR%%/ignore.d.server/exim4
@@ -101,7 +102,6 @@
%%ETCDIR%%/ignore.d.server/pptpd
%%ETCDIR%%/ignore.d.server/procmail
%%ETCDIR%%/ignore.d.server/proftpd
-%%ETCDIR%%/ignore.d.server/puppetd
%%ETCDIR%%/ignore.d.server/pure-ftpd
%%ETCDIR%%/ignore.d.server/pureftp
%%ETCDIR%%/ignore.d.server/qpopper
@@ -159,6 +159,7 @@
%%ETCDIR%%/ignore.d.workstation/kdm
%%ETCDIR%%/ignore.d.workstation/kernel
%%ETCDIR%%/ignore.d.workstation/laptop-mode-tools
+%%ETCDIR%%/ignore.d.workstation/libmtp-runtime
%%ETCDIR%%/ignore.d.workstation/libpam-gnome-keyring
%%ETCDIR%%/ignore.d.workstation/logcheck
%%ETCDIR%%/ignore.d.workstation/login
@@ -190,22 +191,13 @@
%%DATADIR%%/detectrotate/10-savelog.dtr
%%DATADIR%%/detectrotate/20-logrotate.dtr
%%DATADIR%%/detectrotate/30-logrotate-dateext.dtr
+ at mode
+man/man8/logcheck.8.gz
+man/man8/logtail.8.gz
+man/man8/logtail2.8.gz
sbin/logcheck
sbin/logtail
sbin/logtail2
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crontab.in
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
- at dirrm %%ETCDIR%%/violations.ignore.d
- at dirrm %%ETCDIR%%/violations.d
- at dirrm %%ETCDIR%%/ignore.d.workstation
- at dirrm %%ETCDIR%%/ignore.d.server
- at dirrm %%ETCDIR%%/ignore.d.paranoid
- at dirrm %%ETCDIR%%/cracking.d
- at dirrm %%ETCDIR%%
- at dirrm %%DATADIR%%/detectrotate
- at dirrm %%DATADIR%%
- at cwd /
- at exec mkdir -p %%DBDIR%%
- at dirrmtry %%DBDIR%%
- at exec mkdir -p %%RUNDIR%%
- at dirrmtry %%RUNDIR%%
+ at dir(%%LOGCHECK_USER%%,%%LOGCHECK_GROUP%%,) %%DBDIR%%
+ at dir(%%LOGCHECK_USER%%,%%LOGCHECK_GROUP%%,) %%RUNDIR%%
More information about the Midnightbsd-cvs
mailing list