Compare commits

..

No commits in common. 'cs10' and 'c9' have entirely different histories.
cs10 ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/logwatch-7.11.tar.gz
SOURCES/logwatch-7.5.5.tar.gz

@ -1 +1 @@
19f058372865172948db8159f2924628e2c2c836 SOURCES/logwatch-7.11.tar.gz
f4e8ed4f846758be78b3d55791a867d70a197226 SOURCES/logwatch-7.5.5.tar.gz

@ -0,0 +1,14 @@
diff --git a/scripts/services/cron b/scripts/services/cron
index 869b515..45b857f 100644
--- a/scripts/services/cron
+++ b/scripts/services/cron
@@ -63,6 +63,9 @@ while (defined($ThisLine = <STDIN>)) {
if ($ThisLine =~ s/^CMD \((.+)\)\s*$/$1/) {
$Runs->{$User}->{$ThisLine}++;
$ExecutedCommand{$PID} = {command=>$ThisLine, user=>$User};
+ } elsif ($ThisLine =~ /^CMDEND/) {
+ # Ignore - already counted above
+ next;
} elsif ($ThisLine =~ s/^CMD FINISH \((.+)\)\s*$/$1/) {
$Runs->{$User}->{$ThisLine}++;
} elsif ($ThisLine =~ s/^(END|CMD START) \((.+)\)\s*$/$1/) {

@ -1,22 +0,0 @@
--- a/scripts/services/sshd 2022-12-29 01:34:28.000000000 +0100
+++ b/scripts/services/sshd 2024-11-27 13:33:50.590755283 +0100
@@ -548,7 +548,8 @@
if (keys %BadLogins) {
print "\nFailed logins from:\n";
- foreach my $ip (sort SortIP keys %BadLogins) {
+ my $totalSort = TotalCountOrder(%BadLogins, \&SortIP);
+ foreach my $ip (sort $totalSort keys %BadLogins) {
my $name = LookupIP($ip);
my $totcount = 0;
foreach my $user (keys %{$BadLogins{$ip}}) {
@@ -571,7 +572,8 @@
print " (with threshold >= $IllegalUsersThreshold)";
}
print ":\n";
- foreach my $ip (sort SortIP keys %IllegalUsers) {
+ my $totalSort = TotalCountOrder(%IllegalUsers, \&SortIP);
+ foreach my $ip (sort $totalSort keys %IllegalUsers) {
my $name = LookupIP($ip);
my $totcount = 0;
foreach my $user (keys %{$IllegalUsers{$ip}}) {

@ -0,0 +1,13 @@
diff --git a/scripts/services/systemd b/scripts/services/systemd
index f1da2ac..44cc7a9 100644
--- a/scripts/services/systemd
+++ b/scripts/services/systemd
@@ -70,7 +70,7 @@ while (defined(my $ThisLine = <STDIN>)) {
# crond will never restart process when it is restarted
$ThisLine =~ /^crond\.service: Found left-over process \d+ \(.*\) in control group while starting unit\. Ignoring\.$/ or
$ThisLine =~ /^Received SIGINT\./ or
- $ThisLine =~ /^Deactivated / or
+ $ThisLine =~ /: Deactivated / or
$ThisLine =~ /^Detected (architecture|virtualization) / or
$ThisLine =~ /^Found device / or
$ThisLine =~ /Got automount request for \/proc\// or

@ -1,26 +1,27 @@
%global _unitdir /usr/lib/systemd/system
Summary: Analyzes and Reports on system logs
Summary: A log file analysis program
Name: logwatch
Version: 7.11
Release: 2%{?dist}
Version: 7.5.5
Release: 6%{?dist}
License: MIT
URL: https://sourceforge.net/projects/logwatch/
Source0: https://sourceforge.net/projects/logwatch/files/%{name}-%{version}/%{name}-%{version}.tar.gz
Patch0: sshd-sort-by-count.patch
URL: https://sourceforge.net/projects/logwatch
Source0: logwatch-%{version}.tar.gz
Patch0: cron.patch
Patch1: systemd-deactivated.patch
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRequires: perl-generators
Requires: grep
Requires: /usr/bin/mailx
Requires: perl(Date::Manip)
Requires: perl(diagnostics)
Requires: perl(Errno)
Requires: perl(File::Basename)
Requires: perl(lib)
Requires: perl(re)
Requires: perl(Socket)
Requires: perl(subs)
Requires: perl(Sys::CPU)
Requires: perl(Sys::MemInfo)
Requires: perl(Time::Local)
Requires: perl(URI::URL)
Requires: perl(vars)
Requires: perl(warnings)
Requires: crontabs
BuildArchitectures: noarch
@ -31,7 +32,9 @@ that you wish with the detail that you wish. Easy to use - works right out
of the package on many systems.
%prep
%autosetup -p1
%setup -q
%patch0 -p1
%patch1 -p1
%build
@ -52,41 +55,37 @@ install -m 0755 -d %{buildroot}%{_datadir}/logwatch/scripts/services
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/scripts/shared
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/lib
install -m 0755 -d %{buildroot}%{_sbindir}
install -m 0755 -d %{buildroot}%{_mandir}/man1
install -m 0755 -d %{buildroot}%{_mandir}/man5
install -m 0755 -d %{buildroot}%{_mandir}/man8
for i in scripts/logfiles/* ; do
if [ $(ls $i | wc -l) -ne 0 ] ; then
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/$i
install -m 0644 $i/* %{buildroot}%{_datadir}/logwatch/$i
fi
for i in scripts/logfiles/*; do
if [ $(ls $i | wc -l) -ne 0 ]; then
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/$i
install -m 0644 $i/* %{buildroot}%{_datadir}/logwatch/$i
fi
done
install -m 0755 scripts/logwatch.pl %{buildroot}%{_datadir}/logwatch/scripts/logwatch.pl
install -m 0644 scripts/services/* %{buildroot}%{_datadir}/logwatch/scripts/services
install -m 0644 scripts/shared/* %{buildroot}%{_datadir}/logwatch/scripts/shared
install -m 0644 conf/*.conf %{buildroot}%{_datadir}/logwatch/default.conf
install -m 0644 conf/logwatch.conf %{buildroot}%{_datadir}/logwatch/default.conf/logwatch.conf
install -m 0644 conf/logfiles/* %{buildroot}%{_datadir}/logwatch/default.conf/logfiles
install -m 0644 conf/services/* %{buildroot}%{_datadir}/logwatch/default.conf/services
install -m 0644 conf/html/* %{buildroot}%{_datadir}/logwatch/default.conf/html
install -m 0644 lib/* %{buildroot}%{_datadir}/logwatch/lib
install -m 0644 lib/Logwatch.pm %{buildroot}%{_datadir}/logwatch/lib/Logwatch.pm
install -m 0644 amavis-logwatch.1 %{buildroot}%{_mandir}/man1
install -m 0644 postfix-logwatch.1 %{buildroot}%{_mandir}/man1
install -m 0644 ignore.conf.5 %{buildroot}%{_mandir}/man5
install -m 0644 override.conf.5 %{buildroot}%{_mandir}/man5
install -m 0644 logwatch.conf.5 %{buildroot}%{_mandir}/man5
ln -s logwatch.conf.5 %{buildroot}%{_mandir}/man5/ignore.conf.5
ln -s logwatch.conf.5 %{buildroot}%{_mandir}/man5/override.conf.5
install -m 0644 logwatch.8 %{buildroot}%{_mandir}/man8
install -m 0755 scheduler/logwatch.cron %{buildroot}%{_sysconfdir}/cron.daily/0logwatch
mkdir -p %{buildroot}%{_unitdir}
install -m 0644 scheduler/logwatch.timer %{buildroot}%{_unitdir}/logwatch.timer
install -m 0644 scheduler/logwatch.service %{buildroot}%{_unitdir}/logwatch.service
install -m 0644 scheduler/systemd.conf %{buildroot}%{_datadir}/logwatch/default.conf/systemd.conf
ln -s ../../%{_datadir}/logwatch/scripts/logwatch.pl %{buildroot}/%{_sbindir}/logwatch
@ -117,7 +116,7 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
%{_datadir}/logwatch/scripts/services
%{_datadir}/logwatch/scripts/logfiles
%dir %{_datadir}/logwatch/lib
%{_datadir}/logwatch/lib/*
%{_datadir}/logwatch/lib/Logwatch.pm
%dir %{_datadir}/logwatch/default.conf
%dir %{_datadir}/logwatch/default.conf/services
%{_datadir}/logwatch/default.conf/services/*.conf
@ -130,82 +129,23 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
%{_unitdir}/logwatch.timer
%changelog
* Wed Nov 27 2024 Pavel Simovec <psimovec@redhat.com> - 7.11-2
- sshd: sort IP adresses by report count
- Resolves: RHEL-58995
* Fri Apr 14 2023 Pavel Šimovec <psimovec@redhat.com> - 7.5.5-6
- Add patch to fix systemd messages containing "Deactivated"
- Resolves: rhbz:2160770
* Mon Nov 25 2024 Pavel Simovec <psimovec@redhat.com> - 7.11-1
- Update to 7.11
- Resolves: RHEL-58713
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 7.10-3
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 7.10-2
- Bump release for June 2024 mass rebuild
* Sun Jan 28 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.10-1
- Update to 7.10
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Aug 10 2023 Jitka Plesnikova <jplesnik@redhat.com> - 7.9-2
- Remove unused dependencies perl(Sys::CPU), perl(Sys::MemInfo)
* Sun Jul 23 2023 Frank Crawford <frank@crawford.emu.id.au> - 7.9-1
- Update to 7.9
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri May 19 2023 Frank Crawford <frank@crawford.emu.id.au> - 7.8-3
- Add missing dependencies to fix BZ2203367
- Convert to autosetup macro
* Sun May 07 2023 Frank Crawford <frank@crawford.emu.id.au> - 7.8-2
- Add patch to mdadm to fix BZ2192995 for F38
- Fix reports for named
* Sun Jan 22 2023 Frank Crawford <frank@crawford.emu.id.au> - 7.8-1
- Update to 7.8
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Nov 21 2022 Frank Crawford <frank@crawford.emu.id.au> - 7.7-3
- SPDX license update - type MIT:Modern Style with sublicense
* Sun Sep 04 2022 Frank Crawford <frank@crawford.emu.id.au> - 7.7-2
- Add patches for F36 that missed latest release
* Sun Jul 24 2022 Frank Crawford <frank@crawford.emu.id.au> - 7.7-1
- Update to 7.7
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Jan 23 2022 Frank Crawford <frank@crawford.emu.id.au> - 7.6-1
- Update to 7.6 (note new version convention - major.minor)
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.5.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Sat Aug 28 2021 Frank Crawford <frank@crawford.emu.id.au> - 7.5.6-2
- Match minor change in systemd
* Thu Mar 02 2023 Pavel Šimovec <psimovec@redhat.com> - 7.5.5-5
- Add patch to remove CMDEND from cron service
Resolves: rhbz#2158271
* Sat Jul 24 2021 Frank Crawford <frank@crawford.emu.id.au> - 7.5.6-1
- Update to 7.5.6
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 7.5.5-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.5.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jun 02 2021 Lukas Nykryn <lnykryn@redhat.com> - 7.5.5-3
- change the mailx dependency to a binary
* Tue Apr 06 2021 Frank Crawford <frank@crawford.emu.id.au> - 7.5.5-2
- Add patch to remove CMDEND from cron service
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 7.5.5-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Frank Crawford <frank@crawford.emu.id.au> - 7.5.5-1
- Update to 7.5.5

Loading…
Cancel
Save