webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

logwatch: Update to 7.6

Browse Source 
The developers do not provide a changelog, the only comment I could find was on:

https://packetstormsecurity.com/files/165672/Logwatch-7.6.html

"Changes: Fixed bugs."

Running here on Core 166. No seen problems.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
This commit is contained in:
Matthias Fischer
2022-04-16 13:07:00 +02:00
committed by Peter Müller
parent cdf0522ec2
commit ab473dd363
4 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch → src/patches/logwatch/logwatch-7.6-disable_iptables.patch
View File

@@ -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.

34
src/patches/logwatch/logwatch-7.5.5-enable-mdadm-sudo.patch → src/patches/logwatch/logwatch-7.6-enable-mdadm-sudo.patch
View File

@@ -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/) {