summaryrefslogtreecommitdiff
path: root/sysutils/logwatch
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/logwatch')
-rw-r--r--sysutils/logwatch/Makefile7
-rw-r--r--sysutils/logwatch/distinfo6
-rw-r--r--sysutils/logwatch/files/Makefile2
-rw-r--r--sysutils/logwatch/files/patch-scripts_logwatch.pl52
-rw-r--r--sysutils/logwatch/files/patch-scripts_services_syslog-ng11
-rw-r--r--sysutils/logwatch/files/pkg-message.in20
-rw-r--r--sysutils/logwatch/pkg-plist2
7 files changed, 43 insertions, 57 deletions
diff --git a/sysutils/logwatch/Makefile b/sysutils/logwatch/Makefile
index cd053e2ba376..c9f09d893f6e 100644
--- a/sysutils/logwatch/Makefile
+++ b/sysutils/logwatch/Makefile
@@ -1,6 +1,5 @@
PORTNAME= logwatch
-DISTVERSION= 7.12
-PORTREVISION= 1
+DISTVERSION= 7.13
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${DISTVERSION}
@@ -11,8 +10,6 @@ WWW= https://www.logwatch.org
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= p5-HTML-HTML5-Entities>=0:textproc/p5-HTML-HTML5-Entities
-
USES= perl5 shebangfix
USE_PERL5= run
@@ -23,6 +20,8 @@ MAKE_ENV+= SITE_PERL_REL=${SITE_PERL_REL}
NO_ARCH= yes
NO_BUILD= yes
+SUB_FILES= pkg-message
+
PORTDOCS= HOWTO-Customize-LogWatch README
OPTIONS_DEFINE= DATEMANIP DOCS
diff --git a/sysutils/logwatch/distinfo b/sysutils/logwatch/distinfo
index b2e22f5076c4..ad7668fb216c 100644
--- a/sysutils/logwatch/distinfo
+++ b/sysutils/logwatch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737538100
-SHA256 (logwatch-7.12.tar.gz) = 9b87f3f1122d4b6c9b3d77faca40ab98452225cae50019aad761ebd6b01b84d8
-SIZE (logwatch-7.12.tar.gz) = 509278
+TIMESTAMP = 1753253303
+SHA256 (logwatch-7.13.tar.gz) = 0c9a10c2d8e5bc0cb10e16dc86c83be60d71d8a52b97bca785c64a30ed642839
+SIZE (logwatch-7.13.tar.gz) = 514042
diff --git a/sysutils/logwatch/files/Makefile b/sysutils/logwatch/files/Makefile
index e0ee30944e2b..319d76411983 100644
--- a/sysutils/logwatch/files/Makefile
+++ b/sysutils/logwatch/files/Makefile
@@ -3,7 +3,7 @@ PREFIX?=/usr/local/${PORTNAME}
ETCDIR?=${PREFIX}/etc/${PORTNAME}
LIBDIR?=${PREFIX}/lib/${PORTNAME}
LIBEXECDIR?=${PREFIX}/libexec/${PORTNAME}
-CACHEDIR?=${PREFIX}/var/${PORTNAME}
+CACHEDIR?=/var/cache/${PORTNAME}
MANDIR?=${PREFIX}/share/man
MAN8DIR?=${MANDIR}/man8
SITE_PERL= ${PREFIX}/${SITE_PERL_REL}
diff --git a/sysutils/logwatch/files/patch-scripts_logwatch.pl b/sysutils/logwatch/files/patch-scripts_logwatch.pl
index c6c084f83529..be8b4c9a1faa 100644
--- a/sysutils/logwatch/files/patch-scripts_logwatch.pl
+++ b/sysutils/logwatch/files/patch-scripts_logwatch.pl
@@ -1,29 +1,6 @@
---- scripts/logwatch.pl.orig 2024-11-30 10:53:34 UTC
+--- scripts/logwatch.pl.orig 2025-07-21 23:56:15 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;
+@@ -106,20 +106,20 @@ $Config{'appendcwdtologdirs'} = 0;
$Config{'appendvarlogtologdirs'} = 1;
$Config{'appendcwdtologdirs'} = 0;
@@ -54,7 +31,7 @@
}
#Added to create switches for different os options -mgt
-@@ -158,10 +158,10 @@ if ($Config{'debug'} > 8) {
+@@ -157,10 +157,10 @@ if ($Config{'debug'} > 8) {
@ReadConfigNames = ();
@ReadConfigValues = ();
@@ -69,7 +46,7 @@
for (my $i = 0; $i <= $#ReadConfigNames; $i++) {
-@@ -351,7 +351,7 @@ my (@CmdList, @CmdArgList, @Separators, $ThisFile, $co
+@@ -350,7 +350,7 @@ my (@CmdList, @CmdArgList, @Separators, $ThisFile, $co
my (@CmdList, @CmdArgList, @Separators, $ThisFile, $count);
@@ -78,7 +55,7 @@
if (-d "$ServicesDir/services") {
opendir(SERVICESDIR, "$ServicesDir/services") or
die "$ServicesDir $!";
-@@ -375,13 +375,13 @@ foreach my $f (@services) {
+@@ -374,13 +374,13 @@ foreach my $f (@services) {
@ReadConfigValues = ();
@Separators = ();
push (@Separators, scalar(@ReadConfigNames));
@@ -96,7 +73,7 @@
@CmdList = ();
@CmdArgList = ();
-@@ -420,7 +420,7 @@ my @logfiles = ();
+@@ -419,7 +419,7 @@ my @logfiles = ();
# Find out what logfiles are defined...
my @logfiles = ();
@@ -105,7 +82,7 @@
if (-d "$LogfilesDir/logfiles") {
opendir(LOGFILEDIR, "$LogfilesDir/logfiles") or
die "$LogfilesDir $!";
-@@ -441,13 +441,13 @@ for $ThisFile (@logfiles) {
+@@ -440,13 +440,13 @@ for $ThisFile (@logfiles) {
@ReadConfigValues = ();
@Separators = ();
push (@Separators, scalar(@ReadConfigNames));
@@ -123,7 +100,7 @@
@CmdList = ();
@CmdArgList = ();
-@@ -738,7 +738,7 @@ foreach $LogFile (@LogFileList) {
+@@ -737,7 +737,7 @@ foreach $LogFile (@LogFileList) {
foreach $LogFile (@LogFileList) {
next if ($LogFile eq 'none');
if (!defined($LogFileData{$LogFile}{'logfiles'})) {
@@ -132,9 +109,12 @@
next;
}
-@@ -1305,16 +1305,16 @@ sub parselogs {
+@@ -1302,18 +1302,14 @@ sub parselogs {
+ sub parselogs {
+ my $Service;
- #Load our ignore file order is [assume normal install] /etc/conf, /usr/share/logwatch/dist.conf and then default.conf -mgt
+- #Load our ignore file order is [assume normal install] /etc/conf, /usr/share/logwatch/dist.conf and then default.conf -mgt
++ #Load our ignore file order is [assume normal install] /etc/logwatch and then /etc/logwatch/defaults -mgt
my @IGNORE;
- if ( -e "$ConfigDir/conf/ignore.conf") {
- open( IGNORE, "$ConfigDir/conf/ignore.conf" ) or return undef;
@@ -144,10 +124,8 @@
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;
+- @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") {
diff --git a/sysutils/logwatch/files/patch-scripts_services_syslog-ng b/sysutils/logwatch/files/patch-scripts_services_syslog-ng
deleted file mode 100644
index 168694c4e84b..000000000000
--- a/sysutils/logwatch/files/patch-scripts_services_syslog-ng
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/services/syslog-ng.orig 2024-11-19 14:07:57.207167000 +0100
-+++ scripts/services/syslog-ng 2024-12-26 10:49:42.400462000 +0100
-@@ -35,7 +35,7 @@
-
- #use warnings;
- use strict;
--use HTML::Entities qw(encode_entities);
-+use HTML::HTML5::Entities qw(encode_entities);
-
- my $Detail = $ENV{'LOGWATCH_DETAIL_LEVEL'} || 0;
- my $Version = "1.4-20130219";
diff --git a/sysutils/logwatch/files/pkg-message.in b/sysutils/logwatch/files/pkg-message.in
new file mode 100644
index 000000000000..c885cea0b304
--- /dev/null
+++ b/sysutils/logwatch/files/pkg-message.in
@@ -0,0 +1,20 @@
+[
+{
+ type: upgrade
+ message: <<EOM
+
+Important changes in logwatch-7.13:
+
+ - temporary data is now stored in /var/cache/logwatch
+ (you can remove /usr/local/var/logwatch, now)
+
+ - ability to deal with FBSD's <facility.severity> patterns in logfiles, if activated
+
+ - improvement of the dovecot script and conf files
+ (allow granular detail options like the ones for postfix script)
+
+ - postfix script detects modified 3.10+ log entries, now
+
+EOM
+}
+]
diff --git a/sysutils/logwatch/pkg-plist b/sysutils/logwatch/pkg-plist
index 5c633bdda415..8118f2dc6f91 100644
--- a/sysutils/logwatch/pkg-plist
+++ b/sysutils/logwatch/pkg-plist
@@ -1,7 +1,7 @@
+@dir /var/cache/logwatch
@dir etc/logwatch/html
@dir etc/logwatch/logfiles
@dir etc/logwatch/services
-@dir var/logwatch
%%ETCDIR%%/defaults/html/footer.html
%%ETCDIR%%/defaults/html/header.html
%%ETCDIR%%/defaults/ignore.conf
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-29 21:14:29 +0000