public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Frank Crawford <frank@crawford.emu.id.au>
To: git-commits@fedoraproject.org
Subject: [rpms/logwatch] f45: Fix for puppet errors (bz2572332) and changed messages in systemd
Date: Fri, 20 Nov 2026 04:50:15 GMT	[thread overview]
Message-ID: <179515021513.1.18015688376656693059.rpms-logwatch-1e5e2aba4bae@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/logwatch
Branch : f45
Commit : 1e5e2aba4bae229fef17ba95d445c13f60886de2
Author : Frank Crawford <frank@crawford.emu.id.au>
Date   : 2026-11-20T15:06:34+11:00
Stats  : +54/-1 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/logwatch/c/1e5e2aba4bae229fef17ba95d445c13f60886de2?branch=f45

Log:
Fix for puppet errors (bz2572332) and changed messages in systemd

---
diff --git a/logwatch.spec b/logwatch.spec
index 9281cf5..d839966 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -2,10 +2,13 @@
 Summary: Analyzes and Reports on system logs
 Name: logwatch
 Version: 7.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 URL: https://sourceforge.net/projects/logwatch/
 Source0: https://sourceforge.net/projects/logwatch/files/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Updates already in upstream repo
+Patch1: systemd.patch
+Patch2: puppet.patch
 BuildRequires: perl-generators
 Requires: grep
 Requires: dnf5
@@ -130,6 +133,10 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
 %{_unitdir}/logwatch.timer
 
 %changelog
+* Fri Nov 20 2026 Frank Crawford <frank@crawford.emu.id.au> - 7.15-2
+- Fix for puppet errors (bz2572332)
+- Match changed outputs in systemd
+
 * Fri Jul 24 2026 Frank Crawford <frank@crawford.emu.id.au> - 7.15-1
 - Update to 7.15 (bz2506024)
 

diff --git a/puppet.patch b/puppet.patch
new file mode 100644
index 0000000..1cac452
--- /dev/null
+++ b/puppet.patch
@@ -0,0 +1,22 @@
+diff --git a/scripts/services/puppet b/scripts/services/puppet
+index d8ed328..ba5d010 100644
+--- a/scripts/services/puppet
++++ b/scripts/services/puppet
+@@ -136,7 +136,7 @@ while (defined(my $ThisLine = <STDIN>)) {
+       $Created{$type}->{$name}++;
+    } elsif (($type, $name, $attr) = $ThisLine =~ /([^\/]+)\[([^\]]+)\]\/([^\/]+)\) removed/) {
+       $Removed{$type}->{$name}++;
+-   } elsif (($type, $name, $attr, $from, $to) = $ThisLine =~ /([^\/]+)\[([^\]]+)\]\/([^\/]+)\) .+ changed '(.*)' to '(.*)/) {
++   } elsif (($type, $name, $attr, $from, $to) = $ThisLine =~ /([^\/]+)\[([^\]]+)\]\/([^\/]+)\) .+ changed '(.*)' to '(.*)'/) {
+       if ($attr eq 'content' or $attr eq 'checksum') {
+          # Only count these types of changes
+          $Changed{$type}->{$name}->{$attr}++;
+@@ -284,7 +284,7 @@ foreach my $Type (sort(keys %Changed)) {
+             }
+          } else {
+             print "        $Attr: ";
+-            if (defined($Changed{$Type}->{$Name}->{$Attr}->{'from'})) {
++            if (ref($Changed{$Type}->{$Name}->{$Attr}) eq 'HASH') {
+                print "from '$Changed{$Type}->{$Name}->{$Attr}->{from}' to '$Changed{$Type}->{$Name}->{$Attr}->{to}'\n";
+             } else {
+                print "$Changed{$Type}->{$Name}->{$Attr} Time(s)\n";

diff --git a/systemd.patch b/systemd.patch
new file mode 100644
index 0000000..7d498fb
--- /dev/null
+++ b/systemd.patch
@@ -0,0 +1,24 @@
+diff --git a/scripts/services/systemd b/scripts/services/systemd
+index 820e74d..3cdb0fb 100644
+--- a/scripts/services/systemd
++++ b/scripts/services/systemd
+@@ -185,6 +185,8 @@ while (defined(my $ThisLine = <STDIN>)) {
+        $ThisLine =~ /^cgroup compatibility translation between legacy and unified hierarchy settings activated\. See cgroup-compat debug messages for details\.$/ or
+        $ThisLine =~ /^\(This warning is only shown for the first unit using IP firewalling\.\)$/ or
+        $ThisLine =~ /^.*\.socket: Socket service .* already active/ or
++       # Fails due to how qemu sets up scopes - systemd falls back to individual kills
++       $ThisLine =~ /^.*\.scope: Failed to kill control group .*\.scope, ignoring: Operation not supported/ or
+        # User specified ignore messages, lower cased
+        $ThisLine =~ /$Ignore_messages/i
+    ) {
+@@ -220,6 +222,10 @@ while (defined(my $ThisLine = <STDIN>)) {
+       $Skipped{$name}++ if $Detail;
+    } elsif (($name) = ($ThisLine =~ /^(.*) was skipped because/)) {
+       $Skipped{$name}++ if $Detail;
++   } elsif (($name) = ($ThisLine =~ /^(.*) skipped, unmet condition check /)) {
++      $Skipped{$name}++ if $Detail;
++   } elsif (($name) = ($ThisLine =~ /^(.*) skipped, no trigger condition checks were met\./)) {
++      $Skipped{$name}++ if $Detail;
+    } elsif (($service) = ($ThisLine =~ /(\S+): Failed (?:to execute command|with result)/)) {
+       $Failed{$service}++;
+    } elsif (($service) = ($ThisLine =~ /(\S+) failed\.$/)) {

                 reply	other threads:[~2026-11-20  4:50 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=179515021513.1.18015688376656693059.rpms-logwatch-1e5e2aba4bae@fedoraproject.org \
    --to=frank@crawford.emu.id.au \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox