sysutils/logwatch: update to 7.11

- turn static REINPLACE_CMD into patch files - fix dependencies - submitter becomes maintainer PR: 282787 Approved by: trix@basement.net (maintainer timeout)
2024-11-15 16:54:19 +01:00 · 2024-11-15 16:54:19 +01:00 · 69240ce2a1
commit 69240ce2a1
parent 47cfc1e62e
5 changed files with 328 additions and 166 deletions
--- a/sysutils/logwatch/Makefile
+++ b/sysutils/logwatch/Makefile
@ -1,10 +1,9 @@
 PORTNAME=	logwatch
-PORTVERSION=	7.5.1
-PORTREVISION=	1
+DISTVERSION=	7.11
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}

-MAINTAINER=	trix@basement.net
+MAINTAINER=	trashcan@ellael.org
 COMMENT=	Log file analysis program
 WWW=		https://www.logwatch.org

@ -13,6 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 USES=		perl5 shebangfix
 USE_PERL5=	run
+RUN_DEPENDS=	p5-HTML-HTML5-Entities>=0:textproc/p5-HTML-HTML5-Entities
 SHEBANG_FILES=	scripts/logwatch.pl
 PORTDOCS=	HOWTO-Customize-LogWatch README
 NO_BUILD=	yes
@ -21,23 +21,14 @@ MAKE_ENV+=	SITE_PERL_REL=${SITE_PERL_REL}
 OPTIONS_DEFINE=	DOCS

 pre-configure:
-	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
-
-post-patch:
 	${REINPLACE_CMD}  -E \
 	-e "s,/usr/share/logwatch,${LOCALBASE}," \
 	-e "s,/etc/logwatch,${ETCDIR}," \
-	-e 's,^eval "use lib.*,,' \
 	-e "s,.BaseDir/lib,${LIBEXECDIR}," \
-	-e 's,BaseDir/dist.conf,ConfigDir/defaults,' \
-	-e 's,BaseDir/default.conf,ConfigDir/defaults,' \
-	-e 's,ConfigDir/conf,ConfigDir,' \
 	-e "s,BaseDir/scripts/([^/]*)/,BaseDir/libexec/${PORTNAME}/defaults/\1/," \
 	-e "s,ConfigDir/scripts/([^/]*)/,BaseDir/libexec/${PORTNAME}/\1/," \
 	${WRKSRC}/scripts/logwatch.pl
-	${REINPLACE_CMD}  -E \
-	-e "s,/var/cache/logwatch,${LOCALBASE}/var/${PORTNAME}," \
-	${WRKSRC}/conf/logwatch.conf
+	@${CP} ${FILESDIR}/Makefile ${WRKSRC}

 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
--- a/sysutils/logwatch/distinfo
+++ b/sysutils/logwatch/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1548859013
-SHA256 (logwatch-7.5.1.tar.gz) = 9d4a00625065f25058f8966e7fb11f9f72db25507b4dd9c05f57e14447c33295
-SIZE (logwatch-7.5.1.tar.gz) = 469715
+TIMESTAMP = 1731661617
+SHA256 (logwatch-7.11.tar.gz) = 5eb42d983a9667003368b572149fce788c0d7e13daaf1f28ad1bf3a140b865cf
+SIZE (logwatch-7.11.tar.gz) = 513041
--- a/sysutils/logwatch/files/Makefile
+++ b/sysutils/logwatch/files/Makefile
@ -79,6 +79,7 @@ install:
 	rt314 \
 	samba \
 	secure \
+	snort \
 	sonicwall \
 	spamassassin \
 	syslog \
@ -98,6 +99,7 @@ install:
 	automount \
 	autorpm \
 	barracuda \
+	dropbear \
 	bfd \
 	cisco \
 	clam-update \
@ -112,6 +114,7 @@ install:
 	dpkg \
 	emerge \
 	evtapplication \
+	evtmswindows \
 	evtsecurity \
 	evtsystem \
 	exim \
@ -137,6 +140,7 @@ install:
 	named \
 	netopia \
 	netscreen \
+	nut \
 	oidentd \
 	openvpn \
 	pam \
@ -169,6 +173,7 @@ install:
 	shaperd \
 	slon \
 	smartd \
+	snort \
 	sonicwall \
 	spamassassin \
 	sshd \
--- a/sysutils/logwatch/files/patch-scripts_logwatch.pl
+++ b/sysutils/logwatch/files/patch-scripts_logwatch.pl
@ -0,0 +1,157 @@
+--- scripts/logwatch.pl.orig	2024-11-30 10:53:34 UTC
+++ scripts/logwatch.pl
+@@ -61,11 +61,11 @@ use POSIX qw(uname strftime);
+ # SET LIBS, GLOBALS, and DEFAULTS
+ use Getopt::Long;
+ use POSIX qw(uname strftime);
+-use HTML::Entities qw(encode_entities);
+use HTML::HTML5::Entities qw(encode_entities);
+ use File::Temp qw/ tempdir /;
+ use Cwd;
+ 
+-eval "use lib \"$BaseDir/lib\";";
+
+ eval "use Logwatch \':dates\'";
+ 
+ my (%Config, @ServiceList, @LogFileList, %ServiceData, %LogFileData);
+@@ -90,7 +90,7 @@ $Config{'archives'} = 1;
+ $Config{'range'} = "yesterday";
+ $Config{'debug'} = 0;
+ $Config{'archives'} = 1;
+-$Config{'tmpdir'} = "/var/cache/logwatch";
+$Config{'tmpdir'} = "/usr/local/var/logwatch";
+ $Config{'numeric'} = 0;
+ $Config{'pathtocat'} = "cat";
+ $Config{'pathtozcat'} = "zcat";
+@@ -107,20 +107,20 @@ $Config{'appendcwdtologdirs'} = 0;
+ $Config{'appendvarlogtologdirs'} = 1;
+ $Config{'appendcwdtologdirs'} = 0;
+ 
+-if (-e "$ConfigDir/conf/html/header.html") {
+-   $Config{'html_header'} = "$ConfigDir/conf/html/header.html";
+-} elsif (-e "$BaseDir/dist.conf/html/header.html") {
+-   $Config{'html_header'} = "$BaseDir/dist.conf/html/header.html";
+if (-e "$ConfigDir/html/header.html") {
+   $Config{'html_header'} = "$ConfigDir/html/header.html";
+} elsif (-e "$ConfigDir/defaults/html/header.html") {
+   $Config{'html_header'} = "$ConfigDir/defaults/html/header.html";
+ } else {
+-   $Config{'html_header'} = "$BaseDir/default.conf/html/header.html";
+   $Config{'html_header'} = "$ConfigDir/defaults/html/header.html";
+ }
+ 
+-if (-e "$ConfigDir/conf/html/footer.html") {
+-   $Config{'html_footer'} = "$ConfigDir/conf/html/footer.html";
+-} elsif (-e "$BaseDir/dist.conf/html/footer.html") {
+-   $Config{'html_footer'} = "$BaseDir/dist.conf/html/footer.html";
+if (-e "$ConfigDir/html/footer.html") {
+   $Config{'html_footer'} = "$ConfigDir/html/footer.html";
+} elsif (-e "$ConfigDir/defaults/html/footer.html") {
+   $Config{'html_footer'} = "$ConfigDir/defaults/html/footer.html";
+ } else {
+-   $Config{'html_footer'} = "$BaseDir/default.conf/html/footer.html";
+   $Config{'html_footer'} = "$ConfigDir/defaults/html/footer.html";
+ }
+ 
+ #Added to create switches for different os options -mgt
+@@ -158,10 +158,10 @@ if ($Config{'debug'} > 8) {
+ @ReadConfigNames = ();
+ @ReadConfigValues = ();
+ 
+-&ReadConfigFile ("$BaseDir/default.conf/logwatch.conf", "");
+-&ReadConfigFile ("$BaseDir/dist.conf/logwatch.conf", "");
+-&ReadConfigFile ("$ConfigDir/conf/logwatch.conf", "");
+-&ReadConfigFile ("$ConfigDir/conf/override.conf", "logwatch");
+&ReadConfigFile ("$ConfigDir/defaults/logwatch.conf", "");
+&ReadConfigFile ("$ConfigDir/defaults/logwatch.conf", "");
+&ReadConfigFile ("$ConfigDir/logwatch.conf", "");
+&ReadConfigFile ("$ConfigDir/override.conf", "logwatch");
+ 
+ 
+ for (my $i = 0; $i <= $#ReadConfigNames; $i++) {
+@@ -351,7 +351,7 @@ my (@CmdList, @CmdArgList, @Separators, $ThisFile, $co
+ my (@CmdList, @CmdArgList, @Separators, $ThisFile, $count);
+ 
+ 
+-foreach my $ServicesDir ("$BaseDir/default.conf", "$BaseDir/dist.conf", "$ConfigDir/conf") {
+foreach my $ServicesDir ("$ConfigDir/defaults", "$ConfigDir/defaults", "$ConfigDir") {
+    if (-d "$ServicesDir/services") {
+       opendir(SERVICESDIR, "$ServicesDir/services") or
+          die "$ServicesDir $!";
+@@ -375,13 +375,13 @@ foreach my $f (@services) {
+    @ReadConfigValues = ();
+    @Separators = ();
+    push (@Separators, scalar(@ReadConfigNames));
+-   &ReadConfigFile("$BaseDir/default.conf/services/$f", "");
+   &ReadConfigFile("$ConfigDir/defaults/services/$f", "");
+    push (@Separators, scalar(@ReadConfigNames));
+-   &ReadConfigFile("$BaseDir/dist.conf/services/$f", "");
+   &ReadConfigFile("$ConfigDir/defaults/services/$f", "");
+    push (@Separators, scalar(@ReadConfigNames));
+-   &ReadConfigFile("$ConfigDir/conf/services/$f","");
+   &ReadConfigFile("$ConfigDir/services/$f","");
+    push (@Separators, scalar(@ReadConfigNames));
+-   &ReadConfigFile("$ConfigDir/conf/override.conf", "services/$ThisService");
+   &ReadConfigFile("$ConfigDir/override.conf", "services/$ThisService");
+ 
+    @CmdList = ();
+    @CmdArgList = ();
+@@ -420,7 +420,7 @@ my @logfiles = ();
+ 
+ # Find out what logfiles are defined...
+ my @logfiles = ();
+-foreach my $LogfilesDir ("$BaseDir/default.conf", "$BaseDir/dist.conf", "$ConfigDir/conf") {
+foreach my $LogfilesDir ("$ConfigDir/defaults", "$ConfigDir/defaults", "$ConfigDir") {
+    if (-d "$LogfilesDir/logfiles") {
+       opendir(LOGFILEDIR, "$LogfilesDir/logfiles") or
+          die "$LogfilesDir $!";
+@@ -441,13 +441,13 @@ for $ThisFile (@logfiles) {
+          @ReadConfigValues = ();
+          @Separators = ();
+          push (@Separators, scalar(@ReadConfigNames));
+-         &ReadConfigFile("$BaseDir/default.conf/logfiles/$ThisFile", "");
+         &ReadConfigFile("$ConfigDir/defaults/logfiles/$ThisFile", "");
+          push (@Separators, scalar(@ReadConfigNames));
+-         &ReadConfigFile("$BaseDir/dist.conf/logfiles/$ThisFile", "");
+         &ReadConfigFile("$ConfigDir/defaults/logfiles/$ThisFile", "");
+          push (@Separators, scalar(@ReadConfigNames));
+-         &ReadConfigFile("$ConfigDir/conf/logfiles/$ThisFile", "");
+         &ReadConfigFile("$ConfigDir/logfiles/$ThisFile", "");
+          push (@Separators, scalar(@ReadConfigNames));
+-         &ReadConfigFile("$ConfigDir/conf/override.conf", "logfiles/$ThisLogFile");
+         &ReadConfigFile("$ConfigDir/override.conf", "logfiles/$ThisLogFile");
+ 
+          @CmdList = ();
+          @CmdArgList = ();
+@@ -738,7 +738,7 @@ foreach $LogFile (@LogFileList) {
+ foreach $LogFile (@LogFileList) {
+    next if ($LogFile eq 'none');
+ 	if (!defined($LogFileData{$LogFile}{'logfiles'})) {
+-		print "*** Error: There is no logfile defined. Do you have a $ConfigDir/conf/logfiles/" . $LogFile . ".conf file ?\n";
+		print "*** Error: There is no logfile defined. Do you have a $ConfigDir/logfiles/" . $LogFile . ".conf file ?\n";
+ 		next;
+ 	}
+ 
+@@ -1305,16 +1305,16 @@ sub parselogs {
+ 
+    #Load our ignore file order is [assume normal install]  /etc/conf, /usr/share/logwatch/dist.conf and then default.conf -mgt
+    my @IGNORE;
+-   if ( -e "$ConfigDir/conf/ignore.conf") {
+-      open( IGNORE, "$ConfigDir/conf/ignore.conf" )  or return undef;
+   if ( -e "$ConfigDir/ignore.conf") {
+      open( IGNORE, "$ConfigDir/ignore.conf" )  or return undef;
+       @IGNORE = grep {!/(^#|^\s+$)/} <IGNORE>;
+       close IGNORE;
+-   } elsif ( -e "$BaseDir/dist.conf/ignore.conf") {
+-      open( IGNORE, "$BaseDir/dist.conf/ignore.conf" )  or return undef;
+   } elsif ( -e "$ConfigDir/defaults/ignore.conf") {
+      open( IGNORE, "$ConfigDir/defaults/ignore.conf" )  or return undef;
+       @IGNORE = grep {!/(^#|^\s+$)/} <IGNORE>;
+       close IGNORE;
+-   } elsif ( -e "$BaseDir/default.conf/ignore.conf") {
+-      open( IGNORE, "$BaseDir/default.conf/ignore.conf" )  or return undef;
+   } elsif ( -e "$ConfigDir/defaults/ignore.conf") {
+      open( IGNORE, "$ConfigDir/defaults/ignore.conf" )  or return undef;
+       @IGNORE = grep {!/(^#|^\s+$)/} <IGNORE>;
+       close IGNORE;
+    }
--- a/sysutils/logwatch/pkg-plist
+++ b/sysutils/logwatch/pkg-plist
@ -1,152 +1,156 @@
-etc/logwatch/defaults/html/footer.html
-etc/logwatch/defaults/html/header.html
-etc/logwatch/defaults/logfiles/autorpm.conf
-etc/logwatch/defaults/logfiles/bfd.conf
-etc/logwatch/defaults/logfiles/cisco.conf
-etc/logwatch/defaults/logfiles/clam-update.conf
-etc/logwatch/defaults/logfiles/clamav.conf
-etc/logwatch/defaults/logfiles/cron.conf
-etc/logwatch/defaults/logfiles/daemon.conf
-etc/logwatch/defaults/logfiles/denyhosts.conf
-etc/logwatch/defaults/logfiles/dnssec.conf
-etc/logwatch/defaults/logfiles/dovecot.conf
-etc/logwatch/defaults/logfiles/dpkg.conf
-etc/logwatch/defaults/logfiles/emerge.conf
-etc/logwatch/defaults/logfiles/eventlog.conf
-etc/logwatch/defaults/logfiles/exim.conf
-etc/logwatch/defaults/logfiles/extreme-networks.conf
-etc/logwatch/defaults/logfiles/fail2ban.conf
-etc/logwatch/defaults/logfiles/http.conf
-etc/logwatch/defaults/logfiles/http-error.conf
-etc/logwatch/defaults/logfiles/iptables.conf
-etc/logwatch/defaults/logfiles/kernel.conf
-etc/logwatch/defaults/logfiles/maillog.conf
-etc/logwatch/defaults/logfiles/messages.conf
-etc/logwatch/defaults/logfiles/mysql.conf
-etc/logwatch/defaults/logfiles/netopia.conf
-etc/logwatch/defaults/logfiles/netscreen.conf
-etc/logwatch/defaults/logfiles/php.conf
-etc/logwatch/defaults/logfiles/pix.conf
-etc/logwatch/defaults/logfiles/pureftp.conf
-etc/logwatch/defaults/logfiles/qmail-pop3d-current.conf
-etc/logwatch/defaults/logfiles/qmail-pop3ds-current.conf
-etc/logwatch/defaults/logfiles/qmail-send-current.conf
-etc/logwatch/defaults/logfiles/qmail-smtpd-current.conf
-etc/logwatch/defaults/logfiles/resolver.conf
-etc/logwatch/defaults/logfiles/rsnapshot.conf
-etc/logwatch/defaults/logfiles/rt314.conf
-etc/logwatch/defaults/logfiles/samba.conf
-etc/logwatch/defaults/logfiles/secure.conf
-etc/logwatch/defaults/logfiles/sonicwall.conf
-etc/logwatch/defaults/logfiles/spamassassin.conf
-etc/logwatch/defaults/logfiles/syslog.conf
-etc/logwatch/defaults/logfiles/tac_acc.conf
-etc/logwatch/defaults/logfiles/up2date.conf
-etc/logwatch/defaults/logfiles/vsftpd.conf
-etc/logwatch/defaults/logfiles/windows.conf
-etc/logwatch/defaults/logfiles/xferlog.conf
-etc/logwatch/defaults/logfiles/yum.conf
-etc/logwatch/defaults/services/afpd.conf
-etc/logwatch/defaults/services/amavis.conf
-etc/logwatch/defaults/services/arpwatch.conf
-etc/logwatch/defaults/services/audit.conf
-etc/logwatch/defaults/services/automount.conf
-etc/logwatch/defaults/services/autorpm.conf
-etc/logwatch/defaults/services/barracuda.conf
-etc/logwatch/defaults/services/bfd.conf
-etc/logwatch/defaults/services/cisco.conf
-etc/logwatch/defaults/services/clam-update.conf
-etc/logwatch/defaults/services/clamav-milter.conf
-etc/logwatch/defaults/services/clamav.conf
-etc/logwatch/defaults/services/courier.conf
-etc/logwatch/defaults/services/cron.conf
-etc/logwatch/defaults/services/denyhosts.conf
-etc/logwatch/defaults/services/dhcpd.conf
-etc/logwatch/defaults/services/dnssec.conf
-etc/logwatch/defaults/services/dovecot.conf
-etc/logwatch/defaults/services/dpkg.conf
-etc/logwatch/defaults/services/emerge.conf
-etc/logwatch/defaults/services/evtapplication.conf
-etc/logwatch/defaults/services/evtsecurity.conf
-etc/logwatch/defaults/services/evtsystem.conf
-etc/logwatch/defaults/services/exim.conf
-etc/logwatch/defaults/services/eximstats.conf
-etc/logwatch/defaults/services/extreme-networks.conf
-etc/logwatch/defaults/services/fail2ban.conf
-etc/logwatch/defaults/services/fetchmail.conf
-etc/logwatch/defaults/services/ftpd-messages.conf
-etc/logwatch/defaults/services/ftpd-xferlog.conf
-etc/logwatch/defaults/services/http.conf
-etc/logwatch/defaults/services/http-error.conf
-etc/logwatch/defaults/services/identd.conf
-etc/logwatch/defaults/services/imapd.conf
-etc/logwatch/defaults/services/in.qpopper.conf
-etc/logwatch/defaults/services/init.conf
-etc/logwatch/defaults/services/ipop3d.conf
-etc/logwatch/defaults/services/iptables.conf
-etc/logwatch/defaults/services/kernel.conf
-etc/logwatch/defaults/services/mailscanner.conf
-etc/logwatch/defaults/services/modprobe.conf
-etc/logwatch/defaults/services/mountd.conf
-etc/logwatch/defaults/services/mysql.conf
-etc/logwatch/defaults/services/named.conf
-etc/logwatch/defaults/services/netopia.conf
-etc/logwatch/defaults/services/netscreen.conf
-etc/logwatch/defaults/services/oidentd.conf
-etc/logwatch/defaults/services/openvpn.conf
-etc/logwatch/defaults/services/pam.conf
-etc/logwatch/defaults/services/pam_pwdb.conf
-etc/logwatch/defaults/services/pam_unix.conf
-etc/logwatch/defaults/services/php.conf
-etc/logwatch/defaults/services/pix.conf
-etc/logwatch/defaults/services/pluto.conf
-etc/logwatch/defaults/services/pop3.conf
-etc/logwatch/defaults/services/portsentry.conf
-etc/logwatch/defaults/services/postfix.conf
-etc/logwatch/defaults/services/pound.conf
-etc/logwatch/defaults/services/proftpd-messages.conf
-etc/logwatch/defaults/services/pureftpd.conf
-etc/logwatch/defaults/services/qmail-pop3d.conf
-etc/logwatch/defaults/services/qmail-pop3ds.conf
-etc/logwatch/defaults/services/qmail-send.conf
-etc/logwatch/defaults/services/qmail-smtpd.conf
-etc/logwatch/defaults/services/qmail.conf
-etc/logwatch/defaults/services/raid.conf
-etc/logwatch/defaults/services/resolver.conf
-etc/logwatch/defaults/services/rsnapshot.conf
-etc/logwatch/defaults/services/rt314.conf
-etc/logwatch/defaults/services/samba.conf
-etc/logwatch/defaults/services/saslauthd.conf
-etc/logwatch/defaults/services/scsi.conf
-etc/logwatch/defaults/services/secure.conf
-etc/logwatch/defaults/services/sendmail-largeboxes.conf
-etc/logwatch/defaults/services/sendmail.conf
-etc/logwatch/defaults/services/shaperd.conf
-etc/logwatch/defaults/services/slon.conf
-etc/logwatch/defaults/services/smartd.conf
-etc/logwatch/defaults/services/sonicwall.conf
-etc/logwatch/defaults/services/spamassassin.conf
-etc/logwatch/defaults/services/sshd.conf
-etc/logwatch/defaults/services/sshd2.conf
-etc/logwatch/defaults/services/stunnel.conf
-etc/logwatch/defaults/services/sudo.conf
-etc/logwatch/defaults/services/syslogd.conf
-etc/logwatch/defaults/services/syslog-ng.conf
-etc/logwatch/defaults/services/tac_acc.conf
-etc/logwatch/defaults/services/up2date.conf
-etc/logwatch/defaults/services/vpopmail.conf
-etc/logwatch/defaults/services/vsftpd.conf
-etc/logwatch/defaults/services/windows.conf
-etc/logwatch/defaults/services/xntpd.conf
-etc/logwatch/defaults/services/yum.conf
-etc/logwatch/defaults/services/zz-disk_space.conf
-etc/logwatch/defaults/services/zz-network.conf
-etc/logwatch/defaults/services/zz-runtime.conf
-etc/logwatch/defaults/services/zz-sys.conf
-etc/logwatch/defaults/services/zz-zfs.conf
-etc/logwatch/defaults/ignore.conf
-etc/logwatch/defaults/logwatch.conf
-%%SITE_PERL%%/Logwatch.pm
+%%ETCDIR%%/defaults/html/footer.html
+%%ETCDIR%%/defaults/html/header.html
+%%ETCDIR%%/defaults/logfiles/autorpm.conf
+%%ETCDIR%%/defaults/logfiles/bfd.conf
+%%ETCDIR%%/defaults/logfiles/cisco.conf
+%%ETCDIR%%/defaults/logfiles/clam-update.conf
+%%ETCDIR%%/defaults/logfiles/clamav.conf
+%%ETCDIR%%/defaults/logfiles/cron.conf
+%%ETCDIR%%/defaults/logfiles/daemon.conf
+%%ETCDIR%%/defaults/logfiles/denyhosts.conf
+%%ETCDIR%%/defaults/logfiles/dnssec.conf
+%%ETCDIR%%/defaults/logfiles/dovecot.conf
+%%ETCDIR%%/defaults/logfiles/dpkg.conf
+%%ETCDIR%%/defaults/logfiles/emerge.conf
+%%ETCDIR%%/defaults/logfiles/eventlog.conf
+%%ETCDIR%%/defaults/logfiles/exim.conf
+%%ETCDIR%%/defaults/logfiles/extreme-networks.conf
+%%ETCDIR%%/defaults/logfiles/fail2ban.conf
+%%ETCDIR%%/defaults/logfiles/http.conf
+%%ETCDIR%%/defaults/logfiles/http-error.conf
+%%ETCDIR%%/defaults/logfiles/iptables.conf
+%%ETCDIR%%/defaults/logfiles/kernel.conf
+%%ETCDIR%%/defaults/logfiles/maillog.conf
+%%ETCDIR%%/defaults/logfiles/messages.conf
+%%ETCDIR%%/defaults/logfiles/mysql.conf
+%%ETCDIR%%/defaults/logfiles/netopia.conf
+%%ETCDIR%%/defaults/logfiles/netscreen.conf
+%%ETCDIR%%/defaults/logfiles/php.conf
+%%ETCDIR%%/defaults/logfiles/pix.conf
+%%ETCDIR%%/defaults/logfiles/pureftp.conf
+%%ETCDIR%%/defaults/logfiles/qmail-pop3d-current.conf
+%%ETCDIR%%/defaults/logfiles/qmail-pop3ds-current.conf
+%%ETCDIR%%/defaults/logfiles/qmail-send-current.conf
+%%ETCDIR%%/defaults/logfiles/qmail-smtpd-current.conf
+%%ETCDIR%%/defaults/logfiles/resolver.conf
+%%ETCDIR%%/defaults/logfiles/rsnapshot.conf
+%%ETCDIR%%/defaults/logfiles/rt314.conf
+%%ETCDIR%%/defaults/logfiles/samba.conf
+%%ETCDIR%%/defaults/logfiles/secure.conf
+%%ETCDIR%%/defaults/logfiles/snort.conf
+%%ETCDIR%%/defaults/logfiles/sonicwall.conf
+%%ETCDIR%%/defaults/logfiles/spamassassin.conf
+%%ETCDIR%%/defaults/logfiles/syslog.conf
+%%ETCDIR%%/defaults/logfiles/tac_acc.conf
+%%ETCDIR%%/defaults/logfiles/up2date.conf
+%%ETCDIR%%/defaults/logfiles/vsftpd.conf
+%%ETCDIR%%/defaults/logfiles/windows.conf
+%%ETCDIR%%/defaults/logfiles/xferlog.conf
+%%ETCDIR%%/defaults/logfiles/yum.conf
+%%ETCDIR%%/defaults/services/afpd.conf
+%%ETCDIR%%/defaults/services/amavis.conf
+%%ETCDIR%%/defaults/services/arpwatch.conf
+%%ETCDIR%%/defaults/services/audit.conf
+%%ETCDIR%%/defaults/services/automount.conf
+%%ETCDIR%%/defaults/services/autorpm.conf
+%%ETCDIR%%/defaults/services/barracuda.conf
+%%ETCDIR%%/defaults/services/bfd.conf
+%%ETCDIR%%/defaults/services/cisco.conf
+%%ETCDIR%%/defaults/services/clam-update.conf
+%%ETCDIR%%/defaults/services/clamav-milter.conf
+%%ETCDIR%%/defaults/services/clamav.conf
+%%ETCDIR%%/defaults/services/courier.conf
+%%ETCDIR%%/defaults/services/cron.conf
+%%ETCDIR%%/defaults/services/denyhosts.conf
+%%ETCDIR%%/defaults/services/dhcpd.conf
+%%ETCDIR%%/defaults/services/dnssec.conf
+%%ETCDIR%%/defaults/services/dovecot.conf
+%%ETCDIR%%/defaults/services/dpkg.conf
+%%ETCDIR%%/defaults/services/dropbear.conf
+%%ETCDIR%%/defaults/services/emerge.conf
+%%ETCDIR%%/defaults/services/evtapplication.conf
+%%ETCDIR%%/defaults/services/evtmswindows.conf
+%%ETCDIR%%/defaults/services/evtsecurity.conf
+%%ETCDIR%%/defaults/services/evtsystem.conf
+%%ETCDIR%%/defaults/services/exim.conf
+%%ETCDIR%%/defaults/services/eximstats.conf
+%%ETCDIR%%/defaults/services/extreme-networks.conf
+%%ETCDIR%%/defaults/services/fail2ban.conf
+%%ETCDIR%%/defaults/services/fetchmail.conf
+%%ETCDIR%%/defaults/services/ftpd-messages.conf
+%%ETCDIR%%/defaults/services/ftpd-xferlog.conf
+%%ETCDIR%%/defaults/services/http.conf
+%%ETCDIR%%/defaults/services/http-error.conf
+%%ETCDIR%%/defaults/services/identd.conf
+%%ETCDIR%%/defaults/services/imapd.conf
+%%ETCDIR%%/defaults/services/in.qpopper.conf
+%%ETCDIR%%/defaults/services/init.conf
+%%ETCDIR%%/defaults/services/ipop3d.conf
+%%ETCDIR%%/defaults/services/iptables.conf
+%%ETCDIR%%/defaults/services/kernel.conf
+%%ETCDIR%%/defaults/services/mailscanner.conf
+%%ETCDIR%%/defaults/services/modprobe.conf
+%%ETCDIR%%/defaults/services/mountd.conf
+%%ETCDIR%%/defaults/services/mysql.conf
+%%ETCDIR%%/defaults/services/named.conf
+%%ETCDIR%%/defaults/services/netopia.conf
+%%ETCDIR%%/defaults/services/netscreen.conf
+%%ETCDIR%%/defaults/services/nut.conf
+%%ETCDIR%%/defaults/services/oidentd.conf
+%%ETCDIR%%/defaults/services/openvpn.conf
+%%ETCDIR%%/defaults/services/pam.conf
+%%ETCDIR%%/defaults/services/pam_pwdb.conf
+%%ETCDIR%%/defaults/services/pam_unix.conf
+%%ETCDIR%%/defaults/services/php.conf
+%%ETCDIR%%/defaults/services/pix.conf
+%%ETCDIR%%/defaults/services/pluto.conf
+%%ETCDIR%%/defaults/services/pop3.conf
+%%ETCDIR%%/defaults/services/portsentry.conf
+%%ETCDIR%%/defaults/services/postfix.conf
+%%ETCDIR%%/defaults/services/pound.conf
+%%ETCDIR%%/defaults/services/proftpd-messages.conf
+%%ETCDIR%%/defaults/services/pureftpd.conf
+%%ETCDIR%%/defaults/services/qmail-pop3d.conf
+%%ETCDIR%%/defaults/services/qmail-pop3ds.conf
+%%ETCDIR%%/defaults/services/qmail-send.conf
+%%ETCDIR%%/defaults/services/qmail-smtpd.conf
+%%ETCDIR%%/defaults/services/qmail.conf
+%%ETCDIR%%/defaults/services/raid.conf
+%%ETCDIR%%/defaults/services/resolver.conf
+%%ETCDIR%%/defaults/services/rsnapshot.conf
+%%ETCDIR%%/defaults/services/rt314.conf
+%%ETCDIR%%/defaults/services/samba.conf
+%%ETCDIR%%/defaults/services/saslauthd.conf
+%%ETCDIR%%/defaults/services/scsi.conf
+%%ETCDIR%%/defaults/services/secure.conf
+%%ETCDIR%%/defaults/services/sendmail-largeboxes.conf
+%%ETCDIR%%/defaults/services/sendmail.conf
+%%ETCDIR%%/defaults/services/shaperd.conf
+%%ETCDIR%%/defaults/services/slon.conf
+%%ETCDIR%%/defaults/services/smartd.conf
+%%ETCDIR%%/defaults/services/snort.conf
+%%ETCDIR%%/defaults/services/sonicwall.conf
+%%ETCDIR%%/defaults/services/spamassassin.conf
+%%ETCDIR%%/defaults/services/sshd.conf
+%%ETCDIR%%/defaults/services/sshd2.conf
+%%ETCDIR%%/defaults/services/stunnel.conf
+%%ETCDIR%%/defaults/services/sudo.conf
+%%ETCDIR%%/defaults/services/syslogd.conf
+%%ETCDIR%%/defaults/services/syslog-ng.conf
+%%ETCDIR%%/defaults/services/tac_acc.conf
+%%ETCDIR%%/defaults/services/up2date.conf
+%%ETCDIR%%/defaults/services/vpopmail.conf
+%%ETCDIR%%/defaults/services/vsftpd.conf
+%%ETCDIR%%/defaults/services/windows.conf
+%%ETCDIR%%/defaults/services/xntpd.conf
+%%ETCDIR%%/defaults/services/yum.conf
+%%ETCDIR%%/defaults/services/zz-disk_space.conf
+%%ETCDIR%%/defaults/services/zz-network.conf
+%%ETCDIR%%/defaults/services/zz-runtime.conf
+%%ETCDIR%%/defaults/services/zz-sys.conf
+%%ETCDIR%%/defaults/services/zz-zfs.conf
+%%ETCDIR%%/defaults/ignore.conf
+%%ETCDIR%%/defaults/logwatch.conf
 libexec/logwatch/defaults/logfiles/autorpm/applydate
 libexec/logwatch/defaults/logfiles/cron/applydate
 libexec/logwatch/defaults/logfiles/emerge/applydate
@ -176,8 +180,10 @@ libexec/logwatch/defaults/services/dhcpd
 libexec/logwatch/defaults/services/dnssec
 libexec/logwatch/defaults/services/dovecot
 libexec/logwatch/defaults/services/dpkg
+libexec/logwatch/defaults/services/dropbear
 libexec/logwatch/defaults/services/emerge
 libexec/logwatch/defaults/services/evtapplication
+libexec/logwatch/defaults/services/evtmswindows
 libexec/logwatch/defaults/services/evtsecurity
 libexec/logwatch/defaults/services/evtsystem
 libexec/logwatch/defaults/services/exim
@ -203,6 +209,7 @@ libexec/logwatch/defaults/services/mysql
 libexec/logwatch/defaults/services/named
 libexec/logwatch/defaults/services/netopia
 libexec/logwatch/defaults/services/netscreen
+libexec/logwatch/defaults/services/nut
 libexec/logwatch/defaults/services/oidentd
 libexec/logwatch/defaults/services/openvpn
 libexec/logwatch/defaults/services/pam
@ -235,6 +242,7 @@ libexec/logwatch/defaults/services/sendmail-largeboxes
 libexec/logwatch/defaults/services/shaperd
 libexec/logwatch/defaults/services/slon
 libexec/logwatch/defaults/services/smartd
+libexec/logwatch/defaults/services/snort
 libexec/logwatch/defaults/services/sonicwall
 libexec/logwatch/defaults/services/spamassassin
 libexec/logwatch/defaults/services/sshd
@ -273,8 +281,9 @@ libexec/logwatch/defaults/shared/onlyservice
 libexec/logwatch/defaults/shared/remove
 libexec/logwatch/defaults/shared/removeheaders
 libexec/logwatch/defaults/shared/removeservice
-share/man/man8/logwatch.8.gz
 sbin/logwatch.pl
+share/man/man8/logwatch.8.gz
+%%SITE_PERL%%/Logwatch.pm
@dir var/logwatch
@dir etc/logwatch/services
@dir etc/logwatch/logfiles