diff mbox series

logwatch: Update to version 7.15

Message ID 20260921140958.515074-8-adolf.belka@ipfire.org
State Staged
Commit 180b975665afbc0c93157dd1e172e60d2a0986ac
Headers
Series logwatch: Update to version 7.15 |

Commit Message

Adolf Belka 21 Sep 2026, 2:09 p.m. UTC 
- Update from version 7.11 to 7.15
- Patch for openssh-9.8 has been removed as fixes are part of tarball now.
- Location for symlink for logwatch changed from /usr/sbin/ to /usr/bin/. Patch added
   to revert this as there are saeveral places in IPFire that will have the location
   hardcoded.
- No changelog provided. Only option is to review the git commits.
   https://sourceforge.net/p/logwatch/git/ci/master/tree/

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/logwatch              |  7 ++++
 lfs/logwatch                                  |  8 ++--
 ...SSH-9.8-sshd-session-and-port-number.patch | 39 -------------------
 ...watch-7.15-Revert_sbin_to_bin_change.patch | 13 +++++++
 4 files changed, 24 insertions(+), 43 deletions(-)
 delete mode 100644 src/patches/logwatch/logwatch-7.11-Added-support-for-OpenSSH-9.8-sshd-session-and-port-number.patch
 create mode 100644 src/patches/logwatch/logwatch-7.15-Revert_sbin_to_bin_change.patch
diff mbox series

Patch

diff --git a/config/rootfiles/common/logwatch b/config/rootfiles/common/logwatch
index 026757b52..adacb6b6a 100644
--- a/config/rootfiles/common/logwatch
+++ b/config/rootfiles/common/logwatch
@@ -82,6 +82,7 @@  usr/share/logwatch/default.conf/services/amavis.conf
 #usr/share/logwatch/default.conf/services/autorpm.conf
 #usr/share/logwatch/default.conf/services/barracuda.conf
 #usr/share/logwatch/default.conf/services/bfd.conf
+#usr/share/logwatch/default.conf/services/chronyd.conf
 #usr/share/logwatch/default.conf/services/cisco.conf
 #usr/share/logwatch/default.conf/services/citadel.conf
 usr/share/logwatch/default.conf/services/clam-update.conf
@@ -92,7 +93,9 @@  usr/share/logwatch/default.conf/services/cron.conf
 #usr/share/logwatch/default.conf/services/denyhosts.conf
 usr/share/logwatch/default.conf/services/dhcpd.conf
 #usr/share/logwatch/default.conf/services/dirsrv.conf
+#usr/share/logwatch/default.conf/services/dnf-automatic.conf
 #usr/share/logwatch/default.conf/services/dnf-rpm.conf
+#usr/share/logwatch/default.conf/services/dnf5.conf
 #usr/share/logwatch/default.conf/services/dnssec.conf
 #usr/share/logwatch/default.conf/services/dovecot.conf
 #usr/share/logwatch/default.conf/services/dpkg.conf
@@ -123,6 +126,7 @@  usr/share/logwatch/default.conf/services/kernel.conf
 #usr/share/logwatch/default.conf/services/lvm.conf
 #usr/share/logwatch/default.conf/services/mailscanner.conf
 usr/share/logwatch/default.conf/services/mdadm.conf
+#usr/share/logwatch/default.conf/services/mdadm.conf.orig
 #usr/share/logwatch/default.conf/services/mod_security2.conf
 usr/share/logwatch/default.conf/services/modprobe.conf
 #usr/share/logwatch/default.conf/services/mountd.conf
@@ -231,6 +235,7 @@  usr/share/logwatch/scripts/services/amavis
 #usr/share/logwatch/scripts/services/autorpm
 #usr/share/logwatch/scripts/services/barracuda
 #usr/share/logwatch/scripts/services/bfd
+#usr/share/logwatch/scripts/services/chronyd
 #usr/share/logwatch/scripts/services/cisco
 #usr/share/logwatch/scripts/services/citadel
 usr/share/logwatch/scripts/services/clam-update
@@ -242,7 +247,9 @@  usr/share/logwatch/scripts/services/cron
 usr/share/logwatch/scripts/services/dhcpd
 usr/share/logwatch/scripts/services/dialup
 #usr/share/logwatch/scripts/services/dirsrv
+#usr/share/logwatch/scripts/services/dnf-automatic
 #usr/share/logwatch/scripts/services/dnf-rpm
+#usr/share/logwatch/scripts/services/dnf5
 #usr/share/logwatch/scripts/services/dnssec
 #usr/share/logwatch/scripts/services/dovecot
 #usr/share/logwatch/scripts/services/dpkg
diff --git a/lfs/logwatch b/lfs/logwatch
index b2452e21e..cbfa139f1 100644
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2026  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.11
+VER        = 7.15
 
 THISAPP    = logwatch-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 074b9b1d58bd199c82edc6fb40703b71f9488966e2acb8afc015fde93806740d11a3c8705303139716bbc50c353f3e8c3f4c0e9cf1d5f870cbb8599fbdd526d1
+$(DL_FILE)_BLAKE2 = 25e0b84301a6a7e2011fe107bb87b2deddeda9b263ff83c96fe5d65f67c8a7cecd304c1e10c4b5b11eca83be604201235ee1b4c54ec789385bd966c23e9990cb
 
 install : $(TARGET)
 
@@ -75,7 +75,7 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP)/lib && patch -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.11-date_manip6.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.11-disable_iptables.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.11-enable-mdadm-sudo.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.11-Added-support-for-OpenSSH-9.8-sshd-session-and-port-number.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.15-Revert_sbin_to_bin_change.patch
 
 	@cd $(DIR_APP) && chmod 755 install_logwatch.sh
 	cd $(DIR_APP) && yes "" | ./install_logwatch.sh
diff --git a/src/patches/logwatch/logwatch-7.11-Added-support-for-OpenSSH-9.8-sshd-session-and-port-number.patch b/src/patches/logwatch/logwatch-7.11-Added-support-for-OpenSSH-9.8-sshd-session-and-port-number.patch
deleted file mode 100644
index 816f6b4e8..000000000
--- a/src/patches/logwatch/logwatch-7.11-Added-support-for-OpenSSH-9.8-sshd-session-and-port-number.patch
+++ /dev/null
@@ -1,39 +0,0 @@ 
-diff -Naur logwatch-7.11.orig/conf/services/secure.conf logwatch-7.11/conf/services/secure.conf
---- logwatch-7.11.orig/conf/services/secure.conf	2016-03-09 21:14:35.000000000 +0100
-+++ logwatch-7.11/conf/services/secure.conf	2024-08-27 14:48:48.453853293 +0200
-@@ -24,7 +24,7 @@
- # Use this to ignore certain services in the secure log.
- # You can ignore as many services as you would like.
- # (we ignore sshd because its entries are processed by the sshd script)
--$ignore_services = sshd Pluto stunnel proftpd saslauthd imapd postfix/smtpd
-+$ignore_services = sshd sshd-session Pluto stunnel proftpd saslauthd imapd postfix/smtpd
- 
- # For these services, summarize only (i.e. don't least each IP, just
- # list the number of connections total)
-diff -Naur logwatch-7.11.orig/conf/services/sshd.conf logwatch-7.11/conf/services/sshd.conf
---- logwatch-7.11.orig/conf/services/sshd.conf	2020-09-20 23:38:32.000000000 +0200
-+++ logwatch-7.11/conf/services/sshd.conf	2024-08-27 14:49:08.077782387 +0200
-@@ -19,7 +19,7 @@
- LogFile = messages
- 
- # Only give lines pertaining to the sshd service...
--*OnlyService = sshd
-+*OnlyService = (sshd|sshd-session)
- *RemoveHeaders
- 
- # Variable $sshd_ignore_host is used to filter out hosts that login
-diff -Naur logwatch-7.11.orig/scripts/services/sshd logwatch-7.11/scripts/services/sshd
---- logwatch-7.11.orig/scripts/services/sshd	2022-12-29 01:34:28.000000000 +0100
-+++ logwatch-7.11/scripts/services/sshd	2024-08-27 14:49:21.908202288 +0200
-@@ -246,9 +246,9 @@
-       $NoIdent{$name}++;
-    } elsif (
-       ($ThisLine =~ m/^(?:error:.*|fatal:) Connection closed by remote host/ ) or
--      ($ThisLine =~ m/^(|fatal: )Read error from remote host(| [^ ]+): Connection reset by peer/ ) or
-+      ($ThisLine =~ m/^(|fatal: )Read error from remote host(| [^ ]+)(| port \d+): Connection reset by peer/ ) or
-       ($ThisLine =~ m/^error: .*: read: Connection reset by peer/ ) or
--      ($ThisLine =~ m/^Read error from remote host [^ ]+: (Connection timed out|No route to host)/ ) or
-+      ($ThisLine =~ m/^Read error from remote host [^ ]+(| port \d+): (Connection timed out|No route to host)/ ) or
-       ($ThisLine =~ m/^fatal: Read from socket failed: No route to host/) or
-       ($ThisLine =~ m/^fatal: Write failed: Network is unreachable/ ) or
-       ($ThisLine =~ m/^fatal: Write failed: Broken pipe/) or
diff --git a/src/patches/logwatch/logwatch-7.15-Revert_sbin_to_bin_change.patch b/src/patches/logwatch/logwatch-7.15-Revert_sbin_to_bin_change.patch
new file mode 100644
index 000000000..55f0b2cda
--- /dev/null
+++ b/src/patches/logwatch/logwatch-7.15-Revert_sbin_to_bin_change.patch
@@ -0,0 +1,13 @@ 
+--- logwatch-7.15/install_logwatch.sh.orig	2026-09-21 12:24:58.939788088 +0200
++++ logwatch-7.15/install_logwatch.sh	2026-09-21 12:27:56.745789515 +0200
+@@ -326,8 +326,8 @@
+ fi
+ 
+ #Symlink
+-ln -f -s $BASEDIR/scripts/logwatch.pl /usr/bin/logwatch
+-printf "Created symlink for /usr/bin/logwatch \n"
++ln -f -s $BASEDIR/scripts/logwatch.pl /usr/sbin/logwatch
++printf "Created symlink for /usr/sbin/logwatch \n"
+ 
+ #Cron or Systemd timer
+ if [ $systemd -eq 1 ]; then