diff options
-rw-r--r-- | security/logcheck/Makefile | 13 | ||||
-rw-r--r-- | security/logcheck/distinfo | 6 | ||||
-rw-r--r-- | security/logcheck/files/extra-patch-src__logcheck.in | 6 | ||||
-rw-r--r-- | security/logcheck/files/extra-patch-src__logtail2.in | 11 | ||||
-rw-r--r-- | security/logcheck/pkg-plist | 30 |
5 files changed, 56 insertions, 10 deletions
diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile index ec045d679687..df6f5aeebe01 100644 --- a/security/logcheck/Makefile +++ b/security/logcheck/Makefile @@ -6,8 +6,7 @@ # PORTNAME= logcheck -PORTVERSION= 1.2.54 -PORTREVISION= 5 +PORTVERSION= 1.2.69 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -18,6 +17,8 @@ COMMENT= Auditing tool for system logs on Unix boxes RUN_DEPENDS= lockfile:${PORTSDIR}/mail/procmail \ bash:${PORTSDIR}/shells/bash +PORTSCOUT= limit:^1\.2\. + LOGCHECK_USER= logcheck LOGCHECK_UID= 915 LOGCHECK_GROUP= ${LOGCHECK_USER} @@ -38,12 +39,13 @@ 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 +MAN8= logcheck.8 logtail.8 logtail2.8 PATCH_LIST= extra-patch-debian__logcheck.cron.d \ extra-patch-docs__logcheck.8 \ extra-patch-etc__logcheck.conf \ - extra-patch-src__logcheck + extra-patch-src__logcheck \ + extra-patch-src__logtail2 EXTRA_PATCHES= ${PATCH_LIST:C|^|${WRKDIR}/|g} pre-patch: @@ -60,6 +62,7 @@ do-build: 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 @@ -78,6 +81,8 @@ do-install: @${INSTALL} -d ${ETCDIR}/${i} @${INSTALL_DATA} ${WRKSRC}/rulefiles/linux/${i}/* ${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 \ diff --git a/security/logcheck/distinfo b/security/logcheck/distinfo index ecea6b49e342..2abf1f3a489d 100644 --- a/security/logcheck/distinfo +++ b/security/logcheck/distinfo @@ -1,3 +1,3 @@ -MD5 (logcheck_1.2.54.tar.gz) = bbb6fce8987503d7677441d7154fb598 -SHA256 (logcheck_1.2.54.tar.gz) = a15c177211bbd12cef482a0b8fbdd6d32bc6ff7172f0ec54257ca1c68f921b3a -SIZE (logcheck_1.2.54.tar.gz) = 141094 +MD5 (logcheck_1.2.69.tar.gz) = 7d1671e762d3b99fb1832e0c01edf9fe +SHA256 (logcheck_1.2.69.tar.gz) = c1c8438f098d09554a857c68db09f4076b7a868818fb9e5d158a802127176ecf +SIZE (logcheck_1.2.69.tar.gz) = 145023 diff --git a/security/logcheck/files/extra-patch-src__logcheck.in b/security/logcheck/files/extra-patch-src__logcheck.in index f06d96a78bb2..c6850f98d304 100644 --- a/security/logcheck/files/extra-patch-src__logcheck.in +++ b/security/logcheck/files/extra-patch-src__logcheck.in @@ -35,13 +35,13 @@ -STATEDIR="/var/lib/logcheck" -LOGFILES_LIST="/etc/logcheck/logcheck.logfiles" -LOGFILE_FALLBACK="/var/log/syslog" --LOGTAIL="/usr/sbin/logtail" +-LOGTAIL="/usr/sbin/logtail2" +RULEDIR="%%ETCDIR%%" +CONFFILE="%%ETCDIR%%/logcheck.conf" +STATEDIR="/var/db/logcheck" +LOGFILES_LIST="%%ETCDIR%%/logcheck.logfiles" +LOGFILE_FALLBACK="/var/log/messages" -+LOGTAIL="%%PREFIX%%/sbin/logtail" ++LOGTAIL="%%PREFIX%%/sbin/logtail2 CAT="/bin/cat" SYSLOG_SUMMARY="/usr/bin/syslog-summary" @@ -172,7 +172,7 @@ fi # Create the secure temporary directory or exit --TMPDIR=$(mktemp -d -p /tmp logcheck.XXXXXX) \ +-TMPDIR=$(mktemp -d -p ${TMP:-/tmp} logcheck.XXXXXX) \ - || TMPDIR=$(mktemp -d -p /var/tmp logcheck.XXXXXX) \ +TMPDIR=$(mktemp -d /tmp/logcheck.XXXXXX) \ + || TMPDIR=$(mktemp -d /var/tmp/logcheck.XXXXXX) \ diff --git a/security/logcheck/files/extra-patch-src__logtail2.in b/security/logcheck/files/extra-patch-src__logtail2.in new file mode 100644 index 000000000000..8c145bd7f7f0 --- /dev/null +++ b/security/logcheck/files/extra-patch-src__logtail2.in @@ -0,0 +1,11 @@ +--- src/logtail2.orig 2010-01-18 17:24:26.000000000 -0500 ++++ src/logtail2 2010-01-18 17:24:40.000000000 -0500 +@@ -108,7 +108,7 @@ + # function with dateext magic added. + + #print "determine_rotated_logfile $filename $inode\n"; +- for my $codefile (glob("/usr/share/logtail/detectrotate/*.dtr")) { ++ for my $codefile (glob("%%DATADIR%%/detectrotate/*.dtr")) { + my $func = do $codefile; + if (!$func) { + print STDERR "cannot compile $codefile: $!"; diff --git a/security/logcheck/pkg-plist b/security/logcheck/pkg-plist index 1cc35e3c53a7..53c06bc07c1e 100644 --- a/security/logcheck/pkg-plist +++ b/security/logcheck/pkg-plist @@ -2,6 +2,7 @@ %%ETCDIR%%/cracking.d/smartd %%ETCDIR%%/ignore.d.paranoid/bind %%ETCDIR%%/ignore.d.paranoid/cron +%%ETCDIR%%/ignore.d.paranoid/incron %%ETCDIR%%/ignore.d.paranoid/logcheck %%ETCDIR%%/ignore.d.paranoid/postfix %%ETCDIR%%/ignore.d.paranoid/ppp @@ -12,6 +13,7 @@ %%ETCDIR%%/ignore.d.paranoid/sysklogd %%ETCDIR%%/ignore.d.paranoid/telnetd %%ETCDIR%%/ignore.d.paranoid/tripwire +%%ETCDIR%%/ignore.d.server/acpid %%ETCDIR%%/ignore.d.server/amandad %%ETCDIR%%/ignore.d.server/anacron %%ETCDIR%%/ignore.d.server/anon-proxy @@ -31,20 +33,25 @@ %%ETCDIR%%/ignore.d.server/cvsd %%ETCDIR%%/ignore.d.server/cyrus %%ETCDIR%%/ignore.d.server/dcc +%%ETCDIR%%/ignore.d.server/ddclient %%ETCDIR%%/ignore.d.server/dhclient %%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/dspam %%ETCDIR%%/ignore.d.server/epmd %%ETCDIR%%/ignore.d.server/exim4 +%%ETCDIR%%/ignore.d.server/ftpd +%%ETCDIR%%/ignore.d.server/gnu-imap4d %%ETCDIR%%/ignore.d.server/gps %%ETCDIR%%/ignore.d.server/grinch %%ETCDIR%%/ignore.d.server/horde3 %%ETCDIR%%/ignore.d.server/hplip %%ETCDIR%%/ignore.d.server/hylafax +%%ETCDIR%%/ignore.d.server/ikiwiki %%ETCDIR%%/ignore.d.server/imap %%ETCDIR%%/ignore.d.server/imapproxy %%ETCDIR%%/ignore.d.server/imp @@ -55,6 +62,8 @@ %%ETCDIR%%/ignore.d.server/isdnutils %%ETCDIR%%/ignore.d.server/jabberd %%ETCDIR%%/ignore.d.server/kernel +%%ETCDIR%%/ignore.d.server/krb5-kdc +%%ETCDIR%%/ignore.d.server/libpam-mount %%ETCDIR%%/ignore.d.server/logcheck %%ETCDIR%%/ignore.d.server/lpr %%ETCDIR%%/ignore.d.server/maradns @@ -68,6 +77,7 @@ %%ETCDIR%%/ignore.d.server/ntp %%ETCDIR%%/ignore.d.server/oidentd %%ETCDIR%%/ignore.d.server/openvpn +%%ETCDIR%%/ignore.d.server/otrs %%ETCDIR%%/ignore.d.server/pdns %%ETCDIR%%/ignore.d.server/perdition %%ETCDIR%%/ignore.d.server/policyd @@ -76,7 +86,9 @@ %%ETCDIR%%/ignore.d.server/postfix-policyd %%ETCDIR%%/ignore.d.server/ppp %%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/qpopper %%ETCDIR%%/ignore.d.server/rbldnsd @@ -86,10 +98,13 @@ %%ETCDIR%%/ignore.d.server/sa-exim %%ETCDIR%%/ignore.d.server/samba %%ETCDIR%%/ignore.d.server/saned +%%ETCDIR%%/ignore.d.server/sasl2-bin %%ETCDIR%%/ignore.d.server/saslauthd +%%ETCDIR%%/ignore.d.server/schroot %%ETCDIR%%/ignore.d.server/scponly %%ETCDIR%%/ignore.d.server/slapd %%ETCDIR%%/ignore.d.server/smartd +%%ETCDIR%%/ignore.d.server/smbd_audit %%ETCDIR%%/ignore.d.server/smokeping %%ETCDIR%%/ignore.d.server/snmpd %%ETCDIR%%/ignore.d.server/snort @@ -100,17 +115,23 @@ %%ETCDIR%%/ignore.d.server/stunnel %%ETCDIR%%/ignore.d.server/sympa %%ETCDIR%%/ignore.d.server/syslogd +%%ETCDIR%%/ignore.d.server/teapop +%%ETCDIR%%/ignore.d.server/telnetd %%ETCDIR%%/ignore.d.server/tftpd %%ETCDIR%%/ignore.d.server/thy %%ETCDIR%%/ignore.d.server/ucd-snmp +%%ETCDIR%%/ignore.d.server/upsd %%ETCDIR%%/ignore.d.server/uptimed %%ETCDIR%%/ignore.d.server/userv +%%ETCDIR%%/ignore.d.server/vsftpd %%ETCDIR%%/ignore.d.server/watchdog %%ETCDIR%%/ignore.d.server/webmin +%%ETCDIR%%/ignore.d.server/wu-ftpd %%ETCDIR%%/ignore.d.server/xinetd %%ETCDIR%%/ignore.d.workstation/automount %%ETCDIR%%/ignore.d.workstation/bind %%ETCDIR%%/ignore.d.workstation/bluez-utils +%%ETCDIR%%/ignore.d.workstation/bluetooth-alsa %%ETCDIR%%/ignore.d.workstation/bonobo %%ETCDIR%%/ignore.d.workstation/francine %%ETCDIR%%/ignore.d.workstation/gconf @@ -135,6 +156,7 @@ %%ETCDIR%%/ignore.d.workstation/wdm %%ETCDIR%%/ignore.d.workstation/winbind %%ETCDIR%%/ignore.d.workstation/xdm +%%ETCDIR%%/ignore.d.workstation/xlockmore %%ETCDIR%%/logcheck.conf.sample %%ETCDIR%%/logcheck.logfiles.sample %%ETCDIR%%/violations.d/kernel @@ -156,11 +178,13 @@ %%ETCDIR%%/violations.ignore.d/logcheck-mon %%ETCDIR%%/violations.ignore.d/logcheck-nagios %%ETCDIR%%/violations.ignore.d/logcheck-openvpn +%%ETCDIR%%/violations.ignore.d/logcheck-passwd %%ETCDIR%%/violations.ignore.d/logcheck-pdns %%ETCDIR%%/violations.ignore.d/logcheck-postfix %%ETCDIR%%/violations.ignore.d/logcheck-proftpd %%ETCDIR%%/violations.ignore.d/logcheck-pureftp %%ETCDIR%%/violations.ignore.d/logcheck-samba +%%ETCDIR%%/violations.ignore.d/logcheck-sasl2-bin %%ETCDIR%%/violations.ignore.d/logcheck-saslauthd %%ETCDIR%%/violations.ignore.d/logcheck-sendmail_tmp %%ETCDIR%%/violations.ignore.d/logcheck-smartd @@ -171,8 +195,12 @@ %%ETCDIR%%/violations.ignore.d/logcheck-sudo %%ETCDIR%%/violations.ignore.d/logcheck-usb %%ETCDIR%%/violations.ignore.d/logcheck-winbind +%%DATADIR%%/detectrotate/10-savelog.dtr +%%DATADIR%%/detectrotate/20-logrotate.dtr +%%DATADIR%%/detectrotate/30-logrotate-dateext.dtr sbin/logcheck sbin/logtail +sbin/logtail2 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/crontab.in %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% @dirrm %%ETCDIR%%/violations.ignore.d @@ -182,6 +210,8 @@ sbin/logtail @dirrm %%ETCDIR%%/ignore.d.paranoid @dirrm %%ETCDIR%%/cracking.d @dirrm %%ETCDIR%% +@dirrm %%DATADIR%%/detectrotate +@dirrm %%DATADIR%% @exec mkdir -p /var/db/logcheck @dirrmtry /var/db/logcheck @exec mkdir -p /var/run/logcheck |