rpms/logwatch/FC-4 logwatch-6.1.2-audit2.patch, NONE, 1.1 logwatch-7.0-nosegfault.patch, NONE, 1.1 logwatch-7.0-secure.patch, NONE, 1.1 logwatch-7.0-smartd.patch, NONE, 1.1 logwatch-7.0-zz-disk_space.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 logwatch.spec, 1.18, 1.19 sources, 1.10, 1.11 logwatch-2.6-101744-up2date.patch, 1.1, NONE logwatch-4.3.2-nosegfault.patch, 1.1, NONE logwatch-6.1.2-yum_erase.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Oct 24 09:58:36 UTC 2005
- Previous message (by thread): rpms/libidn/devel libidn-0.5.20.tar.gz.sig, NONE, 1.1 .cvsignore, 1.17, 1.18 libidn.spec, 1.22, 1.23 sources, 1.17, 1.18 upstream, 1.10, 1.11 libidn-0.5.19.tar.gz.sig, 1.1, NONE
- Next message (by thread): rpms/logwatch/FC-4 logwatch.spec,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: varekova
Update of /cvs/dist/rpms/logwatch/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv16252
Modified Files:
.cvsignore logwatch.spec sources
Added Files:
logwatch-6.1.2-audit2.patch logwatch-7.0-nosegfault.patch
logwatch-7.0-secure.patch logwatch-7.0-smartd.patch
logwatch-7.0-zz-disk_space.patch
Removed Files:
logwatch-2.6-101744-up2date.patch
logwatch-4.3.2-nosegfault.patch logwatch-6.1.2-yum_erase.patch
Log Message:
Update to 7.0, add smart, zz-disk_space patch, secure and audit2 patches
logwatch-6.1.2-audit2.patch:
audit | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
--- NEW FILE logwatch-6.1.2-audit2.patch ---
--- logwatch-6.1.2/scripts/services/audit.pom 2005-09-30 14:59:39.000000000 +0200
+++ logwatch-6.1.2/scripts/services/audit 2005-10-03 13:51:10.000000000 +0200
@@ -48,9 +48,12 @@
chomp($ThisLine);
if (( $ThisLine =~ /initializing netlink socket \(disabled\)/) or
( $ThisLine =~ /audit_pid=[0-9]* old=[0-9]*(?: by auid=[0-9]*)?/) or
- ( $ThisLine =~ /syscall=[0-9]+ exit=[0-9]+( a[0-3]=[0-9a-f]*)* items=[0-9]* pid=[0-9]* loginuid=[0-9-]* uid=[0-9]* gid=[0-9]* euid=[0-9]* suid=[0-9]* fsuid=[0-9]* egid=[0-9]* sgid=[0-9]* fsgid=[0-9]*/) or
+ ( $ThisLine =~ /(arch=[0-9]+ )?syscall=[0-9]+ (success=(no|yes) )?exit=[0-9-]+( a[0-3]=[0-9a-f]+)* items=[0-9]+ pid=[0-9]+ (loginuid=[0-9-]+ )?(auid=[0-9]+ )?uid=[0-9]+ gid=[0-9]+ euid=[0-9]+ suid=[0-9]+ fsuid=[0-9]+ egid=[0-9]+ sgid=[0-9]+ fsgid=[0-9]+/) or
( $ThisLine =~ /Audit daemon rotating log files/) or
- ( $ThisLine =~ /audit_backlog_limit=[0-9]* old=[0-9]*(?: by auid=[0-9]*)?/)
+ ( $ThisLine =~ /audit_backlog_limit=[0-9]* old=[0-9]*(?: by auid=[0-9]*)?/) or
+ ( $ThisLine =~ /SELinux: unrecognized netlink message type=[0-9]+ for sclass=[0-9]+/) or
+ ( $ThisLine =~ /audit\([0-9.]+:[0-9]+\): saddr=[0-9]+/) or
+ ( $ThisLine =~ /nargs=[0-9]+ a0=[0-9a-f]+ a1=[0-9a-f]+ a2=[0-9a-f]+ a3=[0-9a-f]+ a4=[0-9a-f]+ a5=[0-9a-f]+/)
) {
# Ignore these entries
} elsif ( $ThisLine =~ /audit\([0-9]{10}.[0-9]{3}:[0-9]\): initialized$/) {
logwatch-7.0-nosegfault.patch:
kernel.conf | 3 +++
1 files changed, 3 insertions(+)
--- NEW FILE logwatch-7.0-nosegfault.patch ---
--- logwatch-7.0/conf/services/kernel.conf.pom 2005-07-26 00:19:43.000000000 +0200
+++ logwatch-7.0/conf/services/kernel.conf 2005-10-24 11:15:52.023157880 +0200
@@ -20,6 +20,9 @@
# Only give lines pertaining to the kernel service...
*OnlyService = kernel
*RemoveHeaders
+*Remove = segfault
+*Remove = locate module
+
########################################################
# This was written and is maintained by:
logwatch-7.0-secure.patch:
secure | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE logwatch-7.0-secure.patch ---
--- logwatch-7.0/scripts/services/secure.pom 2005-09-29 17:02:00.000000000 +0200
+++ logwatch-7.0/scripts/services/secure 2005-10-19 13:26:36.312344680 +0200
@@ -226,17 +226,17 @@
$UserLogin{$User}++;
} elsif ( $ThisLine =~ s/^userdel\[\d+\]: delete user `(.+)'/$1/ ) {
push @DeletedUsers, " $ThisLine\n";
- } elsif ( $ThisLine =~ s/^(useradd|adduser)\[\d+\]: new user: name=(.+), uid=(\d+).*$/$1 ($2)/ ) {
+ } elsif ( $ThisLine =~ s/^(useradd|adduser)\[\d+\]: new user: name=(.+), (uid|UID)=(\d+).*$/$1 ($2)/ ) {
push @NewUsers, " $ThisLine\n";
} elsif ( $ThisLine =~ s/^userdel\[\d+\]: remove group `(.+)'/$1/ ) {
push @DeletedGroups, " $ThisLine\n";
} elsif ( $ThisLine =~ s/^groupdel\[\d+\]: remove group `(.+)'/$1/ ) {
push @DeletedGroups, " $ThisLine\n";
- } elsif ( $ThisLine =~ s/^(useradd|adduser)\[\d+\]: new group: name=(.+), gid=(\d+).*$/$1 ($2)/ ) {
+ } elsif ( $ThisLine =~ s/^(useradd|adduser)\[\d+\]: new group: name=(.+), (gid|GID)=(\d+).*$/$1 ($2)/ ) {
push @NewGroups, " $ThisLine\n";
} elsif ( (undef,$User,,undef,$Group) = ($ThisLine =~ /(usermod|useradd)\[\d+\]: add `([^ ]+)' to (shadow |)group `([^ ]+)'/ )) {
$AddToGroup{$Group}{$User}++;
- } elsif ( $ThisLine =~ s/^groupadd\[\d+\]: new group: name=(.+), gid=(\d+).*$/$1 ($2)/ ) {
+ } elsif ( $ThisLine =~ s/^groupadd\[\d+\]: new group: name=(.+), (gid|GID)=(\d+).*$/$1 ($2)/ ) {
push @NewGroups, " $ThisLine\n";
} elsif ( $ThisLine =~ /^userdel\[\d+\]: delete `(.*)' from (shadow |)group `(.*)'\s*$/ ) {
push @RemoveFromGroup, " user $1 from group $3\n";
logwatch-7.0-smartd.patch:
smartd | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE logwatch-7.0-smartd.patch ---
--- logwatch-7.0/scripts/services/smartd.pom 2005-08-24 00:19:56.000000000 +0200
+++ logwatch-7.0/scripts/services/smartd 2005-10-13 14:51:54.000000000 +0200
@@ -36,7 +36,7 @@
}
else {
# Report any unmatched entries...
- push @OtherList,$ThisLine;
+ push @OtherList,"$ThisLine\n";
}
}
logwatch-7.0-zz-disk_space.patch:
zz-disk_space | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE logwatch-7.0-zz-disk_space.patch ---
--- logwatch-7.0/scripts/services/zz-disk_space.pom 2005-07-21 08:00:49.000000000 +0200
+++ logwatch-7.0/scripts/services/zz-disk_space 2005-10-19 14:27:11.610695328 +0200
@@ -21,7 +21,7 @@
my $show_disk_usage = $ENV{'show_disk_usage'} || 0;
my ($OSname, $hostname, $release, $version, $machine) = POSIX::uname();
-exit (0) if ($logwatch_hostname ne $hostname);
+exit (0) if (($ENV{'LOGWATCH_ONLY_HOSTNAME'}) and ($logwatch_hostname ne $hostname));
if ( $Debug >= 5 ) {
print STDERR "\n\nDEBUG: Inside zz-disk-space Filter \n\n";
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/logwatch/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 14 Jul 2005 07:13:29 -0000 1.10
+++ .cvsignore 24 Oct 2005 09:58:29 -0000 1.11
@@ -1 +1 @@
-logwatch-6.1.2.tar.gz
+logwatch-7.0.tar.gz
Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/FC-4/logwatch.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- logwatch.spec 14 Jul 2005 07:13:30 -0000 1.18
+++ logwatch.spec 24 Oct 2005 09:58:29 -0000 1.19
@@ -1,15 +1,17 @@
Summary: A log file analysis program.
Name: logwatch
-Version: 6.1.2
-Release: 1.fc4
+Version: 7.0
+Release: 1
License: MIT
Group: Applications/System
URL: http://www.logwatch.org/
Source: ftp://ftp.kaybee.org/pub/linux/logwatch-%{version}.tar.gz
Patch1: logwatch-4.3.2-nounicode.patch
-Patch2: logwatch-4.3.2-nosegfault.patch
-Patch4: logwatch-2.6-101744-up2date.patch
-Patch5: logwatch-6.1.2-yum_erase.patch
+Patch2: logwatch-7.0-nosegfault.patch
+Patch3: logwatch-6.1.2-audit2.patch
+Patch4: logwatch-7.0-smartd.patch
+Patch5: logwatch-7.0-zz-disk_space.patch
+Patch6: logwatch-7.0-secure.patch
Requires: textutils sh-utils grep mailx
BuildRoot: %{_tmppath}/logwatch-build
BuildArchitectures: noarch
@@ -26,85 +28,112 @@
%setup -q
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%patch4 -p1
-%patch5 -p1 -b .erase
+%patch5 -p1
+%patch6 -p1
+
%install
rm -rf %{buildroot}
-install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/lib
-install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/conf/logfiles
-install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/conf/services
-install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/scripts/services
-install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/scripts/shared
+
+install -m 0755 -d %{buildroot}%{_var}/cache/logwatch
+install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/scripts
+install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/conf
+install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/conf/logfiles
+install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/conf/services
+install -m 0755 -d %{buildroot}%{_datadir}/logwatch/default.conf/logfiles
+install -m 0755 -d %{buildroot}%{_datadir}/logwatch/default.conf/services
+install -m 0755 -d %{buildroot}%{_datadir}/logwatch/dist.conf/logfiles
+install -m 0755 -d %{buildroot}%{_datadir}/logwatch/dist.conf/services
+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
for i in scripts/logfiles/*; do
- if [ $(ls $I | wc -l) -gt 0 ]; then
- install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/$i
- install -m 0755 $i/* %{buildroot}%{_sysconfdir}/log.d/$i
+ if [ $(ls $i | wc -l) -ne 0 ]; then
+ install -m 0755 -d %{buildroot}%{_datadir}/logwatch/$i
+ install -m 0755 $i/* %{buildroot}%{_datadir}/logwatch/$i
fi
done
-install -m 0755 scripts/logwatch.pl %{buildroot}%{_sysconfdir}/log.d/scripts/logwatch.pl
-install -m 0755 scripts/services/* %{buildroot}%{_sysconfdir}/log.d/scripts/services
-
-install -m 0755 scripts/shared/* %{buildroot}%{_sysconfdir}/log.d/scripts/shared
+install -m 0755 scripts/logwatch.pl %{buildroot}%{_datadir}/logwatch/scripts/logwatch.pl
+install -m 0755 scripts/services/* %{buildroot}%{_datadir}/logwatch/scripts/services
+install -m 0755 scripts/shared/* %{buildroot}%{_datadir}/logwatch/scripts/shared
+
+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/logwatch.conf %{buildroot}%{_sysconfdir}/log.d/conf/logwatch.conf
-install -m 0644 conf/logfiles/* %{buildroot}%{_sysconfdir}/log.d/conf/logfiles
-install -m 0644 conf/services/* %{buildroot}%{_sysconfdir}/log.d/conf/services
-
-install -m 0644 lib/Logwatch.pm %{buildroot}%{_sysconfdir}/log.d/lib/Logwatch.pm
+install -m 0644 lib/Logwatch.pm %{buildroot}%{_datadir}/logwatch/lib/Logwatch.pm
install -m 0755 -d %{buildroot}%{_mandir}/man8
install -m 0644 logwatch.8 %{buildroot}%{_mandir}/man8
-rm -f %{buildroot}%{_sysconfdir}/log.d/logwatch \
- %{buildroot}%{_sysconfdir}/log.d/logwatch.conf \
- %{buildroot}%{_sysconfdir}/cron.daily/00-logwatch \
+rm -f %{buildroot}%{_sysconfdir}/cron.daily/logwatch \
%{buildroot}%{_sbindir}/logwatch \
- %{buildroot}%{_sysconfdir}/log.d/scripts/services/zz-fortune* \
- %{buildroot}%{_sysconfdir}/log.d/conf/services/zz-fortune* \
- %{buildroot}%{_sysconfdir}/log.d/conf/logfiles/fortune*
+ %{buildroot}%{_datadir}/logwatch/scripts/services/zz-fortune* \
+ %{buildroot}%{_datadir}/logwatch/conf/services/zz-fortune* \
+ %{buildroot}%{_datadir}/logwatch/conf/logfiles/fortune*
+touch %{buildroot}%{_datadir}/logwatch/scripts/services/zz-fortune
+chmod 755 %{buildroot}%{_datadir}/logwatch/scripts/services/zz-fortune
-ln -s scripts/logwatch.pl %{buildroot}%{_sysconfdir}/log.d/logwatch
-ln -s conf/logwatch.conf %{buildroot}%{_sysconfdir}/log.d/logwatch.conf
install -m 0755 -d %{buildroot}%{_sysconfdir}/cron.daily
-ln -s ../log.d/scripts/logwatch.pl %{buildroot}%{_sysconfdir}/cron.daily/00-logwatch
+ln -s %{_datadir}/logwatch/scripts/logwatch.pl %{buildroot}%{_sysconfdir}/cron.daily/0logwatch
install -m 0755 -d %{buildroot}%{_sbindir}
-ln -s ../..%{_sysconfdir}/log.d/scripts/logwatch.pl %{buildroot}%{_sbindir}/logwatch
+ln -s %{_datadir}/logwatch/scripts/logwatch.pl %{buildroot}%{_sbindir}/logwatch
+
+echo "###### REGULAR EXPRESSIONS IN THIS FILE WILL BE TRIMMED FROM REPORT OUTPUT #####" > %{buildroot}%{_sysconfdir}/logwatch/conf/ignore.conf
+echo "# Local configuration options go here (defaults are in /%{_datadir}/logwatch/logwatch.conf)" > %{buildroot}%{_sysconfdir}/logwatch/conf/logwatch.conf
+echo "# Configuration overrides for specific logfiles/services may be placed here." > %{buildroot}%{_sysconfdir}/logwatch/conf/override.conf
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
-%doc README HOWTO-Make-Filter
-%dir %{_sysconfdir}/log.d
-%dir %{_sysconfdir}/log.d/conf
-%dir %{_sysconfdir}/log.d/lib
-%dir %{_sysconfdir}/log.d/scripts
-%dir %{_sysconfdir}/log.d/conf/logfiles
-%dir %{_sysconfdir}/log.d/conf/services
-%dir %{_sysconfdir}/log.d/scripts/logfiles
-%dir %{_sysconfdir}/log.d/scripts/services
-%dir %{_sysconfdir}/log.d/scripts/shared
-%{_sysconfdir}/log.d/scripts/logfiles/*
-%config %{_sysconfdir}/log.d/conf/logwatch.conf
-%config %{_sysconfdir}/log.d/conf/services/*
-%config %{_sysconfdir}/log.d/conf/logfiles/*
-%{_sysconfdir}/log.d/scripts/logwatch.pl
+%doc README HOWTO-Make-Filter HOWTO-Customize-Configuration
+%dir %{_var}/cache/logwatch
+%dir %{_sysconfdir}/logwatch
+%dir %{_sysconfdir}/logwatch/conf
+%dir %{_sysconfdir}/logwatch/scripts
+%dir %{_sysconfdir}/logwatch/conf/logfiles
+%dir %{_sysconfdir}/logwatch/conf/services
+%dir %{_datadir}/logwatch
+%dir %{_datadir}/logwatch/default.conf
+%dir %{_datadir}/logwatch/default.conf/services
+%dir %{_datadir}/logwatch/default.conf/logfiles
+%dir %{_datadir}/logwatch/dist.conf
+%dir %{_datadir}/logwatch/dist.conf/services
+%dir %{_datadir}/logwatch/dist.conf/logfiles
+%dir %{_datadir}/logwatch/scripts
+%dir %{_datadir}/logwatch/scripts/logfiles
+%dir %{_datadir}/logwatch/scripts/services
+%dir %{_datadir}/logwatch/scripts/shared
+%dir %{_datadir}/logwatch/scripts/logfiles/*
+%dir %{_datadir}/logwatch/lib
+%{_datadir}/logwatch/scripts/logwatch.pl
+%config(noreplace) %{_sysconfdir}/logwatch/conf/*.conf
+#%config(noreplace) %{_datadir}/logwatch/default.conf/*
+#%config(noreplace) %{_sysconfdir}/logwatch/conf/logfiles/*
%{_sbindir}/logwatch
-%{_sysconfdir}/log.d/scripts/shared/*
-%{_sysconfdir}/log.d/scripts/services/*
-%{_sysconfdir}/log.d/logwatch
-%{_sysconfdir}/log.d/lib/Logwatch.pm
-%{_sysconfdir}/log.d/logwatch.conf
-%{_sysconfdir}/cron.daily/00-logwatch
-%{_mandir}/man8/logwatch.8*
+%{_datadir}/logwatch/scripts/shared/*
+%{_datadir}/logwatch/scripts/services/*
+%{_datadir}/logwatch/scripts/logfiles/*/*
+%{_datadir}/logwatch/lib/Logwatch.pm
+%{_datadir}/logwatch/default.conf/*.conf
+%{_datadir}/logwatch/default.conf/services/*.conf
+%{_datadir}/logwatch/default.conf/logfiles/*.conf
+%{_sysconfdir}/cron.daily/0logwatch
+%doc %{_mandir}/man8/logwatch.8*
%doc License project/CHANGES project/TODO
%changelog
+* Mon Oct 24 2005 Ivana Varekova <varekova at redhat.com> 7.0-1
+- Update to 7.0
+- add smart, zz-disk_space patch, secure and audit2 patches
+
* Thu Jul 14 2005 Ivana Varekova <varekova at redhat.com> 6.1.2-1
- Update to 6.1.2 (among others fix bug 162947)
- fix bug 161973 - The logwatch yum service doesn't properly
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/logwatch/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 14 Jul 2005 07:13:30 -0000 1.10
+++ sources 24 Oct 2005 09:58:29 -0000 1.11
@@ -1 +1 @@
-a764bf80a31ab04ca788ac1303cba297 logwatch-6.1.2.tar.gz
+58fc1ea61df69e0e0839e70a289f5b3e logwatch-7.0.tar.gz
--- logwatch-2.6-101744-up2date.patch DELETED ---
--- logwatch-4.3.2-nosegfault.patch DELETED ---
--- logwatch-6.1.2-yum_erase.patch DELETED ---
- Previous message (by thread): rpms/libidn/devel libidn-0.5.20.tar.gz.sig, NONE, 1.1 .cvsignore, 1.17, 1.18 libidn.spec, 1.22, 1.23 sources, 1.17, 1.18 upstream, 1.10, 1.11 libidn-0.5.19.tar.gz.sig, 1.1, NONE
- Next message (by thread): rpms/logwatch/FC-4 logwatch.spec,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list