@@ -128,6 +128,7 @@ usr/share/logwatch/default.conf/services/modprobe.conf
#usr/share/logwatch/default.conf/services/named.conf
#usr/share/logwatch/default.conf/services/netopia.conf
#usr/share/logwatch/default.conf/services/netscreen.conf
+usr/share/logwatch/default.conf/services/nut.conf
#usr/share/logwatch/default.conf/services/oidentd.conf
#usr/share/logwatch/default.conf/services/omsa.conf
usr/share/logwatch/default.conf/services/openvpn.conf
@@ -242,6 +243,7 @@ usr/share/logwatch/scripts/services/dialup
#usr/share/logwatch/scripts/services/dpkg
#usr/share/logwatch/scripts/services/emerge
#usr/share/logwatch/scripts/services/evtapplication
+#usr/share/logwatch/scripts/services/evtmswindows
#usr/share/logwatch/scripts/services/evtsecurity
#usr/share/logwatch/scripts/services/evtsystem
#usr/share/logwatch/scripts/services/exim
@@ -273,6 +275,7 @@ usr/share/logwatch/scripts/services/modprobe
#usr/share/logwatch/scripts/services/named
#usr/share/logwatch/scripts/services/netopia
#usr/share/logwatch/scripts/services/netscreen
+usr/share/logwatch/scripts/services/nut
#usr/share/logwatch/scripts/services/oidentd
#usr/share/logwatch/scripts/services/omsa
usr/share/logwatch/scripts/services/openvpn
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 7.5.5
+VER = 7.6
THISAPP = logwatch-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3e4183ea6dad4f415987870c555391d2a9496b4d4d894f1c06336876077b2a72e06b4e3f8d272aeb65aa5ea14f5f4d17a6f461ae54b2e50f073fef58a27a5241
+$(DL_FILE)_BLAKE2 = fd7f2a7c65151dbfbd924102b01ead00f92d74a59a417361b65be972368f7ed93810feefedf1ad9bba2de5ebbc74589c3fc0a8a484f19b5a9782c9799ffdf656
install : $(TARGET)
@@ -73,8 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR=\"\/tmp\"/g" -i install_logwatch.sh
cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.5-enable-mdadm-sudo.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.6-disable_iptables.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.6-enable-mdadm-sudo.patch
@cd $(DIR_APP) && chmod 755 install_logwatch.sh
cd $(DIR_APP) && yes "" | ./install_logwatch.sh
similarity index 80%
rename from src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch
rename to src/patches/logwatch/logwatch-7.6-disable_iptables.patch
@@ -1,7 +1,7 @@
diff -U 3 a/conf/logwatch.conf b/conf/logwatch.conf
---- a/conf/logwatch.conf Thu Sep 19 01:58:55 2019
-+++ b/conf/logwatch.conf Thu Nov 26 18:46:12 2020
-@@ -94,6 +94,10 @@
+--- a/conf/logwatch.conf Sat Jan 22 01:00:00 2022
++++ b/conf/logwatch.conf Sun Apr 10 10:33:20 2022
+@@ -96,6 +96,10 @@
# prints useful system configuration info.
Service = "-eximstats" # Prevents execution of eximstats service, which
# is a wrapper for the eximstats program.
similarity index 56%
rename from src/patches/logwatch/logwatch-7.5.5-enable-mdadm-sudo.patch
rename to src/patches/logwatch/logwatch-7.6-enable-mdadm-sudo.patch
@@ -1,6 +1,6 @@
-diff -Naur logwatch-7.5.5-orig/conf/services/mdadm.conf logwatch-7.5.5/conf/services/mdadm.conf
---- logwatch-7.5.5-orig/conf/services/mdadm.conf 2021-01-22 21:59:40.000000000 +0100
-+++ logwatch-7.5.5/conf/services/mdadm.conf 2021-10-04 13:52:30.850057355 +0200
+diff -U 3 a/conf/services/mdadm.conf b/conf/services/mdadm.conf
+--- a/conf/services/mdadm.conf Sat Jan 22 01:00:00 2022
++++ b/conf/services/mdadm.conf Sun Apr 10 10:48:21 2022
@@ -13,7 +13,7 @@
# Logwatch will try to find md devices in /etc/mdadm.conf or
# /etc/mdadm/mdadm.conf. If none of these files exist it can scan actively
@@ -10,19 +10,19 @@ diff -Naur logwatch-7.5.5-orig/conf/services/mdadm.conf logwatch-7.5.5/conf/serv
# Logwatch will emit an error for md devices listed in /etc/mdadm.conf
# that are not present. If you do not want this (e.g. raid devices may come
-diff -Naur logwatch-7.5.5-orig/scripts/services/mdadm logwatch-7.5.5/scripts/services/mdadm
---- logwatch-7.5.5-orig/scripts/services/mdadm 2021-01-22 21:59:40.000000000 +0100
-+++ logwatch-7.5.5/scripts/services/mdadm 2021-10-06 11:41:14.800307603 +0200
-@@ -35,7 +35,7 @@
- } elsif ( -f "/etc/mdadm/mdadm.conf" ) {
- open(MDADM,"< /etc/mdadm/mdadm.conf");
- } elsif ($enable_scan) {
-- open(MDADM,"mdadm --detail --scan 2>/dev/null|");
-+ open(MDADM,"sudo mdadm --detail --scan 2>/dev/null|");
- }
- while (<MDADM>) {
- if (/^ARRAY/) {
-@@ -51,7 +51,7 @@
+diff -U 3 a/scripts/services/mdadm b/scripts/services/mdadm
+--- a/scripts/services/mdadm Sat Jan 22 01:00:00 2022
++++ b/scripts/services/mdadm Sun Apr 10 10:38:19 2022
+@@ -36,7 +36,7 @@
+ if (
+ open($mdadm, "<", "/etc/mdadm.conf") or
+ open($mdadm, "<", "/etc/mdadm/mdadm.conf") or
+- open($mdadm, "<", "mdadm --detail --scan 2>/dev/null|")) {
++ open($mdadm, "<", "sudo mdadm --detail --scan 2>/dev/null|")) {
+ while (<$mdadm>) {
+ if (/^ARRAY/) {
+ push(@devices,(split())[1]);
+@@ -52,7 +52,7 @@
next;
}
@@ -31,7 +31,7 @@ diff -Naur logwatch-7.5.5-orig/scripts/services/mdadm logwatch-7.5.5/scripts/ser
while (<MDADM>) {
if ($_ =~ /cannot open .*: No such file or directory/) {
print $_ unless $ignore_missing;
-@@ -74,7 +74,11 @@
+@@ -75,7 +75,11 @@
if ($Detail <= 4) {
if (lc($mdhash{'state'}) =~ /clean|active/) {