From 4f615d74e1afb607ab0837af35a8d172087f591f Mon Sep 17 00:00:00 2001 From: Ivana Varekova Date: Thu, 13 Oct 2005 14:25:46 +0000 Subject: [PATCH] - update to 7.0 (new directory structure) - add smartd and zz-disk_space patch --- .cvsignore | 2 +- logwatch.spec | 152 ++++++++++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 86 insertions(+), 70 deletions(-) diff --git a/.cvsignore b/.cvsignore index de47fab..335bf05 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -logwatch-6.1.2.tar.gz +logwatch-7.0.tar.gz diff --git a/logwatch.spec b/logwatch.spec index 0c32010..380d6cd 100644 --- a/logwatch.spec +++ b/logwatch.spec @@ -1,22 +1,16 @@ Summary: A log file analysis program. Name: logwatch -Version: 6.1.2 -Release: 7 +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 -Patch6: logwatch-6.1.2-secure.patch -Patch7: logwatch-6.1.2-up2date.patch -Patch8: logwatch-6.1.2-named.patch -Patch9: logwatch-6.1.2-sshd.patch -Patch10: logwatch-6.1.2-audit.patch -Patch11: logwatch-6.1.2-cron.patch +Patch2: logwatch-7.0-nosegfault.patch Patch12: logwatch-6.1.2-audit2.patch +Patch13: logwatch-7.0-smartd.patch +Patch14: logwatch-7.0-zz-disk_space.patch Requires: textutils sh-utils grep mailx BuildRoot: %{_tmppath}/logwatch-build @@ -33,93 +27,115 @@ analyzes Samba logs. %prep %setup -q %patch1 -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 +%patch2 -p1 %patch12 -p1 +%patch13 -p1 +%patch14 -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/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 0755 scripts/shared/* %{buildroot}%{_sysconfdir}/log.d/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(noreplace) %{_sysconfdir}/log.d/conf/logwatch.conf -%config(noreplace) %{_sysconfdir}/log.d/conf/services/* -%config(noreplace) %{_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) %{_sysconfdir}/logwatch/conf/services/* +#%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 +* Thu Oct 13 2005 Ivana Varekova 7.0-1 +- update to 7.0 (new directory structure) +- add smartd and zz-disk_space patch + * Mon Oct 3 2005 Ivana Varekova 6.1.2-7 - add audit script patch recognized other unmatched logs - add cron script patch diff --git a/sources b/sources index 25f564e..46eea80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a764bf80a31ab04ca788ac1303cba297 logwatch-6.1.2.tar.gz +58fc1ea61df69e0e0839e70a289f5b3e logwatch-7.0.tar.gz